From 41a82f1b4018cdd298a49602e316084fd0625454 Mon Sep 17 00:00:00 2001 From: acanas Date: Tue, 9 May 2023 08:34:14 +0200 Subject: [PATCH] Version 22.107.17:May 09, 2023 Changes in edition of buildings. --- css/{swad22.107.css => swad22.107.17.css} | 1 + swad_building.c | 95 ++++++++++++----------- swad_changelog.h | 9 ++- swad_text.c | 23 ------ swad_text_action.c | 20 ++--- 5 files changed, 67 insertions(+), 81 deletions(-) rename css/{swad22.107.css => swad22.107.17.css} (99%) diff --git a/css/swad22.107.css b/css/swad22.107.17.css similarity index 99% rename from css/swad22.107.css rename to css/swad22.107.17.css index ef6e888e2..c76c1e6c1 100644 --- a/css/swad22.107.css +++ b/css/swad22.107.17.css @@ -3068,6 +3068,7 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} fieldset { margin:2px 0; + padding:2px; border-style:solid; border-width:1px; border-radius:2px; diff --git a/swad_building.c b/swad_building.c index 8b2ce2ad9..aa94ce278 100644 --- a/swad_building.c +++ b/swad_building.c @@ -670,62 +670,69 @@ void Bld_ContEditAfterChgBuilding (void) static void Bld_PutFormToCreateBuilding (void) { - extern const char *Txt_Create_building; + extern const char *Txt_Actions[ActLst_NUM_ACTIONS]; + extern const char *Txt_Create; - /***** Begin form *****/ - Frm_BeginForm (ActNewBld); + /***** Begin fieldset *****/ + HTM_FIELDSET_Begin (NULL); + HTM_LEGEND (Txt_Actions[ActNewBld]); - /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,NULL, - NULL,NULL, - NULL,Box_NOT_CLOSABLE,2); + /***** Begin form *****/ + Frm_BeginForm (ActNewBld); - /***** Write heading *****/ - Bld_PutHeadBuildings (); + /***** Begin table *****/ + HTM_TABLE_BeginWidePadding (2); - HTM_TR_Begin (NULL); + /***** Write heading *****/ + Bld_PutHeadBuildings (); - /***** Column to remove building, disabled here *****/ - HTM_TD_Begin ("class=\"BM\""); - HTM_TD_End (); + HTM_TR_Begin (NULL); - /***** Building code *****/ - HTM_TD_Begin ("class=\"CODE\""); - HTM_TD_End (); + /***** Column to remove building, disabled here *****/ + HTM_TD_Begin ("class=\"BM\""); + HTM_TD_End (); - /***** Building short name *****/ - HTM_TD_Begin ("class=\"LM\""); - HTM_INPUT_TEXT ("ShortName",Bld_MAX_CHARS_SHRT_NAME,Bld_EditingBuilding->ShrtName, - HTM_DONT_SUBMIT_ON_CHANGE, - "size=\"10\" class=\"INPUT_SHORT_NAME INPUT_%s\"" - " required=\"required\"", - The_GetSuffix ()); - HTM_TD_End (); + /***** Building code *****/ + HTM_TD_Begin ("class=\"CODE\""); + HTM_TD_End (); - /***** Building full name *****/ - HTM_TD_Begin ("class=\"LM\""); - HTM_INPUT_TEXT ("FullName",Bld_MAX_CHARS_FULL_NAME,Bld_EditingBuilding->FullName, - HTM_DONT_SUBMIT_ON_CHANGE, - "size=\"20\" class=\"INPUT_FULL_NAME INPUT_%s\"" - " required=\"required\"", - The_GetSuffix ()); - HTM_TD_End (); + /***** Building short name *****/ + HTM_TD_Begin ("class=\"LM\""); + HTM_INPUT_TEXT ("ShortName",Bld_MAX_CHARS_SHRT_NAME,Bld_EditingBuilding->ShrtName, + HTM_DONT_SUBMIT_ON_CHANGE, + "size=\"10\" class=\"INPUT_SHORT_NAME INPUT_%s\"" + " required=\"required\"", + The_GetSuffix ()); + HTM_TD_End (); - /***** Building location *****/ - HTM_TD_Begin ("class=\"LM\""); - HTM_INPUT_TEXT ("Location",Bld_MAX_CHARS_LOCATION,Bld_EditingBuilding->Location, - HTM_DONT_SUBMIT_ON_CHANGE, - "size=\"15\" class=\"INPUT_FULL_NAME INPUT_%s\"", - The_GetSuffix ()); - HTM_TD_End (); + /***** Building full name *****/ + HTM_TD_Begin ("class=\"LM\""); + HTM_INPUT_TEXT ("FullName",Bld_MAX_CHARS_FULL_NAME,Bld_EditingBuilding->FullName, + HTM_DONT_SUBMIT_ON_CHANGE, + "size=\"20\" class=\"INPUT_FULL_NAME INPUT_%s\"" + " required=\"required\"", + The_GetSuffix ()); + HTM_TD_End (); - HTM_TR_End (); + /***** Building location *****/ + HTM_TD_Begin ("class=\"LM\""); + HTM_INPUT_TEXT ("Location",Bld_MAX_CHARS_LOCATION,Bld_EditingBuilding->Location, + HTM_DONT_SUBMIT_ON_CHANGE, + "size=\"15\" class=\"INPUT_FULL_NAME INPUT_%s\"", + The_GetSuffix ()); + HTM_TD_End (); - /***** End table, send button and end box *****/ - Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_building); + HTM_TR_End (); - /***** End form *****/ - Frm_EndForm (); + /***** End table and send button *****/ + HTM_TABLE_End (); + Btn_PutButton (Btn_CREATE_BUTTON,Txt_Create); + + /***** End form *****/ + Frm_EndForm (); + + /***** End fieldset *****/ + HTM_FIELDSET_End (); } /*****************************************************************************/ diff --git a/swad_changelog.h b/swad_changelog.h index 7db712928..f070380c0 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -629,12 +629,13 @@ TODO: Emilce Barrera Mesa: Podr TODO: Emilce Barrera Mesa: Mis estudiantes presentan muchas dificultades a la hora de poner la foto porque la plataforma es muy exigente respecto al fondo de la imagen. */ -#define Log_PLATFORM_VERSION "SWAD 22.107.15 (2023-05-07)" -#define CSS_FILE "swad22.107.css" +#define Log_PLATFORM_VERSION "SWAD 22.107.17 (2023-05-09)" +#define CSS_FILE "swad22.107.17.css" #define JS_FILE "swad22.49.js" /* - Version 22.107.16:May 07, 2023 Changes in edition of banners. (337915 lines) - Version 22.107.15:May 07, 2023 Changes in edition of assignments. (337915 lines) + Version 22.107.17:May 09, 2023 Changes in edition of buildings. (337884 lines) + Version 22.107.16:May 08, 2023 Changes in edition of banners. (337899 lines) + Version 22.107.15:May 08, 2023 Changes in edition of assignments. (337915 lines) Version 22.107.14:May 07, 2023 Changes in edition of announcements. (337936 lines) Version 22.107.13:May 07, 2023 Changes in edition of exam sessions. (337957 lines) Version 22.107.12:May 07, 2023 Changes in edition of rubrics. (337930 lines) diff --git a/swad_text.c b/swad_text.c index 8ab9f5c78..63b5f9f3f 100644 --- a/swad_text.c +++ b/swad_text.c @@ -6618,29 +6618,6 @@ const char *Txt_Create_another_type_of_degree = "Create another type of degree"; // Çeviri lazim! #endif -const char *Txt_Create_building = -#if L==1 // ca - "Crear edifici"; -#elif L==2 // de - "Gebäude eingeben"; -#elif L==3 // en - "Create building"; -#elif L==4 // es - "Crear edificio"; -#elif L==5 // fr - "Créer bâtiment"; -#elif L==6 // gn - "Crear edificio"; // Okoteve traducción -#elif L==7 // it - "Crea edificio"; -#elif L==8 // pl - "Utwórz budynek"; -#elif L==9 // pt - "Criar edifício"; -#elif L==10 // tr - "Create building"; // Çeviri lazim! -#endif - const char *Txt_Create_center = #if L==1 // ca "Crear center"; diff --git a/swad_text_action.c b/swad_text_action.c index 2dd566a22..f58bee828 100644 --- a/swad_text_action.c +++ b/swad_text_action.c @@ -4641,25 +4641,25 @@ const char *Txt_Actions[ActLst_NUM_ACTIONS] = , [ActNewBld] = #if L==1 // ca - "Request creation of a building" // Necessita traducció + "Crear edifici" #elif L==2 // de - "Request creation of a building" // Need Übersetzung + "Gebäude eingeben" #elif L==3 // en - "Request creation of a building" + "Create building" #elif L==4 // es - "Solicitar creación de edificio" + "Crear edificio" #elif L==5 // fr - "Request creation of a building" // Besoin de traduction + "Créer bâtiment" #elif L==6 // gn - "Solicitar creación de edificio" // Okoteve traducción + "Crear edificio" // Okoteve traducción #elif L==7 // it - "Request creation of a building" // Bisogno di traduzione + "Crea edificio" #elif L==8 // pl - "Request creation of a building" // Potrzebujesz tlumaczenie + "Utwórz budynek" #elif L==9 // pt - "Request creation of a building" // Precisa de tradução + "Criar edifício" #elif L==10 // tr - "Request creation of a building" // Çeviri lazim! + "Create building" // Çeviri lazim! #endif , [ActRemBld] =