Version 15.50.1

This commit is contained in:
Antonio Cañas Vargas 2015-11-30 09:44:17 +01:00
parent 3fb649cfc2
commit 743f5a2513
3 changed files with 38 additions and 58 deletions

View File

@ -86,72 +86,57 @@ a:hover {text-decoration:underline;}
.MENU_LIST_ITEM a:hover {text-decoration:none;}
/****************** Layout (the whole page with a background) ****************/
#whole_page_white
#whole_page
{
display:table;
box-sizing:border-box;
width:100%;
background-image:linear-gradient(black 0,black 40px,white 40px,#cfcfce 40px,white 80px,white 100%);
}
.WHOLE_PAGE_WHITE
{
background-image:linear-gradient(black 0,black 40px,#cfcfce 40px,white 80px,white 100%);
background-repeat:no-repeat;
}
#whole_page_grey
.WHOLE_PAGE_GREY
{
display:table;
box-sizing:border-box;
width:100%;
background-image:linear-gradient(#383838 0,#404040 26px,#404040 185px,white 185px,white 100%);
background-image:linear-gradient(#383838 0,#404040 26px,#404040 184px,white 184px,white 100%);
background-repeat:no-repeat;
}
#whole_page_blue
.WHOLE_PAGE_BLUE
{
display:table;
box-sizing:border-box;
width:100%;
background-image:linear-gradient(#5fa5df 0,#4f90c8 26px,#4f90c8 185px,white 185px,white 100%);
background-image:linear-gradient(#5fa5df 0,#4f90c8 26px,#4f90c8 184px,white 184px,white 100%);
background-repeat:no-repeat;
}
#whole_page_yellow
.WHOLE_PAGE_YELLOW
{
display:table;
box-sizing:border-box;
width:100%;
background-image:linear-gradient(#201420 0,#201420 185px,white 185px,white 100%);
background-image:linear-gradient(#201420 0,#201420 184px,white 184px,white 100%);
background-repeat:no-repeat;
}
/************************* Layout (first heading row) ************************/
#head_row_1_white
#head_row_1
{
display:table;
box-sizing:border-box;
width:100%;
height:40px;
}
.HEAD_ROW_1_WHITE
{
background-color:black;
}
#head_row_1_grey
.HEAD_ROW_1_GREY
{
display:table;
box-sizing:border-box;
width:100%;
height:40px;
background-image:linear-gradient(#383838 0,#383838 26px,#404040 100%);
background-repeat:no-repeat;
}
#head_row_1_blue
.HEAD_ROW_1_BLUE
{
display:table;
box-sizing:border-box;
width:100%;
height:40px;
background-image:linear-gradient(#5fa5df 0,#4f90c8 26px,#4f90c8 100%);
background-repeat:no-repeat;
}
#head_row_1_yellow
.HEAD_ROW_1_YELLOW
{
display:table;
box-sizing:border-box;
width:100%;
height:40px;
background-color:#201420;
}
@ -217,11 +202,7 @@ a:hover {text-decoration:underline;}
.YELLOW_CUR_TIME {color:#B3B0B3; font-size:14pt; font-weight:bold;}
@media only screen and (max-width: 1023px)
{ /* For mobile phones */
#current_date
{
display:none;
}
#current_time
#head_row_2_time
{
display:none;
}
@ -258,11 +239,7 @@ a:hover {text-decoration:underline;}
}
@media only screen and (max-width: 1023px)
{ /* For mobile phones */
#notif_all
{
display:none;
}
#notif_new
#msg
{
display:none;
}

View File

@ -117,11 +117,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.50 (2015/11/30)"
#define Log_PLATFORM_VERSION "SWAD 15.50.1 (2015/11/30)"
// 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.50.1: Nov 30, 2015 Changes in layout of heading. (186494 lines)
Version 15.50: Nov 30, 2015 Changes in layout of menus.
Responsive design in menu: when screen is small, horizontal menu is drawn. (186514 lines)
Version 15.49.4: Nov 29, 2015 Changes in layout of menus. (186481 lines)

View File

@ -104,12 +104,12 @@ void Lay_WriteStartOfPage (void)
extern const unsigned Txt_Current_CGI_SWAD_Language;
extern const char *The_TabOnBgColors[The_NUM_THEMES];
extern const char *Txt_NEW_YEAR_GREETING;
const char *IdWholePage[The_NUM_THEMES] =
const char *ClassWholePage[The_NUM_THEMES] =
{
"whole_page_white", // The_THEME_WHITE
"whole_page_grey", // The_THEME_GREY
"whole_page_blue", // The_THEME_BLUE
"whole_page_yellow", // The_THEME_YELLOW
"WHOLE_PAGE_WHITE", // The_THEME_WHITE
"WHOLE_PAGE_GREY", // The_THEME_GREY
"WHOLE_PAGE_BLUE", // The_THEME_BLUE
"WHOLE_PAGE_YELLOW", // The_THEME_YELLOW
};
const char *LayoutMainZone[Mnu_NUM_MENUS] =
{
@ -257,7 +257,8 @@ void Lay_WriteStartOfPage (void)
}
/***** Start of box that contains the whole page except the foot *****/
fprintf (Gbl.F.Out,"<div id=\"%s\">",IdWholePage[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<div id=\"whole_page\" class=\"%s\">",
ClassWholePage[Gbl.Prefs.Theme]);
/***** Header of layout *****/
Lay_WritePageTopHeading ();
@ -669,19 +670,20 @@ static void Lay_WriteScriptCustomDropzone (void)
static void Lay_WritePageTopHeading (void)
{
extern const char *The_ClassHead[The_NUM_THEMES];
const char *IdHeadRow1[The_NUM_THEMES] =
const char *ClassHeadRow1[The_NUM_THEMES] =
{
"head_row_1_white", // The_THEME_WHITE
"head_row_1_grey", // The_THEME_GREY
"head_row_1_blue", // The_THEME_BLUE
"head_row_1_yellow", // The_THEME_YELLOW
"HEAD_ROW_1_WHITE", // The_THEME_WHITE
"HEAD_ROW_1_GREY", // The_THEME_GREY
"HEAD_ROW_1_BLUE", // The_THEME_BLUE
"HEAD_ROW_1_YELLOW", // The_THEME_YELLOW
};
/***** 1st. row *****/
/* Start of 1st. row */
fprintf (Gbl.F.Out,"<div id=\"%s\">",IdHeadRow1[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<div id=\"head_row_1\" class=\"%s\">",
ClassHeadRow1[Gbl.Prefs.Theme]);
/* 1st. row, 2nd. column: logo */
/* 1st. row, 1st. column: logo */
fprintf (Gbl.F.Out,"<div id=\"head_row_1_logo\" style=\"width:%upx;\">"
"<a href=\"%s\" target=\"_blank\">"
"<img src=\"%s/%s\""
@ -697,7 +699,7 @@ static void Lay_WritePageTopHeading (void)
Cfg_PLATFORM_LOGO_WIDTH,
Cfg_PLATFORM_LOGO_HEIGHT);
/* 1st. row, 1st. column: search */
/* 1st. row, 2nd. column: search */
fprintf (Gbl.F.Out,"<div id=\"head_row_1_search\">");
Act_FormStart ( Gbl.CurrentCrs.Crs.CrsCod > 0 ? ActCrsSch :
(Gbl.CurrentDeg.Deg.DegCod > 0 ? ActDegSch :