From 17fbfd629fd080a89f47e5795783577fe37b8962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 25 Nov 2015 14:44:17 +0100 Subject: [PATCH] Version 15.45.10 --- css/swad_desktop.css | 21 +++++------- css/swad_mobile.css | 81 ++++++++++++++++++++------------------------ swad_changelog.h | 3 +- swad_layout.c | 12 +++---- swad_tab.c | 29 ++-------------- swad_tab.h | 2 +- 6 files changed, 57 insertions(+), 91 deletions(-) diff --git a/css/swad_desktop.css b/css/swad_desktop.css index 5ef444683..2ad8e9836 100644 --- a/css/swad_desktop.css +++ b/css/swad_desktop.css @@ -153,7 +153,6 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} .BLUE_HEAD {color:white; font-size:12pt; white-space:nowrap;} .YELLOW_HEAD {color:#B3B0B3; font-size:12pt; white-space:nowrap;} - /************************ Layout (second heading row) ************************/ #head_row_2 { @@ -176,6 +175,12 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} vertical-align:top; padding-top:8px; } +.TOP_LOGO /* Institution / Centre / Degree logo in top title */ + { + margin-right:10px; + text-align:left; + vertical-align:top !important; + } #msg /* Notifications, used for AJAX based refresh */ { display:table-cell; @@ -185,19 +190,11 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} padding-top:10px; } -/************* Institution / Centre / Degree logo in top title ***************/ -.TOP_LOGO - { - margin-right:10px; - text-align:left; - vertical-align:top !important; - } - -/*********************************** Tabs ************************************/ -#tabs_container +/******************* Layout (third heading row with tabs) ********************/ +#head_row_3 { width:672px; /* 112 px * 6 visible tabs */ - height:64px; + height:72px; margin:0 auto; } .TAB_OFF diff --git a/css/swad_mobile.css b/css/swad_mobile.css index 12e910365..20912be25 100644 --- a/css/swad_mobile.css +++ b/css/swad_mobile.css @@ -151,32 +151,59 @@ form {margin:0; display:inline;} text-align:center; vertical-align:middle; } - -/************* Institution / Centre / Degree logo in top title ***************/ -.TOP_LOGO +.TOP_LOGO /* Institution / Centre / Degree logo in top title */ { margin-right:10px; text-align:left; vertical-align:top !important; } -/*********************************** Tabs ************************************/ -#tabs_container +/**************** Layout (third heading row with breadcrumb) *****************/ +#head_row_3 { - height:64px; - margin:0 auto; + display:table; + // width:100%; + height:72px; } -.TAB_ON +#breadcrumb_container { + display:table-cell; + min-width:500px; height:72px; margin:0; padding:0 25px; border-radius:8px 8px 0 0; box-shadow:inset -2px -2px 1px 0 rgba(50,50,50,0.2); - text-align:center; vertical-align:middle; overflow:hidden; - display:table-cell; + } +.WHITE_TAB_ON + { + color:#4D88A1; + font-size:25pt; + font-weight:bold; + white-space:nowrap; + } +.GREY_TAB_ON + { + color:#606060; + font-size:25pt; + font-weight:bold; + white-space:nowrap; + } +.BLUE_TAB_ON + { + color:#4D88A1; + font-size:25pt; + font-weight:bold; + white-space:nowrap; + } +.YELLOW_TAB_ON + { + color:#BD4815; + font-size:25pt; + font-weight:bold; + white-space:nowrap; } /****************************** Main zone ************************************/ @@ -719,40 +746,6 @@ a:hover img.CENTRE_PHOTO_SHOW opacity:1; } -/*********************************** Tabs ************************************/ -.WHITE_TAB_ON - { - color:#4D88A1; - font-size:25pt; - font-weight:bold; - line-height:100%; - white-space:nowrap; - } -.GREY_TAB_ON - { - color:#606060; - font-size:25pt; - font-weight:bold; - line-height:100%; - white-space:nowrap; - } -.BLUE_TAB_ON - { - color:#4D88A1; - font-size:25pt; - font-weight:bold; - line-height:100%; - white-space:nowrap; - } -.YELLOW_TAB_ON - { - color:#BD4815; - font-size:25pt; - font-weight:bold; - line-height:100%; - white-space:nowrap; - } - /********************************* Menu fonts ********************************/ .WHITE_MENU_OFF {color:#707070; font-size:25pt; line-height:110%;} .GREY_MENU_OFF {color:#707070; font-size:25pt; line-height:110%;} diff --git a/swad_changelog.h b/swad_changelog.h index 73d1e5f42..343211db6 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -111,11 +111,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.45.9 (2015/11/25)" +#define Log_PLATFORM_VERSION "SWAD 15.45.10 (2015/11/25)" // 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.45.10: Nov 25, 2015 Some CSS styles related to layout are moved to CSS file. (187992 lines) Version 15.45.9: Nov 25, 2015 Some CSS styles related to layout are moved to CSS file. (188020 lines) Version 15.45.8: Nov 25, 2015 Some CSS styles related to layout are moved to CSS file. (188018 lines) Version 15.45.7: Nov 25, 2015 Some CSS styles related to layout are moved to CSS file. (188015 lines) diff --git a/swad_layout.c b/swad_layout.c index 9b069ea74..a093a37c4 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -808,9 +808,9 @@ static void Lay_WritePageTopHeadingDesktop (void) /* End of 2nd. row */ fprintf (Gbl.F.Out,""); - /***** 3rd. row *****/ - fprintf (Gbl.F.Out,"
"); - Tab_DrawTabs (); + /***** 3rd. row (tabs) *****/ + fprintf (Gbl.F.Out,"
"); + Tab_DrawTabsDeskTop (); fprintf (Gbl.F.Out,"
"); } @@ -873,9 +873,9 @@ static void Lay_WritePageTopHeadingMobile (void) Crs_WriteSelectorMyCourses (); fprintf (Gbl.F.Out,"
"); - /***** 3rd. row *****/ - fprintf (Gbl.F.Out,"
"); - Tab_DrawTabs (); + /***** 3rd. row (breadcrumb) *****/ + fprintf (Gbl.F.Out,"
"); + Tab_DrawBreadcrumb (); fprintf (Gbl.F.Out,"
"); } diff --git a/swad_tab.c b/swad_tab.c index cb5762bd4..ce7d6c167 100644 --- a/swad_tab.c +++ b/swad_tab.c @@ -68,7 +68,6 @@ const char *Tab_TabIcons[Tab_NUM_TABS] = /***************************** Private prototypes ****************************/ /*****************************************************************************/ -static void Tab_DrawTabsDeskTop (void); static bool Tab_CheckIfICanViewTab (Act_Tab_t Tab); static void Tab_WriteBreadcrumbHome (void); @@ -79,31 +78,7 @@ static void Tab_WriteBreadcrumbAction (void); /**************** Draw tabs with the current tab highlighted *****************/ /*****************************************************************************/ -void Tab_DrawTabs (void) - { - fprintf (Gbl.F.Out,"
" - "
"); - switch (Gbl.Prefs.Layout) - { - case Lay_LAYOUT_DESKTOP: - Tab_DrawTabsDeskTop (); - break; - case Lay_LAYOUT_MOBILE: - Tab_DrawBreadcrumb (); - break; - default: - break; - } - fprintf (Gbl.F.Out,"
" - "
"); - } - -/*****************************************************************************/ -/**************** Draw tabs with the current tab highlighted *****************/ -/*****************************************************************************/ - -static void Tab_DrawTabsDeskTop (void) +void Tab_DrawTabsDeskTop (void) { extern const char *The_ClassTabOn[The_NUM_THEMES]; extern const char *The_ClassTabOff[The_NUM_THEMES]; @@ -299,7 +274,7 @@ void Tab_DrawBreadcrumb (void) extern const char *The_TabOnBgColors[The_NUM_THEMES]; extern const char *The_ClassTabOn[The_NUM_THEMES]; - fprintf (Gbl.F.Out,"
", + fprintf (Gbl.F.Out,"
", The_TabOnBgColors[Gbl.Prefs.Theme]); /***** Home *****/ diff --git a/swad_tab.h b/swad_tab.h index daba8c2c9..8a95c867e 100644 --- a/swad_tab.h +++ b/swad_tab.h @@ -41,7 +41,7 @@ /***************************** Public prototypes *****************************/ /*****************************************************************************/ -void Tab_DrawTabs (void); +void Tab_DrawTabsDeskTop (void); void Tab_DrawTabsMobile (void); void Tab_DrawBreadcrumb (void);