From e7ff2b2645f5c655846e535df7815c1e19bc2902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sun, 27 Mar 2016 21:36:52 +0200 Subject: [PATCH] Version 15.163.1 --- swad_changelog.h | 3 ++- swad_date.c | 15 +++++++-------- swad_enrollment.c | 14 ++++++-------- swad_indicator.c | 16 ++++++++-------- swad_search.c | 4 ++-- swad_statistic.c | 42 +++++++++++++++++++++--------------------- swad_survey.c | 16 ++++++++-------- swad_user.c | 22 +++++++++++----------- 8 files changed, 65 insertions(+), 67 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index f8d08af0d..88b425284 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -136,13 +136,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.163 (2016-03-27)" +#define Log_PLATFORM_VERSION "SWAD 15.163.1 (2016-03-27)" #define CSS_FILE "swad15.162.1.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.163.1: Mar 27, 2016 Added label HTML directives for scope and other form fields. (196654 lines) Version 15.163: Mar 27, 2016 Requests for enrollment older than one month are automatically removed. (196656 lines) Version 15.162.7: Mar 25, 2016 Changed message after enrollment request. (196625 lines) Version 15.162.6: Mar 24, 2016 Smaller buttons to see results of surveys. diff --git a/swad_date.c b/swad_date.c index 5129b740a..d13c87c32 100644 --- a/swad_date.c +++ b/swad_date.c @@ -205,8 +205,8 @@ void Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (void) /***** Start date-time *****/ fprintf (Gbl.F.Out,"" - "" - "%s:" + "" + "" "" "", The_ClassForm[Gbl.Prefs.Theme], @@ -233,8 +233,8 @@ void Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (void) /***** End date-time *****/ fprintf (Gbl.F.Out,"" - "" - "%s:" + "" + "" "" "", The_ClassForm[Gbl.Prefs.Theme], @@ -277,15 +277,14 @@ void Dat_PutFormStartEndClientLocalDateTimes (time_t TimeUTC[2]) StartOrEndTime++) { fprintf (Gbl.F.Out,"" - "" - "%s:" + "" + "" "" "" "" "" "" - "" "" ""); /* Users' roles in listing */ fprintf (Gbl.F.Out,"" - "" "
", - The_ClassForm[Gbl.Prefs.Theme], - Dates[StartOrEndTime]); + The_ClassForm[Gbl.Prefs.Theme],Dates[StartOrEndTime]); /* Date-time */ Dat_WriteFormClientLocalDateTimeFromTimeUTC (Id[StartOrEndTime], diff --git a/swad_enrollment.c b/swad_enrollment.c index 7afc4f1e6..e25960213 100644 --- a/swad_enrollment.c +++ b/swad_enrollment.c @@ -2248,24 +2248,22 @@ static void Enr_ShowEnrollmentRequestsGivenRoles (unsigned RolesSelected) /* Scope (whole platform, current centre, current degree or current course) */ fprintf (Gbl.F.Out,"
" - "%s:" + "" + "" "", - The_ClassForm[Gbl.Prefs.Theme], - Txt_Scope); + The_ClassForm[Gbl.Prefs.Theme],Txt_Scope); Sco_PutSelectorScope (true); fprintf (Gbl.F.Out,"
" - "%s:" + "" + "" "", - The_ClassForm[Gbl.Prefs.Theme], - Txt_Users); + The_ClassForm[Gbl.Prefs.Theme],Txt_Users); Rol_WriteSelectorRoles (1 << Rol_STUDENT | 1 << Rol_TEACHER, RolesSelected, diff --git a/swad_indicator.c b/swad_indicator.c index fb8a70b7f..b08ec80d4 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -98,8 +98,8 @@ void Ind_ReqIndicatorsCourses (void) fprintf (Gbl.F.Out,"" "" - "" "" - "" "" - "" "" - "" "
" - "%s:" + "" + "" "", The_ClassForm[Gbl.Prefs.Theme],Txt_Scope); @@ -117,8 +117,8 @@ void Ind_ReqIndicatorsCourses (void) /* Compute stats for a type of degree */ fprintf (Gbl.F.Out,"
" - "%s:" + "" + "" "", The_ClassForm[Gbl.Prefs.Theme],Txt_Types_of_degree); @@ -131,8 +131,8 @@ void Ind_ReqIndicatorsCourses (void) /* Compute stats for courses with teachers belonging to any department or to a particular departament? */ fprintf (Gbl.F.Out,"
" - "%s:" + "" + "" "", The_ClassForm[Gbl.Prefs.Theme],Txt_Department); @@ -143,8 +143,8 @@ void Ind_ReqIndicatorsCourses (void) /* Show only courses with a number of indicators */ Gbl.Stat.NumIndicators = Ind_GetParamNumIndicators (); fprintf (Gbl.F.Out,"
" - "%s:" + "" + "" "" "" "" - "" "
" - "%s:" + "" + "" "" "", @@ -470,12 +470,11 @@ void Sta_AskShowCrsHits (void) /***** Option a) Listing of clicks distributed by some metric *****/ fprintf (Gbl.F.Out,"" - "" - "" - "" "" - "" "" - "" - "" - "" "" "" - "" "" "
" - "%s:" + "" + "" "", - The_ClassForm[Gbl.Prefs.Theme],Txt_Show, - The_ClassForm[Gbl.Prefs.Theme]); + "", + The_ClassForm[Gbl.Prefs.Theme],Txt_Show); if ((Gbl.Stat.ClicksGroupedBy < Sta_CLICKS_CRS_PER_USR || Gbl.Stat.ClicksGroupedBy > Sta_CLICKS_CRS_PER_ACTION) && @@ -491,8 +490,9 @@ void Sta_AskShowCrsHits (void) /* Selection of count type (number of pages generated, accesses per user, etc.) */ Sta_WriteSelectorCountType (); - fprintf (Gbl.F.Out," %s ", + The_ClassForm[Gbl.Prefs.Theme],Txt_distributed_by); for (ClicksGroupedBy = Sta_CLICKS_CRS_PER_USR; ClicksGroupedBy <= Sta_CLICKS_CRS_PER_ACTION; ClicksGroupedBy++) @@ -611,8 +611,8 @@ void Sta_AskShowGblHits (void) /***** Users' roles whose accesses we want to see *****/ fprintf (Gbl.F.Out,"
" - "%s:" + "" + "" "" "
" - "%s:" + "" + "" "", The_ClassForm[Gbl.Prefs.Theme],Txt_Scope); @@ -654,16 +654,16 @@ void Sta_AskShowGblHits (void) /***** Count type for the statistic *****/ fprintf (Gbl.F.Out,"
" - "%s:" + "" + "" "", - The_ClassForm[Gbl.Prefs.Theme],Txt_Show, - The_ClassForm[Gbl.Prefs.Theme]); + "", + The_ClassForm[Gbl.Prefs.Theme],Txt_Show); Sta_WriteSelectorCountType (); /***** Type of statistic *****/ - fprintf (Gbl.F.Out," %s ",Txt_distributed_by); + fprintf (Gbl.F.Out,"", + The_ClassForm[Gbl.Prefs.Theme],Txt_distributed_by); if (Gbl.Stat.ClicksGroupedBy < Sta_CLICKS_GBL_PER_DAYS || Gbl.Stat.ClicksGroupedBy > Sta_CLICKS_GBL_PER_COURSE) @@ -735,8 +735,8 @@ static void Sta_WriteSelectorAction (void) char ActTxt[Act_MAX_LENGTH_ACTION_TXT+1]; fprintf (Gbl.F.Out,"
" - "%s:" + "" + "" "" "" - "%s:" + "" + "" "", The_ClassForm[Gbl.Prefs.Theme], @@ -1552,8 +1552,8 @@ void Svy_RequestCreatOrEditSvy (void) /***** Survey title *****/ fprintf (Gbl.F.Out,"
" - "%s:" + "" + "" "" "" - "" - "%s:" + "" + "" "" "