Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 16.103.6

This commit is contained in:
Antonio Cañas Vargas 2016-12-18 19:50:33 +01:00
parent 38cc2d9578
commit 8f85e08e98
4 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -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)

44
swad_layout.c
View File

@ -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,"<div id=\"main_zone\">");
/* Left column */
if (Gbl.Prefs.SideCols & Lay_SHOW_LEFT_COLUMN) // Left column visible
{
fprintf (Gbl.F.Out,"<div id=\"left_col\">");
fprintf (Gbl.F.Out,"<aside id=\"left_col\">");
Lay_ShowLeftColumn ();
fprintf (Gbl.F.Out,"</div>");
fprintf (Gbl.F.Out,"</aside>");
}
/* 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,"<div id=\"right_col\">");
fprintf (Gbl.F.Out,"<aside id=\"right_col\">");
Lay_ShowRightColumn ();
fprintf (Gbl.F.Out,"</div>");
fprintf (Gbl.F.Out,"</aside>");
}
/* 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,"<header>");
/***** 1st. row *****/
/* Start of 1st. row */
@ -903,11 +902,8 @@ static void Lay_WritePageTopHeading (void)
/* End of 2nd. row */
fprintf (Gbl.F.Out,"</div>");
/***** 3rd. row (tabs) *****/
fprintf (Gbl.F.Out,"<div class=\"%s\">",
ClassHeadRow3[Gbl.Prefs.Theme]);
Tab_DrawTabs ();
fprintf (Gbl.F.Out,"</div>");
/***** End header *****/
fprintf (Gbl.F.Out,"</header>");
}
/*****************************************************************************/
@ -916,10 +912,10 @@ static void Lay_WritePageTopHeading (void)
static void Lay_WriteBreadcrumb (void)
{
fprintf (Gbl.F.Out,"<div id=\"breadcrumb\">");
fprintf (Gbl.F.Out,"<nav id=\"breadcrumb\">");
Hie_WriteHierarchyBreadcrumb ();
Crs_WriteSelectorMyCourses ();
fprintf (Gbl.F.Out,"</div>");
fprintf (Gbl.F.Out,"</nav>");
}
/*****************************************************************************/
@ -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,"<div id=\"about_zone\" class=\"ABOUT\">");
/***** Start about zone *****/
fprintf (Gbl.F.Out,"<footer id=\"about_zone\" class=\"ABOUT\">");
/***** Institution and centre hosting the platform *****/
fprintf (Gbl.F.Out,"<a href=\"%s\" class=\"ABOUT\" target=\"_blank\">"
@ -1614,8 +1610,8 @@ static void Lay_WriteAboutZone (void)
fprintf (Gbl.F.Out,"</div>");
/***** About zone end *****/
fprintf (Gbl.F.Out,"</div>"); // about_zone
/***** End about zone *****/
fprintf (Gbl.F.Out,"</footer>"); // 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,"<div id=\"foot_zone\">");
fprintf (Gbl.F.Out,"<footer id=\"foot_zone\">");
/***** Copy HTML to output file *****/
Fil_FastCopyOfOpenFiles (FileHTML,Gbl.F.Out);
fclose (FileHTML);
fprintf (Gbl.F.Out,"</div>");
fprintf (Gbl.F.Out,"</footer>");
}
}

4
swad_menu.c
View File

@ -296,7 +296,7 @@ void Mnu_WriteMenuThisTab (void)
bool IsTheSelectedAction;
/***** Menu start *****/
fprintf (Gbl.F.Out,"<div class=\"MENU_LIST_CONTAINER\">"
fprintf (Gbl.F.Out,"<nav class=\"MENU_LIST_CONTAINER\">"
"<ul class=\"MENU_LIST\">");
/***** Loop to write all options in menu. Each row holds an option *****/
@ -356,7 +356,7 @@ void Mnu_WriteMenuThisTab (void)
/***** Menu end *****/
fprintf (Gbl.F.Out,"</ul>"
"</div>");
"</nav>");
}
/*****************************************************************************/

20
swad_tab.c
View File

@ -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,"<div id=\"tabs\">"
"<ul class=\"LIST_CENTER\">");
/***** Start tabs container *****/
fprintf (Gbl.F.Out,"<div class=\"%s\">"
"<nav id=\"tabs\">"
"<ul class=\"LIST_CENTER\">",
ClassHeadRow3[Gbl.Prefs.Theme]);
/***** Draw the tabs *****/
for (NumTab = (Tab_Tab_t) 1;
@ -144,9 +153,10 @@ void Tab_DrawTabs (void)
}
}
/***** End of the table *****/
/***** End tabs container *****/
fprintf (Gbl.F.Out,"</ul>"
"</div>");
"</nav>"
"</div>");
}
/*****************************************************************************/