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 15.45.10

This commit is contained in:
Antonio Cañas Vargas 2015-11-25 14:44:17 +01:00
parent 4b92b48105
commit 17fbfd629f
6 changed files with 57 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
css/swad_desktop.css
View File

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

81
css/swad_mobile.css
View File

@ -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%;}

3
swad_changelog.h
View File

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

12
swad_layout.c
View File

@ -808,9 +808,9 @@ static void Lay_WritePageTopHeadingDesktop (void)
/* End of 2nd. row */
fprintf (Gbl.F.Out,"</div>");
/***** 3rd. row *****/
fprintf (Gbl.F.Out,"<div style=\"display:table; width:100%%;\">");
Tab_DrawTabs ();
/***** 3rd. row (tabs) *****/
fprintf (Gbl.F.Out,"<div id=\"head_row_3\">");
Tab_DrawTabsDeskTop ();
fprintf (Gbl.F.Out,"</div>");
}
@ -873,9 +873,9 @@ static void Lay_WritePageTopHeadingMobile (void)
Crs_WriteSelectorMyCourses ();
fprintf (Gbl.F.Out,"</div>");
/***** 3rd. row *****/
fprintf (Gbl.F.Out,"<div style=\"display:table; width:100%%;\">");
Tab_DrawTabs ();
/***** 3rd. row (breadcrumb) *****/
fprintf (Gbl.F.Out,"<div id=\"head_row_3\">");
Tab_DrawBreadcrumb ();
fprintf (Gbl.F.Out,"</div>");
}

29
swad_tab.c
View File

@ -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,"<div class=\"CENTER_TOP\""
" style=\"display:table-cell; height:64px;\">"
"<div id=\"tabs_container\">");
switch (Gbl.Prefs.Layout)
{
case Lay_LAYOUT_DESKTOP:
Tab_DrawTabsDeskTop ();
break;
case Lay_LAYOUT_MOBILE:
Tab_DrawBreadcrumb ();
break;
default:
break;
}
fprintf (Gbl.F.Out,"</div>"
"</div>");
}
/*****************************************************************************/
/**************** 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,"<div class=\"TAB_ON %s\">",
fprintf (Gbl.F.Out,"<div id=\"breadcrumb_container\" class=\"%s\">",
The_TabOnBgColors[Gbl.Prefs.Theme]);
/***** Home *****/

2
swad_tab.h
View File

@ -41,7 +41,7 @@
/***************************** Public prototypes *****************************/
/*****************************************************************************/
void Tab_DrawTabs (void);
void Tab_DrawTabsDeskTop (void);
void Tab_DrawTabsMobile (void);
void Tab_DrawBreadcrumb (void);