diff --git a/css/swad15.150.2.css b/css/swad15.152.css similarity index 99% rename from css/swad15.150.2.css rename to css/swad15.152.css index 7136d5f45..e0becf05b 100644 --- a/css/swad15.150.2.css +++ b/css/swad15.152.css @@ -166,6 +166,31 @@ a:hover /* Default ==> underlined */ 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 + { + display:inline-block; + box-sizing:border-box; + max-width:220px; + padding:0 4px; + color:#B0B0B0; + font-size:11pt; + font-weight:bold; + line-height:110%; + text-align:left; + vertical-align:middle; + } + } + #head_row_1_search { display:inline-block; diff --git a/icon/swad64x64.png b/icon/swad64x64.png new file mode 100644 index 000000000..0bb933d27 Binary files /dev/null and b/icon/swad64x64.png differ diff --git a/swad_changelog.h b/swad_changelog.h index 43cf546f2..76fb88fce 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -134,13 +134,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.151.5 (2016-03-19)" -#define CSS_FILE "swad15.150.2.css" +#define Log_PLATFORM_VERSION "SWAD 15.152 (2016-03-19)" +#define CSS_FILE "swad15.152.css" #define JS_FILE "swad15.131.3.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 15.152: Mar 19, 2016 Changes in layout of head. Not finished. (? lines) Version 15.151.5: Mar 19, 2016 Icon to edit holidays integrated in frame. (195931 lines) Version 15.151.4: Mar 19, 2016 Icon to edit plugins integrated in frame. (195933 lines) Version 15.151.3: Mar 19, 2016 Icon to edit mail domains integrated in frame. (195934 lines) diff --git a/swad_config.h b/swad_config.h index 5c9db6d22..90acadefc 100644 --- a/swad_config.h +++ b/swad_config.h @@ -59,7 +59,7 @@ #define Cfg_PATH_SWAD_PUBLIC "/var/www/html/swad" // Main public directory for public SWAD pages, icons, etc. #define Cfg_PATH_SWAD_PRIVATE "/var/www/swad" // Main private directory for SWAD private data -#define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad40x40.png" // Logo displayed in the top of the page +#define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad64x64.png" // Logo displayed in the top of the page #define Cfg_PLATFORM_LOGO_SMALL_WIDTH 40 #define Cfg_PLATFORM_LOGO_SMALL_HEIGHT 40 #define Cfg_PLATFORM_LOGO_BIG_FILENAME "swad140x40.png" @@ -111,7 +111,7 @@ #define Cfg_PATH_SWAD_PUBLIC "/var/www/html/swad" // Main public directory for public SWAD pages, icons, etc. #define Cfg_PATH_SWAD_PRIVATE "/var/www/swad" // Main private directory for SWAD private data -#define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad40x40.png" // Logo displayed in the top of the page +#define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad64x64.png" // Logo displayed in the top of the page #define Cfg_PLATFORM_LOGO_SMALL_WIDTH 40 #define Cfg_PLATFORM_LOGO_SMALL_HEIGHT 40 #define Cfg_PLATFORM_LOGO_BIG_FILENAME "openswad220x40.png" @@ -180,7 +180,7 @@ #define Cfg_PATH_SWAD_PUBLIC "/var/www/html/swad" // Main public directory for public SWAD pages, icons, etc. #define Cfg_PATH_SWAD_PRIVATE "/var/www/swad" // Main private directory for SWAD private data -#define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad40x40.png" // Logo displayed in the top of the page +#define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad64x64.png" // Logo displayed in the top of the page #define Cfg_PLATFORM_LOGO_SMALL_WIDTH 40 #define Cfg_PLATFORM_LOGO_SMALL_HEIGHT 40 #define Cfg_PLATFORM_LOGO_BIG_FILENAME "swad140x40.png" @@ -239,7 +239,7 @@ #define Cfg_PATH_SWAD_PUBLIC "/var/www/html/swad" // Main public directory for public SWAD pages, icons, etc. #define Cfg_PATH_SWAD_PRIVATE "/var/www/swad" // Main private directory for SWAD private data -#define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad40x40.png" // Logo displayed in the top of the page +#define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad64x64.png" // Logo displayed in the top of the page #define Cfg_PLATFORM_LOGO_SMALL_WIDTH 40 #define Cfg_PLATFORM_LOGO_SMALL_HEIGHT 40 #define Cfg_PLATFORM_LOGO_BIG_FILENAME "swad140x40.png" diff --git a/swad_degree.c b/swad_degree.c index a7daa4841..b03452ff1 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -685,7 +685,7 @@ void Deg_WriteCtyInsCtrDeg (void) if (Gbl.CurrentCty.Cty.CtyCod > 0) // Country selected... { /***** Separator *****/ - fprintf (Gbl.F.Out," / ",ClassOn); + fprintf (Gbl.F.Out," > ",ClassOn); /***** Form to go to select institutions *****/ Act_FormGoToStart (ActSeeCtyInf); @@ -698,7 +698,7 @@ void Deg_WriteCtyInsCtrDeg (void) else { /***** Separator *****/ - fprintf (Gbl.F.Out," / ",ClassSemiOff); + fprintf (Gbl.F.Out," > ",ClassSemiOff); /***** Form to go to select countries *****/ Act_FormGoToStart (ActSeeCty); @@ -710,7 +710,7 @@ void Deg_WriteCtyInsCtrDeg (void) if (Gbl.CurrentIns.Ins.InsCod > 0) // Institution selected... { /***** Separator *****/ - fprintf (Gbl.F.Out," / ",ClassOn); + fprintf (Gbl.F.Out," > ",ClassOn); /***** Form to go to select centres *****/ Act_FormGoToStart (ActSeeInsInf); @@ -723,7 +723,7 @@ void Deg_WriteCtyInsCtrDeg (void) else if (Gbl.CurrentCty.Cty.CtyCod > 0) { /***** Separator *****/ - fprintf (Gbl.F.Out," / ",ClassSemiOff); + fprintf (Gbl.F.Out," > ",ClassSemiOff); /***** Form to go to select institutions *****/ Act_FormGoToStart (ActSeeIns); @@ -733,13 +733,13 @@ void Deg_WriteCtyInsCtrDeg (void) } else /***** Separator and hidden institution *****/ - fprintf (Gbl.F.Out," / %s", + fprintf (Gbl.F.Out," > %s", ClassOff,Txt_Institution); if (Gbl.CurrentCtr.Ctr.CtrCod > 0) // Centre selected... { /***** Separator *****/ - fprintf (Gbl.F.Out," / ",ClassOn); + fprintf (Gbl.F.Out," > ",ClassOn); /***** Form to go to the centre *****/ Act_FormGoToStart (ActSeeCtrInf); @@ -752,7 +752,7 @@ void Deg_WriteCtyInsCtrDeg (void) else if (Gbl.CurrentIns.Ins.InsCod > 0) { /***** Separator *****/ - fprintf (Gbl.F.Out," / ",ClassSemiOff); + fprintf (Gbl.F.Out," > ",ClassSemiOff); /***** Form to go to select centres *****/ Act_FormGoToStart (ActSeeCtr); @@ -762,13 +762,13 @@ void Deg_WriteCtyInsCtrDeg (void) } else /***** Separator and hidden centre *****/ - fprintf (Gbl.F.Out," / %s", + fprintf (Gbl.F.Out," > %s", ClassOff,Txt_Centre); if (Gbl.CurrentDeg.Deg.DegCod > 0) // Degree selected... { /***** Separator *****/ - fprintf (Gbl.F.Out," / ",ClassOn); + fprintf (Gbl.F.Out," > ",ClassOn); /***** Form to go to the degree *****/ Act_FormGoToStart (ActSeeDegInf); @@ -784,7 +784,7 @@ void Deg_WriteCtyInsCtrDeg (void) else if (Gbl.CurrentCtr.Ctr.CtrCod > 0) { /***** Separator *****/ - fprintf (Gbl.F.Out," / ",ClassSemiOff); + fprintf (Gbl.F.Out," > ",ClassSemiOff); /***** Form to go to select degrees *****/ Act_FormGoToStart (ActSeeDeg); @@ -794,11 +794,11 @@ void Deg_WriteCtyInsCtrDeg (void) } else /***** Separator and hidden degree *****/ - fprintf (Gbl.F.Out," / %s", + fprintf (Gbl.F.Out," > %s", ClassOff,Txt_Degree); /***** Separator *****/ - fprintf (Gbl.F.Out," / ", + fprintf (Gbl.F.Out," > ", (Gbl.CurrentCrs.Crs.CrsCod > 0) ? ClassOn : ((Gbl.CurrentDeg.Deg.DegCod > 0) ? ClassSemiOff : ClassOff)); @@ -815,60 +815,50 @@ void Deg_WriteBigNameCtyInsCtrDegCrs (void) fprintf (Gbl.F.Out,"