From dc1ae70508c3c8adfd138b7794cbb92e402d2121 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 2 Oct 2015 12:28:52 +0200 Subject: [PATCH] Version 15.5.1 --- css/swad_desktop.css | 2 +- swad_changelog.h | 3 ++- swad_date.c | 52 +++++++++++++++++++++++++++----------------- swad_date.h | 4 +++- swad_group.c | 4 ++-- swad_statistic.c | 12 +++++----- swad_test.c | 31 +++++++++++++++++++------- swad_text.c | 42 +++++++++++++++++------------------ 8 files changed, 90 insertions(+), 60 deletions(-) diff --git a/css/swad_desktop.css b/css/swad_desktop.css index 549dc2890..71ef6aefc 100644 --- a/css/swad_desktop.css +++ b/css/swad_desktop.css @@ -846,7 +846,7 @@ a:hover img.CENTRE_PHOTO_SHOW .BLUE_FORM {color:#4D88A1; font-size:13pt;} .YELLOW_FORM {color:#7C4D2A; font-size:13pt;} -.WHITE_FORM_NOWRAP {color:#4D88A1; font-size:16pt; white-space:nowrap;} +.WHITE_FORM_NOWRAP {color:#4D88A1; font-size:13pt; white-space:nowrap;} .GREY_FORM_NOWRAP {color:#4D88A1; font-size:13pt; white-space:nowrap;} .BLUE_FORM_NOWRAP {color:#4D88A1; font-size:13pt; white-space:nowrap;} .YELLOW_FORM_NOWRAP {color:#7C4D2A; font-size:13pt; white-space:nowrap;} diff --git a/swad_changelog.h b/swad_changelog.h index e3a4880dd..310b1d3b3 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -98,11 +98,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.5 (2015/10/01)" +#define Log_PLATFORM_VERSION "SWAD 15.5.1 (2015/10/02)" // 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.5.1: Oct 02, 2015 Changes in layout of forms with initial and final dates. (184938 lines) Version 15.5: Oct 01, 2015 Changes in layout of selectors classphoto/list. (184909 lines) Version 15.4.2: Oct 01, 2015 Institution admins can edit holidays. (184863 lines) Version 15.4.1: Sep 30, 2015 Code refactoring in global/course statistics. (184861 lines) diff --git a/swad_date.c b/swad_date.c index 4bf7fb3ac..2e738cfa8 100644 --- a/swad_date.c +++ b/swad_date.c @@ -241,16 +241,23 @@ void Dat_WriteFormIniEndDates (void) &(Gbl.DateRange.DateIni), false,false); - /***** "Yesterday" button *****/ - fprintf (Gbl.F.Out,"" + "" + "" + "" "" "", Txt_Yesterday, Gbl.Yesterday.Day, Gbl.Yesterday.Month, - Gbl.Yesterday.Year - Cfg_LOG_START_YEAR + 1); + Gbl.Yesterday.Year - Cfg_LOG_START_YEAR + 1, + Txt_Today, + Gbl.Now.Date.Day, + Gbl.Now.Date.Month, + Gbl.Now.Date.Year - Cfg_LOG_START_YEAR + 1); /***** End date *****/ fprintf (Gbl.F.Out,"" @@ -263,17 +270,8 @@ void Dat_WriteFormIniEndDates (void) Dat_WriteFormDate (Cfg_LOG_START_YEAR,Gbl.Now.Date.Year,"EndDay","EndMonth","EndYear", &(Gbl.DateRange.DateEnd), false,false); - - /***** "Today" button *****/ - fprintf (Gbl.F.Out,"" - "" - "", - Txt_Today, - Gbl.Now.Date.Day, - Gbl.Now.Date.Month, - Gbl.Now.Date.Year - Cfg_LOG_START_YEAR + 1); + fprintf (Gbl.F.Out,"" + ""); } /*****************************************************************************/ @@ -291,16 +289,23 @@ http://javascript.internet.com/forms/category-selection.html See also http://www.ashleyit.com/rs/jsrs/select/php/select.php */ void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear, - const char *NameSelectDay,const char *NameSelectMonth,const char *NameSelectYear, + const char *NameSelectDay, + const char *NameSelectMonth, + const char *NameSelectYear, struct Date *DateSelected, bool SubmitFormOnChange,bool Disabled) { - unsigned Day,Month,Year; - unsigned NumDaysSelectedMonth; extern const char *Txt_MONTHS_SMALL[12]; + unsigned Day; + unsigned Month; + unsigned Year; + unsigned NumDaysSelectedMonth; /***** Day *****/ - fprintf (Gbl.F.Out,"" + "" + "" "%u",Year); } - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"" + "" + "" + ""); } /*****************************************************************************/ diff --git a/swad_date.h b/swad_date.h index 96debd14a..06b705e2e 100644 --- a/swad_date.h +++ b/swad_date.h @@ -81,7 +81,9 @@ void Dat_ConvDateToDateStr (struct Date *Date,char *DateStr); void Dat_WriteFormIniEndDates (void); void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear, - const char *NameSelectDay,const char *NameSelectMonth,const char *NameSelectYear, + const char *NameSelectDay, + const char *NameSelectMonth, + const char *NameSelectYear, struct Date *DateSelected, bool SubmitFormOnChange,bool Disabled); void Dat_WriteFormHourMinute (const char *NameSelectHour,const char *NameSelectMinute, diff --git a/swad_group.c b/swad_group.c index 21d1ffc08..71cdd0cf5 100644 --- a/swad_group.c +++ b/swad_group.c @@ -1217,7 +1217,7 @@ static void Grp_ListGroupTypesForEdition (void) Txt_The_groups_will_not_automatically_open, Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].MustBeOpened ? Txt_The_groups_will_automatically_open : Txt_The_groups_will_not_automatically_open); - Dat_WriteFormDate (Gbl.Now.Date.Year,Gbl.Now.Date.Year+1, + Dat_WriteFormDate (Gbl.Now.Date.Year,Gbl.Now.Date.Year + 1, "OpenDay","OpenMonth","OpenYear", &(Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].OpenTime.Date), true,false); @@ -2107,7 +2107,7 @@ static void Grp_PutFormToCreateGroupType (void) Txt_The_groups_will_not_automatically_open, Gbl.CurrentCrs.Grps.GrpTyp.MustBeOpened ? Txt_The_groups_will_automatically_open : Txt_The_groups_will_not_automatically_open); - Dat_WriteFormDate (Gbl.Now.Date.Year,Gbl.Now.Date.Year+1, + Dat_WriteFormDate (Gbl.Now.Date.Year,Gbl.Now.Date.Year + 1, "OpenDay","OpenMonth","OpenYear", &(Gbl.CurrentCrs.Grps.GrpTyp.OpenTime.Date), false,false); diff --git a/swad_statistic.c b/swad_statistic.c index d74e20012..cae04b309 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -453,7 +453,7 @@ void Sta_AskSeeCrsAccesses (void) "" "%s:" "" - "" + "" "", The_ClassForm[Gbl.Prefs.Theme],Txt_Users, The_ClassForm[Gbl.Prefs.Theme]); @@ -474,7 +474,7 @@ void Sta_AskSeeCrsAccesses (void) "" - "" - "" - "" - "" - "" + ""); /***** Starting and ending dates in the search *****/ - fprintf (Gbl.F.Out,"
" "%s:" "", + "", The_ClassForm[Gbl.Prefs.Theme],Txt_Show, The_ClassForm[Gbl.Prefs.Theme]); @@ -603,7 +603,7 @@ void Sta_AskSeeGblAccesses (void) "" "%s:" "" + "" "" "%s:" "", + "", The_ClassForm[Gbl.Prefs.Theme],Txt_Scope); Gbl.Scope.Allowed = 1 << Sco_SCOPE_SYS | 1 << Sco_SCOPE_CTY | @@ -646,7 +646,7 @@ void Sta_AskSeeGblAccesses (void) "" "%s:" "", + "", The_ClassForm[Gbl.Prefs.Theme],Txt_Show, The_ClassForm[Gbl.Prefs.Theme]); Sta_WriteSelectorCountType (); @@ -719,7 +719,7 @@ static void Sta_WriteSelectorAction (void) "" "%s:" "" + "" ""); + fprintf (Gbl.F.Out,"
" + "" + "" + "
" + "%s:" + "" + "", + The_ClassForm[Gbl.Prefs.Theme],Txt_Users, + The_ClassForm[Gbl.Prefs.Theme]); Usr_ListUsersToSelect (Rol_TEACHER); Usr_ListUsersToSelect (Rol_STUDENT); - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
" + "
"); Dat_WriteFormIniEndDates (); + fprintf (Gbl.F.Out,"
"); /***** Send button *****/ @@ -5958,18 +5971,20 @@ void Tst_SelUsrsToSeeUsrsTstExams (void) void Tst_SelDatesToSeeMyTstExams (void) { + extern const char *Txt_Exams; extern const char *Txt_See_exams; /***** Start form *****/ Act_FormStart (ActSeeMyTstExa); /***** Starting and ending dates in the search *****/ - fprintf (Gbl.F.Out,""); + Lay_StartRoundFrameTable (NULL,2,Txt_Exams); Dat_WriteFormIniEndDates (); - fprintf (Gbl.F.Out,"
"); - /***** Button to send the form *****/ - Lay_PutConfirmButton (Txt_See_exams); + /***** Send button and end frame *****/ + Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_See_exams); + + /***** End form *****/ Act_FormEnd (); } diff --git a/swad_text.c b/swad_text.c index dec8708a5..6f280f45a 100644 --- a/swad_text.c +++ b/swad_text.c @@ -7877,17 +7877,17 @@ const char *Txt_Display_photos = const char *Txt_distributed_by = #if L==0 - "distribuïts per"; + "distribuït per"; #elif L==1 "vertrieben von"; #elif L==2 "distributed by"; #elif L==3 - "distribuidos por"; + "distribuido por"; #elif L==4 "distribué par"; #elif L==5 - "distribuidos por"; // Okoteve traducción + "distribuido por"; // Okoteve traducción #elif L==6 "distribuito da"; #elif L==7 @@ -35883,43 +35883,43 @@ const char *Txt_STAT_TYPE_COUNT_SMALL[Sta_NUM_COUNT_TYPES] = #endif , #if L==0 - "tiempo de generación de página" // Necessita traduccio + "tiempo de generación" // Necessita traduccio #elif L==1 - "Zeit zur Erzeugung der Seite" + "Zeit zur Erzeugung" #elif L==2 - "time to generate page" + "time to generate" #elif L==3 - "tiempo de generación de página" + "tiempo de generación" #elif L==4 - "temps pour générer la page" + "temps pour générer" #elif L==5 - "tiempo de generación de página" // Okoteve traducción + "tiempo de generación" // Okoteve traducción #elif L==6 - "tempo per generare pagina" + "tempo per generare" #elif L==7 - "time to generate page" // Potrzebujesz tlumaczenie + "time to generate" // Potrzebujesz tlumaczenie #elif L==8 - "tempo para gerar página" + "tempo para gerar" #endif , #if L==0 - "tiempo de envío de página" // Necessita traduccio + "tiempo de envío" // Necessita traduccio #elif L==1 - "Zeit, um Seite zu senden" + "Zeit, um Seite" #elif L==2 - "time to send page" + "time to send" #elif L==3 - "tiempo de envío de página" + "tiempo de envío" #elif L==4 - "temps pour envoyer la page" + "temps pour envoyer" #elif L==5 - "tiempo de envío de página" // Okoteve traducción + "tiempo de envío" // Okoteve traducción #elif L==6 - "tempo d'invio di una pagina" + "tempo d'invio" #elif L==7 - "time to send page" // Potrzebujesz tlumaczenie + "time to send" // Potrzebujesz tlumaczenie #elif L==8 - "Tempo para enviar a página" + "Tempo para enviar" #endif };