From 3df265695cc8df9e1b4b2f42708c07575ee8d4bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 5 May 2017 13:42:59 +0200 Subject: [PATCH] Version 16.207 --- css/{swad16.205.css => swad16.207.css} | 2 + swad_calendar.c | 2 +- swad_changelog.h | 5 ++- swad_icon.c | 2 +- swad_menu.c | 2 +- swad_preference.c | 30 ++++++------- swad_text.c | 60 ++++++++++++++++++++++---- 7 files changed, 73 insertions(+), 30 deletions(-) rename css/{swad16.205.css => swad16.207.css} (99%) diff --git a/css/swad16.205.css b/css/swad16.207.css similarity index 99% rename from css/swad16.205.css rename to css/swad16.207.css index 4f360a24..d840b64b 100644 --- a/css/swad16.205.css +++ b/css/swad16.207.css @@ -1521,6 +1521,7 @@ a:hover /* Default ==> underlined */ .ICO20x20 {width:20px; height:20px; vertical-align:middle;} .ICO20x20B {width:20px; height:20px; vertical-align:middle; display:block;} .ICO25x25 {width:25px; height:25px; vertical-align:middle;} +.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;} @@ -1554,6 +1555,7 @@ a:hover /* Default ==> underlined */ { display:inline-block; margin:0 8px; + vertical-align:top; } .FRAME_CONTAINER { diff --git a/swad_calendar.c b/swad_calendar.c index bc119659..1b7a3685 100644 --- a/swad_calendar.c +++ b/swad_calendar.c @@ -86,7 +86,7 @@ void Cal_PutIconsToSelectFirstDayOfWeek (void) Lay_StartRoundFrame (NULL,Txt_Calendar, Cal_PutIconsFirstDayOfWeek, Hlp_PROFILE_Preferences_calendar); - Cal_ShowFormToSelFirstDayOfWeek (ActChg1stDay,NULL,"ICO40x40B"); + Cal_ShowFormToSelFirstDayOfWeek (ActChg1stDay,NULL,"ICO25x25B"); Lay_EndRoundFrame (); } diff --git a/swad_changelog.h b/swad_changelog.h index 08e0a109..319fda78 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -232,13 +232,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.206.4 (2017-05-05)" -#define CSS_FILE "swad16.205.css" +#define Log_PLATFORM_VERSION "SWAD 16.207 (2017-05-05)" +#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: 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) Version 16.206.2: May 05, 2017 Changes in date and time of connected users. (218527 lines) diff --git a/swad_icon.c b/swad_icon.c index 09fc2106..5ddfc81c 100644 --- a/swad_icon.c +++ b/swad_icon.c @@ -89,7 +89,7 @@ void Ico_PutIconsToSelectIconSet (void) Act_FormStart (ActChgIco); Par_PutHiddenParamString ("IconSet",Ico_IconSetId[IconSet]); fprintf (Gbl.F.Out,"", + " alt=\"%s\" title=\"%s\" class=\"ICO25x25B\" />", Gbl.Prefs.IconsURL, Cfg_ICON_FOLDER_ICON_SETS, Ico_IconSetId[IconSet], diff --git a/swad_menu.c b/swad_menu.c index 80be02b7..8e1099bd 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -411,7 +411,7 @@ void Mnu_PutIconsToSelectMenu (void) Act_FormStart (ActChgMnu); Par_PutHiddenParamUnsigned ("Menu",(unsigned) Menu); fprintf (Gbl.F.Out,"", + " alt=\"%s\" title=\"%s\" class=\"ICO25x25B\" />", Gbl.Prefs.IconsURL, Mnu_MenuIcons[Menu], Txt_MENU_NAMES[Menu], diff --git a/swad_preference.c b/swad_preference.c index 9b63a893..e3883b22 100644 --- a/swad_preference.c +++ b/swad_preference.c @@ -72,43 +72,41 @@ static void Pre_UpdateSideColsOnUsrDataTable (void); void Pre_EditPrefs (void) { extern const char *Hlp_PROFILE_Preferences_language; + extern const char *Txt_Internationalization; + extern const char *Txt_Design; extern const char *Txt_Language; - /***** Language, first day of week *****/ + /***** Internationalization: language, first day of week, date format *****/ + Lay_StartRoundFrame (NULL,Txt_Internationalization,NULL,NULL); + fprintf (Gbl.F.Out,"
"); Lay_StartRoundFrame (NULL,Txt_Language, Pre_PutIconsLanguage,Hlp_PROFILE_Preferences_language); Pre_PutSelectorToSelectLanguage (); // 1. Language Lay_EndRoundFrame (); - - /***** First day of week, date format *****/ - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" "
"); Cal_PutIconsToSelectFirstDayOfWeek (); // 2. First day of week fprintf (Gbl.F.Out,"
" "
"); Dat_PutIconsToSelectDateFormat (); // 3. Date format - fprintf (Gbl.F.Out,"
" - "
"); + fprintf (Gbl.F.Out,""); + Lay_EndRoundFrame (); - /***** Icon set, menu *****/ - fprintf (Gbl.F.Out,"
" - "
"); + /***** Design: icon set, menu, theme, side columns *****/ + Lay_StartRoundFrame (NULL,Txt_Design,NULL,NULL); + fprintf (Gbl.F.Out,"
"); Ico_PutIconsToSelectIconSet (); // 4. Icon set fprintf (Gbl.F.Out,"
" "
"); Mnu_PutIconsToSelectMenu (); // 5. Menu fprintf (Gbl.F.Out,"
" - "
"); - - /***** Theme, side columns *****/ - fprintf (Gbl.F.Out,"
" - "
"); + "
"); The_PutIconsToSelectTheme (); // 6. Theme fprintf (Gbl.F.Out,"
" "
"); Pre_PutIconsToSelectSideCols (); // 7. Side columns - fprintf (Gbl.F.Out,"
" - "
"); + fprintf (Gbl.F.Out,"
"); + Lay_EndRoundFrame (); if (Gbl.Usrs.Me.Logged) { diff --git a/swad_text.c b/swad_text.c index b7727d1f..294aa726 100644 --- a/swad_text.c +++ b/swad_text.c @@ -8420,7 +8420,7 @@ const char *Txt_DEPARTMENTS_ORDER[Dpt_NUM_ORDERS] = const char *Txt_Description = #if L==1 - "Descripción"; // Necessita traduccio + "Descripció"; #elif L==2 "Beschreibung"; #elif L==3 @@ -8439,6 +8439,27 @@ const char *Txt_Description = "Descrição"; #endif +const char *Txt_Design = +#if L==1 + "Disseny"; +#elif L==2 + "Design"; +#elif L==3 + "Design"; +#elif L==4 + "Diseño"; +#elif L==5 + "Design"; +#elif L==6 + "Ta'ãngahai"; +#elif L==7 + "Disegno"; +#elif L==8 + "Design"; +#elif L==9 + "Design"; +#endif + const char *Txt_Details = #if L==1 "Detalls"; @@ -16689,6 +16710,27 @@ const char *Txt_Internal_code = "Código interno"; #endif +const char *Txt_Internationalization = +#if L==1 + "Internacionalització"; +#elif L==2 + "Internationalisierung"; +#elif L==3 + "Internationalization"; +#elif L==4 + "Internacionalización"; +#elif L==5 + "Internationalisation"; +#elif L==6 + "Internacionalización"; // Okoteve traducción +#elif L==7 + "Internazionalizzazione"; +#elif L==8 + "Umiędzynarodowienie"; +#elif L==9 + "Internacionalização"; +#endif + const char *Txt_IP = // Internet Protocol address #if L==1 "IP"; @@ -16775,23 +16817,23 @@ const char *Txt_Its_me = const char *Txt_Language = #if L==1 - "Idioma (language)"; + "Idioma"; #elif L==2 - "Sprache (language)"; + "Sprache"; #elif L==3 "Language"; #elif L==4 - "Idioma (language)"; + "Idioma"; #elif L==5 - "Langue (language)"; + "Langue"; #elif L==6 - "Ñe'ẽ (language)"; + "Ñe'ẽ"; #elif L==7 - "Lingua (language)"; + "Lingua"; #elif L==8 - "Język (language)"; + "Język"; #elif L==9 - "Lingua (language)"; + "Lingua"; #endif const char *Txt_Last_clicks =