diff --git a/icon/arroba64x64.gif b/icon/arroba64x64.gif new file mode 100644 index 000000000..93c386381 Binary files /dev/null and b/icon/arroba64x64.gif differ diff --git a/icon/key64x64.gif b/icon/key64x64.gif new file mode 100644 index 000000000..e103e14c0 Binary files /dev/null and b/icon/key64x64.gif differ diff --git a/icon/key64x64.png b/icon/key64x64.png new file mode 100644 index 000000000..9b02a054e Binary files /dev/null and b/icon/key64x64.png differ diff --git a/icon/login-green64x64.png b/icon/login-green64x64.png new file mode 100644 index 000000000..b691e0253 Binary files /dev/null and b/icon/login-green64x64.png differ diff --git a/icon/login64x64.png b/icon/login64x64.png new file mode 100644 index 000000000..dd8ac1efd Binary files /dev/null and b/icon/login64x64.png differ diff --git a/icon/logout-red64x64.png b/icon/logout-red64x64.png new file mode 100644 index 000000000..5cad6f457 Binary files /dev/null and b/icon/logout-red64x64.png differ diff --git a/icon/logout64x64.png b/icon/logout64x64.png new file mode 100644 index 000000000..3d705dbed Binary files /dev/null and b/icon/logout64x64.png differ diff --git a/icon/search-white64x64.png b/icon/search-white64x64.png new file mode 100644 index 000000000..7086ba93f Binary files /dev/null and b/icon/search-white64x64.png differ diff --git a/icon/search64x64.gif b/icon/search64x64.gif new file mode 100644 index 000000000..544cce486 Binary files /dev/null and b/icon/search64x64.gif differ diff --git a/icon/search64x64.png b/icon/search64x64.png new file mode 100644 index 000000000..f4c416ae8 Binary files /dev/null and b/icon/search64x64.png differ diff --git a/icon/user64x64.gif b/icon/user64x64.gif new file mode 100644 index 000000000..85442a188 Binary files /dev/null and b/icon/user64x64.gif differ diff --git a/swad_ID.c b/swad_ID.c index 8954428cb..60e9c89f5 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -378,13 +378,13 @@ void ID_PutLinkToChangeUsrIDs (void) /***** Link for changing the password *****/ if (Gbl.Usrs.Other.UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod) // It's me Act_PutContextualLink (ActFrmUsrAcc,NULL, - "arroba16x16.gif",Txt_Change_IDs); + "arroba64x64.gif",Txt_Change_IDs); else // Not me Act_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActFrmIDsStd : (Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActFrmIDsTch : ActFrmIDsOth), // Guest, visitor or admin Usr_PutParamOtherUsrCodEncrypted, - "arroba16x16.gif",Txt_Change_IDs); + "arroba64x64.gif",Txt_Change_IDs); } /*****************************************************************************/ diff --git a/swad_account.c b/swad_account.c index 7d65e6e43..510e5d91a 100644 --- a/swad_account.c +++ b/swad_account.c @@ -127,7 +127,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith /***** Link to log in *****/ fprintf (Gbl.F.Out,"
"); - Act_PutContextualLink (ActFrmLogIn,NULL,"login16x16.gif",Txt_Log_in); + Act_PutContextualLink (ActFrmLogIn,NULL,"login64x64.png",Txt_Log_in); fprintf (Gbl.F.Out,"
"); /***** Form to enter some data of the new user *****/ diff --git a/swad_changelog.h b/swad_changelog.h index 9cec11376..07c1f950e 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -110,12 +110,13 @@ /****************************** 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" // 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 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.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. diff --git a/swad_course.c b/swad_course.c index d7eb47b2a..09e0fdcb2 100644 --- a/swad_course.c +++ b/swad_course.c @@ -2898,7 +2898,7 @@ static void Crs_PutLinkToSearchCourses (void) (Gbl.CurrentCty.Cty.CtyCod > 0 ? ActCtyReqSch : ActSysReqSch)))), Crs_PutLinkToSearchCoursesParams, - "search16x16.gif",Txt_Search_courses); + "search64x64.gif",Txt_Search_courses); } static void Crs_PutLinkToSearchCoursesParams (void) diff --git a/swad_layout.c b/swad_layout.c index a833fb5cf..20378cb0f 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -724,7 +724,7 @@ static void Lay_WritePageTopHeading (void) (Gbl.CurrentCty.Cty.CtyCod > 0 ? ActCtySch : ActSysSch))))); Sco_PutParamScope (Sco_SCOPE_SYS); - Sch_PutFormToSearch (Gbl.Prefs.PathTheme,"head_search_text"); + Sch_PutFormToSearch ("search-white64x64.png","head_search_text"); Act_FormEnd (); fprintf (Gbl.F.Out,""); // head_row_1_search diff --git a/swad_password.c b/swad_password.c index 77969cf97..ed45b95a9 100644 --- a/swad_password.c +++ b/swad_password.c @@ -218,7 +218,7 @@ void Pwd_PutLinkToSendNewPasswd (void) extern const char *Txt_Forgotten_password; Act_PutContextualLink (ActReqSndNewPwd,Pwd_PutLinkToSendNewPasswdParams, - "key16x16.gif",Txt_Forgotten_password); + "key64x64.gif",Txt_Forgotten_password); } static void Pwd_PutLinkToSendNewPasswdParams (void) @@ -842,7 +842,7 @@ void Pwd_PutLinkToChangeMyPassword (void) extern const char *Txt_Change_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 : ActFrmPwdOth), Usr_PutParamOtherUsrCodEncrypted, - "key16x16.gif",Txt_Change_password); + "key64x64.gif",Txt_Change_password); } /*****************************************************************************/ diff --git a/swad_search.c b/swad_search.c index 59ebc479f..b1fbc42dd 100644 --- a/swad_search.c +++ b/swad_search.c @@ -266,7 +266,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco fprintf (Gbl.F.Out,""); /***** String to find *****/ - Sch_PutFormToSearch (Gbl.Prefs.IconsURL,NULL); + Sch_PutFormToSearch ("search64x64.png",NULL); /***** Send button and end frame *****/ 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... **************/ /*****************************************************************************/ -void Sch_PutFormToSearch (const char *IconURL,const char *IdInputText) +void Sch_PutFormToSearch (const char *Icon,const char *IdInputText) { 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;\" />"); /***** Send button *****/ - fprintf (Gbl.F.Out,"", - IconURL, + Gbl.Prefs.IconsURL, + Icon, Txt_Search, Txt_Search); } diff --git a/swad_search.h b/swad_search.h index 811fdb81b..a8b09ab20 100644 --- a/swad_search.h +++ b/swad_search.h @@ -63,7 +63,7 @@ void Sch_ReqInsSearch (void); void Sch_ReqCtrSearch (void); void Sch_ReqDegSearch (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_GetParamsSearch (void); void Sch_SysSearch (void); diff --git a/swad_user.c b/swad_user.c index f905e460d..4be0aae2b 100644 --- a/swad_user.c +++ b/swad_user.c @@ -1426,7 +1426,7 @@ void Usr_WriteFormLogin (void) fprintf (Gbl.F.Out,"
"); /* 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 */ if (Cfg_EXTERNAL_LOGIN_URL[0] && @@ -1437,7 +1437,7 @@ void Usr_WriteFormLogin (void) The_ClassFormBold[Gbl.Prefs.Theme]); sprintf (Gbl.Title,Txt_Enter_from_X, Cfg_EXTERNAL_LOGIN_SERVICE_SHORT_NAME); - Lay_PutIconWithText ("login16x16.gif", + Lay_PutIconWithText ("login64x64.png", Gbl.Title, Gbl.Title); } @@ -1455,7 +1455,7 @@ void Usr_WriteFormLogin (void) /***** User's ID/nickname and password *****/ fprintf (Gbl.F.Out,"" "" - "\"%s\"" "" @@ -1467,7 +1467,7 @@ void Usr_WriteFormLogin (void) "" "" "" - "\"%s\"" "" @@ -1607,12 +1607,12 @@ void Usr_PutFormLogIn (void) /***** Link to log in form *****/ Act_FormStart (ActFrmLogIn); Act_LinkFormSubmit (Txt_Log_in,The_ClassHead[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"\"%s\"" " %s" "", - Gbl.Prefs.PathTheme, + Gbl.Prefs.IconsURL, Txt_Log_in, Txt_Log_in, Txt_Log_in); @@ -1676,12 +1676,12 @@ void Usr_PutFormLogOut (void) Act_FormStart (ActLogOut); Act_LinkFormSubmit (Txt_Log_out,The_ClassHead[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"\"%s\"" " %s" "", - Gbl.Prefs.PathTheme, + Gbl.Prefs.IconsURL, Txt_Log_out, Txt_Log_out, Txt_Log_out); @@ -2572,7 +2572,7 @@ void Usr_ShowFormsLogoutAndRole (void) /***** Link to log out *****/ fprintf (Gbl.F.Out,"
"); - Act_PutContextualLink (ActLogOut,NULL,"logout16x16.gif",Txt_Log_out); + Act_PutContextualLink (ActLogOut,NULL,"logout64x64.png",Txt_Log_out); fprintf (Gbl.F.Out,"
"); /***** Write message with my new logged role *****/