Version 15.60.6
BIN
icon/arroba64x64.gif
Normal file
After Width: | Height: | Size: 711 B |
BIN
icon/key64x64.gif
Normal file
After Width: | Height: | Size: 446 B |
BIN
icon/key64x64.png
Normal file
After Width: | Height: | Size: 1.8 KiB |
BIN
icon/login-green64x64.png
Normal file
After Width: | Height: | Size: 943 B |
BIN
icon/login64x64.png
Normal file
After Width: | Height: | Size: 887 B |
BIN
icon/logout-red64x64.png
Normal file
After Width: | Height: | Size: 858 B |
BIN
icon/logout64x64.png
Normal file
After Width: | Height: | Size: 922 B |
BIN
icon/search-white64x64.png
Normal file
After Width: | Height: | Size: 1.4 KiB |
BIN
icon/search64x64.gif
Normal file
After Width: | Height: | Size: 437 B |
BIN
icon/search64x64.png
Normal file
After Width: | Height: | Size: 1.8 KiB |
BIN
icon/user64x64.gif
Normal file
After Width: | Height: | Size: 371 B |
|
@ -378,13 +378,13 @@ void ID_PutLinkToChangeUsrIDs (void)
|
||||||
/***** Link for changing the password *****/
|
/***** Link for changing the password *****/
|
||||||
if (Gbl.Usrs.Other.UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod) // It's me
|
if (Gbl.Usrs.Other.UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod) // It's me
|
||||||
Act_PutContextualLink (ActFrmUsrAcc,NULL,
|
Act_PutContextualLink (ActFrmUsrAcc,NULL,
|
||||||
"arroba16x16.gif",Txt_Change_IDs);
|
"arroba64x64.gif",Txt_Change_IDs);
|
||||||
else // Not me
|
else // Not me
|
||||||
Act_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActFrmIDsStd :
|
Act_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActFrmIDsStd :
|
||||||
(Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActFrmIDsTch :
|
(Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActFrmIDsTch :
|
||||||
ActFrmIDsOth), // Guest, visitor or admin
|
ActFrmIDsOth), // Guest, visitor or admin
|
||||||
Usr_PutParamOtherUsrCodEncrypted,
|
Usr_PutParamOtherUsrCodEncrypted,
|
||||||
"arroba16x16.gif",Txt_Change_IDs);
|
"arroba64x64.gif",Txt_Change_IDs);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
|
@ -127,7 +127,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
|
||||||
|
|
||||||
/***** Link to log in *****/
|
/***** Link to log in *****/
|
||||||
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
|
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
|
||||||
Act_PutContextualLink (ActFrmLogIn,NULL,"login16x16.gif",Txt_Log_in);
|
Act_PutContextualLink (ActFrmLogIn,NULL,"login64x64.png",Txt_Log_in);
|
||||||
fprintf (Gbl.F.Out,"</div>");
|
fprintf (Gbl.F.Out,"</div>");
|
||||||
|
|
||||||
/***** Form to enter some data of the new user *****/
|
/***** Form to enter some data of the new user *****/
|
||||||
|
|
|
@ -110,12 +110,13 @@
|
||||||
/****************************** Public constants *****************************/
|
/****************************** Public constants *****************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#define Log_PLATFORM_VERSION "SWAD 15.60.5 (2015/12/08)"
|
#define Log_PLATFORM_VERSION "SWAD 15.60.6 (2015/12/08)"
|
||||||
#define CSS_FILE "swad15.59.4.css"
|
#define CSS_FILE "swad15.59.4.css"
|
||||||
|
|
||||||
// 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 15.60.6: Dec 08, 2015 Changed icons in login. (186592 lines)
|
||||||
Version 15.60.5: Dec 08, 2015 Changed some messages related to login. (186589 lines)
|
Version 15.60.5: Dec 08, 2015 Changed some messages related to login. (186589 lines)
|
||||||
Version 15.60.4: Dec 08, 2015 Change in text about first / last year of a degree. (186589 lines)
|
Version 15.60.4: Dec 08, 2015 Change in text about first / last year of a degree. (186589 lines)
|
||||||
Version 15.60.3: Dec 08, 2015 Fixed bug in country.
|
Version 15.60.3: Dec 08, 2015 Fixed bug in country.
|
||||||
|
|
|
@ -2898,7 +2898,7 @@ static void Crs_PutLinkToSearchCourses (void)
|
||||||
(Gbl.CurrentCty.Cty.CtyCod > 0 ? ActCtyReqSch :
|
(Gbl.CurrentCty.Cty.CtyCod > 0 ? ActCtyReqSch :
|
||||||
ActSysReqSch)))),
|
ActSysReqSch)))),
|
||||||
Crs_PutLinkToSearchCoursesParams,
|
Crs_PutLinkToSearchCoursesParams,
|
||||||
"search16x16.gif",Txt_Search_courses);
|
"search64x64.gif",Txt_Search_courses);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Crs_PutLinkToSearchCoursesParams (void)
|
static void Crs_PutLinkToSearchCoursesParams (void)
|
||||||
|
|
|
@ -724,7 +724,7 @@ static void Lay_WritePageTopHeading (void)
|
||||||
(Gbl.CurrentCty.Cty.CtyCod > 0 ? ActCtySch :
|
(Gbl.CurrentCty.Cty.CtyCod > 0 ? ActCtySch :
|
||||||
ActSysSch)))));
|
ActSysSch)))));
|
||||||
Sco_PutParamScope (Sco_SCOPE_SYS);
|
Sco_PutParamScope (Sco_SCOPE_SYS);
|
||||||
Sch_PutFormToSearch (Gbl.Prefs.PathTheme,"head_search_text");
|
Sch_PutFormToSearch ("search-white64x64.png","head_search_text");
|
||||||
Act_FormEnd ();
|
Act_FormEnd ();
|
||||||
fprintf (Gbl.F.Out,"</div>"); // head_row_1_search
|
fprintf (Gbl.F.Out,"</div>"); // head_row_1_search
|
||||||
|
|
||||||
|
|
|
@ -218,7 +218,7 @@ void Pwd_PutLinkToSendNewPasswd (void)
|
||||||
extern const char *Txt_Forgotten_password;
|
extern const char *Txt_Forgotten_password;
|
||||||
|
|
||||||
Act_PutContextualLink (ActReqSndNewPwd,Pwd_PutLinkToSendNewPasswdParams,
|
Act_PutContextualLink (ActReqSndNewPwd,Pwd_PutLinkToSendNewPasswdParams,
|
||||||
"key16x16.gif",Txt_Forgotten_password);
|
"key64x64.gif",Txt_Forgotten_password);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Pwd_PutLinkToSendNewPasswdParams (void)
|
static void Pwd_PutLinkToSendNewPasswdParams (void)
|
||||||
|
@ -842,7 +842,7 @@ void Pwd_PutLinkToChangeMyPassword (void)
|
||||||
extern const char *Txt_Change_password;
|
extern const char *Txt_Change_password;
|
||||||
|
|
||||||
/***** Link for changing the password *****/
|
/***** Link for changing the password *****/
|
||||||
Act_PutContextualLink (ActFrmChgMyPwd,NULL,"key16x16.gif",Txt_Change_password);
|
Act_PutContextualLink (ActFrmChgMyPwd,NULL,"key64x64.gif",Txt_Change_password);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
@ -861,7 +861,7 @@ void Pwd_PutLinkToChangeOtherUsrPassword (void)
|
||||||
(Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActFrmPwdTch :
|
(Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActFrmPwdTch :
|
||||||
ActFrmPwdOth),
|
ActFrmPwdOth),
|
||||||
Usr_PutParamOtherUsrCodEncrypted,
|
Usr_PutParamOtherUsrCodEncrypted,
|
||||||
"key16x16.gif",Txt_Change_password);
|
"key64x64.gif",Txt_Change_password);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
|
@ -266,7 +266,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco
|
||||||
fprintf (Gbl.F.Out,"</select>");
|
fprintf (Gbl.F.Out,"</select>");
|
||||||
|
|
||||||
/***** String to find *****/
|
/***** String to find *****/
|
||||||
Sch_PutFormToSearch (Gbl.Prefs.IconsURL,NULL);
|
Sch_PutFormToSearch ("search64x64.png",NULL);
|
||||||
|
|
||||||
/***** Send button and end frame *****/
|
/***** Send button and end frame *****/
|
||||||
Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Search);
|
Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Search);
|
||||||
|
@ -304,7 +304,7 @@ static bool Sch_CheckIfIHavePermissionToSearch (Sch_WhatToSearch_t WhatToSearch)
|
||||||
/*********** Put form to search courses, teachers, documents... **************/
|
/*********** Put form to search courses, teachers, documents... **************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
void Sch_PutFormToSearch (const char *IconURL,const char *IdInputText)
|
void Sch_PutFormToSearch (const char *Icon,const char *IdInputText)
|
||||||
{
|
{
|
||||||
extern const char *Txt_Search;
|
extern const char *Txt_Search;
|
||||||
|
|
||||||
|
@ -322,10 +322,11 @@ void Sch_PutFormToSearch (const char *IconURL,const char *IdInputText)
|
||||||
fprintf (Gbl.F.Out," style=\"margin:0;\" />");
|
fprintf (Gbl.F.Out," style=\"margin:0;\" />");
|
||||||
|
|
||||||
/***** Send button *****/
|
/***** Send button *****/
|
||||||
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/search16x16.gif\""
|
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s\""
|
||||||
" alt=\"%s\" title=\"%s\""
|
" alt=\"%s\" title=\"%s\""
|
||||||
" class=\"ICON16x16\" />",
|
" class=\"ICON16x16\" />",
|
||||||
IconURL,
|
Gbl.Prefs.IconsURL,
|
||||||
|
Icon,
|
||||||
Txt_Search,
|
Txt_Search,
|
||||||
Txt_Search);
|
Txt_Search);
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,7 +63,7 @@ void Sch_ReqInsSearch (void);
|
||||||
void Sch_ReqCtrSearch (void);
|
void Sch_ReqCtrSearch (void);
|
||||||
void Sch_ReqDegSearch (void);
|
void Sch_ReqDegSearch (void);
|
||||||
void Sch_ReqCrsSearch (void);
|
void Sch_ReqCrsSearch (void);
|
||||||
void Sch_PutFormToSearch (const char *IconURL,const char *IdInputText);
|
void Sch_PutFormToSearch (const char *Icon,const char *IdInputText);
|
||||||
void Sch_GetParamWhatToSearch (void);
|
void Sch_GetParamWhatToSearch (void);
|
||||||
void Sch_GetParamsSearch (void);
|
void Sch_GetParamsSearch (void);
|
||||||
void Sch_SysSearch (void);
|
void Sch_SysSearch (void);
|
||||||
|
|
18
swad_user.c
|
@ -1426,7 +1426,7 @@ void Usr_WriteFormLogin (void)
|
||||||
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
|
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
|
||||||
|
|
||||||
/* Link to create a new account */
|
/* Link to create a new account */
|
||||||
Act_PutContextualLink (ActFrmUsrAcc,NULL,"arroba16x16.gif",Txt_Create_account);
|
Act_PutContextualLink (ActFrmUsrAcc,NULL,"arroba64x64.gif",Txt_Create_account);
|
||||||
|
|
||||||
/* Link to enter from external site */
|
/* Link to enter from external site */
|
||||||
if (Cfg_EXTERNAL_LOGIN_URL[0] &&
|
if (Cfg_EXTERNAL_LOGIN_URL[0] &&
|
||||||
|
@ -1437,7 +1437,7 @@ void Usr_WriteFormLogin (void)
|
||||||
The_ClassFormBold[Gbl.Prefs.Theme]);
|
The_ClassFormBold[Gbl.Prefs.Theme]);
|
||||||
sprintf (Gbl.Title,Txt_Enter_from_X,
|
sprintf (Gbl.Title,Txt_Enter_from_X,
|
||||||
Cfg_EXTERNAL_LOGIN_SERVICE_SHORT_NAME);
|
Cfg_EXTERNAL_LOGIN_SERVICE_SHORT_NAME);
|
||||||
Lay_PutIconWithText ("login16x16.gif",
|
Lay_PutIconWithText ("login64x64.png",
|
||||||
Gbl.Title,
|
Gbl.Title,
|
||||||
Gbl.Title);
|
Gbl.Title);
|
||||||
}
|
}
|
||||||
|
@ -1455,7 +1455,7 @@ void Usr_WriteFormLogin (void)
|
||||||
/***** User's ID/nickname and password *****/
|
/***** User's ID/nickname and password *****/
|
||||||
fprintf (Gbl.F.Out,"<tr>"
|
fprintf (Gbl.F.Out,"<tr>"
|
||||||
"<td class=\"BM\">"
|
"<td class=\"BM\">"
|
||||||
"<img src=\"%s/user16x16.gif\""
|
"<img src=\"%s/user64x64.gif\""
|
||||||
" alt=\"%s\" title=\"%s\""
|
" alt=\"%s\" title=\"%s\""
|
||||||
" class=\"ICON16x16\" />"
|
" class=\"ICON16x16\" />"
|
||||||
"</td>"
|
"</td>"
|
||||||
|
@ -1467,7 +1467,7 @@ void Usr_WriteFormLogin (void)
|
||||||
"</tr>"
|
"</tr>"
|
||||||
"<tr>"
|
"<tr>"
|
||||||
"<td class=\"BM\">"
|
"<td class=\"BM\">"
|
||||||
"<img src=\"%s/key16x16.gif\""
|
"<img src=\"%s/key64x64.gif\""
|
||||||
" alt=\"%s\" title=\"%s\""
|
" alt=\"%s\" title=\"%s\""
|
||||||
" class=\"ICON16x16\" />"
|
" class=\"ICON16x16\" />"
|
||||||
"</td>"
|
"</td>"
|
||||||
|
@ -1607,12 +1607,12 @@ void Usr_PutFormLogIn (void)
|
||||||
/***** Link to log in form *****/
|
/***** Link to log in form *****/
|
||||||
Act_FormStart (ActFrmLogIn);
|
Act_FormStart (ActFrmLogIn);
|
||||||
Act_LinkFormSubmit (Txt_Log_in,The_ClassHead[Gbl.Prefs.Theme]);
|
Act_LinkFormSubmit (Txt_Log_in,The_ClassHead[Gbl.Prefs.Theme]);
|
||||||
fprintf (Gbl.F.Out,"<img src=\"%s/login16x16.gif\""
|
fprintf (Gbl.F.Out,"<img src=\"%s/login-green64x64.png\""
|
||||||
" alt=\"%s\" title=\"%s\""
|
" alt=\"%s\" title=\"%s\""
|
||||||
" class=\"ICON16x16\" />"
|
" class=\"ICON16x16\" />"
|
||||||
"<span id=\"login_txt\"> %s</span>"
|
"<span id=\"login_txt\"> %s</span>"
|
||||||
"</a>",
|
"</a>",
|
||||||
Gbl.Prefs.PathTheme,
|
Gbl.Prefs.IconsURL,
|
||||||
Txt_Log_in,
|
Txt_Log_in,
|
||||||
Txt_Log_in,
|
Txt_Log_in,
|
||||||
Txt_Log_in);
|
Txt_Log_in);
|
||||||
|
@ -1676,12 +1676,12 @@ void Usr_PutFormLogOut (void)
|
||||||
|
|
||||||
Act_FormStart (ActLogOut);
|
Act_FormStart (ActLogOut);
|
||||||
Act_LinkFormSubmit (Txt_Log_out,The_ClassHead[Gbl.Prefs.Theme]);
|
Act_LinkFormSubmit (Txt_Log_out,The_ClassHead[Gbl.Prefs.Theme]);
|
||||||
fprintf (Gbl.F.Out,"<img src=\"%s/logout16x16.gif\""
|
fprintf (Gbl.F.Out,"<img src=\"%s/logout-red64x64.png\""
|
||||||
" alt=\"%s\" title=\"%s\""
|
" alt=\"%s\" title=\"%s\""
|
||||||
" class=\"ICON16x16\" />"
|
" class=\"ICON16x16\" />"
|
||||||
"<span id=\"login_txt\"> %s</span>"
|
"<span id=\"login_txt\"> %s</span>"
|
||||||
"</a>",
|
"</a>",
|
||||||
Gbl.Prefs.PathTheme,
|
Gbl.Prefs.IconsURL,
|
||||||
Txt_Log_out,
|
Txt_Log_out,
|
||||||
Txt_Log_out,
|
Txt_Log_out,
|
||||||
Txt_Log_out);
|
Txt_Log_out);
|
||||||
|
@ -2572,7 +2572,7 @@ void Usr_ShowFormsLogoutAndRole (void)
|
||||||
|
|
||||||
/***** Link to log out *****/
|
/***** Link to log out *****/
|
||||||
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
|
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
|
||||||
Act_PutContextualLink (ActLogOut,NULL,"logout16x16.gif",Txt_Log_out);
|
Act_PutContextualLink (ActLogOut,NULL,"logout64x64.png",Txt_Log_out);
|
||||||
fprintf (Gbl.F.Out,"</div>");
|
fprintf (Gbl.F.Out,"</div>");
|
||||||
|
|
||||||
/***** Write message with my new logged role *****/
|
/***** Write message with my new logged role *****/
|
||||||
|
|