Version 16.69

This commit is contained in:
Antonio Cañas Vargas 2016-11-23 23:58:46 +01:00
parent 83da8d38e2
commit f313afe58e
10 changed files with 33 additions and 16 deletions

View File

@ -1363,16 +1363,23 @@ a:hover /* Default ==> underlined */
width:100%; width:100%;
margin-bottom:20px; margin-bottom:20px;
} }
.FRAME_TBL_TITLE .FRAME_TITLE
{ {
display:table; display:table;
box-sizing:border-box; box-sizing:border-box;
width:100%; width:100%;
margin:0 auto; margin:0 auto;
padding:0 12px 12px 12px; padding:0 12px 12px 12px;
color:#808080; }
.FRAME_TITLE_BIG
{
color:#606060;
font-size:20pt; font-size:20pt;
font-weight:bold; }
.FRAME_TITLE_SMALL
{
color:#808080;
font-size:18pt;
} }
/* Apply only to the first level of th and td */ /* Apply only to the first level of th and td */

View File

@ -305,10 +305,10 @@ static void Ctr_Configuration (bool PrintView)
Hlp_CENTRE_Information); Hlp_CENTRE_Information);
/***** Title *****/ /***** Title *****/
fprintf (Gbl.F.Out,"<div class=\"FRAME_TBL_TITLE CENTER_MIDDLE\">"); fprintf (Gbl.F.Out,"<div class=\"FRAME_TITLE FRAME_TITLE_BIG\">");
if (PutLink) if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\"" fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
" class=\"TITLE_LOCATION\" title=\"%s\">", " class=\"FRAME_TITLE_BIG\" title=\"%s\">",
Gbl.CurrentCtr.Ctr.WWW, Gbl.CurrentCtr.Ctr.WWW,
Gbl.CurrentCtr.Ctr.FullName); Gbl.CurrentCtr.Ctr.FullName);
Log_DrawLogo (Sco_SCOPE_CTR,Gbl.CurrentCtr.Ctr.CtrCod, Log_DrawLogo (Sco_SCOPE_CTR,Gbl.CurrentCtr.Ctr.CtrCod,

View File

@ -172,13 +172,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.68.10 (2016-11-23)" #define Log_PLATFORM_VERSION "SWAD 16.69 (2016-11-23)"
#define CSS_FILE "swad16.68.css" #define CSS_FILE "swad16.69.css"
#define JS_FILE "swad16.46.1.js" #define JS_FILE "swad16.46.1.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 16.69: Nov 23, 2016 Changes in layout of frame title. (207473 lines)
Version 16.68.10: Nov 23, 2016 Changes in layout of messages received / sent. (207459 lines) Version 16.68.10: Nov 23, 2016 Changes in layout of messages received / sent. (207459 lines)
Version 16.68.9: Nov 23, 2016 Changes in layout of messages received / sent. (207458 lines) Version 16.68.9: Nov 23, 2016 Changes in layout of messages received / sent. (207458 lines)
Version 16.68.8: Nov 23, 2016 Changes in layout of messages received / sent. (207462 lines) Version 16.68.8: Nov 23, 2016 Changes in layout of messages received / sent. (207462 lines)

View File

@ -236,10 +236,10 @@ static void Cty_Configuration (bool PrintView)
Hlp_COUNTRY_Information); Hlp_COUNTRY_Information);
/***** Title *****/ /***** Title *****/
fprintf (Gbl.F.Out,"<div class=\"FRAME_TBL_TITLE CENTER_MIDDLE\">"); fprintf (Gbl.F.Out,"<div class=\"FRAME_TITLE FRAME_TITLE_BIG\">");
if (PutLink) if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\"" fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
" class=\"TITLE_LOCATION\" title=\"%s\">", " class=\"FRAME_TITLE_BIG\" title=\"%s\">",
Gbl.CurrentCty.Cty.WWW[Gbl.Prefs.Language], Gbl.CurrentCty.Cty.WWW[Gbl.Prefs.Language],
Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]); Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]);
fprintf (Gbl.F.Out,"%s",Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]); fprintf (Gbl.F.Out,"%s",Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]);

View File

@ -197,10 +197,10 @@ static void Crs_Configuration (bool PrintView)
Hlp_COURSE_Information); Hlp_COURSE_Information);
/***** Title *****/ /***** Title *****/
fprintf (Gbl.F.Out,"<div class=\"FRAME_TBL_TITLE CENTER_MIDDLE\">"); fprintf (Gbl.F.Out,"<div class=\"FRAME_TITLE FRAME_TITLE_BIG\">");
if (PutLink) if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\"" fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
" class=\"TITLE_LOCATION\" title=\"%s\">", " class=\"FRAME_TITLE_BIG\" title=\"%s\">",
Gbl.CurrentDeg.Deg.WWW, Gbl.CurrentDeg.Deg.WWW,
Gbl.CurrentDeg.Deg.FullName); Gbl.CurrentDeg.Deg.FullName);
Log_DrawLogo (Sco_SCOPE_DEG,Gbl.CurrentDeg.Deg.DegCod, Log_DrawLogo (Sco_SCOPE_DEG,Gbl.CurrentDeg.Deg.DegCod,

View File

@ -314,10 +314,10 @@ static void Deg_Configuration (bool PrintView)
Hlp_DEGREE_Information); Hlp_DEGREE_Information);
/***** Title *****/ /***** Title *****/
fprintf (Gbl.F.Out,"<div class=\"FRAME_TBL_TITLE CENTER_MIDDLE\">"); fprintf (Gbl.F.Out,"<div class=\"FRAME_TITLE FRAME_TITLE_BIG\">");
if (PutLink) if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\"" fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
" class=\"TITLE_LOCATION\" title=\"%s\">", " class=\"FRAME_TITLE_BIG\" title=\"%s\">",
Gbl.CurrentDeg.Deg.WWW, Gbl.CurrentDeg.Deg.WWW,
Gbl.CurrentDeg.Deg.FullName); Gbl.CurrentDeg.Deg.FullName);
Log_DrawLogo (Sco_SCOPE_DEG,Gbl.CurrentDeg.Deg.DegCod, Log_DrawLogo (Sco_SCOPE_DEG,Gbl.CurrentDeg.Deg.DegCod,

View File

@ -424,6 +424,8 @@ void Gbl_InitializeGlobals (void)
Gbl.ColorRows[1] = "COLOR1"; // Lighter Gbl.ColorRows[1] = "COLOR1"; // Lighter
Gbl.WebService.Function = Svc_unknown; Gbl.WebService.Function = Svc_unknown;
Gbl.Layout.FrameNested = 0;
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -125,6 +125,7 @@ struct Globals
bool HTMLStartWritten; // Used to avoid writing more than once the HTML head bool HTMLStartWritten; // Used to avoid writing more than once the HTML head
bool DivsEndWritten; // Used to avoid writing more than once the HTML end bool DivsEndWritten; // Used to avoid writing more than once the HTML end
bool HTMLEndWritten; // Used to avoid writing more than once the HTML end bool HTMLEndWritten; // Used to avoid writing more than once the HTML end
unsigned FrameNested;
} Layout; } Layout;
struct struct
{ {

View File

@ -304,10 +304,10 @@ static void Ins_Configuration (bool PrintView)
Hlp_INSTITUTION_Information); Hlp_INSTITUTION_Information);
/***** Title *****/ /***** Title *****/
fprintf (Gbl.F.Out,"<div class=\"FRAME_TBL_TITLE CENTER_MIDDLE\">"); fprintf (Gbl.F.Out,"<div class=\"FRAME_TITLE FRAME_TITLE_BIG\">");
if (PutLink) if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\"" fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
" class=\"TITLE_LOCATION\" title=\"%s\">", " class=\"FRAME_TITLE_BIG\" title=\"%s\">",
Gbl.CurrentIns.Ins.WWW, Gbl.CurrentIns.Ins.WWW,
Gbl.CurrentIns.Ins.FullName); Gbl.CurrentIns.Ins.FullName);
Log_DrawLogo (Sco_SCOPE_INS,Gbl.CurrentIns.Ins.InsCod, Log_DrawLogo (Sco_SCOPE_INS,Gbl.CurrentIns.Ins.InsCod,

View File

@ -1332,10 +1332,14 @@ void Lay_StartRoundFrame (const char *Width,const char *Title,
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
if (Title) if (Title)
fprintf (Gbl.F.Out,"<div class=\"FRAME_TBL_TITLE CENTER_MIDDLE\">" fprintf (Gbl.F.Out,"<div class=\"FRAME_TITLE %s\">"
"%s" "%s"
"</div>", "</div>",
Gbl.Layout.FrameNested ? "FRAME_TITLE_SMALL" :
"FRAME_TITLE_BIG",
Title); Title);
Gbl.Layout.FrameNested++;
} }
// CellPadding must be 0, 1, 2, 4 or 8 // CellPadding must be 0, 1, 2, 4 or 8
@ -1363,6 +1367,8 @@ void Lay_EndRoundFrameTable (void)
void Lay_EndRoundFrame (void) void Lay_EndRoundFrame (void)
{ {
Gbl.Layout.FrameNested--;
fprintf (Gbl.F.Out,"</div>" fprintf (Gbl.F.Out,"</div>"
"</div>"); "</div>");
} }