From 06ca8ba2f2ecc8e78856580127fa9baffd5374e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 26 Dec 2014 22:11:03 +0100 Subject: [PATCH] Version 14.42.1 --- swad_assignment.c | 15 ++++-- swad_attendance.c | 78 ++++++++++++++++++--------- swad_centre.c | 68 +++++++++++++++++------- swad_changelog.h | 5 +- swad_connected.c | 25 +++++++-- swad_country.c | 48 ++++++++++++----- swad_course.c | 120 ++++++++++++++++++++++++++++++----------- swad_degree.c | 127 ++++++++++++++++++++++++++++++++------------ swad_department.c | 16 ++++-- swad_enrollment.c | 31 ++++++++--- swad_file_browser.c | 16 ++++-- swad_group.c | 36 +++++++++---- swad_import.c | 3 +- swad_indicator.c | 12 +++-- swad_layout.c | 2 +- 15 files changed, 443 insertions(+), 159 deletions(-) diff --git a/swad_assignment.c b/swad_assignment.c index 56ae3e0ce..2a8b43ad1 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -152,7 +152,8 @@ static void Asg_ShowAllAssignments (void) Order <= Asg_ORDER_BY_END_DATE; Order++) { - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); Act_FormStart (ActSeeAsg); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); @@ -167,9 +168,15 @@ static void Asg_ShowAllAssignments (void) "" ""); } - fprintf (Gbl.F.Out,"%s" - "%s" - "%s" + fprintf (Gbl.F.Out,"" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" "", Txt_Assignment, Txt_Upload_files_QUESTION, diff --git a/swad_attendance.c b/swad_attendance.c index 9faf15e34..b847abd79 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -182,7 +182,7 @@ static void Att_ShowAllAttEvents (void) Order <= Att_ORDER_BY_END_DATE; Order++) { - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); Act_FormStart (ActSeeAtt); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); @@ -197,8 +197,12 @@ static void Att_ShowAllAttEvents (void) "" ""); } - fprintf (Gbl.F.Out,"%s" - "%s" + fprintf (Gbl.F.Out,"" + "%s" + "" + "" + "%s" + "" "", Txt_Event, Txt_ROLES_PLURAL_Abc[Rol_ROLE_STUDENT][Usr_SEX_UNKNOWN]); @@ -1906,14 +1910,21 @@ static void Att_ListAttOnlyMeAsStudent (struct AttendanceEvent *Att) /* Header */ Lay_StartRoundFrameTable10 (NULL,2,NULL); fprintf (Gbl.F.Out,"" - "" - "" - ""); + "" + "" + ""); if (Gbl.Usrs.Listing.WithPhotos) - fprintf (Gbl.F.Out,""); - fprintf (Gbl.F.Out,"%s" - "%s" - "%s" + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" "", Txt_ROLES_SINGULAR_Abc[Rol_ROLE_STUDENT][Usr_SEX_UNKNOWN], Txt_Student_comment, @@ -1970,14 +1981,21 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att) /* Header */ Lay_StartRoundFrameTable10 (NULL,2,NULL); fprintf (Gbl.F.Out,"" - "" - "" - ""); + "" + "" + ""); if (Gbl.Usrs.Listing.WithPhotos) - fprintf (Gbl.F.Out,""); - fprintf (Gbl.F.Out,"%s" - "%s" - "%s" + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" "", Txt_ROLES_SINGULAR_Abc[Rol_ROLE_STUDENT][Usr_SEX_UNKNOWN], Txt_Student_comment, @@ -2962,8 +2980,13 @@ static void Att_ListEventsToSelect (void) /***** Heading row *****/ fprintf (Gbl.F.Out,"" - "%s" - "%s" + "" + "%s" + "" + "" + "%s" + "" "", Txt_Event, Txt_ROLES_PLURAL_Abc[Rol_ROLE_STUDENT][Usr_SEX_UNKNOWN]); @@ -3125,7 +3148,10 @@ static void Att_WriteTableHeadSeveralAttEvents (void) unsigned NumAttEvent; fprintf (Gbl.F.Out,"" - "%s", + "" + "%s" + "", Gbl.Usrs.Listing.WithPhotos ? 4 : 3, Txt_ROLES_SINGULAR_Abc[Rol_ROLE_STUDENT][Usr_SEX_UNKNOWN]); @@ -3138,13 +3164,17 @@ static void Att_WriteTableHeadSeveralAttEvents (void) /***** Get data of this attendance event *****/ Att_GetDataOfAttEventByCodAndCheckCrs (&Gbl.AttEvents.Lst[NumAttEvent]); - fprintf (Gbl.F.Out,"" - "%u" + fprintf (Gbl.F.Out,"" + "%u" "", - Gbl.AttEvents.Lst[NumAttEvent].Title,NumAttEvent+1); + Gbl.AttEvents.Lst[NumAttEvent].Title, + NumAttEvent + 1); } - fprintf (Gbl.F.Out,"%s" + fprintf (Gbl.F.Out,"" + "%s" + "" "", Txt_Attendance); } diff --git a/swad_centre.c b/swad_centre.c index eb771ccb2..9235ab7a9 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -138,9 +138,13 @@ void Ctr_SeeCtrWithPendingDegs (void) /***** Write heading *****/ Lay_StartRoundFrameTable10 (NULL,2,Txt_Centres_with_pending_degrees); fprintf (Gbl.F.Out,"" - "" - "%s" - "%s" + "" + "" + "%s" + "" + "" + "%s" + "" "", Txt_Centre, Txt_Degrees_ABBREVIATION); @@ -2081,13 +2085,15 @@ static void Ctr_PutHeadCentresForSeeing (bool OrderSelectable) fprintf (Gbl.F.Out,"" "" "" - "%s", + "" + "%s" + "", Txt_Place); for (Order = Ctr_ORDER_BY_CENTRE; Order <= Ctr_ORDER_BY_NUM_TCHS; Order++) { - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); if (OrderSelectable) { Act_FormStart (ActSeeCtr); @@ -2106,8 +2112,12 @@ static void Ctr_PutHeadCentresForSeeing (bool OrderSelectable) } fprintf (Gbl.F.Out,""); } - fprintf (Gbl.F.Out,"%s" - "%s" + fprintf (Gbl.F.Out,"" + "%s" + "" + "" + "%s" + "" "", Txt_Degrees_ABBREVIATION, Txt_Status); @@ -2131,18 +2141,38 @@ static void Ctr_PutHeadCentresForEdition (void) extern const char *Txt_Requester; fprintf (Gbl.F.Out,"" - "" - "%s" - " " - "%s" - "%s" - "%s" - "%s" - "%s" - "%s" - "%s" - "%s" - "%s" + "" + "" + "%s" + "" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" "", Txt_Code, Txt_Institution, diff --git a/swad_changelog.h b/swad_changelog.h index 7b5ebdd8a..4716cf16b 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -35,11 +35,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.42 (2014/12/26)" +#define Log_PLATFORM_VERSION "SWAD 14.42.1 (2014/12/26)" // 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.42.1 :Dic 26, 2014 Fixed bug in HTML of tabs. + Changes in foot.html to validate HTML5 in W3C validator. + Changes in HTML and CSS to validate HTML5 in W3C validator. (173987 lines) Version 14.42 :Dic 26, 2014 Changes in HTML and CSS to validate HTML5 in W3C validator. (173703 lines) Version 14.41 :Dic 26, 2014 Changes in HTML and CSS to validate HTML5 in W3C validator. (173630 lines) Version 14.40.12 :Dic 26, 2014 Changes in HTML and CSS to validate HTML5 in W3C validator. (173478 lines) diff --git a/swad_connected.c b/swad_connected.c index f2480d501..513bd3d0d 100644 --- a/swad_connected.c +++ b/swad_connected.c @@ -178,11 +178,26 @@ void Con_GetAndShowLastClicks (void) /* Print table row */ fprintf (Gbl.F.Out,"" - "%s" - "%s" - "%s" - "%s" - "%s" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" "", Txt_Click, Txt_Hour, diff --git a/swad_country.c b/swad_country.c index 670d83664..0f00063e6 100644 --- a/swad_country.c +++ b/swad_country.c @@ -118,9 +118,13 @@ void Cty_SeeCtyWithPendingInss (void) /***** Write heading *****/ Lay_StartRoundFrameTable10 (NULL,2,Txt_Countries_with_pending_institutions); fprintf (Gbl.F.Out,"" - "" - "%s" - "%s" + "" + "" + "%s" + "" + "" + "%s" + "" "", Txt_Country, Txt_Institutions_ABBREVIATION); @@ -544,7 +548,7 @@ void Cty_ListCountries2 (void) Order <= Cty_ORDER_BY_NUM_USRS; Order++) { - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", Order == Cty_ORDER_BY_COUNTRY ? "left" : "right"); Act_FormStart (ActSeeCty); @@ -559,9 +563,15 @@ void Cty_ListCountries2 (void) "" ""); } - fprintf (Gbl.F.Out,"%s" - "%s" - "%s" + fprintf (Gbl.F.Out,"" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" "", Txt_Students_ABBREVIATION, Txt_Teachers_ABBREVIATION, @@ -1763,13 +1773,25 @@ static void Cty_PutHeadCountries (void) fprintf (Gbl.F.Out,"" "" - "%s" - "%s" + "" + "%s" + "" + "" + "%s" + "" "" - "%s" - "%s" - "%s" - "%s" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" "", Txt_Numeric_BR_code_BR_ISO_3166_1, Txt_Alphabetic_BR_code_BR_ISO_3166_1, diff --git a/swad_course.c b/swad_course.c index ca8caa8a8..2f65a64bc 100644 --- a/swad_course.c +++ b/swad_course.c @@ -1579,13 +1579,27 @@ static void Crs_PutHeadCoursesForSeeing (void) fprintf (Gbl.F.Out,"" "" - "%s" - "%s" - "%s" - "%s" - "%s" - "%s" - "%s" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" "", Txt_Institutional_BR_code, Txt_Year_OF_A_DEGREE, @@ -1616,17 +1630,39 @@ static void Crs_PutHeadCoursesForEdition (void) fprintf (Gbl.F.Out,"" "" - "%s" - "%s" - "%s" - "%s" - "%s" - "%s" - "%s" - "%s" - "%s" - "%s" - "%s" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" "", Txt_Code, Txt_Institutional_BR_code, @@ -2861,12 +2897,24 @@ void Crs_GetAndWriteCrssOfAUsr (long UsrCod,Rol_Role_t Role) fprintf (Gbl.F.Out,"" "" "" - "%s" - "%s" - "%s" - "%s" - "%s" - "%s" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" "", Txt_Degree, Txt_Year_OF_A_DEGREE, @@ -2936,12 +2984,24 @@ unsigned Crs_ListCrssFound (const char *Query) /* Heading row */ fprintf (Gbl.F.Out,"" "" - "%s" - "%s" - "%s" - "%s" - "%s" - "%s" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" "", Txt_Degree, Txt_Year_OF_A_DEGREE, diff --git a/swad_degree.c b/swad_degree.c index b7c5e81a1..6e1a9be13 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -187,9 +187,13 @@ void Deg_SeeDegWithPendingCrss (void) /***** Write heading *****/ Lay_StartRoundFrameTable10 (NULL,2,Txt_Degrees_with_pending_courses); fprintf (Gbl.F.Out,"" - "" - "%s" - "%s" + "" + "" + "%s" + "" + "" + "%s" + "" "", Txt_Degree, Txt_Courses_ABBREVIATION); @@ -1485,7 +1489,8 @@ static void Deg_ListDegreesForEdition (void) fprintf (Gbl.F.Out,""); /* Degree type */ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); if (ICanEdit) { Act_FormStart (ActChgDegTyp); @@ -1740,8 +1745,12 @@ static void Deg_PutFormToCreateDegType (void) /***** Write heading *****/ fprintf (Gbl.F.Out,"" - "%s" - "%s" + "" + "%s" + "" + "" + "%s" + "" "", Txt_Type_of_BR_degree, Txt_Direct_authentication); @@ -1959,9 +1968,15 @@ static void Deg_PutHeadDegreeTypesForSeeing (void) fprintf (Gbl.F.Out,"" "" - "%s" - "%s" - "%s" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" "", Txt_Type_of_BR_degree, Txt_Direct_authentication, @@ -1981,10 +1996,18 @@ static void Deg_PutHeadDegreeTypesForEdition (void) fprintf (Gbl.F.Out,"" "" - "%s" - "%s" - "%s" - "%s" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" "", Txt_Code, Txt_Type_of_BR_degree, @@ -2010,13 +2033,27 @@ static void Deg_PutHeadDegreesForSeeing (void) "" "" "" - "%s" - "%s" - "%s" - "%s" - "%s" - "%s" - "%s" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" "", Txt_Degree, Txt_Type_of_BR_degree, @@ -2048,19 +2085,43 @@ static void Deg_PutHeadDegreesForEdition (void) fprintf (Gbl.F.Out,"" "" - "%s" - " " - "%s" - "%s" - "%s" - "%s" - "%s" - "%s" - "%s" - "%s" - "%s" - "%s" - "%s" + "" + "%s" + "" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" "", Txt_Code, Txt_Centre, diff --git a/swad_department.c b/swad_department.c index cc9feaecc..00b835687 100644 --- a/swad_department.c +++ b/swad_department.c @@ -884,10 +884,18 @@ static void Dpt_PutFormToCreateDepartment (void) /***** Write heading *****/ fprintf (Gbl.F.Out,"" - "%s" - "%s" - "%s" - "%s" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" "", Txt_Institution, Txt_Short_Name, diff --git a/swad_enrollment.c b/swad_enrollment.c index 96df00d4b..22a02db01 100644 --- a/swad_enrollment.c +++ b/swad_enrollment.c @@ -2184,14 +2184,29 @@ void Enr_ShowEnrollmentRequests (void) /* Start table */ Lay_StartRoundFrameTable10 (NULL,2,NULL); fprintf (Gbl.F.Out,"" - "" - "%s" - "%s" - "%s" - "%s" - "%s" - "" - "" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "" "", Txt_Course, Txt_Teachers_ABBREVIATION, diff --git a/swad_file_browser.c b/swad_file_browser.c index c00193e16..de1003ca0 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -9446,10 +9446,18 @@ unsigned Brw_ListDocsFound (const char *Query,const char *Title) /* Heading row */ fprintf (Gbl.F.Out,"" "" - "%s" - "%s" - "%s" - "%s" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" "", Txt_Degree, Txt_Course, diff --git a/swad_group.c b/swad_group.c index 7bd0cc8ba..1c20f0d25 100644 --- a/swad_group.c +++ b/swad_group.c @@ -1268,11 +1268,21 @@ static void Grp_WriteHeadingGroupTypes (void) fprintf (Gbl.F.Out,"" "" - "%s
(%s)" - "%s" - "%s" - "%s" - "%s" + "" + "%s
(%s)" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" + "" + "%s" + "" "", Txt_Type_of_group,Txt_eg_Lectures_Practicals, Txt_Mandatory_enrollment, @@ -1439,10 +1449,18 @@ static void Grp_WriteHeadingGroups (void) "" "" "" - "%s" - "%s
(%s)" - "%s" - "%s" + "" + "%s" + "" + "" + "%s
(%s)" + "" + "" + "%s" + "" + "" + "%s" + "" "", Txt_Type_BR_of_group, Txt_Group_name,Txt_eg_A_B, diff --git a/swad_import.c b/swad_import.c index e760aea46..509ce616d 100644 --- a/swad_import.c +++ b/swad_import.c @@ -511,7 +511,8 @@ static unsigned Imp_GetAndListImpGrpsAndStdsFromDB (bool ItsAFormToRegRemStds) /***** Start table with groups *****/ Lay_StartRoundFrameTable10 (NULL,2,NULL); fprintf (Gbl.F.Out,"" - "", + "", ItsAFormToRegRemStds ? 3 : 2); Lay_WriteTitle (Txt_Official_students); diff --git a/swad_indicator.c b/swad_indicator.c index 63357d414..e53288529 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -1274,10 +1274,16 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat fprintf (Gbl.F.Out,""); /***** Write number of courses with each number of indicators valid *****/ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"
" "" - "" - "" + "" + "" "", Txt_No_of_indicators, Txt_Courses); diff --git a/swad_layout.c b/swad_layout.c index 53aac8a87..c66d664ac 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -934,7 +934,7 @@ static void Lay_DrawTabsDeskTop (void) Act_LinkFormSubmit (Txt_TABS_FULL_TXT[NumTab], NumTab == Gbl.CurrentTab ? The_ClassTabOn[Gbl.Prefs.Theme] : The_ClassTabOff[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"" "
%s
"
%s%s" + "%s" + "" + "%s" + "