From b34552964e4c9e777ee69f7413c63f9c61e67aa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sat, 26 Dec 2015 14:17:48 +0100 Subject: [PATCH] Version 15.74.3 --- css/{swad15.74.css => swad15.74.3.css} | 7 ++++++- swad_changelog.h | 5 +++-- swad_degree.c | 23 +++++++++++++---------- swad_user.c | 2 +- 4 files changed, 23 insertions(+), 14 deletions(-) rename css/{swad15.74.css => swad15.74.3.css} (99%) diff --git a/css/swad15.74.css b/css/swad15.74.3.css similarity index 99% rename from css/swad15.74.css rename to css/swad15.74.3.css index bcffa2e99..afdd4c718 100644 --- a/css/swad15.74.css +++ b/css/swad15.74.3.css @@ -287,10 +287,14 @@ a:hover /* Default ==> underlined */ } } -.BC_OFF +.BC_SEMIOFF { opacity:0.33; } +.BC_OFF + { + opacity:0.25; + } .BC_WHITE {color:#707070;} .BC_GREY {color:#FFB42E;} @@ -1333,6 +1337,7 @@ a:hover img.CENTRE_PHOTO_SHOW .PHOTO15x20 {width: 15px; height: 20px; vertical-align:middle; border-radius:2px;} .PHOTO15x20B {width: 15px; height: 20px; vertical-align:middle; border-radius:2px; display:block; margin:0 auto;} .PHOTO18x24 {width: 18px; height: 24px; vertical-align:middle; border-radius:2px;} +.PHOTO18x24T {width: 18px; height: 24px; vertical-align:top; border-radius:2px;} .PHOTO21x28 {width: 21px; height: 28px; vertical-align:middle; border-radius:2px;} .PHOTO30x40 {width: 30px; height: 40px; vertical-align:middle; border-radius:2px;} .PHOTO45x60 {width: 45px; height: 60px; vertical-align:middle; border-radius:3px;} diff --git a/swad_changelog.h b/swad_changelog.h index bc8cfa8ee..3340ba64e 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -117,12 +117,13 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.74.2 (2015-12-26)" -#define CSS_FILE "swad15.74.css" +#define Log_PLATFORM_VERSION "SWAD 15.74.3 (2015-12-26)" +#define CSS_FILE "swad15.74.3.css" // 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.74.3: Dec 26, 2015 Changes in layout of breadcrumb. (187770 lines) Version 15.74.2: Dec 26, 2015 Changes in list of countries. (187761 lines) Version 15.74.1: Dec 26, 2015 Changes in layout of breadcrumb. (187775 lines) Version 15.74: Dec 26, 2015 New layout of breadcrumb. (187750 lines) diff --git a/swad_degree.c b/swad_degree.c index 31069cd17..e7a543172 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -654,10 +654,12 @@ void Deg_WriteCtyInsCtrDeg (void) extern const char *Txt_Degree; char DegreeShortName[Deg_MAX_LENGTH_DEGREE_FULL_NAME+1]; // Full name of degree char ClassOn[64]; + char ClassSemiOff[64]; char ClassOff[64]; /***** CSS classes *****/ strcpy (ClassOn,The_ClassBreadcrumb[Gbl.Prefs.Theme]); + sprintf (ClassSemiOff,"BC_SEMIOFF %s",The_ClassBreadcrumb[Gbl.Prefs.Theme]); sprintf (ClassOff,"BC_OFF %s",The_ClassBreadcrumb[Gbl.Prefs.Theme]); /***** Form to go to the system *****/ @@ -683,11 +685,11 @@ void Deg_WriteCtyInsCtrDeg (void) else { /***** Separator *****/ - fprintf (Gbl.F.Out," / ",ClassOff); + fprintf (Gbl.F.Out," / ",ClassSemiOff); /***** Form to go to select countries *****/ Act_FormGoToStart (ActSeeCty); - Act_LinkFormSubmit (Txt_Country,ClassOff); + Act_LinkFormSubmit (Txt_Country,ClassSemiOff); fprintf (Gbl.F.Out,"%s",Txt_Country); Act_FormEnd (); } @@ -708,11 +710,11 @@ void Deg_WriteCtyInsCtrDeg (void) else if (Gbl.CurrentCty.Cty.CtyCod > 0) { /***** Separator *****/ - fprintf (Gbl.F.Out," / ",ClassOff); + fprintf (Gbl.F.Out," / ",ClassSemiOff); /***** Form to go to select institutions *****/ Act_FormGoToStart (ActSeeIns); - Act_LinkFormSubmit (Txt_Institution,ClassOff); + Act_LinkFormSubmit (Txt_Institution,ClassSemiOff); fprintf (Gbl.F.Out,"%s",Txt_Institution); Act_FormEnd (); } @@ -737,11 +739,11 @@ void Deg_WriteCtyInsCtrDeg (void) else if (Gbl.CurrentIns.Ins.InsCod > 0) { /***** Separator *****/ - fprintf (Gbl.F.Out," / ",ClassOff); + fprintf (Gbl.F.Out," / ",ClassSemiOff); /***** Form to go to select centres *****/ Act_FormGoToStart (ActSeeCtr); - Act_LinkFormSubmit (Txt_Centre,ClassOff); + Act_LinkFormSubmit (Txt_Centre,ClassSemiOff); fprintf (Gbl.F.Out,"%s",Txt_Centre); Act_FormEnd (); } @@ -769,11 +771,11 @@ void Deg_WriteCtyInsCtrDeg (void) else if (Gbl.CurrentCtr.Ctr.CtrCod > 0) { /***** Separator *****/ - fprintf (Gbl.F.Out," / ",ClassOff); + fprintf (Gbl.F.Out," / ",ClassSemiOff); /***** Form to go to select degrees *****/ Act_FormGoToStart (ActSeeDeg); - Act_LinkFormSubmit (Txt_Degree,ClassOff); + Act_LinkFormSubmit (Txt_Degree,ClassSemiOff); fprintf (Gbl.F.Out,"%s",Txt_Degree); Act_FormEnd (); } @@ -784,8 +786,9 @@ void Deg_WriteCtyInsCtrDeg (void) /***** Separator *****/ fprintf (Gbl.F.Out," / ", - (Gbl.CurrentCrs.Crs.CrsCod > 0) ? ClassOn : - ClassOff); + (Gbl.CurrentCrs.Crs.CrsCod > 0) ? ClassOn : + ((Gbl.CurrentDeg.Deg.DegCod > 0) ? ClassSemiOff : + ClassOff)); } /*****************************************************************************/ diff --git a/swad_user.c b/swad_user.c index e95991ceb..c3c0d1ebf 100644 --- a/swad_user.c +++ b/swad_user.c @@ -1650,7 +1650,7 @@ void Usr_WriteLoggedUsrHead (void) ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&Gbl.Usrs.Me.UsrDat,PhotoURL); Pho_ShowUsrPhoto (&Gbl.Usrs.Me.UsrDat,ShowPhoto ? PhotoURL : NULL, - "PHOTO18x24",Pho_ZOOM); + "PHOTO18x24T",Pho_ZOOM); /***** User's name *****/ fprintf (Gbl.F.Out," ",