Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 14.74.5

This commit is contained in:
Antonio Cañas Vargas 2015-02-08 18:39:58 +01:00
parent a1b3ecd331
commit c343635559
4 changed files with 52 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -42,11 +42,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.74.4 (2015/02/08)"
#define Log_PLATFORM_VERSION "SWAD 14.74.5 (2015/02/08)"
// Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h | tail -1
/*
Version 14.74.5: Feb 08, 2015 Changes in layout of form to register/remove users. (178038 lines)
Version 14.74.4: Feb 08, 2015 Changes in layout of form to register/remove users. (178000 lines)
Version 14.74.3: Feb 08, 2015 Button to view banners.
Button to view mail domains.

35
swad_enrollment.c
View File

@ -500,6 +500,7 @@ void Enr_ReqAdminUsrs (void)
static void Enr_ShowFormRegRemSeveralUsrs (void)
{
extern const char *The_ClassTitle[The_NUM_THEMES];
extern const char *Txt_Admin_users;
extern const char *Txt_Step_1_Provide_a_list_of_users;
extern const char *Txt_Option_a_Import_students_from_the_official_lists;
extern const char *Txt_Select_the_groups_of_students_you_want_to_register_in_remove_from_this_course;
@ -527,12 +528,17 @@ static void Enr_ShowFormRegRemSeveralUsrs (void)
if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SYS_ADM)
Enr_PutFormToRemOldUsrs ();
/***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_Admin_users);
fprintf (Gbl.F.Out,"<tr>"
"<td>");
/***** Form to send students to be enrolled / removed *****/
Act_FormStart (ActRcvFrmMdfUsrCrs);
/***** Step 1: List of students to be enrolled / removed *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:left;\">"
"<br />%s"
"%s"
"</div>",
The_ClassTitle[Gbl.Prefs.Theme],
Txt_Step_1_Provide_a_list_of_users);
@ -541,7 +547,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (void)
{
/* Option a: get students from official lists */
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:left;\">"
"<br />%s<br />&nbsp;"
"%s"
"</div>",
The_ClassTitle[Gbl.Prefs.Theme],
Txt_Option_a_Import_students_from_the_official_lists);
@ -550,7 +556,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (void)
/* Option b: get students' IDs from pasted text */
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:left;\">"
"<br />%s<br />&nbsp;"
"%s"
"</div>",
The_ClassTitle[Gbl.Prefs.Theme],
Txt_Option_b_Type_or_paste_a_list_of_users);
@ -561,7 +567,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (void)
/***** Step 2: Select type of user to register/remove to/from current course *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:left;\">"
"<br />%s<br />&nbsp;"
"%s"
"</div>",
The_ClassTitle[Gbl.Prefs.Theme],
Txt_Step_2_Select_the_type_of_user_to_register_remove);
@ -570,7 +576,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (void)
/***** Step 3: Put different actions to register/remove students to/from current course *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:left;\">"
"<br />%s<br />&nbsp;"
"%s"
"</div>",
The_ClassTitle[Gbl.Prefs.Theme],
Txt_Step_3_Select_the_desired_action);
@ -578,7 +584,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (void)
/***** Step 4: Select groups in which register / remove students *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:left;\">"
"<br />%s<br />&nbsp;"
"%s"
"</div>",
The_ClassTitle[Gbl.Prefs.Theme],
Txt_Step_4_Optionally_select_groups);
@ -600,7 +606,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (void)
/***** Step 5: Button to register / remove students *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:left;\">"
"<br />%s<br />&nbsp;"
"%s"
"</div>",
The_ClassTitle[Gbl.Prefs.Theme],
Txt_Step_5_Confirm_the_enrollment_removing);
@ -610,6 +616,11 @@ static void Enr_ShowFormRegRemSeveralUsrs (void)
/***** End of form *****/
fprintf (Gbl.F.Out,"</form>"
"</div>");
/***** Frame end *****/
fprintf (Gbl.F.Out,"</td>"
"</tr>");
Lay_EndRoundFrameTable10 ();
}
/*****************************************************************************/
@ -767,7 +778,7 @@ static void Enr_PutAreaToEnterUsrsIDs (void)
"%s: "
"</td>"
"<td style=\"text-align:left;\">"
"<textarea name=\"UsrsIDs\" cols=\"50\" rows=\"10\">",
"<textarea name=\"UsrsIDs\" cols=\"80\" rows=\"20\">",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_List_of_nicks_emails_or_IDs);
@ -2631,6 +2642,14 @@ static void Enr_ReqAnotherUsrIDToRegisterRemove (void)
{
extern const char *Txt_Enter_the_ID_of_the_user_you_want_to_register_remove_;
/***** Put link to remove old users *****/
if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SYS_ADM)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
Enr_PutFormToRemOldUsrs ();
fprintf (Gbl.F.Out,"</div>");
}
Lay_ShowAlert (Lay_INFO,Txt_Enter_the_ID_of_the_user_you_want_to_register_remove_);
Enr_WriteFormToReqAnotherUsrID (ActReqMdfUsr);

3
swad_group.c
View File

@ -1729,13 +1729,14 @@ static unsigned Grp_ListGrpsForChange (struct GroupType *GrpTyp)
void Grp_ShowLstGrpsToChgOtherUsrsGrps (long UsrCod)
{
extern const char *Txt_Groups;
unsigned NumGrpTyp;
/***** Get list of groups types and groups in current course *****/
Grp_GetListGrpTypesAndGrpsInThisCrs (Grp_ONLY_GROUP_TYPES_WITH_GROUPS);
/***** Start table *****/
Lay_StartRoundFrameTable10 (NULL,0,NULL);
Lay_StartRoundFrameTable10 (NULL,0,Txt_Groups);
/***** List to select the groups the user belongs to *****/
for (NumGrpTyp = 0;

21
swad_text.c
View File

@ -1873,6 +1873,27 @@ const char *Txt_Admin_user =
"Gerenciar utilizador";
#endif
const char *Txt_Admin_users =
#if L==0
"Administrar usuaris";
#elif L==1
"Verwalten Benutzern";
#elif L==2
"Admin users";
#elif L==3
"Administrar usuarios";
#elif L==4
"G&eacute;rer utilisateurs";
#elif L==5
"Administrar usuarios"; // Okoteve traducción
#elif L==6
"Gestire utenti";
#elif L==7
"Zarz&aogon;dzaj u&zdot;ytkownikow";
#elif L==8
"Gerenciar utilizadores";
#endif
const char *Txt_All =
#if L==0
"Tot";