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 16.105.12

This commit is contained in:
Antonio Cañas Vargas 2016-12-21 01:51:30 +01:00
parent cf97d3e62b
commit ccf0efc06f
3 changed files with 118 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -188,13 +188,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.105.11 (2016-12-21)"
#define Log_PLATFORM_VERSION "SWAD 16.105.12 (2016-12-21)"
#define CSS_FILE "swad16.105.3.css"
#define JS_FILE "swad16.101.js"
// 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 sql/swad*.sql | tail -1
/*
Version 16.105.12:Dec 21, 2016 Changes in behaviour of labels in forms. (211408 lines)
Version 16.105.11:Dec 21, 2016 Changes in behaviour of labels in forms. (211323 lines)
Version 16.105.10:Dec 21, 2016 Changes in behaviour of labels in forms. (211320 lines)
Version 16.105.9: Dec 21, 2016 Changes in behaviour of labels in forms. (211316 lines)

139
swad_enrollment.c
View File

@ -884,14 +884,20 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
Txt_Register_USER_in_the_course_X),
Gbl.CurrentCrs.Crs.ShrtName);
fprintf (Gbl.F.Out,"<li>"
"<input type=\"radio\" name=\"RegRemAction\" value=\"%u\"",
"<label>"
"<input type=\"radio\" name=\"RegRemAction\""
" value=\"%u\"",
(unsigned) Enr_REGISTER_MODIFY_ONE_USR_IN_CRS);
if (!OptionChecked)
{
fprintf (Gbl.F.Out," checked=\"checked\"");
OptionChecked = true;
}
fprintf (Gbl.F.Out," />%s</li>",Gbl.Message);
fprintf (Gbl.F.Out," />"
"%s"
"</label>"
"</li>",
Gbl.Message);
NumOptionsShown++;
}
@ -908,14 +914,20 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
sprintf (Gbl.Message,Txt_Register_USER_as_an_administrator_of_the_degree_X,
Gbl.CurrentDeg.Deg.ShrtName);
fprintf (Gbl.F.Out,"<li>"
"<input type=\"radio\" name=\"RegRemAction\" value=\"%u\"",
"<label>"
"<input type=\"radio\" name=\"RegRemAction\""
" value=\"%u\"",
(unsigned) Enr_REGISTER_ONE_DEGREE_ADMIN);
if (!OptionChecked)
{
fprintf (Gbl.F.Out," checked=\"checked\"");
OptionChecked = true;
}
fprintf (Gbl.F.Out," />%s</li>",Gbl.Message);
fprintf (Gbl.F.Out," />"
"%s"
"</label>"
"</li>",
Gbl.Message);
NumOptionsShown++;
}
@ -927,14 +939,20 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
sprintf (Gbl.Message,Txt_Register_USER_as_an_administrator_of_the_centre_X,
Gbl.CurrentCtr.Ctr.ShrtName);
fprintf (Gbl.F.Out,"<li>"
"<input type=\"radio\" name=\"RegRemAction\" value=\"%u\"",
"<label>"
"<input type=\"radio\" name=\"RegRemAction\""
" value=\"%u\"",
(unsigned) Enr_REGISTER_ONE_CENTRE_ADMIN);
if (!OptionChecked)
{
fprintf (Gbl.F.Out," checked=\"checked\"");
OptionChecked = true;
}
fprintf (Gbl.F.Out," />%s</li>",Gbl.Message);
fprintf (Gbl.F.Out," />"
"%s"
"</label>"
"</li>",
Gbl.Message);
NumOptionsShown++;
}
@ -947,14 +965,20 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
sprintf (Gbl.Message,Txt_Register_USER_as_an_administrator_of_the_institution_X,
Gbl.CurrentIns.Ins.ShrtName);
fprintf (Gbl.F.Out,"<li>"
"<input type=\"radio\" name=\"RegRemAction\" value=\"%u\"",
"<label>"
"<input type=\"radio\" name=\"RegRemAction\""
" value=\"%u\"",
(unsigned) Enr_REGISTER_ONE_INSTITUTION_ADMIN);
if (!OptionChecked)
{
fprintf (Gbl.F.Out," checked=\"checked\"");
OptionChecked = true;
}
fprintf (Gbl.F.Out," />%s</li>",Gbl.Message);
fprintf (Gbl.F.Out," />"
"%s"
"</label>"
"</li>",
Gbl.Message);
NumOptionsShown++;
}
@ -964,14 +988,20 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
if (!ItsMe && Gbl.Usrs.Me.LoggedRole >= Rol_TEACHER)
{
fprintf (Gbl.F.Out,"<li>"
"<input type=\"radio\" name=\"RegRemAction\" value=\"%u\"",
"<label>"
"<input type=\"radio\" name=\"RegRemAction\""
" value=\"%u\"",
(unsigned) Enr_REPORT_USR_AS_POSSIBLE_DUPLICATE);
if (!OptionChecked)
{
fprintf (Gbl.F.Out," checked=\"checked\"");
OptionChecked = true;
}
fprintf (Gbl.F.Out," />%s</li>",Txt_Report_possible_duplicate_user);
fprintf (Gbl.F.Out," />"
"%s"
"</label>"
"</li>",
Txt_Report_possible_duplicate_user);
NumOptionsShown++;
}
@ -984,14 +1014,20 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
Txt_Remove_USER_from_the_course_X,
Gbl.CurrentCrs.Crs.ShrtName);
fprintf (Gbl.F.Out,"<li>"
"<input type=\"radio\" name=\"RegRemAction\" value=\"%u\"",
"<label>"
"<input type=\"radio\" name=\"RegRemAction\""
" value=\"%u\"",
(unsigned) Enr_REMOVE_ONE_USR_FROM_CRS);
if (!OptionChecked)
{
fprintf (Gbl.F.Out," checked=\"checked\"");
OptionChecked = true;
}
fprintf (Gbl.F.Out," />%s</li>",Gbl.Message);
fprintf (Gbl.F.Out," />"
"%s"
"</label>"
"</li>",
Gbl.Message);
NumOptionsShown++;
}
@ -1010,14 +1046,20 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
Txt_Remove_USER_as_an_administrator_of_the_degree_X,
Gbl.CurrentDeg.Deg.ShrtName);
fprintf (Gbl.F.Out,"<li>"
"<input type=\"radio\" name=\"RegRemAction\" value=\"%u\"",
"<label>"
"<input type=\"radio\" name=\"RegRemAction\""
" value=\"%u\"",
(unsigned) Enr_REMOVE_ONE_DEGREE_ADMIN);
if (!OptionChecked)
{
fprintf (Gbl.F.Out," checked=\"checked\"");
OptionChecked = true;
}
fprintf (Gbl.F.Out," />%s</li>",Gbl.Message);
fprintf (Gbl.F.Out," />"
"%s"
"</label>"
"</li>",
Gbl.Message);
NumOptionsShown++;
}
@ -1031,14 +1073,20 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
Txt_Remove_USER_as_an_administrator_of_the_centre_X,
Gbl.CurrentCtr.Ctr.ShrtName);
fprintf (Gbl.F.Out,"<li>"
"<input type=\"radio\" name=\"RegRemAction\" value=\"%u\"",
"<label>"
"<input type=\"radio\" name=\"RegRemAction\""
" value=\"%u\"",
(unsigned) Enr_REMOVE_ONE_CENTRE_ADMIN);
if (!OptionChecked)
{
fprintf (Gbl.F.Out," checked=\"checked\"");
OptionChecked = true;
}
fprintf (Gbl.F.Out," />%s</li>",Gbl.Message);
fprintf (Gbl.F.Out," />"
"%s"
"</label>"
"</li>",
Gbl.Message);
NumOptionsShown++;
}
@ -1053,14 +1101,20 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
Txt_Remove_USER_as_an_administrator_of_the_institution_X,
Gbl.CurrentIns.Ins.ShrtName);
fprintf (Gbl.F.Out,"<li>"
"<input type=\"radio\" name=\"RegRemAction\" value=\"%u\"",
"<label>"
"<input type=\"radio\" name=\"RegRemAction\""
" value=\"%u\"",
(unsigned) Enr_REMOVE_ONE_INSTITUTION_ADMIN);
if (!OptionChecked)
{
fprintf (Gbl.F.Out," checked=\"checked\"");
OptionChecked = true;
}
fprintf (Gbl.F.Out," />%s</li>",Gbl.Message);
fprintf (Gbl.F.Out," />"
"%s"
"</label>"
"</li>",
Gbl.Message);
NumOptionsShown++;
}
@ -1070,11 +1124,16 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
if (Acc_CheckIfICanEliminateAccount (Gbl.Usrs.Other.UsrDat.UsrCod))
{
fprintf (Gbl.F.Out,"<li>"
"<input type=\"radio\" name=\"RegRemAction\" value=\"%u\"",
"<label>"
"<input type=\"radio\" name=\"RegRemAction\""
" value=\"%u\"",
(unsigned) Enr_ELIMINATE_ONE_USR_FROM_PLATFORM);
if (!OptionChecked)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," />%s</li>",
fprintf (Gbl.F.Out," />"
"%s"
"</label>"
"</li>",
ItsMe ? Txt_Eliminate_my_user_account :
Txt_Eliminate_user_account);
@ -1108,17 +1167,33 @@ static void Enr_PutActionsRegRemSeveralUsrs (void)
/***** Register / remove users listed or not listed *****/
if (Gbl.CurrentCrs.Crs.CrsCod > 0) // Course selected
fprintf (Gbl.F.Out,"<li>"
"<input type=\"radio\" name=\"RegRemAction\" value=\"%u\" checked=\"checked\" />"
"%s</li>"
"<label>"
"<input type=\"radio\" name=\"RegRemAction\""
" value=\"%u\" checked=\"checked\" />"
"%s"
"</label>"
"</li>"
"<li>"
"<input type=\"radio\" name=\"RegRemAction\" value=\"%u\" />"
"%s</li>"
"<label>"
"<input type=\"radio\" name=\"RegRemAction\""
" value=\"%u\" />"
"%s"
"</label>"
"</li>"
"<li>"
"<input type=\"radio\" name=\"RegRemAction\" value=\"%u\" />"
"%s</li>"
"<label>"
"<input type=\"radio\" name=\"RegRemAction\""
" value=\"%u\" />"
"%s"
"</label>"
"</li>"
"<li>"
"<input type=\"radio\" name=\"RegRemAction\" value=\"%u\" />"
"%s</li>",
"<label>"
"<input type=\"radio\" name=\"RegRemAction\""
" value=\"%u\" />"
"%s"
"</label>"
"</li>",
(unsigned) Enr_REGISTER_SPECIFIED_USRS_IN_CRS,
Txt_Register_the_users_indicated_in_step_1,
(unsigned) Enr_REMOVE_SPECIFIED_USRS_FROM_CRS,
@ -1131,8 +1206,12 @@ static void Enr_PutActionsRegRemSeveralUsrs (void)
/***** Only for superusers *****/
if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
fprintf (Gbl.F.Out,"<li>"
"<input type=\"radio\" name=\"RegRemAction\" value=\"%u\" />"
"%s</li>",
"<label>"
"<input type=\"radio\" name=\"RegRemAction\""
" value=\"%u\" />"
"%s"
"</label>"
"</li>",
(unsigned) Enr_ELIMINATE_USRS_FROM_PLATFORM,
Txt_Eliminate_from_the_platform_the_users_indicated_in_step_1);

9
swad_password.c
View File

@ -920,11 +920,16 @@ void Pwd_AskForConfirmationOnDangerousAction (void)
extern const char *Txt_For_security_enter_your_password;
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\" style=\"margin:12px;\">"
"<label class=\"%s\">"
"<input type=\"checkbox\" name=\"Consent\" value=\"Y\" />"
"<span class=\"%s\">%s</span><br />"
"<span class=\"%s\">%s: </span>"
"%s"
"</label>"
"<br />"
"<label class=\"%s\">"
"%s:&nbsp;"
"<input type=\"password\" name=\"OthUsrPwd\""
" size=\"16\" maxlength=\"%u\" autocomplete=\"off\" />"
"</label>"
"</div>",
The_ClassForm[Gbl.Prefs.Theme],
Txt_I_understand_that_this_action_can_not_be_undone,