Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-05-31 22:05:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 15.45.2

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2015-11-25 10:22:43 +01:00
parent a4b3133aff
commit f445437201
4 changed files with 229 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

285
css/swad_desktop.css
View File

@ -61,32 +61,54 @@ hr.GREY_SEPARA {height:0; border-top:0; border-bottom:#707070 dotted 1px;}
hr.BLUE_SEPARA {height:0; border-top:0; border-bottom:#4D88A1 dotted 1px;}
hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
/********************************** Background *******************************/
.WHITE_BACKGROUND
/****************** Layout (the whole page with a background) ****************/
#whole_page_white
{
display:table;
width:100%;
background-image:linear-gradient(black 0,black 40px,white 40px,#cfcfce 40px,white 80px,white 100%);
background-repeat:no-repeat;
}
.GREY_BACKGROUND
#whole_page_grey
{
display:table;
width:100%;
background-image:linear-gradient(#383838 0,#404040 26px,#404040 185px,white 185px,white 100%);
background-repeat:no-repeat;
}
.BLUE_BACKGROUND
#whole_page_blue
{
display:table;
width:100%;
background-image:linear-gradient(#5fa5df 0,#4f90c8 26px,#4f90c8 185px,white 185px,white 100%);
background-repeat:no-repeat;
}
.YELLOW_BACKGROUND
#whole_page_yellow
{
display:table;
width:100%;
background-image:linear-gradient(#201420 0,#201420 185px,white 185px,white 100%);
background-repeat:no-repeat;
}
.WHITE_HEAD_ROW_1 {background-color:black;}
.GREY_HEAD_ROW_1 {background-image:linear-gradient(#383838 0,#383838 26px,#404040 100%); background-repeat:no-repeat;}
.BLUE_HEAD_ROW_1 {background-image:linear-gradient(#5fa5df 0,#4f90c8 26px,#4f90c8 100%); background-repeat:no-repeat;}
.YELLOW_HEAD_ROW_1 {background-color:#201420;}
.WHITE_HEAD_ROW_1
{
background-color:black;
}
.GREY_HEAD_ROW_1
{
background-image:linear-gradient(#383838 0,#383838 26px,#404040 100%);
background-repeat:no-repeat;
}
.BLUE_HEAD_ROW_1
{
background-image:linear-gradient(#5fa5df 0,#4f90c8 26px,#4f90c8 100%);
background-repeat:no-repeat;
}
.YELLOW_HEAD_ROW_1
{
background-color:#201420;
}
/************* Institution / Centre / Degree logo in top title ***************/
.TOP_LOGO
@ -96,6 +118,129 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
vertical-align:top !important;
}
/*********************************** Tabs ************************************/
#tabs_container
{
width:672px; /* 112 px * 6 visible tabs */
height:64px;
margin:0 auto;
}
.TAB_OFF
{
float:left;
width:108px;height:70px;
margin:1px 1px 0 1px;
padding:0 1px 0 1px;
border-radius:6px 6px 0 0;
box-shadow:inset -2px -2px 1px 0 rgba(50,50,50,0.2);
text-align:center;
vertical-align:middle;
overflow:hidden;
display:inline-block;
}
.TAB_ON
{
float:left;
width:110px; height:72px;
margin:0;
padding:1px 1px 0 1px;
border-radius:6px 6px 0 0;
box-shadow:inset -2px -2px 1px 0 rgba(50,50,50,0.2);
text-align:center;
vertical-align:middle;
overflow:hidden;
display:inline-block;
}
.WHITE_TAB_OFF
{
color:#707070;
font-size:9pt;
font-weight:bold;
line-height:100%;
white-space:nowrap;
overflow:hidden;
}
.GREY_TAB_OFF
{
color:#505050;
font-size:9pt;
font-weight:bold;
line-height:100%;
white-space:nowrap;
overflow:hidden;
}
.BLUE_TAB_OFF
{
color:#365E6E;
font-size:9pt;
font-weight:bold;
line-height:100%;
white-space:nowrap;
overflow:hidden;
}
.YELLOW_TAB_OFF
{
color:#7C4D2A;
font-size:9pt;
font-weight:bold;
line-height:100%;
white-space:nowrap;
overflow:hidden;
}
.WHITE_TAB_ON
{
color:#4D88A1;
font-size:9pt;
font-weight:bold;
line-height:100%;
white-space:nowrap;
overflow:hidden;
}
.GREY_TAB_ON
{
color:#606060;
font-size:9pt;
font-weight:bold;
line-height:100%;
white-space:nowrap;
overflow:hidden;
}
.BLUE_TAB_ON
{
color:#4D88A1;
font-size:9pt;
font-weight:bold;
line-height:100%;
white-space:nowrap;
overflow:hidden;
}
.YELLOW_TAB_ON
{
color:#BD4815;
font-size:9pt;
font-weight:bold;
line-height:100%;
white-space:nowrap;
overflow:hidden;
}
/****************************** Main zone ************************************/
#CENTRAL_ZONE
{
min-width:925px;
min-height:925px;
width:100%;
margin:-8px 0 0 0;
padding:10px 0;
border-radius:6px;
box-shadow:inset -2px -2px 1px 0 rgba(50,50,50,0.2);
text-align:center;
vertical-align:top;
overflow:hidden;
position:relative;
display:inline-block;
}
/****************** Title of current action in main block ********************/
#action_title
{
@ -418,22 +563,6 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
color:#4D88A1;
}
#CENTRAL_ZONE
{
min-width:925px;
min-height:925px;
width:100%;
margin:-8px 0 0 0;
padding:10px 0;
border-radius:6px;
box-shadow:inset -2px -2px 1px 0 rgba(50,50,50,0.2);
text-align:center;
vertical-align:top;
overflow:hidden;
position:relative;
display:inline-block;
}
/*********************************** Alerts **********************************/
.ALERT
{
@ -718,112 +847,6 @@ a:hover img.CENTRE_PHOTO_SHOW
transform:scale(1.2,1.2);
}
/*********************************** Tabs ************************************/
#tabs_container
{
width:672px; /* 112 px * 6 visible tabs */
height:64px;
margin:0 auto;
}
.TAB_OFF
{
float:left;
width:108px;height:70px;
margin:1px 1px 0 1px;
padding:0 1px 0 1px;
border-radius:6px 6px 0 0;
box-shadow:inset -2px -2px 1px 0 rgba(50,50,50,0.2);
text-align:center;
vertical-align:middle;
overflow:hidden;
display:inline-block;
}
.TAB_ON
{
float:left;
width:110px; height:72px;
margin:0;
padding:1px 1px 0 1px;
border-radius:6px 6px 0 0;
box-shadow:inset -2px -2px 1px 0 rgba(50,50,50,0.2);
text-align:center;
vertical-align:middle;
overflow:hidden;
display:inline-block;
}
.WHITE_TAB_OFF
{
color:#707070;
font-size:9pt;
font-weight:bold;
line-height:100%;
white-space:nowrap;
overflow:hidden;
}
.GREY_TAB_OFF
{
color:#505050;
font-size:9pt;
font-weight:bold;
line-height:100%;
white-space:nowrap;
overflow:hidden;
}
.BLUE_TAB_OFF
{
color:#365E6E;
font-size:9pt;
font-weight:bold;
line-height:100%;
white-space:nowrap;
overflow:hidden;
}
.YELLOW_TAB_OFF
{
color:#7C4D2A;
font-size:9pt;
font-weight:bold;
line-height:100%;
white-space:nowrap;
overflow:hidden;
}
.WHITE_TAB_ON
{
color:#4D88A1;
font-size:9pt;
font-weight:bold;
line-height:100%;
white-space:nowrap;
overflow:hidden;
}
.GREY_TAB_ON
{
color:#606060;
font-size:9pt;
font-weight:bold;
line-height:100%;
white-space:nowrap;
overflow:hidden;
}
.BLUE_TAB_ON
{
color:#4D88A1;
font-size:9pt;
font-weight:bold;
line-height:100%;
white-space:nowrap;
overflow:hidden;
}
.YELLOW_TAB_ON
{
color:#BD4815;
font-size:9pt;
font-weight:bold;
line-height:100%;
white-space:nowrap;
overflow:hidden;
}
/***************************** Horizontal menu *******************************/
#horizontal_menu_container ul
{

110
css/swad_mobile.css
View File

@ -56,32 +56,54 @@ table td
img {border-width:0; border-style:none;}
form {margin:0; display:inline;}
/********************************** Background *******************************/
.WHITE_BACKGROUND
/****************** Layout (the whole page with a background) ****************/
#whole_page_white
{
display:table;
width:100%;
background-image:linear-gradient(black 0,black 60px,white 60px,#cfcfce 60px,white 94px,white 100%);
background-repeat:no-repeat;
}
.GREY_BACKGROUND
#whole_page_grey
{
display:table;
width:100%;
background-image:linear-gradient(#383838 0,#404040 40px,#404040 170px,white 170px,white 100%);
background-repeat:no-repeat;
}
.BLUE_BACKGROUND
#whole_page_blue
{
display:table;
width:100%;
background-image:linear-gradient(#5fa5df 0,#4f90c8 40px,#4f90c8 170px,white 170px,white 100%);
background-repeat:no-repeat;
}
.YELLOW_BACKGROUND
#whole_page_yellow
{
display:table;
width:100%;
background-image:linear-gradient(#201420 0,#201420 170px,white 170px,white 100%);
background-repeat:no-repeat;
}
.WHITE_HEAD_ROW_1 {background-color:black;}
.GREY_HEAD_ROW_1 {background-image:linear-gradient(#383838 0,#383838 40px,#404040 100%); background-repeat:no-repeat;}
.BLUE_HEAD_ROW_1 {background-image:linear-gradient(#5fa5df 0,#4f90c8 40px,#4f90c8 100%); background-repeat:no-repeat;}
.YELLOW_HEAD_ROW_1 {background-color:#201420;}
.WHITE_HEAD_ROW_1
{
background-color:black;
}
.GREY_HEAD_ROW_1
{
background-image:linear-gradient(#383838 0,#383838 40px,#404040 100%);
background-repeat:no-repeat;
}
.BLUE_HEAD_ROW_1
{
background-image:linear-gradient(#5fa5df 0,#4f90c8 40px,#4f90c8 100%);
background-repeat:no-repeat;
}
.YELLOW_HEAD_ROW_1
{
background-color:#201420;
}
/************* Institution / Centre / Degree logo in top title ***************/
.TOP_LOGO
@ -91,6 +113,42 @@ form {margin:0; display:inline;}
vertical-align:top !important;
}
/*********************************** Tabs ************************************/
#tabs_container
{
height:64px;
margin:0 auto;
}
.TAB_ON
{
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;
}
/****************************** Main zone ************************************/
#CENTRAL_ZONE
{
min-width:925px;
min-height:925px;
width:100%;
margin:-8px 0 0 0;
padding:10px 0;
border-radius:8px;
box-shadow:inset -2px -2px 1px 0 rgba(50,50,50,0.2);
text-align:center;
vertical-align:top;
overflow:hidden;
position:relative;
display:inline-block;
}
/************************* Users connected globally **************************/
.CONNECTED
{
@ -363,40 +421,6 @@ form {margin:0; display:inline;}
color:#4D88A1;
}
/***************************** Tabs and main zone ****************************/
#tabs_container
{
height:64px;
margin:0 auto;
}
.TAB_ON
{
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;
}
#CENTRAL_ZONE
{
min-width:925px;
min-height:925px;
width:100%;
margin:-8px 0 0 0;
padding:10px 0;
border-radius:8px;
box-shadow:inset -2px -2px 1px 0 rgba(50,50,50,0.2);
text-align:center;
vertical-align:top;
overflow:hidden;
position:relative;
display:inline-block;
}
/********************************** Alerts ***********************************/
.ALERT
{

3
swad_changelog.h
View File

@ -111,11 +111,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.45.1 (2015/11/25)"
#define Log_PLATFORM_VERSION "SWAD 15.45.2 (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.2: Nov 25, 2015 Some CSS styles related to layout are moved to CSS file. (187929 lines)
Version 15.45.1: Nov 25, 2015 Changes in layout of page (some tables used with layout purposes are replaced by CSS). (187884 lines)
Version 15.45: Nov 25, 2015 Changes in layout of page (some tables used with layout purposes are replaced by CSS). (187877 lines)
Version 15.44.8: Nov 24, 2015 Code refactoring in layout. (187895 lines)

14
swad_layout.c
View File

@ -111,12 +111,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 *ClassBackground[The_NUM_THEMES] =
const char *IdWholePage[The_NUM_THEMES] =
{
"WHITE_BACKGROUND", // The_THEME_WHITE
"GREY_BACKGROUND", // The_THEME_GREY
"BLUE_BACKGROUND", // The_THEME_BLUE
"YELLOW_BACKGROUND", // 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
};
/***** If, when this function is called, the head is being written
@ -268,9 +268,7 @@ void Lay_WriteStartOfPage (void)
Gbl.Prefs.IconsURL);
/***** Start of box that contains the whole page except the foot *****/
fprintf (Gbl.F.Out,"<div class=\"%s\""
" style=\"display:table; width:100%%;\">",
ClassBackground[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<div id=\"%s\">",IdWholePage[Gbl.Prefs.Theme]);
/***** Header of layout *****/
switch (Gbl.Prefs.Layout)