From ad4ca518395488794dfb533e99a8cbdfe9c3dc61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sun, 21 Dec 2014 01:58:30 +0100 Subject: [PATCH] Version 14.39.2 --- swad_changelog.h | 5 +++-- swad_date.c | 2 +- swad_layout.c | 8 +++----- swad_preference.c | 2 +- swad_search.c | 2 +- swad_statistic.c | 45 ++++++++++++++++++++------------------------- swad_user.c | 6 +----- 7 files changed, 30 insertions(+), 40 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 0e8cc73f9..2287d8d48 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -35,12 +35,13 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.39.1 (2014/12/20)" +#define Log_PLATFORM_VERSION "SWAD 14.39.2 (2014/12/21)" // 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 | tail -1 /* - Version 14.39.1 :Dic 20, 2014 Change from XHTML 1.0 Transitional to HTML5. (? lines) + Version 14.39.2 :Dic 21, 2014 Changes in layout and graphics. (170739 lines) + Version 14.39.1 :Dic 20, 2014 Change from XHTML 1.0 Transitional to HTML5. (170747 lines) Version 14.39 :Dic 20, 2014 iframes removed from course info. (170746 lines) Version 14.38.9 :Dic 20, 2014 The words "Course" and "Group" are removed from selection of course and groups in Documents and Shared files. (? lines) Version 14.38.8 :Dic 18, 2014 Fixed bug in banned users. (170793 lines) diff --git a/swad_date.c b/swad_date.c index fc1bf91c7..3104f6da1 100644 --- a/swad_date.c +++ b/swad_date.c @@ -353,7 +353,7 @@ void Dat_DrawMonth (unsigned RealYear,unsigned RealMonth, /***** Start of month *****/ fprintf (Gbl.F.Out,"
" - "%s %u
" + "
%s %u
" "", Txt_MONTHS_CAPS[RealMonth-1],RealYear); diff --git a/swad_layout.c b/swad_layout.c index b5a79fe5f..0062ce262 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -593,16 +593,16 @@ static void Lay_WritePageTopHeading (void) }, }; - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", Gbl.Prefs.PathTheme); /***** 1st. row, 1st. column: logo *****/ - fprintf (Gbl.F.Out,""); - fprintf (Gbl.F.Out,"
", + fprintf (Gbl.F.Out,"", LogoLayout[Gbl.Prefs.Layout].Width + 16); /* Left logo */ fprintf (Gbl.F.Out,"" - "\"%s\"" + "\"%s\"" "", Cfg_HTTP_SwAD_HOME_PAGE,Gbl.Prefs.PathTheme, LogoLayout[Gbl.Prefs.Layout].Icon, @@ -610,11 +610,9 @@ static void Lay_WritePageTopHeading (void) LogoLayout[Gbl.Prefs.Layout].Height, Cfg_PLATFORM_FULL_NAME); fprintf (Gbl.F.Out,"" "" ""); - /***** 1st. row, 2nd. column: search, and logged user / language selection *****/ if (Gbl.Prefs.Layout == Lay_LAYOUT_DESKTOP) { diff --git a/swad_preference.c b/swad_preference.c index 89039c5c1..ea557b516 100644 --- a/swad_preference.c +++ b/swad_preference.c @@ -270,7 +270,7 @@ void Prf_PutSelectorToSelectLanguage (void) }; Act_FormStart (ActReqChgLan); - fprintf (Gbl.F.Out,"" - "\"","); + fprintf (Gbl.F.Out,"\">" + ""); } } @@ -2565,7 +2562,7 @@ static void Sta_WriteAccessHour (unsigned Hour,float NumPagesGenerated,float Max #define NUM_MINUTES_PER_DAY (60*24) // 1440 minutes in a day #define WIDTH_SEMIDIVISION_GRAPHIC 24 -#define NUM_DIVISIONS_X 10 +#define NUM_DIVISIONS_X 10 static void Sta_ShowAverageAccessesPerMinute (unsigned long NumRows,MYSQL_RES *mysql_res) { @@ -2628,20 +2625,20 @@ static void Sta_ShowAverageAccessesPerMinute (unsigned long NumRows,MYSQL_RES *m else Format = "%f"; - /***** Rótulos of the X axis *****/ + /***** X axis tags *****/ Sta_WriteLabelsXAxisAccMin (IncX,Format); - /***** Eje Y and graphic *****/ + /***** Y axis and graphic *****/ for (i = 0; i < NUM_MINUTES_PER_DAY; i++) Sta_WriteAccessMinute (i,NumClicksPerMin[i],MaxX); - /***** Eje X *****/ + /***** X axis *****/ /* First division (left) */ fprintf (Gbl.F.Out,"" "", WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.IconsURL,WIDTH_SEMIDIVISION_GRAPHIC); /* All the intermediate divisions */ @@ -2649,12 +2646,12 @@ static void Sta_ShowAverageAccessesPerMinute (unsigned long NumRows,MYSQL_RES *m i < NUM_DIVISIONS_X*2; i++) fprintf (Gbl.F.Out,"", WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.IconsURL,WIDTH_SEMIDIVISION_GRAPHIC); /* Last division (right) */ fprintf (Gbl.F.Out,"" "", WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.IconsURL,WIDTH_SEMIDIVISION_GRAPHIC); @@ -2721,7 +2718,7 @@ static void Sta_WriteAccessMinute (unsigned Minute,float NumPagesGenerated,float /***** Draw bar with anchura proporcional al number of clicks *****/ if (NumPagesGenerated != 0.0) if ((BarWidth = (unsigned) (((NumPagesGenerated * (float) WIDTH_GRAPHIC / MaxX)) + 0.5)) != 0) - fprintf (Gbl.F.Out,"\"\"", + fprintf (Gbl.F.Out,"\"\"", Gbl.Prefs.IconsURL, (Minute % 60) == 0 ? 'g' : 'b', @@ -3164,23 +3161,21 @@ static void Sta_WriteDegree (long DegCod) extern const char *Txt_Clicks_without_degree_selected; struct Degree Deg; - fprintf (Gbl.F.Out,""); } @@ -3193,7 +3188,7 @@ static void Sta_DrawBarNumClicks (char Color,float NumPagesGenerated,float MaxPa { unsigned BarWidth; - fprintf (Gbl.F.Out,"" ""); } diff --git a/swad_user.c b/swad_user.c index d246316df..56051c94e 100644 --- a/swad_user.c +++ b/swad_user.c @@ -1456,11 +1456,9 @@ void Usr_WriteLoggedUsrHead (void) ShowPhoto ? PhotoURL : NULL, 15,20,true); - fprintf (Gbl.F.Out," ", - The_ClassUsr[Gbl.Prefs.Theme]); /***** User's name *****/ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out," ", The_ClassUsr[Gbl.Prefs.Theme]); /* Name */ @@ -1470,8 +1468,6 @@ void Usr_WriteLoggedUsrHead (void) Str_LimitLengthHTMLStr (UsrFullName,NumCharsName[Gbl.Prefs.Layout]); fprintf (Gbl.F.Out,"%s",UsrFullName); } - else - fprintf (Gbl.F.Out," "); fprintf (Gbl.F.Out,""); }
" - "\"\"" + "\"\"" "" - "\"\"" + "\"\"" "" - "\"\"" + "\"\"" "
"); + fprintf (Gbl.F.Out,"= 0) { Deg.DegCod = DegCod; Deg_GetDataOfDegreeByCod (&Deg); - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"%s\">" + "", Deg.WWW,Deg.FullName); Deg_DrawDegreeLogo (Deg.Logo,Deg.ShortName,16,"vertical-align:top;"); fprintf (Gbl.F.Out," %s ", Deg.ShortName); } else - fprintf (Gbl.F.Out,"" - "\"%s\""" - " - ", - Txt_Clicks_without_degree_selected,Gbl.Prefs.IconsURL, + fprintf (Gbl.F.Out,"%s\">" + " - ", Txt_Clicks_without_degree_selected); fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); if (NumPagesGenerated != 0.0) { /* Draw bar with a with proportional to the number of clicks */ @@ -3201,7 +3196,7 @@ static void Sta_DrawBarNumClicks (char Color,float NumPagesGenerated,float MaxPa if (BarWidth == 0) BarWidth = 1; fprintf (Gbl.F.Out,"\"\"" - " ", + " ", Gbl.Prefs.IconsURL,Color,BarWidth); /* Write the number of clicks */ @@ -3211,8 +3206,8 @@ static void Sta_DrawBarNumClicks (char Color,float NumPagesGenerated,float MaxPa } else /* Write the number of clicks */ - fprintf (Gbl.F.Out,"0 (0"); - fprintf (Gbl.F.Out,"%%) " + fprintf (Gbl.F.Out,"0 (0"); + fprintf (Gbl.F.Out,"%%) " "