From a3540dcfc386a11497ac193feaa6821246c11ee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sun, 7 May 2017 17:26:46 +0200 Subject: [PATCH] Version 16.207.2 --- css/swad16.207.css | 1 - swad_assignment.c | 4 ++-- swad_attendance.c | 4 ++-- swad_changelog.h | 4 +++- swad_help_URL.c | 42 ++++++++++++++++++++++++++++++++++++++++++ swad_preference.c | 11 +++++++---- 6 files changed, 56 insertions(+), 10 deletions(-) diff --git a/css/swad16.207.css b/css/swad16.207.css index d840b64b..7774f904 100644 --- a/css/swad16.207.css +++ b/css/swad16.207.css @@ -1524,7 +1524,6 @@ a:hover /* Default ==> underlined */ .ICO25x25B {width:25px; height:25px; vertical-align:middle; display:block;} .ICO40x25B {width:40px; height:25px; vertical-align:middle;} .ICO40x40 {width:40px; height:40px; vertical-align:middle;} -.ICO40x40B {width:40px; height:40px; vertical-align:middle; display:block;} .ICO64x64 {width:64px; height:64px; vertical-align:middle;} .ICO160x160 {width:160px; height:160px; vertical-align:middle;} .BANNER {width:150px; height:50px;} diff --git a/swad_assignment.c b/swad_assignment.c index 18b0e754..d3977380 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -370,7 +370,7 @@ static void Asg_ShowOneAssignment (long AsgCod,bool PrintView) /* Start date/time */ UniqueId++; - fprintf (Gbl.F.Out,"Hidden ? (Att->Open ? "DATE_GREEN_LIGHT" : "DATE_RED_LIGHT") : @@ -401,7 +401,7 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt (unsigned) Gbl.Prefs.DateFormat,Txt_Today); /* End date/time */ - fprintf (Gbl.F.Out,"Hidden ? (Att->Open ? "DATE_GREEN_LIGHT" : "DATE_RED_LIGHT") : diff --git a/swad_changelog.h b/swad_changelog.h index 319fda78..c78d0d24 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -232,13 +232,15 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.207 (2017-05-05)" +#define Log_PLATFORM_VERSION "SWAD 16.207.2 (2017-05-07)" #define CSS_FILE "swad16.207.css" #define JS_FILE "swad16.206.3.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.207.2: May 05, 2017 Changes un help on preferences. (218621 lines) + Version 16.207.1: May 05, 2017 Minor changes in layout. (218577 lines) Version 16.207: May 05, 2017 Changes in layout of preferences. (218577 lines) Version 16.206.4: May 05, 2017 Changes in question to change language. (218534 lines) Version 16.206.3: May 05, 2017 Fixed bug in Javascript function to write local date and time. (218527 lines) diff --git a/swad_help_URL.c b/swad_help_URL.c index b2c365e7..ad39fe21 100644 --- a/swad_help_URL.c +++ b/swad_help_URL.c @@ -3184,6 +3184,27 @@ const char *Hlp_PROFILE_Photo = "PROFILE.Photo.en"; #endif +const char *Hlp_PROFILE_Preferences_internationalization = +#if L==1 + "PROFILE.Preferences.es#internacionalizaci%C3%B3n"; +#elif L==2 + "PROFILE.Preferences.en#internationalization"; +#elif L==3 + "PROFILE.Preferences.en#internationalization"; +#elif L==4 + "PROFILE.Preferences.es#internacionalizaci%C3%B3n"; +#elif L==5 + "PROFILE.Preferences.en#internationalization"; +#elif L==6 + "PROFILE.Preferences.es#internacionalizaci%C3%B3n"; +#elif L==7 + "PROFILE.Preferences.en#internationalization"; +#elif L==8 + "PROFILE.Preferences.en#internationalization"; +#elif L==9 + "PROFILE.Preferences.en#internationalization"; +#endif + const char *Hlp_PROFILE_Preferences_language = #if L==1 "PROFILE.Preferences.es#idioma"; @@ -3247,6 +3268,27 @@ const char *Hlp_PROFILE_Preferences_dates = "PROFILE.Preferences.en#dates"; #endif +const char *Hlp_PROFILE_Preferences_design = +#if L==1 + "PROFILE.Preferences.es#dise%C3%B1o"; +#elif L==2 + "PROFILE.Preferences.en#design"; +#elif L==3 + "PROFILE.Preferences.en#design"; +#elif L==4 + "PROFILE.Preferences.es#dise%C3%B1o"; +#elif L==5 + "PROFILE.Preferences.en#design"; +#elif L==6 + "PROFILE.Preferences.es#dise%C3%B1o"; +#elif L==7 + "PROFILE.Preferences.en#design"; +#elif L==8 + "PROFILE.Preferences.en#design"; +#elif L==9 + "PROFILE.Preferences.en#design"; +#endif + const char *Hlp_PROFILE_Preferences_icons = #if L==1 "PROFILE.Preferences.es#iconos"; diff --git a/swad_preference.c b/swad_preference.c index e3883b22..9d26d544 100644 --- a/swad_preference.c +++ b/swad_preference.c @@ -71,16 +71,19 @@ static void Pre_UpdateSideColsOnUsrDataTable (void); void Pre_EditPrefs (void) { + extern const char *Hlp_PROFILE_Preferences_internationalization; extern const char *Hlp_PROFILE_Preferences_language; + extern const char *Hlp_PROFILE_Preferences_design; extern const char *Txt_Internationalization; extern const char *Txt_Design; extern const char *Txt_Language; /***** Internationalization: language, first day of week, date format *****/ - Lay_StartRoundFrame (NULL,Txt_Internationalization,NULL,NULL); + Lay_StartRoundFrame (NULL,Txt_Internationalization,NULL, + Hlp_PROFILE_Preferences_internationalization); fprintf (Gbl.F.Out,"
"); - Lay_StartRoundFrame (NULL,Txt_Language, - Pre_PutIconsLanguage,Hlp_PROFILE_Preferences_language); + Lay_StartRoundFrame (NULL,Txt_Language,Pre_PutIconsLanguage, + Hlp_PROFILE_Preferences_language); Pre_PutSelectorToSelectLanguage (); // 1. Language Lay_EndRoundFrame (); fprintf (Gbl.F.Out,"
" @@ -93,7 +96,7 @@ void Pre_EditPrefs (void) Lay_EndRoundFrame (); /***** Design: icon set, menu, theme, side columns *****/ - Lay_StartRoundFrame (NULL,Txt_Design,NULL,NULL); + Lay_StartRoundFrame (NULL,Txt_Design,NULL,Hlp_PROFILE_Preferences_design); fprintf (Gbl.F.Out,"
"); Ico_PutIconsToSelectIconSet (); // 4. Icon set fprintf (Gbl.F.Out,"
"