diff --git a/swad_action.c b/swad_action.c index a0f317c4..821aed0d 100644 --- a/swad_action.c +++ b/swad_action.c @@ -4913,7 +4913,7 @@ void Act_WriteBigMFUActions (struct Act_ListMFUActions *ListMFUActions) } } - /***** Table end *****/ + /***** End table *****/ Lay_EndRoundFrameTable (); } diff --git a/swad_assignment.c b/swad_assignment.c index 9488b09d..face2f37 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -188,7 +188,7 @@ static void Asg_ShowAllAssignments (void) NumAsg++) Asg_ShowOneAssignment (Gbl.Asgs.LstAsgCods[NumAsg - 1]); - /***** Table end *****/ + /***** End table *****/ fprintf (Gbl.F.Out,""); } else // No assignments created diff --git a/swad_centre.c b/swad_centre.c index 118e60c8..01fd6c7b 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -73,7 +73,6 @@ static void Ctr_Configuration (bool PrintView); static void Ctr_PutIconToPrint (void); static void Ctr_ListCentres (void); -static void Ctr_ListCentresForSeeing (bool ICanEdit); static void Ctr_PutIconToEditFrames (void); static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr); static void Ctr_GetParamCtrOrderType (void); @@ -593,16 +592,38 @@ void Ctr_ShowCtrsOfCurrentIns (void) static void Ctr_ListCentres (void) { - extern const char *Txt_No_centres_have_been_created_in_this_institution; + extern const char *Txt_Centres_of_INSTITUTION_X; + extern const char *Txt_No_centres; extern const char *Txt_Create_another_centre; extern const char *Txt_Create_centre; + unsigned NumCtr; bool ICanEdit = (Gbl.Usrs.Me.LoggedRole >= Rol__GUEST_); - if (Gbl.Ctrs.Num) // There are centres in the current institution - Ctr_ListCentresForSeeing (ICanEdit); - else // No centres created in the current institution - Lay_ShowAlert (Lay_INFO,Txt_No_centres_have_been_created_in_this_institution); + /***** Start frame *****/ + sprintf (Gbl.Title,Txt_Centres_of_INSTITUTION_X,Gbl.CurrentIns.Ins.FullName); + Lay_StartRoundFrame (NULL,Gbl.Title,ICanEdit ? Ctr_PutIconToEditFrames : + NULL); + if (Gbl.Ctrs.Num) // There are centres in the current institution + { + /***** Start table *****/ + fprintf (Gbl.F.Out,""); + Ctr_PutHeadCentresForSeeing (true); // Order selectable + + /***** Write all the centres and their nuber of teachers *****/ + for (NumCtr = 0; + NumCtr < Gbl.Ctrs.Num; + NumCtr++) + Ctr_ListOneCentreForSeeing (&(Gbl.Ctrs.Lst[NumCtr]),NumCtr + 1); + + /***** End table *****/ + fprintf (Gbl.F.Out,"
"); + } + else // No centres created in the current institution + Lay_ShowAlert (Lay_INFO,Txt_No_centres); + + /***** Button to create centre *****/ if (ICanEdit) { Act_FormStart (ActEdiCtr); @@ -610,34 +631,8 @@ static void Ctr_ListCentres (void) Txt_Create_centre); Act_FormEnd (); } - } -/*****************************************************************************/ -/*************** List the centres of the current institution *****************/ -/*****************************************************************************/ - -static void Ctr_ListCentresForSeeing (bool ICanEdit) - { - extern const char *Txt_Centres_of_INSTITUTION_X; - unsigned NumCtr; - - /***** Write heading *****/ - sprintf (Gbl.Title,Txt_Centres_of_INSTITUTION_X, - Gbl.CurrentIns.Ins.FullName); - Lay_StartRoundFrame (NULL,Gbl.Title, - ICanEdit ? Ctr_PutIconToEditFrames : - NULL); - fprintf (Gbl.F.Out,""); - Ctr_PutHeadCentresForSeeing (true); // Order selectable - - /***** Write all the centres and their nuber of teachers *****/ - for (NumCtr = 0; - NumCtr < Gbl.Ctrs.Num; - NumCtr++) - Ctr_ListOneCentreForSeeing (&(Gbl.Ctrs.Lst[NumCtr]),NumCtr + 1); - - /***** Table end *****/ - fprintf (Gbl.F.Out,"
"); + /***** End frame *****/ Lay_EndRoundFrame (); } @@ -2674,7 +2669,7 @@ unsigned Ctr_ListCtrsFound (const char *Query) Ctr_ListOneCentreForSeeing (&Ctr,NumCtr); } - /***** Table end *****/ + /***** End table *****/ Lay_EndRoundFrameTable (); } diff --git a/swad_changelog.h b/swad_changelog.h index 3abe4cf4..9f99d282 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -129,18 +129,20 @@ // TODO: Icon to the left in list of forums is not correct when scope is system // TODO: Move info about number of files to bottom of file browsers +// TODO: New module swad_degree_type (DeT_*) for degree types. /*****************************************************************************/ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.155.5 (2016-03-20)" +#define Log_PLATFORM_VERSION "SWAD 15.155.6 (2016-03-20)" #define CSS_FILE "swad15.152.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.155.6: Mar 20, 2016 Changes in layout of listing of centres. (196055 lines) Version 15.155.5: Mar 20, 2016 Changes in behaviour of hierarchy breadcrumb. Changes in layout of listing of degrees. (196057 lines) Version 15.155.4: Mar 20, 2016 Changes in layout of listing of courses. (196059 lines) diff --git a/swad_country.c b/swad_country.c index 1840f7d4..e22d4d04 100644 --- a/swad_country.c +++ b/swad_country.c @@ -659,7 +659,7 @@ void Cty_ListCountries2 (void) Deg_GetNumDegsInCty (-1L), Crs_GetNumCrssInCty (-1L)); - /***** Table end *****/ + /***** End table *****/ fprintf (Gbl.F.Out,""); Lay_EndRoundFrame (); diff --git a/swad_course.c b/swad_course.c index 8df07bdd..b6724f59 100644 --- a/swad_course.c +++ b/swad_course.c @@ -3035,7 +3035,7 @@ unsigned Crs_ListCrssFound (const char *Query) Crs_WriteRowCrsData (NumCrs,row,false); } - /***** Table end *****/ + /***** End table *****/ Lay_EndRoundFrameTable (); } diff --git a/swad_degree.c b/swad_degree.c index 3a900513..e0a40087 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -1197,7 +1197,7 @@ static void Deg_ListDegreeTypesForSeeing (void) Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd; } - /***** Table end *****/ + /***** End table *****/ fprintf (Gbl.F.Out,""); Lay_EndRoundFrame (); } @@ -3789,7 +3789,7 @@ unsigned Deg_ListDegsFound (const char *Query) Deg_ListOneDegreeForSeeing (&Deg,NumDeg); } - /***** Table end *****/ + /***** End table *****/ Lay_EndRoundFrameTable (); } diff --git a/swad_department.c b/swad_department.c index f27b1dbb..6a2fb250 100644 --- a/swad_department.c +++ b/swad_department.c @@ -178,7 +178,7 @@ void Dpt_SeeDepts (void) Sta_GetTotalNumberOfUsersInCourses (Sco_SCOPE_INS, Rol_TEACHER) - NumTchsInsWithDpt); - /***** Table end *****/ + /***** End table *****/ fprintf (Gbl.F.Out,""); Lay_EndRoundFrame (); diff --git a/swad_file_browser.c b/swad_file_browser.c index aa85790f..a82b66bd 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -11211,7 +11211,7 @@ unsigned Brw_ListDocsFound (const char *Query,const char *Title) "" ""); - /* Table end */ + /* End table */ Lay_EndRoundFrameTable (); } diff --git a/swad_holiday.c b/swad_holiday.c index e975b534..963e4e59 100644 --- a/swad_holiday.c +++ b/swad_holiday.c @@ -164,7 +164,7 @@ void Hld_SeeHolidays (void) Gbl.Hlds.Lst[NumHld].Name); } - /***** Table end *****/ + /***** End table *****/ fprintf (Gbl.F.Out,""); Lay_EndRoundFrameTable (); diff --git a/swad_institution.c b/swad_institution.c index daa74c37..fadc3cf3 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -579,7 +579,7 @@ static void Ins_ListInstitutionsForSeeing (bool ICanEdit) NumIns++) Ins_ListOneInstitutionForSeeing (&(Gbl.Inss.Lst[NumIns]),NumIns + 1); - /***** Table end *****/ + /***** End table *****/ fprintf (Gbl.F.Out,""); Lay_EndRoundFrame (); } @@ -2298,7 +2298,7 @@ unsigned Ins_ListInssFound (const char *Query) Ins_ListOneInstitutionForSeeing (&Ins,NumIns); } - /***** Table end *****/ + /***** End table *****/ Lay_EndRoundFrameTable (); } diff --git a/swad_layout.c b/swad_layout.c index 562cbd8c..fea3165a 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -1627,7 +1627,7 @@ void Lay_WriteHeaderClassPhoto (bool PrintView,bool DrawingClassPhoto, } fprintf (Gbl.F.Out,""); - /***** Table end *****/ + /***** End table *****/ fprintf (Gbl.F.Out,"" ""); } diff --git a/swad_mail.c b/swad_mail.c index b3aaf1eb..739f8371 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -143,7 +143,7 @@ void Mai_SeeMailDomains (void) Gbl.Mails.Lst[NumMai].Info, Gbl.Mails.Lst[NumMai].NumUsrs); - /***** Table end *****/ + /***** End table *****/ fprintf (Gbl.F.Out,""); Lay_EndRoundFrame (); diff --git a/swad_message.c b/swad_message.c index e7f9116b..699bfd5a 100644 --- a/swad_message.c +++ b/swad_message.c @@ -2475,7 +2475,7 @@ void Msg_ShowFormToFilterMsgs (Msg_TypeOfMessages_t TypeOfMessages) Txt_MSG_Message, Msg_MAX_LENGTH_FILTER_CONTENT,Gbl.Msg.FilterContent); - /***** Table end *****/ + /***** End table *****/ fprintf (Gbl.F.Out,""); } diff --git a/swad_notification.c b/swad_notification.c index 987a0fbb..b8812d8f 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -606,7 +606,7 @@ void Ntf_ShowMyNotifications (void) } } - /***** Table end *****/ + /***** End table *****/ Lay_EndRoundFrameTable (); /***** Free memory used for user's data *****/ diff --git a/swad_place.c b/swad_place.c index 890ddb5c..dad0bccd 100644 --- a/swad_place.c +++ b/swad_place.c @@ -169,7 +169,7 @@ void Plc_SeePlaces (void) Ctr_GetNumCtrsInIns (Gbl.CurrentIns.Ins.InsCod) - NumCtrsWithPlc); - /***** Table end *****/ + /***** End table *****/ fprintf (Gbl.F.Out,""); Lay_EndRoundFrameTable (); diff --git a/swad_survey.c b/swad_survey.c index 4370d109..fd6592b1 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -2949,7 +2949,7 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ /***** Put button to add a new question in this survey *****/ Svy_PutButtonToCreateNewQuestion (); - /***** Table end *****/ + /***** End table *****/ Lay_EndRoundFrame (); } diff --git a/swad_test.c b/swad_test.c index d710acf9..7d818b1e 100644 --- a/swad_test.c +++ b/swad_test.c @@ -2650,7 +2650,7 @@ static void Tst_ListOneOrMoreQuestionsToEdit (unsigned long NumRows,MYSQL_RES *m ""); } - /***** Table end *****/ + /***** End table *****/ Lay_EndRoundFrameTable (); } diff --git a/swad_test_import.c b/swad_test_import.c index daf4a755..182b6d6d 100644 --- a/swad_test_import.c +++ b/swad_test_import.c @@ -985,7 +985,7 @@ static void TsI_WriteHeadingListImportedQst (void) static void TsI_WriteEndingListImportedQst (void) { - /***** Table end *****/ + /***** End table *****/ Lay_EndRoundFrameTable (); } diff --git a/swad_text.c b/swad_text.c index ba77a28c..5aa59e25 100644 --- a/swad_text.c +++ b/swad_text.c @@ -23448,25 +23448,25 @@ const char *Txt_no_course_of_origin = // Means: "message sent from any course" "no course of origin"; // Necessita de tradução #endif -const char *Txt_No_centres_have_been_created_in_this_institution = +const char *Txt_No_centres = #if L==1 - "No se han creado centros en esta institución."; // Necessita traduccio + "No hi ha centres."; #elif L==2 - "No centres have been created in this institution."; // Need Übersetzung + "Keine Lehrinstitute."; #elif L==3 - "No centres have been created in this institution."; + "No centres."; #elif L==4 - "No se han creado centros en esta institución."; + "No hay centros."; #elif L==5 - "No centres have been created in this institution."; // Besoin de traduction + "Il n'y a pas de centres."; #elif L==6 - "No se han creado centros en esta institución."; // Okoteve traducción + "No hay centros."; // Okoteve traducción #elif L==7 - "No centres have been created in this institution."; // Bisogno di traduzione + "Non ci sono centri."; #elif L==8 - "No centres have been created in this institution."; // Potrzebujesz tlumaczenie + "Brak centra."; #elif L==9 - "No centres have been created in this institution."; // Necessita de tradução + "Não há centros."; #endif const char *Txt_No_countries_have_been_created = diff --git a/swad_user.c b/swad_user.c index a6ab5dcb..bc27cb56 100644 --- a/swad_user.c +++ b/swad_user.c @@ -6092,7 +6092,7 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,const char *UsrQuery) /***** Free memory used for user's data *****/ Usr_UsrDataDestructor (&UsrDat); - /***** Table end *****/ + /***** End table *****/ Lay_EndRoundFrameTable (); }