Version 15.160.2

This commit is contained in:
Antonio Cañas Vargas 2016-03-22 01:26:00 +01:00
parent 3ee87af9a2
commit d689cb44ec
4 changed files with 45 additions and 36 deletions

View File

@ -154,6 +154,10 @@ a:hover /* Default ==> underlined */
{ {
display:none; display:none;
} }
#head_row_1_tagline
{
display:none;
}
} }
@media only screen and (min-width: 900px) @media only screen and (min-width: 900px)
{ /* For tablets and desktop */ { /* For tablets and desktop */
@ -165,31 +169,23 @@ a:hover /* Default ==> underlined */
{ {
display:inline-block; display:inline-block;
} }
}
@media only screen and (max-width: 1023px)
{ /* For mobile phones and tablets */
#head_row_1_tagline
{
display:none;
}
}
@media only screen and (min-width: 1024px)
{ /* For mobile phones and tablets */
#head_row_1_tagline #head_row_1_tagline
{ {
display:inline-block; display:inline-block;
box-sizing:border-box; box-sizing:border-box;
/* max-width:200px; */
padding:0 4px; padding:0 4px;
color:#B0B0B0;
font-size:11pt; font-size:11pt;
font-weight:bold; font-weight:bold;
line-height:110%; line-height:110%;
white-space:nowrap;
text-align:left; text-align:left;
vertical-align:middle; vertical-align:middle;
} }
} }
.WHITE_TAGLINE {color:#B0B0B0;}
.GREY_TAGLINE {color:#E0E0E0;}
.BLUE_TAGLINE {color:#BAD2DA;}
.YELLOW_TAGLINE {color:#B3B0B3;}
#head_row_1_search #head_row_1_search
{ {
@ -543,14 +539,9 @@ a:hover /* Default ==> underlined */
text-decoration:none; text-decoration:none;
} }
/*.TAB_ON_WHITE {background-color:#F7F6F5;}*/
.TAB_ON_WHITE {background-color:rgba(247, 246, 245, 0.95);} .TAB_ON_WHITE {background-color:rgba(247, 246, 245, 0.95);}
/*.TAB_ON_GREY {background-color:#F7F6F5;}*/
.TAB_ON_GREY {background-color:rgba(247, 246, 245, 0.95);} .TAB_ON_GREY {background-color:rgba(247, 246, 245, 0.95);}
.TAB_ON_BLUE {background-color:#E8F3F6;}
/*.TAB_ON_BLUE {background-color:#E8F3F6;}*/
.TAB_ON_BLUE {background-color:rgba(232, 243, 246, 0.95);} .TAB_ON_BLUE {background-color:rgba(232, 243, 246, 0.95);}
/* .TAB_ON_YELLOW {background-color:#FFF2BD;} */
.TAB_ON_YELLOW {background-color:rgba(255, 242, 189, 0.95);} .TAB_ON_YELLOW {background-color:rgba(255, 242, 189, 0.95);}
.TAB_OFF_WHITE {background-color:#D4D4D4;} .TAB_OFF_WHITE {background-color:#D4D4D4;}

View File

@ -134,13 +134,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.160.1 (2016-03-21)" #define Log_PLATFORM_VERSION "SWAD 15.160.2 (2016-03-22)"
#define CSS_FILE "swad15.160.css" #define CSS_FILE "swad15.160.2.css"
#define JS_FILE "swad15.131.3.js" #define JS_FILE "swad15.131.3.js"
// Number of lines (includes comments but not blank lines) has been got with the following command: // 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 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/* /*
Version 15.160.2: Mar 22, 2016 Changes in layout of tagline. (196512 lines)
Version 15.160.1: Mar 21, 2016 Changes in layout of tagline. (196504 lines) Version 15.160.1: Mar 21, 2016 Changes in layout of tagline. (196504 lines)
Version 15.160: Mar 21, 2016 Changes in forms to login and to create new account. (196423 lines) Version 15.160: Mar 21, 2016 Changes in forms to login and to create new account. (196423 lines)
Version 15.159.5: Mar 21, 2016 Changes in CSS related to tables. (196423 lines) Version 15.159.5: Mar 21, 2016 Changes in CSS related to tables. (196423 lines)

View File

@ -733,6 +733,9 @@ static void Lay_WriteScriptCustomDropzone (void)
static void Lay_WritePageTopHeading (void) static void Lay_WritePageTopHeading (void)
{ {
extern const char *The_ClassHead[The_NUM_THEMES]; extern const char *The_ClassHead[The_NUM_THEMES];
extern const char *The_ClassTagline[The_NUM_THEMES];
extern const char *Txt_System;
extern const char *Txt_TAGLINE;
extern const char *Txt_TAGLINE_BR; extern const char *Txt_TAGLINE_BR;
const char *ClassHeadRow1[The_NUM_THEMES] = const char *ClassHeadRow1[The_NUM_THEMES] =
{ {
@ -764,34 +767,40 @@ static void Lay_WritePageTopHeading (void)
/* 1st. row, 1st. column: logo, tagline and search */ /* 1st. row, 1st. column: logo, tagline and search */
fprintf (Gbl.F.Out,"<div id=\"head_row_1_left\">"); fprintf (Gbl.F.Out,"<div id=\"head_row_1_left\">");
fprintf (Gbl.F.Out,"<div id=\"head_row_1_logo_small\">" /* Start form to go to home page */
"<a href=\"%s\" target=\"_blank\">" Act_FormGoToStart (ActMnu);
"<img src=\"%s/%s\" alt=\"%s\" title=\"%s\"" Par_PutHiddenParamUnsigned ("NxtTab",(unsigned) TabSys);
fprintf (Gbl.F.Out,"<div id=\"head_row_1_logo_small\">");
Act_LinkFormSubmit (Txt_System,NULL);
fprintf (Gbl.F.Out,"<img src=\"%s/%s\" alt=\"%s\" title=\"%s\""
" class=\"CENTER_MIDDLE\"" " class=\"CENTER_MIDDLE\""
" style=\"width:%upx; height:%upx;\" />" " style=\"width:%upx; height:%upx;\" />"
"</a>" "</a>", // head_row_1_logo_small
"</div>", // head_row_1_logo_small
Cfg_HTTPS_URL_SWAD_CGI,
Gbl.Prefs.IconsURL,Cfg_PLATFORM_LOGO_SMALL_FILENAME, Gbl.Prefs.IconsURL,Cfg_PLATFORM_LOGO_SMALL_FILENAME,
Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME, Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME,
Cfg_PLATFORM_LOGO_SMALL_WIDTH,Cfg_PLATFORM_LOGO_SMALL_HEIGHT); Cfg_PLATFORM_LOGO_SMALL_WIDTH,Cfg_PLATFORM_LOGO_SMALL_HEIGHT);
fprintf (Gbl.F.Out,"<div id=\"head_row_1_logo_big\">" fprintf (Gbl.F.Out,"</div>"
"<a href=\"%s\" target=\"_blank\">" "<div id=\"head_row_1_logo_big\">");
"<img src=\"%s/%s\" alt=\"%s\" title=\"%s\"" Act_LinkFormSubmit (Txt_System,NULL);
fprintf (Gbl.F.Out,"<img src=\"%s/%s\" alt=\"%s\" title=\"%s\""
" class=\"CENTER_MIDDLE\"" " class=\"CENTER_MIDDLE\""
" style=\"width:%upx; height:%upx;\" />" " style=\"width:%upx; height:%upx;\" />"
"</a>" "</a>", // head_row_1_logo_big
"</div>", // head_row_1_logo_big
Cfg_HTTPS_URL_SWAD_CGI,
Gbl.Prefs.IconsURL,Cfg_PLATFORM_LOGO_BIG_FILENAME, Gbl.Prefs.IconsURL,Cfg_PLATFORM_LOGO_BIG_FILENAME,
Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME, Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME,
Cfg_PLATFORM_LOGO_BIG_WIDTH,Cfg_PLATFORM_LOGO_BIG_HEIGHT); Cfg_PLATFORM_LOGO_BIG_WIDTH,Cfg_PLATFORM_LOGO_BIG_HEIGHT);
fprintf (Gbl.F.Out,"</div>"
fprintf (Gbl.F.Out,"<div id=\"head_row_1_tagline\">" "<div id=\"head_row_1_tagline\">");
"%s" Act_LinkFormSubmit (Txt_TAGLINE,The_ClassTagline[Gbl.Prefs.Theme]);
"</div>", // head_row_1_logo_small fprintf (Gbl.F.Out,"%s"
"</a>"
"</div>", // head_row_1_tagline
Txt_TAGLINE_BR); Txt_TAGLINE_BR);
/* End form to go to home page */
Act_FormEnd ();
fprintf (Gbl.F.Out,"<div id=\"head_row_1_search\">"); fprintf (Gbl.F.Out,"<div id=\"head_row_1_search\">");
Act_FormStart ( Gbl.CurrentCrs.Crs.CrsCod > 0 ? ActCrsSch : Act_FormStart ( Gbl.CurrentCrs.Crs.CrsCod > 0 ? ActCrsSch :
(Gbl.CurrentDeg.Deg.DegCod > 0 ? ActDegSch : (Gbl.CurrentDeg.Deg.DegCod > 0 ? ActDegSch :

View File

@ -95,6 +95,14 @@ const char *The_ClassHead[The_NUM_THEMES] =
"YELLOW_HEAD", "YELLOW_HEAD",
}; };
const char *The_ClassTagline[The_NUM_THEMES] =
{
"WHITE_TAGLINE",
"GREY_TAGLINE",
"BLUE_TAGLINE",
"YELLOW_TAGLINE",
};
const char *The_ClassCurrentTime[The_NUM_THEMES] = const char *The_ClassCurrentTime[The_NUM_THEMES] =
{ {
"WHITE_CUR_TIME", "WHITE_CUR_TIME",