From e340302b45d0a50b6098659911e4608cb13d34fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sun, 30 Apr 2017 20:20:25 +0200 Subject: [PATCH] Version 16.198.1 --- swad_changelog.h | 3 ++- swad_country.c | 42 ++++++++++++++++++++++++++++-------------- swad_hierarchy.c | 2 +- swad_text.c | 42 ------------------------------------------ 4 files changed, 31 insertions(+), 58 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index cb398b76..af75421b 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -223,13 +223,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.198 (2017-04-30)" +#define Log_PLATFORM_VERSION "SWAD 16.198.1 (2017-04-30)" #define CSS_FILE "swad16.195.8.css" #define JS_FILE "swad16.181.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 16.198.1: Apr 30, 2017 Changes in layout of edition of countries. (218332 lines) Version 16.198: Apr 30, 2017 Code refactoring related to contextual icons to edit, view and print. (218361 lines) Version 16.197: Apr 30, 2017 Changes in layout of edition of degree types. (218579 lines) Version 16.196.3: Apr 30, 2017 Changes in layout of edition of courses. (218540 lines) diff --git a/swad_country.c b/swad_country.c index 955351f8..757b0b3a 100644 --- a/swad_country.c +++ b/swad_country.c @@ -76,6 +76,9 @@ static void Cty_PutIconToEditCountries (void); static unsigned Cty_GetNumUsrsWhoClaimToBelongToCty (long CtyCod); static void Cty_GetParamCtyOrder (void); + +static void Cty_PutIconToViewCountries (void); + static void Cty_GetMapAttribution (long CtyCod,char **MapAttribution); static void Cty_FreeMapAttribution (char **MapAttribution); static void Cty_ListCountriesForEdition (void); @@ -940,15 +943,16 @@ static void Cty_GetParamCtyOrder (void) void Cty_EditCountries (void) { - extern const char *Txt_No_countries_have_been_created; + extern const char *Hlp_SYSTEM_Countries; + extern const char *Txt_Countries; /***** Get list of countries *****/ Gbl.Ctys.SelectedOrder = Cty_ORDER_BY_COUNTRY; Cty_GetListCountries (Cty_GET_EXTRA_DATA); - if (!Gbl.Ctys.Num) - /***** Help message *****/ - Lay_ShowAlert (Lay_INFO,Txt_No_countries_have_been_created); + /***** Start frame *****/ + Lay_StartRoundFrame (NULL,Txt_Countries,Cty_PutIconToViewCountries, + Hlp_SYSTEM_Countries); /***** Put a form to create a new country *****/ Cty_PutFormToCreateCountry (); @@ -957,10 +961,22 @@ void Cty_EditCountries (void) if (Gbl.Ctys.Num) Cty_ListCountriesForEdition (); + /***** End frame *****/ + Lay_EndRoundFrame (); + /***** Free list of countries *****/ Cty_FreeListCountries (); } +/*****************************************************************************/ +/*************** Put contextual icons in edition of countries ****************/ +/*****************************************************************************/ + +static void Cty_PutIconToViewCountries (void) + { + Lay_PutIconToView (ActSeeCty,NULL); + } + /*****************************************************************************/ /************************** List all the countries ***************************/ /*****************************************************************************/ @@ -1511,16 +1527,13 @@ void Cty_FreeListCountries (void) static void Cty_ListCountriesForEdition (void) { - extern const char *Hlp_SYSTEM_Countries; - extern const char *Txt_Countries; extern const char *Txt_STR_LANG_NAME[1 + Txt_NUM_LANGUAGES]; unsigned NumCty; struct Country *Cty; Txt_Language_t Lan; - Lay_StartRoundFrameTable (NULL,Txt_Countries,NULL,Hlp_SYSTEM_Countries,2); - - /***** Table head *****/ + /***** Write heading *****/ + fprintf (Gbl.F.Out,""); Cty_PutHeadCountriesForEdition (); /***** Write all the countries *****/ @@ -1618,7 +1631,8 @@ static void Cty_ListCountriesForEdition (void) } } - Lay_EndRoundFrameTable (); + /***** End table *****/ + fprintf (Gbl.F.Out,"
"); } /*****************************************************************************/ @@ -1909,7 +1923,6 @@ void Cty_ChangeCtyMapAttribution (void) static void Cty_PutFormToCreateCountry (void) { - extern const char *Hlp_SYSTEM_Countries; extern const char *Txt_New_country; extern const char *Txt_STR_LANG_NAME[1 + Txt_NUM_LANGUAGES]; extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES]; @@ -1917,18 +1930,19 @@ static void Cty_PutFormToCreateCountry (void) struct Country *Cty; Txt_Language_t Lan; + /***** Country data *****/ Cty = &Gbl.Ctys.EditingCty; /***** Start form *****/ Act_FormStart (ActNewCty); - /***** Start of frame *****/ - Lay_StartRoundFrameTable (NULL,Txt_New_country,NULL,Hlp_SYSTEM_Countries,2); + /***** Start frame *****/ + Lay_StartRoundFrameTable (NULL,Txt_New_country,NULL,NULL,2); /***** Write heading *****/ Cty_PutHeadCountriesForEdition (); - /***** Firts columns for CtyCod *****/ + /***** Column to remove country, disabled here *****/ fprintf (Gbl.F.Out,"" "", 1 + Txt_NUM_LANGUAGES); diff --git a/swad_hierarchy.c b/swad_hierarchy.c index 9b0e833d..77335e37 100644 --- a/swad_hierarchy.c +++ b/swad_hierarchy.c @@ -97,7 +97,7 @@ void Hie_WriteMenuHierarchy (void) extern const char *Txt_Course; /***** Start of table *****/ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"
"); /***** Write a 1st selector with all the countries *****/ diff --git a/swad_text.c b/swad_text.c index 5ff199ce..f4d956fb 100644 --- a/swad_text.c +++ b/swad_text.c @@ -10074,27 +10074,6 @@ const char *Txt_Edit_my_webs_networks = "Editar as minhas webs / redes"; #endif -const char *Txt_Edit_office_hours = -#if L==1 - "Editar tutories"; -#elif L==2 - "Geschäftszeiten bearbeiten"; -#elif L==3 - "Edit office hours"; -#elif L==4 - "Editar tutorías"; -#elif L==5 - "Éditer tuteur"; -#elif L==6 - "Editar tutorías"; // Okoteve traducción -#elif L==7 - "Editare tutoraggio"; -#elif L==8 - "Edytuj godzin pracy biura"; -#elif L==9 - "Editar tutor"; -#endif - const char *Txt_Edit_question = #if L==1 "Editar pregunta"; @@ -24699,27 +24678,6 @@ const char *Txt_No_centres = "Não há centros."; #endif -const char *Txt_No_countries_have_been_created = -#if L==1 - "No se han creado países."; // Necessita traduccio -#elif L==2 - "No countries have been created."; // Need Übersetzung -#elif L==3 - "No countries have been created."; -#elif L==4 - "No se han creado países."; -#elif L==5 - "No countries have been created."; // Besoin de traduction -#elif L==6 - "No se han creado países."; // Okoteve traducción -#elif L==7 - "No countries have been created."; // Bisogno di traduzione -#elif L==8 - "No countries have been created."; // Potrzebujesz tlumaczenie -#elif L==9 - "No countries have been created."; // Necessita de tradução -#endif - const char *Txt_No_courses = #if L==1 "No hi ha assignatures.";