From 8f85e08e98ade6e07e93ffc10b0885104c2bc74c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sun, 18 Dec 2016 19:50:33 +0100 Subject: [PATCH] Version 16.103.6 --- swad_changelog.h | 3 ++- swad_layout.c | 44 ++++++++++++++++++++------------------------ swad_menu.c | 4 ++-- swad_tab.c | 20 +++++++++++++++----- 4 files changed, 39 insertions(+), 32 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 4e208fe80..6617f7485 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -190,13 +190,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.103.5 (2016-12-17)" +#define Log_PLATFORM_VERSION "SWAD 16.103.6 (2016-12-18)" #define CSS_FILE "swad16.103.1.css" #define JS_FILE "swad16.101.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.103.6: Dec 18, 2016 Some div elements changed to header, footer, aside and nav elements. (211212 lines) Version 16.103.5: Dec 17, 2016 Code refactoring in user enrollment. (211207 lines) Version 16.103.4: Dec 17, 2016 Code refactoring in user enrollment. (211170 lines) Version 16.103.3: Dec 17, 2016 Code refactoring in user enrollment. (211149 lines) diff --git a/swad_layout.c b/swad_layout.c index e43b09b74..dda8455ab 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -268,15 +268,18 @@ void Lay_WriteStartOfPage (void) /***** Header of layout *****/ Lay_WritePageTopHeading (); + /***** 3rd. row (tabs) *****/ + Tab_DrawTabs (); + /***** 4th row: main zone *****/ fprintf (Gbl.F.Out,"
"); /* Left column */ if (Gbl.Prefs.SideCols & Lay_SHOW_LEFT_COLUMN) // Left column visible { - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,""); } /* Right column */ @@ -286,9 +289,9 @@ void Lay_WriteStartOfPage (void) // is that central column may hold a lot of content drawn slowly. if (Gbl.Prefs.SideCols & Lay_SHOW_RIGHT_COLUMN) // Right column visible { - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,""); } /* Central (main) column */ @@ -803,13 +806,9 @@ static void Lay_WritePageTopHeading (void) "HEAD_ROW_2_BLUE", // The_THEME_BLUE "HEAD_ROW_2_YELLOW", // The_THEME_YELLOW }; - const char *ClassHeadRow3[The_NUM_THEMES] = - { - "HEAD_ROW_3_WHITE", // The_THEME_WHITE - "HEAD_ROW_3_GREY", // The_THEME_GREY - "HEAD_ROW_3_BLUE", // The_THEME_BLUE - "HEAD_ROW_3_YELLOW", // The_THEME_YELLOW - }; + + /***** Start header *****/ + fprintf (Gbl.F.Out,"
"); /***** 1st. row *****/ /* Start of 1st. row */ @@ -903,11 +902,8 @@ static void Lay_WritePageTopHeading (void) /* End of 2nd. row */ fprintf (Gbl.F.Out,"
"); - /***** 3rd. row (tabs) *****/ - fprintf (Gbl.F.Out,"
", - ClassHeadRow3[Gbl.Prefs.Theme]); - Tab_DrawTabs (); - fprintf (Gbl.F.Out,"
"); + /***** End header *****/ + fprintf (Gbl.F.Out,""); } /*****************************************************************************/ @@ -916,10 +912,10 @@ static void Lay_WritePageTopHeading (void) static void Lay_WriteBreadcrumb (void) { - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,""); } /*****************************************************************************/ @@ -1575,8 +1571,8 @@ static void Lay_WriteAboutZone (void) extern const char *Txt_About_X; extern const char *Txt_Questions_and_problems; - /***** About zone start *****/ - fprintf (Gbl.F.Out,"
"); + /***** Start about zone *****/ + fprintf (Gbl.F.Out,"
"); - /***** About zone end *****/ - fprintf (Gbl.F.Out,""); // about_zone + /***** End about zone *****/ + fprintf (Gbl.F.Out,""); // about_zone } /*****************************************************************************/ @@ -1689,13 +1685,13 @@ static void Lay_WriteFootFromHTMLFile (void) /***** Open file with the HTML page for the chat *****/ if ((FileHTML = fopen (Cfg_PATH_AND_FILE_REL_HTML_PRIVATE,"rb"))) { - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /***** Copy HTML to output file *****/ Fil_FastCopyOfOpenFiles (FileHTML,Gbl.F.Out); fclose (FileHTML); - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,""); } } diff --git a/swad_menu.c b/swad_menu.c index 83e371cf0..b832263f6 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -296,7 +296,7 @@ void Mnu_WriteMenuThisTab (void) bool IsTheSelectedAction; /***** Menu start *****/ - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
"); + ""); } /*****************************************************************************/ diff --git a/swad_tab.c b/swad_tab.c index 97ce7bb65..3df3b2c39 100644 --- a/swad_tab.c +++ b/swad_tab.c @@ -88,10 +88,19 @@ void Tab_DrawTabs (void) extern const char *Txt_TABS_SHORT_TXT[Tab_NUM_TABS]; Tab_Tab_t NumTab; bool ICanViewTab; + const char *ClassHeadRow3[The_NUM_THEMES] = + { + "HEAD_ROW_3_WHITE", // The_THEME_WHITE + "HEAD_ROW_3_GREY", // The_THEME_GREY + "HEAD_ROW_3_BLUE", // The_THEME_BLUE + "HEAD_ROW_3_YELLOW", // The_THEME_YELLOW + }; - /***** Table start *****/ - fprintf (Gbl.F.Out,"
" - "
    "); + /***** Start tabs container *****/ + fprintf (Gbl.F.Out,"
    " + "
    "); + "" + "
"); } /*****************************************************************************/