diff --git a/swad_changelog.h b/swad_changelog.h index 85f581852..148fb394e 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -138,14 +138,15 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.210.1 (2016-05-05)" +#define Log_PLATFORM_VERSION "SWAD 15.210.2 (2016-05-05)" #define CSS_FILE "swad15.210.css" #define JS_FILE "swad15.197.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 15.210.1: May 05, 2016 New icon to change logo of institution/centre/degree. (? lines) + Version 15.210.2: May 05, 2016 Link to change logo of institution is moved to top of window. (201399 lines) + Version 15.210.1: May 05, 2016 New icon to change logo of institution/centre/degree. (201388 lines) 1 change necessary in icons: Copy file icon/logo64x64.png to public icon directory diff --git a/swad_institution.c b/swad_institution.c index 1bfb7ff9d..dfbafd82a 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -64,7 +64,7 @@ extern struct Globals Gbl; /*****************************************************************************/ static void Ins_Configuration (bool PrintView); -static void Ins_PutIconToPrint (void); +static void Ins_PutIconsToPrintAndUpload (void); static void Ins_ListInstitutions (void); static void Ins_PutIconToEditInstitutions (void); @@ -257,21 +257,9 @@ static void Ins_Configuration (bool PrintView) if (Gbl.CurrentIns.Ins.InsCod > 0) { - /***** Contextual links *****/ - if (!PrintView && - Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM) - { - fprintf (Gbl.F.Out,"
"); - - /* Link to upload logo */ - Log_PutFormToChangeLogo (Sco_SCOPE_INS); - - fprintf (Gbl.F.Out,"
"); - } - /***** Start frame *****/ Lay_StartRoundFrame (NULL,NULL,PrintView ? NULL : - Ins_PutIconToPrint); + Ins_PutIconsToPrintAndUpload); /***** Title *****/ fprintf (Gbl.F.Out,"
"); @@ -494,14 +482,35 @@ static void Ins_Configuration (bool PrintView) } /*****************************************************************************/ -/********** Put icon to print the configuration of an institution ************/ +/********* Put contextual icons in configuration of an institution ***********/ /*****************************************************************************/ -static void Ins_PutIconToPrint (void) +static void Ins_PutIconsToPrintAndUpload (void) { extern const char *Txt_Print; + extern const char *Txt_Change_logo; + extern const char *Txt_Upload_logo; + char PathLogo[PATH_MAX+1]; + bool LogoExists; + /***** Link to print info about institution *****/ Lay_PutContextualLink (ActPrnInsInf,NULL,"print64x64.png",Txt_Print,NULL); + + /***** Link to upload logo of institution *****/ + if (Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM) + { + sprintf (PathLogo,"%s/%s/%02u/%u/logo/%u.png", + Cfg_PATH_SWAD_PUBLIC,Cfg_FOLDER_INS, + (unsigned) (Gbl.CurrentIns.Ins.InsCod % 100), + (unsigned) Gbl.CurrentIns.Ins.InsCod, + (unsigned) Gbl.CurrentIns.Ins.InsCod); + LogoExists = Fil_CheckIfPathExists (PathLogo); + + Lay_PutContextualLink (ActReqInsLog,NULL,"logo64x64.png", + LogoExists ? Txt_Change_logo : + Txt_Upload_logo, + NULL); + } } /*****************************************************************************/