From e74643b86a64eeb3847c0bf4bb57ad22e8485918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Tue, 24 Nov 2015 14:35:47 +0100 Subject: [PATCH] Version 15.45 --- swad_changelog.h | 3 ++- swad_layout.c | 28 +++++++++++++--------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 70bfef496..4c0b2226f 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -111,11 +111,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.44.8 (2015/11/24)" +#define Log_PLATFORM_VERSION "SWAD 15.45 (2015/11/24)" // 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.45: Nov 24, 2015 Changes in layout of top of page. (187894 lines) Version 15.44.8: Nov 24, 2015 Code refactoring in layout. (187895 lines) Version 15.44.7: Nov 24, 2015 Code refactoring in layout. (187901 lines) Version 15.44.6: Nov 24, 2015 Code refactoring in layout. (187893 lines) diff --git a/swad_layout.c b/swad_layout.c index e7994af97..fc6e2ab8b 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -711,17 +711,16 @@ static void Lay_WritePageTopHeadingDesktop (void) /***** 1st. row *****/ /* 1st. row, 2nd. column: logo */ fprintf (Gbl.F.Out,"" - "" - "" - "" - "", + "", ClassHeadRow1[Gbl.Prefs.Theme], The_ClassHead[Gbl.Prefs.Theme], Cfg_PLATFORM_LOGO_DESKTOP_WIDTH, @@ -732,7 +731,7 @@ static void Lay_WritePageTopHeadingDesktop (void) Cfg_PLATFORM_LOGO_DESKTOP_HEIGHT); /* 1st. row, 1st. column: search */ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); /* 1st. row, 3rd. column: logged user or language selection */ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); /* 1st. row, 4th. column: link to open/close session */ - fprintf (Gbl.F.Out,"" - "" - "
" + "" + "
" + "
" "" "\"%s\"" "" - "
"); + fprintf (Gbl.F.Out,"
"); Act_FormStart ( Gbl.CurrentCrs.Crs.CrsCod > 0 ? ActCrsSch : (Gbl.CurrentDeg.Deg.DegCod > 0 ? ActDegSch : (Gbl.CurrentCtr.Ctr.CtrCod > 0 ? ActCtrSch : @@ -742,29 +741,28 @@ static void Lay_WritePageTopHeadingDesktop (void) Sco_PutParamScope (Sco_SCOPE_SYS); Sch_PutFormToSearch (Gbl.Prefs.PathTheme); Act_FormEnd (); - fprintf (Gbl.F.Out,"
", + fprintf (Gbl.F.Out,"
", The_ClassHead[Gbl.Prefs.Theme]); if (Gbl.Usrs.Me.Logged) Usr_WriteLoggedUsrHead (); else Pre_PutSelectorToSelectLanguage (); - fprintf (Gbl.F.Out,"
", + fprintf (Gbl.F.Out,"
", The_ClassHead[Gbl.Prefs.Theme]); if (Gbl.Usrs.Me.Logged) Usr_PutFormLogOut (); else Usr_PutFormLogIn (); - fprintf (Gbl.F.Out,"
" - "" - ""); + fprintf (Gbl.F.Out,"" + "" + "" + ""); /***** 2nd. row *****/ /* 2nd. row, 1st. column