Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-09 10:15:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 16.107.3

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-12-26 16:58:49 +01:00
parent 0373ec2bc3
commit 3299bc6592
5 changed files with 45 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -189,13 +189,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.107.2 (2016-12-26)" #define Log_PLATFORM_VERSION "SWAD 16.107.3 (2016-12-26)"
#define CSS_FILE "swad16.106.5.css" #define CSS_FILE "swad16.106.5.css"
#define JS_FILE "swad16.101.js" #define JS_FILE "swad16.101.js"
// Number of lines (includes comments but not blank lines) has been got with the following command: // 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 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
/* /*
Version 16.107.3: Dec 26, 2016 Changes in behaviour of labels in forms. (211531 lines)
Version 16.107.2: Dec 26, 2016 Changes in behaviour of labels in forms. (211525 lines) Version 16.107.2: Dec 26, 2016 Changes in behaviour of labels in forms. (211525 lines)
Version 16.107.1: Dec 26, 2016 Changes in behaviour of labels in forms. Version 16.107.1: Dec 26, 2016 Changes in behaviour of labels in forms.
Code refactoring in tests. (211515 lines) Code refactoring in tests. (211515 lines)

3
swad_password.c
View File

@ -929,7 +929,8 @@ void Pwd_AskForConfirmationOnDangerousAction (void)
"<label class=\"%s\">" "<label class=\"%s\">"
"%s:&nbsp;" "%s:&nbsp;"
"<input type=\"password\" name=\"OthUsrPwd\"" "<input type=\"password\" name=\"OthUsrPwd\""
" size=\"16\" maxlength=\"%u\" autocomplete=\"off\" />" " size=\"16\" maxlength=\"%u\""
" autocomplete=\"off\" required=\"required\" />"
"</label>" "</label>"
"</div>", "</div>",
The_ClassForm[Gbl.Prefs.Theme], The_ClassForm[Gbl.Prefs.Theme],

2
swad_text.c
View File

@ -29925,7 +29925,7 @@ const char *Txt_Real_number_between_A_and_B_1 =
"N&ordm; real entre"; "N&ordm; real entre";
#endif #endif
const char *Txt_Real_number_between_A_and_B_2 = const char *Txt_Real_number_between_A_and_B_2 = // Must start by space
#if L==1 #if L==1
" i"; " i";
#elif L==2 #elif L==2

73
swad_user.c
View File

@ -1894,37 +1894,33 @@ void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncParams) ())
/***** Start frame and table *****/ /***** Start frame and table *****/
Lay_StartRoundFrameTable (NULL,Txt_Log_in,NULL,Hlp_PROFILE_Log_in,2); Lay_StartRoundFrameTable (NULL,Txt_Log_in,NULL,Hlp_PROFILE_Log_in,2);
/***** User's ID/nickname and password *****/ /***** User's ID/nickname *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<div class=\"LEFT_MIDDLE\">"
"<td class=\"BM\">" "<label>"
"<img src=\"%s/user64x64.gif\"" "<img src=\"%s/user64x64.gif\" alt=\"%s\" title=\"%s\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />" " class=\"ICO20x20\" />"
"</td>" "<input type=\"text\" name=\"UsrId\""
"<td class=\"LEFT_MIDDLE\">" " size=\"18\" maxlength=\"%u\" placeholder=\"%s\""
"<input type=\"text\" id=\"UsrId\" name=\"UsrId\"" " value=\"%s\""
" size=\"18\" maxlength=\"%u\""
" placeholder=\"%s\" value=\"%s\""
" autofocus=\"autofocus\" required=\"required\" />" " autofocus=\"autofocus\" required=\"required\" />"
"</td>" "</label>"
"</tr>" "</div>",
"<tr>"
"<td class=\"BM\">"
"<img src=\"%s/key64x64.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />"
"</td>"
"<td class=\"LEFT_MIDDLE\">"
"<input type=\"password\" name=\"UsrPwd\""
" size=\"18\" maxlength=\"%u\" placeholder=\"%s\" />"
"</td>"
"</tr>",
Gbl.Prefs.IconsURL, Gbl.Prefs.IconsURL,
Txt_User[Usr_SEX_UNKNOWN], Txt_User[Usr_SEX_UNKNOWN],
Txt_User[Usr_SEX_UNKNOWN], Txt_User[Usr_SEX_UNKNOWN],
Usr_MAX_LENGTH_USR_LOGIN, Usr_MAX_LENGTH_USR_LOGIN,
Txt_nick_email_or_ID, Txt_nick_email_or_ID,
Gbl.Usrs.Me.UsrIdLogin, Gbl.Usrs.Me.UsrIdLogin);
/***** User's password *****/
fprintf (Gbl.F.Out,"<div class=\"LEFT_MIDDLE\">"
"<label>"
"<img src=\"%s/key64x64.gif\" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />"
"<input type=\"password\" name=\"UsrPwd\""
" size=\"18\" maxlength=\"%u\" placeholder=\"%s\" />"
"</label>"
"</div>",
Gbl.Prefs.IconsURL, Gbl.Prefs.IconsURL,
Txt_Password, Txt_Password,
Txt_Password, Txt_Password,
@ -5438,7 +5434,7 @@ void Usr_ListUsersToSelect (Rol_Role_t Role)
return; return;
/***** Put a row to select all users *****/ /***** Put a row to select all users *****/
Usr_PutCheckboxToSelectAllTheUsers (Role); Usr_PutCheckboxToSelectAllUsers (Role);
/***** Draw the classphoto/list *****/ /***** Draw the classphoto/list *****/
switch (Gbl.Usrs.Me.ListType) switch (Gbl.Usrs.Me.ListType)
@ -5453,10 +5449,10 @@ void Usr_ListUsersToSelect (Rol_Role_t Role)
} }
/*****************************************************************************/ /*****************************************************************************/
/****** Put a row, in a classphoto or a list, to select all the users ********/ /******** Put a row, in a classphoto or a list, to select all users **********/
/*****************************************************************************/ /*****************************************************************************/
void Usr_PutCheckboxToSelectAllTheUsers (Rol_Role_t Role) void Usr_PutCheckboxToSelectAllUsers (Rol_Role_t Role)
{ {
extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
@ -5564,13 +5560,16 @@ static void Usr_PutCheckboxListWithPhotos (void)
Par_PutHiddenParamChar ("WithPhotosExists",'Y'); Par_PutHiddenParamChar ("WithPhotosExists",'Y');
/***** Put checkbox to select whether list users with photos *****/ /***** Put checkbox to select whether list users with photos *****/
fprintf (Gbl.F.Out,"<input type=\"checkbox\" name=\"WithPhotos\" value=\"Y\""); fprintf (Gbl.F.Out,"<label class=\"%s\">"
"<input type=\"checkbox\" name=\"WithPhotos\""
" value=\"Y\"",
The_ClassForm[Gbl.Prefs.Theme]);
if (Gbl.Usrs.Listing.WithPhotos) if (Gbl.Usrs.Listing.WithPhotos)
fprintf (Gbl.F.Out," checked=\"checked\""); fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," onclick=\"document.getElementById('%s').submit();\" />" fprintf (Gbl.F.Out," onclick=\"document.getElementById('%s').submit();\" />"
"<span class=\"%s\">%s</span>", "%s"
Gbl.Form.Id, "</label>",
The_ClassForm[Gbl.Prefs.Theme],Txt_Display_photos); Gbl.Form.Id,Txt_Display_photos);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -6979,7 +6978,7 @@ void Usr_SeeGuests (void)
fprintf (Gbl.F.Out,"<table style=\"width:100%%;\">"); fprintf (Gbl.F.Out,"<table style=\"width:100%%;\">");
/* Put a row to select all users */ /* Put a row to select all users */
Usr_PutCheckboxToSelectAllTheUsers (Rol__GUEST_); Usr_PutCheckboxToSelectAllUsers (Rol__GUEST_);
/* Draw the classphoto/list */ /* Draw the classphoto/list */
switch (Gbl.Usrs.Me.ListType) switch (Gbl.Usrs.Me.ListType)
@ -7145,7 +7144,7 @@ void Usr_SeeStudents (void)
/* Put a row to select all users */ /* Put a row to select all users */
if (ICanViewRecords) if (ICanViewRecords)
Usr_PutCheckboxToSelectAllTheUsers (Rol_STUDENT); Usr_PutCheckboxToSelectAllUsers (Rol_STUDENT);
/* Draw the classphoto/list */ /* Draw the classphoto/list */
switch (Gbl.Usrs.Me.ListType) switch (Gbl.Usrs.Me.ListType)
@ -7298,7 +7297,7 @@ void Usr_SeeTeachers (void)
/* Put a row to select all users */ /* Put a row to select all users */
if (ICanViewRecords) if (ICanViewRecords)
Usr_PutCheckboxToSelectAllTheUsers (Rol_TEACHER); Usr_PutCheckboxToSelectAllUsers (Rol_TEACHER);
/***** Draw the classphoto/list *****/ /***** Draw the classphoto/list *****/
switch (Gbl.Usrs.Me.ListType) switch (Gbl.Usrs.Me.ListType)
@ -7451,10 +7450,12 @@ static void Usr_PutLinkToShowGstsAllData (void)
{ {
extern const char *Txt_Show_all_data; extern const char *Txt_Show_all_data;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActLstGstAll,Usr_ShowGstsAllDataParams, Lay_PutContextualLink (ActLstGstAll,Usr_ShowGstsAllDataParams,
"table64x64.gif", "table64x64.gif",
Txt_Show_all_data,Txt_Show_all_data, Txt_Show_all_data,Txt_Show_all_data,
NULL); NULL);
fprintf (Gbl.F.Out,"</div>");
} }
static void Usr_PutIconToShowStdsAllData (void) static void Usr_PutIconToShowStdsAllData (void)
@ -7471,10 +7472,12 @@ static void Usr_PutLinkToShowStdsAllData (void)
{ {
extern const char *Txt_Show_all_data; extern const char *Txt_Show_all_data;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActLstStdAll,Usr_ShowStdsAllDataParams, Lay_PutContextualLink (ActLstStdAll,Usr_ShowStdsAllDataParams,
"table64x64.gif", "table64x64.gif",
Txt_Show_all_data,Txt_Show_all_data, Txt_Show_all_data,Txt_Show_all_data,
NULL); NULL);
fprintf (Gbl.F.Out,"</div>");
} }
static void Usr_PutIconToShowTchsAllData (void) static void Usr_PutIconToShowTchsAllData (void)
@ -7491,10 +7494,12 @@ static void Usr_PutLinkToShowTchsAllData (void)
{ {
extern const char *Txt_Show_all_data; extern const char *Txt_Show_all_data;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActLstTchAll,Usr_ShowTchsAllDataParams, Lay_PutContextualLink (ActLstTchAll,Usr_ShowTchsAllDataParams,
"table64x64.gif", "table64x64.gif",
Txt_Show_all_data,Txt_Show_all_data, Txt_Show_all_data,Txt_Show_all_data,
NULL); NULL);
fprintf (Gbl.F.Out,"</div>");
} }
static void Usr_ShowGstsAllDataParams (void) static void Usr_ShowGstsAllDataParams (void)

2
swad_user.h
View File

@ -352,7 +352,7 @@ void Usr_FreeListsSelectedUsrsCods (void);
void Usr_FreeListOtherRecipients (void); void Usr_FreeListOtherRecipients (void);
void Usr_ShowFormsToSelectUsrListType (Act_Action_t NextAction); void Usr_ShowFormsToSelectUsrListType (Act_Action_t NextAction);
void Usr_PutCheckboxToSelectAllTheUsers (Rol_Role_t Role); void Usr_PutCheckboxToSelectAllUsers (Rol_Role_t Role);
unsigned Usr_GetColumnsForSelectUsrs (void); unsigned Usr_GetColumnsForSelectUsrs (void);
void Usr_SetUsrDatMainFieldNames (void); void Usr_SetUsrDatMainFieldNames (void);
void Usr_WriteHeaderFieldsUsrDat (bool PutCheckBoxToSelectUsr); void Usr_WriteHeaderFieldsUsrDat (bool PutCheckBoxToSelectUsr);