From c9644b2db2b279f729067d8aa8c84e113a7585dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 30 Nov 2015 12:58:19 +0100 Subject: [PATCH] Version 15.51.1 --- css/{swad15.51.css => swad15.51.1.css} | 137 +++++++++++++++++-------- icon/swad40x40.png | Bin 0 -> 2187 bytes swad_changelog.h | 4 +- swad_config.h | 36 ++++--- swad_degree.c | 22 ++-- swad_layout.c | 26 +++-- swad_theme.c | 10 +- 7 files changed, 155 insertions(+), 80 deletions(-) rename css/{swad15.51.css => swad15.51.1.css} (97%) create mode 100644 icon/swad40x40.png diff --git a/css/swad15.51.css b/css/swad15.51.1.css similarity index 97% rename from css/swad15.51.css rename to css/swad15.51.1.css index 0af26afef..f88e191de 100644 --- a/css/swad15.51.css +++ b/css/swad15.51.1.css @@ -140,11 +140,29 @@ a:hover {text-decoration:underline;} background-color:#201420; } -#head_row_1_logo - { - display:table-cell; - text-align:center; - vertical-align:middle; +@media only screen and (max-width: 899px) + { /* For mobile-phones */ + #head_row_1_logo_small + { + display:table-cell; + vertical-align:middle; + } + #head_row_1_logo_big + { + display:none; + } + } +@media only screen and (min-width: 900px) + { /* For tablets and desktop */ + #head_row_1_logo_small + { + display:none; + } + #head_row_1_logo_big + { + display:table-cell; + vertical-align:middle; + } } #head_row_1_search { @@ -188,6 +206,8 @@ a:hover {text-decoration:underline;} height:80px; vertical-align:top; } + +/******************************* Current time ********************************/ #head_row_2_time { display:table-cell; @@ -215,6 +235,7 @@ a:hover {text-decoration:underline;} } } +/****** Breadcrumb (platform/country/institution/centre/degree/course) *******/ #head_row_2_hierarchy { display:table-cell; @@ -228,6 +249,73 @@ a:hover {text-decoration:underline;} text-align:left; vertical-align:top !important; } +@media only screen and (max-width: 899px) + { /* For mobile-phones */ + #breadcrumb + { + font-size:10pt; + font-weight:bold; + white-space:nowrap; + } + } +@media only screen and (min-width: 900px) and (max-width: 1023px) + { /* For tablets */ + #breadcrumb + { + font-size:12pt; + font-weight:bold; + white-space:nowrap; + } + } +@media only screen and (min-width: 1024px) + { /* For desktop */ + #breadcrumb + { + font-size:14pt; + font-weight:bold; + white-space:nowrap; + } + } +.BREADCRUMB_WHITE {color:#707070;} +.BREADCRUMB_GREY {color:#FFB42E;} +.BREADCRUMB_BLUE {color:#FFE880;} +.BREADCRUMB_YELLOW {color:#FFC040;} + +/******** Big name of country, institution, centre, degree or course *********/ +#big_name h1,#big_name abbr + { + margin:0; + padding:0; + font-size:25pt; + font-weight:normal; + white-space:nowrap; + } +@media only screen and (max-width: 1023px) + { /* For mobile-phones */ + #big_short_name + { + } + #big_full_name + { + display:none; + } + } +@media only screen and (min-width: 1024px) + { /* For tablets and desktop */ + #big_short_name + { + display:none; + } + #big_full_name + { + } + } +.WHITE_COURSE {color:#4D88A1;} +.GREY_COURSE {font-family:Georgia,"DejaVu LGC Serif","Bitstream Vera Serif",serif; color:#F7F6F5;} +.BLUE_COURSE {font-family:Georgia,"DejaVu LGC Serif","Bitstream Vera Serif",serif; color:white;} +.YELLOW_COURSE {font-family:Georgia,"DejaVu LGC Serif","Bitstream Vera Serif",serif; color:white;} + +/***************************** Notifications *********************************/ #msg /* Notifications, used for AJAX based refresh */ { display:table-cell; @@ -1262,45 +1350,6 @@ a:hover img.CENTRE_PHOTO_SHOW background-repeat:no-repeat; } -.WHITE_DEGREE {color:#707070; font-size:14pt; font-weight:bold; white-space:nowrap;} -.GREY_DEGREE {color:#FFB42E; font-size:14pt; font-weight:bold; white-space:nowrap;} -.BLUE_DEGREE {color:#FFE880; font-size:14pt; font-weight:bold; white-space:nowrap;} -.YELLOW_DEGREE {color:#FFC040; font-size:14pt; font-weight:bold; white-space:nowrap;} - -/******** Big name of country, institution, centre, degree or course *********/ -#big_name h1,#big_name abbr - { - margin:0; - padding:0; - font-size:25pt; - font-weight:normal; - white-space:nowrap; - } -@media only screen and (max-width: 1023px) - { /* For mobile-phones */ - #big_short_name - { - } - #big_full_name - { - display:none; - } - } -@media only screen and (min-width: 1024px) - { /* For tablets and desktop */ - #big_short_name - { - display:none; - } - #big_full_name - { - } - } -.WHITE_COURSE {color:#4D88A1;} -.GREY_COURSE {font-family:Georgia,"DejaVu LGC Serif","Bitstream Vera Serif",serif; color:#F7F6F5;} -.BLUE_COURSE {font-family:Georgia,"DejaVu LGC Serif","Bitstream Vera Serif",serif; color:white;} -.YELLOW_COURSE {font-family:Georgia,"DejaVu LGC Serif","Bitstream Vera Serif",serif; color:white;} - /*****************************************************************************/ .WHITE_USR {color:#E0E0E0; font-size:15pt; font-weight:bold; white-space:nowrap;} .GREY_USR {color:#E0E0E0; font-size:15pt; font-weight:bold; white-space:nowrap;} diff --git a/icon/swad40x40.png b/icon/swad40x40.png new file mode 100644 index 0000000000000000000000000000000000000000..401437535bfdd0a0030e2049fb12b706c7cac0e8 GIT binary patch literal 2187 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",Txt_System); Act_FormEnd (); @@ -660,13 +660,13 @@ void Deg_WriteCtyInsCtrDeg (void) { /***** Separator *****/ fprintf (Gbl.F.Out," / ", - The_ClassDegree[Gbl.Prefs.Theme]); + The_ClassBreadcrumb[Gbl.Prefs.Theme]); /***** Form to go to the country *****/ Act_FormGoToStart (ActSeeIns); Cty_PutParamCtyCod (Gbl.CurrentCty.Cty.CtyCod); Act_LinkFormSubmit (Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language], - The_ClassDegree[Gbl.Prefs.Theme]); + The_ClassBreadcrumb[Gbl.Prefs.Theme]); fprintf (Gbl.F.Out,"%s", Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]); Act_FormEnd (); @@ -675,13 +675,13 @@ void Deg_WriteCtyInsCtrDeg (void) { /***** Separator *****/ fprintf (Gbl.F.Out," / ", - The_ClassDegree[Gbl.Prefs.Theme]); + The_ClassBreadcrumb[Gbl.Prefs.Theme]); /***** Form to go to the institution *****/ Act_FormGoToStart (ActSeeCtr); Ins_PutParamInsCod (Gbl.CurrentIns.Ins.InsCod); Act_LinkFormSubmit (Gbl.CurrentIns.Ins.FullName, - The_ClassDegree[Gbl.Prefs.Theme]); + The_ClassBreadcrumb[Gbl.Prefs.Theme]); fprintf (Gbl.F.Out,"%s", Gbl.CurrentIns.Ins.ShortName); Act_FormEnd (); @@ -690,13 +690,13 @@ void Deg_WriteCtyInsCtrDeg (void) { /***** Separator *****/ fprintf (Gbl.F.Out," / ", - The_ClassDegree[Gbl.Prefs.Theme]); + The_ClassBreadcrumb[Gbl.Prefs.Theme]); /***** Form to go to the centre *****/ Act_FormGoToStart (ActSeeDeg); Ctr_PutParamCtrCod (Gbl.CurrentCtr.Ctr.CtrCod); Act_LinkFormSubmit (Gbl.CurrentCtr.Ctr.FullName, - The_ClassDegree[Gbl.Prefs.Theme]); + The_ClassBreadcrumb[Gbl.Prefs.Theme]); fprintf (Gbl.F.Out,"%s", Gbl.CurrentCtr.Ctr.ShortName); Act_FormEnd (); @@ -705,13 +705,13 @@ void Deg_WriteCtyInsCtrDeg (void) { /***** Separator *****/ fprintf (Gbl.F.Out," / ", - The_ClassDegree[Gbl.Prefs.Theme]); + The_ClassBreadcrumb[Gbl.Prefs.Theme]); /***** Form to go to the degree *****/ Act_FormGoToStart (ActSeeCrs); Deg_PutParamDegCod (Gbl.CurrentDeg.Deg.DegCod); Act_LinkFormSubmit (Gbl.CurrentDeg.Deg.FullName, - The_ClassDegree[Gbl.Prefs.Theme]); + The_ClassBreadcrumb[Gbl.Prefs.Theme]); strcpy (DegreeShortName,Gbl.CurrentDeg.Deg.ShortName); Str_LimitLengthHTMLStr (DegreeShortName, Deg_MAX_LENGTH_SHORT_NAME_DEGREE_ON_PAGE_HEAD); @@ -725,7 +725,7 @@ void Deg_WriteCtyInsCtrDeg (void) /***** Separator *****/ fprintf (Gbl.F.Out," / ", - The_ClassDegree[Gbl.Prefs.Theme]); + The_ClassBreadcrumb[Gbl.Prefs.Theme]); if (Gbl.CurrentDeg.Deg.DegCod <= 0) // No degree selected... fprintf (Gbl.F.Out,"... "); fprintf (Gbl.F.Out,""); diff --git a/swad_layout.c b/swad_layout.c index a752c3dbf..023bd271e 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -684,20 +684,30 @@ static void Lay_WritePageTopHeading (void) ClassHeadRow1[Gbl.Prefs.Theme]); /* 1st. row, 1st. column: logo */ - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" "" - "\"%s\"" "" "
", - Cfg_PLATFORM_LOGO_WIDTH, + Cfg_PLATFORM_LOGO_SMALL_WIDTH, Cfg_HTTPS_URL_SWAD_CGI, - Gbl.Prefs.IconsURL,Cfg_PLATFORM_LOGO_FILE, + Gbl.Prefs.IconsURL,Cfg_PLATFORM_LOGO_SMALL_FILENAME, Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME, - Cfg_PLATFORM_LOGO_WIDTH, - Cfg_PLATFORM_LOGO_HEIGHT); + Cfg_PLATFORM_LOGO_SMALL_WIDTH,Cfg_PLATFORM_LOGO_SMALL_HEIGHT); + fprintf (Gbl.F.Out,"
" + "" + "\"%s\"" + "" + "
", + Cfg_PLATFORM_LOGO_BIG_WIDTH, + Cfg_HTTPS_URL_SWAD_CGI, + Gbl.Prefs.IconsURL,Cfg_PLATFORM_LOGO_BIG_FILENAME, + Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME, + Cfg_PLATFORM_LOGO_BIG_WIDTH,Cfg_PLATFORM_LOGO_BIG_HEIGHT); /* 1st. row, 2nd. column: search */ fprintf (Gbl.F.Out,"
"); @@ -745,8 +755,10 @@ static void Lay_WritePageTopHeading (void) /* 2nd. row, 2nd. column: degree and course */ fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Deg_WriteCtyInsCtrDeg (); Crs_WriteSelectorMyCourses (); + fprintf (Gbl.F.Out,"
"); Deg_WriteBigNameCtyInsCtrDegCrs (); fprintf (Gbl.F.Out,"
"); diff --git a/swad_theme.c b/swad_theme.c index a6f8d4b73..e518111a4 100644 --- a/swad_theme.c +++ b/swad_theme.c @@ -119,12 +119,12 @@ const char *The_ClassUsr[The_NUM_THEMES] = "YELLOW_USR", }; -const char *The_ClassDegree[The_NUM_THEMES] = +const char *The_ClassBreadcrumb[The_NUM_THEMES] = { - "WHITE_DEGREE", - "GREY_DEGREE", - "BLUE_DEGREE", - "YELLOW_DEGREE", + "BREADCRUMB_WHITE", + "BREADCRUMB_GREY", + "BREADCRUMB_BLUE", + "BREADCRUMB_YELLOW", }; const char *The_ClassCourse[The_NUM_THEMES] =