diff --git a/css/swad22.107.17.css b/css/swad22.107.17.css index c76c1e6c1..2f58adab2 100644 --- a/css/swad22.107.17.css +++ b/css/swad22.107.17.css @@ -3067,7 +3067,7 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} /***************** Text decoration of fieldset and legend ********************/ fieldset { - margin:2px 0; + margin:2px 0 4px 0; padding:2px; border-style:solid; border-width:1px; diff --git a/swad_center.c b/swad_center.c index 388e4659d..903bcd7f9 100644 --- a/swad_center.c +++ b/swad_center.c @@ -1237,122 +1237,133 @@ static void Ctr_ShowAlertAndButtonToGoToCtr (void) static void Ctr_PutFormToCreateCenter (const struct Plc_Places *Places) { + extern const char *Txt_Actions[ActLst_NUM_ACTIONS]; extern const char *Txt_Another_place; - extern const char *Txt_Create_center; + extern const char *Txt_Create; + Act_Action_t NextAction = ActUnk; unsigned NumPlc; const struct Plc_Place *PlcInLst; - /***** Begin form *****/ + /***** Set action depending on role *****/ if (Gbl.Usrs.Me.Role.Logged >= Rol_INS_ADM) - Frm_BeginForm (ActNewCtr); + NextAction = ActNewCtr; else if (Gbl.Usrs.Me.Role.Max >= Rol_GST) - Frm_BeginForm (ActReqCtr); + NextAction = ActReqCtr; else Err_NoPermissionExit (); - /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,NULL, - NULL,NULL, - NULL,Box_NOT_CLOSABLE,2); + /***** Begin fieldset *****/ + HTM_FIELDSET_Begin (NULL); + HTM_LEGEND (Txt_Actions[NextAction]); - /***** Write heading *****/ - Ctr_PutHeadCentersForEdition (); + /***** Begin form *****/ + Frm_BeginForm (NextAction); - HTM_TR_Begin (NULL); + /***** Begin table *****/ + HTM_TABLE_BeginWidePadding (2); - /***** Column to remove center, disabled here *****/ - HTM_TD_Begin ("class=\"BM\""); - HTM_TD_End (); + /***** Write heading *****/ + Ctr_PutHeadCentersForEdition (); - /***** Center code *****/ - HTM_TD_Begin ("class=\"CODE\""); - HTM_TD_End (); + HTM_TR_Begin (NULL); - /***** Center logo *****/ - HTM_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",Ctr_EditingCtr->FullName); - Lgo_DrawLogo (HieLvl_CTR,-1L,"",20,NULL,true); - HTM_TD_End (); + /***** Column to remove center, disabled here *****/ + HTM_TD_Begin ("class=\"BM\""); + HTM_TD_End (); - /***** Place *****/ - HTM_TD_Begin ("class=\"LM\""); - HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,NULL, - "name=\"PlcCod\" class=\"PLC_SEL INPUT_%s\"", - The_GetSuffix ()); - HTM_OPTION (HTM_Type_STRING,"0", - Ctr_EditingCtr->PlcCod == 0, // Selected? - HTM_OPTION_ENABLED, - "%s",Txt_Another_place); - for (NumPlc = 0; - NumPlc < Places->Num; - NumPlc++) - { - PlcInLst = &Places->Lst[NumPlc]; - HTM_OPTION (HTM_Type_LONG,&PlcInLst->PlcCod, - PlcInLst->PlcCod == Ctr_EditingCtr->PlcCod, // Selected? - HTM_OPTION_ENABLED, - "%s",PlcInLst->ShrtName); - } - HTM_SELECT_End (); - HTM_TD_End (); + /***** Center code *****/ + HTM_TD_Begin ("class=\"CODE\""); + HTM_TD_End (); - /***** Center short name *****/ - HTM_TD_Begin ("class=\"LM\""); - HTM_INPUT_TEXT ("ShortName",Cns_HIERARCHY_MAX_CHARS_SHRT_NAME,Ctr_EditingCtr->ShrtName, - HTM_DONT_SUBMIT_ON_CHANGE, - "class=\"INPUT_SHORT_NAME INPUT_%s\"" - " required=\"required\"", - The_GetSuffix ()); - HTM_TD_End (); + /***** Center logo *****/ + HTM_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",Ctr_EditingCtr->FullName); + Lgo_DrawLogo (HieLvl_CTR,-1L,"",20,NULL,true); + HTM_TD_End (); - /***** Center full name *****/ - HTM_TD_Begin ("class=\"LM\""); - HTM_INPUT_TEXT ("FullName",Cns_HIERARCHY_MAX_CHARS_FULL_NAME,Ctr_EditingCtr->FullName, - HTM_DONT_SUBMIT_ON_CHANGE, - "class=\"INPUT_FULL_NAME INPUT_%s\"" - " required=\"required\"", - The_GetSuffix ()); - HTM_TD_End (); + /***** Place *****/ + HTM_TD_Begin ("class=\"LM\""); + HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,NULL, + "name=\"PlcCod\" class=\"PLC_SEL INPUT_%s\"", + The_GetSuffix ()); + HTM_OPTION (HTM_Type_STRING,"0", + Ctr_EditingCtr->PlcCod == 0, // Selected? + HTM_OPTION_ENABLED, + "%s",Txt_Another_place); + for (NumPlc = 0; + NumPlc < Places->Num; + NumPlc++) + { + PlcInLst = &Places->Lst[NumPlc]; + HTM_OPTION (HTM_Type_LONG,&PlcInLst->PlcCod, + PlcInLst->PlcCod == Ctr_EditingCtr->PlcCod, // Selected? + HTM_OPTION_ENABLED, + "%s",PlcInLst->ShrtName); + } + HTM_SELECT_End (); + HTM_TD_End (); - /***** Center WWW *****/ - HTM_TD_Begin ("class=\"LM\""); - HTM_INPUT_URL ("WWW",Ctr_EditingCtr->WWW,HTM_DONT_SUBMIT_ON_CHANGE, - "class=\"INPUT_WWW_NARROW INPUT_%s\"" - " required=\"required\"", - The_GetSuffix ()); - HTM_TD_End (); + /***** Center short name *****/ + HTM_TD_Begin ("class=\"LM\""); + HTM_INPUT_TEXT ("ShortName",Cns_HIERARCHY_MAX_CHARS_SHRT_NAME,Ctr_EditingCtr->ShrtName, + HTM_DONT_SUBMIT_ON_CHANGE, + "class=\"INPUT_SHORT_NAME INPUT_%s\"" + " required=\"required\"", + The_GetSuffix ()); + HTM_TD_End (); - /***** Number of users who claim to belong to this center *****/ - HTM_TD_Begin ("class=\"RM DAT_%s\"",The_GetSuffix ()); - HTM_Unsigned (0); - HTM_TD_End (); + /***** Center full name *****/ + HTM_TD_Begin ("class=\"LM\""); + HTM_INPUT_TEXT ("FullName",Cns_HIERARCHY_MAX_CHARS_FULL_NAME,Ctr_EditingCtr->FullName, + HTM_DONT_SUBMIT_ON_CHANGE, + "class=\"INPUT_FULL_NAME INPUT_%s\"" + " required=\"required\"", + The_GetSuffix ()); + HTM_TD_End (); - /***** Number of degrees *****/ - HTM_TD_Begin ("class=\"RM DAT_%s\"",The_GetSuffix ()); - HTM_Unsigned (0); - HTM_TD_End (); + /***** Center WWW *****/ + HTM_TD_Begin ("class=\"LM\""); + HTM_INPUT_URL ("WWW",Ctr_EditingCtr->WWW,HTM_DONT_SUBMIT_ON_CHANGE, + "class=\"INPUT_WWW_NARROW INPUT_%s\"" + " required=\"required\"", + The_GetSuffix ()); + HTM_TD_End (); - /***** Number of users in courses of this center *****/ - HTM_TD_Begin ("class=\"RM DAT_%s\"",The_GetSuffix ()); - HTM_Unsigned (0); - HTM_TD_End (); + /***** Number of users who claim to belong to this center *****/ + HTM_TD_Begin ("class=\"RM DAT_%s\"",The_GetSuffix ()); + HTM_Unsigned (0); + HTM_TD_End (); - /***** Center requester *****/ - HTM_TD_Begin ("class=\"DAT_%s INPUT_REQUESTER LT\"", - The_GetSuffix ()); - Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,true); - HTM_TD_End (); + /***** Number of degrees *****/ + HTM_TD_Begin ("class=\"RM DAT_%s\"",The_GetSuffix ()); + HTM_Unsigned (0); + HTM_TD_End (); - /***** Center status *****/ - HTM_TD_Begin ("class=\"LM DAT_%s\"",The_GetSuffix ()); - HTM_TD_End (); + /***** Number of users in courses of this center *****/ + HTM_TD_Begin ("class=\"RM DAT_%s\"",The_GetSuffix ()); + HTM_Unsigned (0); + HTM_TD_End (); - HTM_TR_End (); + /***** Center requester *****/ + HTM_TD_Begin ("class=\"DAT_%s INPUT_REQUESTER LT\"", + The_GetSuffix ()); + Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,true); + HTM_TD_End (); - /***** End table, send button and end box *****/ - Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_center); + /***** Center status *****/ + HTM_TD_Begin ("class=\"LM DAT_%s\"",The_GetSuffix ()); + HTM_TD_End (); - /***** End form *****/ - Frm_EndForm (); + HTM_TR_End (); + + /***** 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 f070380c0..da1f1da27 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -629,10 +629,11 @@ 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.17 (2023-05-09)" +#define Log_PLATFORM_VERSION "SWAD 22.107.18 (2023-05-09)" #define CSS_FILE "swad22.107.17.css" #define JS_FILE "swad22.49.js" /* + Version 22.107.18:May 09, 2023 Changes in edition of centers. (337871 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) diff --git a/swad_text.c b/swad_text.c index 63b5f9f3f..070020f6b 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_center = -#if L==1 // ca - "Crear center"; -#elif L==2 // de - "Lehrinstitut eingeben"; -#elif L==3 // en - "Create center"; -#elif L==4 // es - "Crear centro"; -#elif L==5 // fr - "Créer center"; -#elif L==6 // gn - "Crear centro"; // Okoteve traducción -#elif L==7 // it - "Crea centro"; -#elif L==8 // pl - "Utwórz centrum"; -#elif L==9 // pt - "Criar centro"; -#elif L==10 // tr - "Create center"; // Çeviri lazim! -#endif - const char *Txt_Create_country = #if L==1 // ca "Crear país"; diff --git a/swad_text_action.c b/swad_text_action.c index f58bee828..6c8b565e0 100644 --- a/swad_text_action.c +++ b/swad_text_action.c @@ -3236,25 +3236,25 @@ const char *Txt_Actions[ActLst_NUM_ACTIONS] = , [ActNewCtr] = #if L==1 // ca - "Create center" // Necessita traducció + "Crear center" #elif L==2 // de - "Create center" // Need Übersetzung + "Lehrinstitut eingeben" #elif L==3 // en "Create center" #elif L==4 // es "Crear centro" #elif L==5 // fr - "Create center" // Besoin de traduction + "Créer center" #elif L==6 // gn - "Crear centro" // Okoteve traducción + "Crear centro" // Okoteve traducción #elif L==7 // it - "Create center" // Bisogno di traduzione + "Crea centro" #elif L==8 // pl - "Create center" // Potrzebujesz tlumaczenie + "Utwórz centrum" #elif L==9 // pt - "Create center" // Precisa de tradução + "Criar centro" #elif L==10 // tr - "Create center" // Çeviri lazim! + "Create center" // Çeviri lazim! #endif , [ActRemCtr] =