From f313afe58e3ec647091ecca4b180caf12950ad9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 23 Nov 2016 23:58:46 +0100 Subject: [PATCH] Version 16.69 --- css/{swad16.68.css => swad16.69.css} | 13 ++++++++++--- swad_centre.c | 4 ++-- swad_changelog.h | 5 +++-- swad_country.c | 4 ++-- swad_course.c | 4 ++-- swad_degree.c | 4 ++-- swad_global.c | 2 ++ swad_global.h | 1 + swad_institution.c | 4 ++-- swad_layout.c | 8 +++++++- 10 files changed, 33 insertions(+), 16 deletions(-) rename css/{swad16.68.css => swad16.69.css} (99%) diff --git a/css/swad16.68.css b/css/swad16.69.css similarity index 99% rename from css/swad16.68.css rename to css/swad16.69.css index 65b1ef10..f36cd84b 100644 --- a/css/swad16.68.css +++ b/css/swad16.69.css @@ -1363,16 +1363,23 @@ a:hover /* Default ==> underlined */ width:100%; margin-bottom:20px; } -.FRAME_TBL_TITLE +.FRAME_TITLE { display:table; box-sizing:border-box; width:100%; margin:0 auto; padding:0 12px 12px 12px; - color:#808080; + } +.FRAME_TITLE_BIG + { + color:#606060; font-size:20pt; - font-weight:bold; + } +.FRAME_TITLE_SMALL + { + color:#808080; + font-size:18pt; } /* Apply only to the first level of th and td */ diff --git a/swad_centre.c b/swad_centre.c index 9fad5310..41e297ce 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -305,10 +305,10 @@ static void Ctr_Configuration (bool PrintView) Hlp_CENTRE_Information); /***** Title *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); if (PutLink) fprintf (Gbl.F.Out,"", + " class=\"FRAME_TITLE_BIG\" title=\"%s\">", Gbl.CurrentCtr.Ctr.WWW, Gbl.CurrentCtr.Ctr.FullName); Log_DrawLogo (Sco_SCOPE_CTR,Gbl.CurrentCtr.Ctr.CtrCod, diff --git a/swad_changelog.h b/swad_changelog.h index 6d29ea28..f868d2be 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -172,13 +172,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.68.10 (2016-11-23)" -#define CSS_FILE "swad16.68.css" +#define Log_PLATFORM_VERSION "SWAD 16.69 (2016-11-23)" +#define CSS_FILE "swad16.69.css" #define JS_FILE "swad16.46.1.js" // 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 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.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) diff --git a/swad_country.c b/swad_country.c index 335873f5..382da37a 100644 --- a/swad_country.c +++ b/swad_country.c @@ -236,10 +236,10 @@ static void Cty_Configuration (bool PrintView) Hlp_COUNTRY_Information); /***** Title *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); if (PutLink) fprintf (Gbl.F.Out,"", + " class=\"FRAME_TITLE_BIG\" title=\"%s\">", Gbl.CurrentCty.Cty.WWW[Gbl.Prefs.Language], Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]); fprintf (Gbl.F.Out,"%s",Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]); diff --git a/swad_course.c b/swad_course.c index 6d86792e..80ec194e 100644 --- a/swad_course.c +++ b/swad_course.c @@ -197,10 +197,10 @@ static void Crs_Configuration (bool PrintView) Hlp_COURSE_Information); /***** Title *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); if (PutLink) fprintf (Gbl.F.Out,"", + " class=\"FRAME_TITLE_BIG\" title=\"%s\">", Gbl.CurrentDeg.Deg.WWW, Gbl.CurrentDeg.Deg.FullName); Log_DrawLogo (Sco_SCOPE_DEG,Gbl.CurrentDeg.Deg.DegCod, diff --git a/swad_degree.c b/swad_degree.c index 93ee4640..4a1d8f16 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -314,10 +314,10 @@ static void Deg_Configuration (bool PrintView) Hlp_DEGREE_Information); /***** Title *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); if (PutLink) fprintf (Gbl.F.Out,"", + " class=\"FRAME_TITLE_BIG\" title=\"%s\">", Gbl.CurrentDeg.Deg.WWW, Gbl.CurrentDeg.Deg.FullName); Log_DrawLogo (Sco_SCOPE_DEG,Gbl.CurrentDeg.Deg.DegCod, diff --git a/swad_global.c b/swad_global.c index 667791af..d8784fd5 100644 --- a/swad_global.c +++ b/swad_global.c @@ -424,6 +424,8 @@ void Gbl_InitializeGlobals (void) Gbl.ColorRows[1] = "COLOR1"; // Lighter Gbl.WebService.Function = Svc_unknown; + + Gbl.Layout.FrameNested = 0; } /*****************************************************************************/ diff --git a/swad_global.h b/swad_global.h index 613e38c6..1017c37a 100644 --- a/swad_global.h +++ b/swad_global.h @@ -125,6 +125,7 @@ struct Globals 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 HTMLEndWritten; // Used to avoid writing more than once the HTML end + unsigned FrameNested; } Layout; struct { diff --git a/swad_institution.c b/swad_institution.c index 508442b5..64a6b392 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -304,10 +304,10 @@ static void Ins_Configuration (bool PrintView) Hlp_INSTITUTION_Information); /***** Title *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); if (PutLink) fprintf (Gbl.F.Out,"", + " class=\"FRAME_TITLE_BIG\" title=\"%s\">", Gbl.CurrentIns.Ins.WWW, Gbl.CurrentIns.Ins.FullName); Log_DrawLogo (Sco_SCOPE_INS,Gbl.CurrentIns.Ins.InsCod, diff --git a/swad_layout.c b/swad_layout.c index 7defe599..7b05cf25 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -1332,10 +1332,14 @@ void Lay_StartRoundFrame (const char *Width,const char *Title, fprintf (Gbl.F.Out,"
"); if (Title) - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" "%s" "
", + Gbl.Layout.FrameNested ? "FRAME_TITLE_SMALL" : + "FRAME_TITLE_BIG", Title); + + Gbl.Layout.FrameNested++; } // CellPadding must be 0, 1, 2, 4 or 8 @@ -1363,6 +1367,8 @@ void Lay_EndRoundFrameTable (void) void Lay_EndRoundFrame (void) { + Gbl.Layout.FrameNested--; + fprintf (Gbl.F.Out,"
" "
"); }