From 4c4e51488453459e6dca7520f29195624c9095d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Thu, 1 Jan 2015 15:50:45 +0100 Subject: [PATCH] Version 14.50.3 --- css/swad_desktop.css | 4 +- css/swad_mobile.css | 4 +- swad_changelog.h | 3 +- swad_icon.c | 9 +-- swad_layout.c | 24 ++++---- swad_notification.c | 6 +- swad_preference.c | 129 +++++++++++++------------------------------ swad_theme.c | 9 +-- 8 files changed, 68 insertions(+), 120 deletions(-) diff --git a/css/swad_desktop.css b/css/swad_desktop.css index cbc04393..4d5de4d9 100644 --- a/css/swad_desktop.css +++ b/css/swad_desktop.css @@ -776,8 +776,8 @@ a:hover img.CENTRE_PHOTO_SHOW .USR_LIST_TYPE_OFF {border:solid 1px; border-color:#FFFFFF;} .USR_LIST_TYPE_ON {border:solid 1px; border-color:#50B800;} -.LAYOUT_OFF {border:solid; border-width:0;} -.LAYOUT_ON {border:solid; border-width:1px; border-color:#80E000;} +.LAYOUT_OFF {background-color:white;} +.LAYOUT_ON {background-color:#80E000;} .LOG {font-family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#606060; font-size:9pt;} .LOG_R {font-family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#FF0000; font-size:9pt;} diff --git a/css/swad_mobile.css b/css/swad_mobile.css index 43d42b63..bad85f5d 100644 --- a/css/swad_mobile.css +++ b/css/swad_mobile.css @@ -587,8 +587,8 @@ a:hover img.CENTRE_PHOTO_SHOW .USR_LIST_TYPE_OFF {border:solid 1px; border-color:#FFFFFF;} .USR_LIST_TYPE_ON {border:solid 1px; border-color:#50B800;} -.LAYOUT_OFF {border:solid; border-width:0;} -.LAYOUT_ON {border:solid; border-width:1px; border-color:#80E000;} +.LAYOUT_OFF {background-color:white;} +.LAYOUT_ON {background-color:#80E000;} .LOG {font-Family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#606060; font-size:9pt;} .LOG_R {font-Family:"Arial Narrow", "Nimbus Sans L", "DejaVu LGC Sans Condensed", sans-serif; color:#FF0000; font-size:9pt;} diff --git a/swad_changelog.h b/swad_changelog.h index 49cb766c..d9d6129a 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -35,11 +35,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.50.2 (2015/01/01)" +#define Log_PLATFORM_VERSION "SWAD 14.50.3 (2015/01/01)" // 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 | tail -1 /* + Version 14.50.3 :Jan 01, 2014 Changes in layout of preferences. (172691 lines) Version 14.50.2 :Jan 01, 2014 Changes in CSS. (172739 lines) Version 14.50.1 :Dec 31, 2014 Horizontal menu (not finished). (172736 lines) Version 14.50 :Dec 31, 2014 Horizontal menu (not finished). (172735 lines) diff --git a/swad_icon.c b/swad_icon.c index eafcdfc8..4e08e37b 100644 --- a/swad_icon.c +++ b/swad_icon.c @@ -66,10 +66,11 @@ const char *Ico_IconSetNames[Ico_NUM_ICON_SETS] = void Ico_PutIconsToSelectIconSet (void) { + extern const char *Txt_Icons; Ico_IconSet_t IconSet; - fprintf (Gbl.F.Out,"" - ""); + Lay_StartRoundFrameTable10 (NULL,2,Txt_Icons); + fprintf (Gbl.F.Out,""); for (IconSet = (Ico_IconSet_t) 0; IconSet < Ico_NUM_ICON_SETS; IconSet++) @@ -90,8 +91,8 @@ void Ico_PutIconsToSelectIconSet (void) Ico_IconSetNames[IconSet], Ico_IconSetNames[IconSet]); } - fprintf (Gbl.F.Out,"" - "
"); + fprintf (Gbl.F.Out,""); + Lay_EndRoundFrameTable10 (); } /*****************************************************************************/ diff --git a/swad_layout.c b/swad_layout.c index af5792ac..417a685a 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -63,7 +63,7 @@ const char *Lay_LayoutIcons[Lay_NUM_LAYOUTS] = /****************************** Private constants ****************************/ /*****************************************************************************/ -// #define HORIZONTAL_MENU 1 +#define HORIZONTAL_MENU 1 const char *Lay_TabIcons[Act_NUM_TABS] = { @@ -336,11 +336,8 @@ void Lay_WriteStartOfPage (void) " text-align:left; vertical-align:top;\">"); #ifdef HORIZONTAL_MENU - - fprintf (Gbl.F.Out,"
"); - Lay_WriteHorizontalMenuThisTabDesktop (); - fprintf (Gbl.F.Out,"
"); - + if (Gbl.Prefs.Layout == Lay_LAYOUT_DESKTOP) + Lay_WriteHorizontalMenuThisTabDesktop (); #endif Usr_WarningWhenDegreeTypeDoesntAllowDirectLogin (); @@ -1242,7 +1239,8 @@ static void Lay_WriteHorizontalMenuThisTabDesktop (void) bool IsTheSelectedAction; /***** List start *****/ - fprintf (Gbl.F.Out,"" + ""); } #endif @@ -2024,11 +2023,12 @@ void Lay_WriteHeaderClassPhoto (unsigned NumColumns,bool PrintView,bool DrawingC void Lay_PutIconsToSelectLayout (void) { + extern const char *Txt_Layout; extern const char *Txt_LAYOUT_NAMES[Lay_NUM_LAYOUTS]; Lay_Layout_t Layout; - fprintf (Gbl.F.Out,"" - ""); + Lay_StartRoundFrameTable10 (NULL,2,Txt_Layout); + fprintf (Gbl.F.Out,""); for (Layout = (Lay_Layout_t) 0; Layout < Lay_NUM_LAYOUTS; Layout++) @@ -2047,8 +2047,8 @@ void Lay_PutIconsToSelectLayout (void) Txt_LAYOUT_NAMES[Layout], Txt_LAYOUT_NAMES[Layout]); } - fprintf (Gbl.F.Out,"" - "
"); + fprintf (Gbl.F.Out,""); + Lay_EndRoundFrameTable10 (); } /*****************************************************************************/ diff --git a/swad_notification.c b/swad_notification.c index 9b8ade47..9dac4527 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -1656,14 +1656,13 @@ void Ntf_PutFormChangeNotifSentByEMail (void) Ntf_NotifyEvent_t NotifyEvent; /***** Start table *****/ - Lay_StartRoundFrameTable10 (NULL,0,NULL); + Lay_StartRoundFrameTable10 (NULL,0,Txt_Notifications); fprintf (Gbl.F.Out,"" ""); /***** Start form *****/ Act_FormStart (ActChgNtfPrf); - fprintf (Gbl.F.Out,"

%s

" - "" + fprintf (Gbl.F.Out,"
" "" "" "" "", - Txt_Notifications, Txt_Create_BR_notification, Txt_Notify_me_BR_by_e_mail); diff --git a/swad_preference.c b/swad_preference.c index 5e4af167..6f97e9f6 100644 --- a/swad_preference.c +++ b/swad_preference.c @@ -63,98 +63,46 @@ static void Prf_PutFormPublicPhoto (void); void Prf_EditPrefs (void) { extern const char *Txt_Language; - extern const char *Txt_Layout; - extern const char *Txt_Theme_SKIN; - extern const char *Txt_Columns; - extern const char *Txt_Icons; extern const char *Txt_You_can_only_receive_email_notifications_if_; char MailDomain[Cns_MAX_BYTES_STRING+1]; - /***** Language selection *****/ - Lay_StartRoundFrameTable10 (NULL,0,NULL); + /***** Language *****/ + Lay_StartRoundFrameTable10 (NULL,2,Txt_Language); fprintf (Gbl.F.Out,"" - "" - "" - "" - "" ""); Lay_EndRoundFrameTable10 (); - /***** Layout selection *****/ - Lay_StartRoundFrameTable10 (NULL,0,NULL); - fprintf (Gbl.F.Out,"" - "" - "" + /***** Layout & icons *****/ + fprintf (Gbl.F.Out,"
" @@ -1673,7 +1672,6 @@ void Ntf_PutFormChangeNotifSentByEMail (void) "%s" "
" - "%s" - "
", - Txt_Language); + ""); Prf_PutSelectorToSelectLanguage (); fprintf (Gbl.F.Out,"
" - "%s" - "
" "" - "" - ""); - Lay_EndRoundFrameTable10 (); - - /***** Theme selection *****/ - Lay_StartRoundFrameTable10 (NULL,0,NULL); - fprintf (Gbl.F.Out,"" - "" - "" - "" - "" - ""); - Lay_EndRoundFrameTable10 (); - - /***** Side columns selection *****/ - Lay_StartRoundFrameTable10 (NULL,0,NULL); - fprintf (Gbl.F.Out,"" - "" - "" - "" - "" - ""); - Lay_EndRoundFrameTable10 (); - - /***** Icons selection *****/ - Lay_StartRoundFrameTable10 (NULL,0,NULL); - fprintf (Gbl.F.Out,"" - "" - "" - "" - "" - ""); - Lay_EndRoundFrameTable10 (); + "" + "
", - Txt_Layout); + ""); Lay_PutIconsToSelectLayout (); fprintf (Gbl.F.Out,"
" - "%s" - "
", - Txt_Theme_SKIN); - The_PutIconsToSelectTheme (); - fprintf (Gbl.F.Out,"
" - "%s" - "
", - Txt_Columns); - Prf_PutIconsToSelectSideCols (); - fprintf (Gbl.F.Out,"
" - "%s" - "
", - Txt_Icons); + ""); Ico_PutIconsToSelectIconSet (); fprintf (Gbl.F.Out,"
"); + + /***** Theme & side colums *****/ + fprintf (Gbl.F.Out,"" + "" + "" + "" + "" + "
"); + The_PutIconsToSelectTheme (); + fprintf (Gbl.F.Out,""); + Prf_PutIconsToSelectSideCols (); + fprintf (Gbl.F.Out,"
"); if (Gbl.Usrs.Me.Logged) { /***** Public / private photo *****/ - Lay_StartRoundFrameTable10 (NULL,0,NULL); - fprintf (Gbl.F.Out,"" - ""); Prf_PutFormPublicPhoto (); - fprintf (Gbl.F.Out,"" - ""); - Lay_EndRoundFrameTable10 (); /***** Automatic e-mail to notify of new events *****/ Ntf_PutFormChangeNotifSentByEMail (); @@ -384,11 +332,12 @@ Txt_Language_t Prf_GetParamLanguage (void) void Prf_PutIconsToSelectSideCols (void) { - unsigned SideCols; + extern const char *Txt_Columns; extern const char *Txt_LAYOUT_SIDE_COLUMNS[4]; + unsigned SideCols; - fprintf (Gbl.F.Out,"" - ""); + Lay_StartRoundFrameTable10 (NULL,2,Txt_Columns); + fprintf (Gbl.F.Out,""); for (SideCols = 0; SideCols <= Lay_SHOW_BOTH_COLUMNS; SideCols++) @@ -408,8 +357,8 @@ void Prf_PutIconsToSelectSideCols (void) Txt_LAYOUT_SIDE_COLUMNS[SideCols], Txt_LAYOUT_SIDE_COLUMNS[SideCols]); } - fprintf (Gbl.F.Out,"" - "
"); + fprintf (Gbl.F.Out,""); + Lay_EndRoundFrameTable10 (); } /*****************************************************************************/ @@ -591,27 +540,25 @@ static void Prf_PutFormPublicPhoto (void) extern const char *Txt_Public_photo; /***** Start form *****/ + Lay_StartRoundFrameTable10 (NULL,2,Txt_Public_photo); + fprintf (Gbl.F.Out,"" + "", + The_ClassFormul[Gbl.Prefs.Theme]); Act_FormStart (ActChgPubPho); - fprintf (Gbl.F.Out,"" - ""); /***** Checkbox to select between public or private photo *****/ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out," onchange=\"javascript:document.getElementById('%s').submit();\" />", Gbl.FormId); - fprintf (Gbl.F.Out,"", - The_ClassFormul[Gbl.Prefs.Theme],Txt_Public_photo); + fprintf (Gbl.F.Out,"%s",Txt_Public_photo); /***** End form *****/ - fprintf (Gbl.F.Out,"" - "
" - "" - "" - "%s" - "
" - ""); + fprintf (Gbl.F.Out,"" + "" + ""); + Lay_EndRoundFrameTable10 (); } /*****************************************************************************/ diff --git a/swad_theme.c b/swad_theme.c index 31b237cc..c679df05 100644 --- a/swad_theme.c +++ b/swad_theme.c @@ -230,10 +230,11 @@ const char *The_ClassFormulB[The_NUM_THEMES] = void The_PutIconsToSelectTheme (void) { + extern const char *Txt_Theme_SKIN; The_Theme_t Theme; - fprintf (Gbl.F.Out,"" - ""); + Lay_StartRoundFrameTable10 (NULL,2,Txt_Theme_SKIN); + fprintf (Gbl.F.Out,""); for (Theme = (The_Theme_t) 0; Theme < The_NUM_THEMES; Theme++) @@ -254,8 +255,8 @@ void The_PutIconsToSelectTheme (void) The_ThemeNames[Theme], The_ThemeNames[Theme]); } - fprintf (Gbl.F.Out,"" - "
"); + fprintf (Gbl.F.Out,""); + Lay_EndRoundFrameTable10 (); } /*****************************************************************************/