diff --git a/swad_changelog.h b/swad_changelog.h index 1938ffcbd..64bf8728b 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.22 (2023-05-09)" +#define Log_PLATFORM_VERSION "SWAD 22.107.23 (2023-05-09)" #define CSS_FILE "swad22.107.17.css" #define JS_FILE "swad22.49.js" /* + Version 22.107.23:May 09, 2023 Changes in edition of departments. (337802 lines) Version 22.107.22:May 09, 2023 Changes in edition of courses. (337817 lines) Version 22.107.21:May 09, 2023 Changes in edition of degrees. (337829 lines) Version 22.107.20:May 09, 2023 Changes in edition of countries. (337842 lines) diff --git a/swad_department.c b/swad_department.c index 1baae0f63..969e15d5e 100644 --- a/swad_department.c +++ b/swad_department.c @@ -488,7 +488,7 @@ static void Dpt_ListDepartmentsForEdition (const struct Dpt_Departments *Departm HTM_TR_Begin (NULL); - /* Put icon to remove department */ + /* Icon to remove department */ HTM_TD_Begin ("class=\"BM\""); if (DptInLst->NumTchs) // Department has teachers ==> deletion forbidden Ico_PutIconRemovalNotAllowed (); @@ -498,12 +498,12 @@ static void Dpt_ListDepartmentsForEdition (const struct Dpt_Departments *Departm HTM_TD_End (); /* Department code */ - HTM_TD_Begin ("class=\"RM DAT_%s\"",The_GetSuffix ()); + HTM_TD_Begin ("class=\"DAT_%s CODE\"",The_GetSuffix ()); HTM_TxtF ("%ld ",DptInLst->DptCod); HTM_TD_End (); /* Institution */ - HTM_TD_Begin ("class=\"CM\""); + HTM_TD_Begin ("class=\"LM\""); Frm_BeginForm (ActChgDptIns); ParCod_PutPar (ParCod_Dpt,DptInLst->DptCod); HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,NULL, @@ -529,7 +529,7 @@ static void Dpt_ListDepartmentsForEdition (const struct Dpt_Departments *Departm HTM_TD_End (); /* Department short name */ - HTM_TD_Begin ("class=\"CM\""); + HTM_TD_Begin ("class=\"LM\""); Frm_BeginForm (ActRenDptSho); ParCod_PutPar (ParCod_Dpt,DptInLst->DptCod); HTM_INPUT_TEXT ("ShortName",Cns_HIERARCHY_MAX_CHARS_SHRT_NAME,DptInLst->ShrtName, @@ -540,7 +540,7 @@ static void Dpt_ListDepartmentsForEdition (const struct Dpt_Departments *Departm HTM_TD_End (); /* Department full name */ - HTM_TD_Begin ("class=\"CM\""); + HTM_TD_Begin ("class=\"LM\""); Frm_BeginForm (ActRenDptFul); ParCod_PutPar (ParCod_Dpt,DptInLst->DptCod); HTM_INPUT_TEXT ("FullName",Cns_HIERARCHY_MAX_CHARS_FULL_NAME,DptInLst->FullName, @@ -551,7 +551,7 @@ static void Dpt_ListDepartmentsForEdition (const struct Dpt_Departments *Departm HTM_TD_End (); /* Department WWW */ - HTM_TD_Begin ("class=\"CM\""); + HTM_TD_Begin ("class=\"LM\""); Frm_BeginForm (ActChgDptWWW); ParCod_PutPar (ParCod_Dpt,DptInLst->DptCod); HTM_INPUT_URL ("WWW",DptInLst->WWW,HTM_SUBMIT_ON_CHANGE, @@ -810,89 +810,100 @@ void Dpt_ContEditAfterChgDpt (void) static void Dpt_PutFormToCreateDepartment (void) { - extern const char *Txt_Institution; - extern const char *Txt_Short_name; - extern const char *Txt_Full_name; - extern const char *Txt_WWW; + extern const char *Txt_Actions[ActLst_NUM_ACTIONS]; extern const char *Txt_Another_institution; - extern const char *Txt_Create_department; + extern const char *Txt_Create; unsigned NumIns; const struct Ins_Instit *InsInLst; - /***** Begin form *****/ - Frm_BeginForm (ActNewDpt); + /***** Begin fieldset *****/ + HTM_FIELDSET_Begin (NULL); + HTM_LEGEND (Txt_Actions[ActNewDpt]); - /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,NULL, - NULL,NULL, - NULL,Box_NOT_CLOSABLE,2); + /***** Begin form *****/ + Frm_BeginForm (ActNewDpt); - /***** Write heading *****/ - HTM_TR_Begin (NULL); - HTM_TH (Txt_Institution,HTM_HEAD_LEFT ); - HTM_TH (Txt_Short_name ,HTM_HEAD_LEFT ); - HTM_TH (Txt_Full_name ,HTM_HEAD_LEFT ); - HTM_TH (Txt_WWW ,HTM_HEAD_LEFT ); - HTM_TR_End (); + /***** Begin table *****/ + HTM_TABLE_BeginWidePadding (2); - HTM_TR_Begin (NULL); + /***** Write heading *****/ + Dpt_PutHeadDepartments (); - /***** Institution *****/ - HTM_TD_Begin ("class=\"CM\""); - HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,NULL, - "name=\"OthInsCod\"" - " class=\"HIE_SEL_NARROW INPUT_%s\"", + HTM_TR_Begin (NULL); + + /***** Column to remove department, disabled here *****/ + HTM_TD_Begin ("class=\"BM\""); + HTM_TD_End (); + + /***** Department code *****/ + HTM_TD_Begin ("class=\"CODE\""); + HTM_TD_End (); + + /***** Institution *****/ + HTM_TD_Begin ("class=\"LM\""); + HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,NULL, + "name=\"OthInsCod\"" + " class=\"HIE_SEL_NARROW INPUT_%s\"", + The_GetSuffix ()); + HTM_OPTION (HTM_Type_STRING,"0", + Dpt_EditingDpt->InsCod == 0, // Selected? + HTM_OPTION_ENABLED, + "%s",Txt_Another_institution); + for (NumIns = 0; + NumIns < Gbl.Hierarchy.Inss.Num; + NumIns++) + { + InsInLst = &Gbl.Hierarchy.Inss.Lst[NumIns]; + HTM_OPTION (HTM_Type_LONG,&InsInLst->InsCod, + InsInLst->InsCod == Dpt_EditingDpt->InsCod, // Selected? + HTM_OPTION_ENABLED, + "%s",InsInLst->ShrtName); + } + HTM_SELECT_End (); + HTM_TD_End (); + + /***** Department short name *****/ + HTM_TD_Begin ("class=\"LM\""); + HTM_INPUT_TEXT ("ShortName",Cns_HIERARCHY_MAX_CHARS_SHRT_NAME,Dpt_EditingDpt->ShrtName, + HTM_DONT_SUBMIT_ON_CHANGE, + "class=\"INPUT_SHORT_NAME INPUT_%s\"" + " required=\"required\"", + The_GetSuffix ()); + HTM_TD_End (); + + /***** Department full name *****/ + HTM_TD_Begin ("class=\"LM\""); + HTM_INPUT_TEXT ("FullName",Cns_HIERARCHY_MAX_CHARS_FULL_NAME,Dpt_EditingDpt->FullName, + HTM_DONT_SUBMIT_ON_CHANGE, + "class=\"INPUT_FULL_NAME INPUT_%s\"" + " required=\"required\"", + The_GetSuffix ()); + HTM_TD_End (); + + /***** Department WWW *****/ + HTM_TD_Begin ("class=\"LM\""); + HTM_INPUT_URL ("WWW",Dpt_EditingDpt->WWW,HTM_DONT_SUBMIT_ON_CHANGE, + "class=\"INPUT_WWW_NARROW INPUT_%s\"" + " required=\"required\"", The_GetSuffix ()); - HTM_OPTION (HTM_Type_STRING,"0", - Dpt_EditingDpt->InsCod == 0, // Selected? - HTM_OPTION_ENABLED, - "%s",Txt_Another_institution); - for (NumIns = 0; - NumIns < Gbl.Hierarchy.Inss.Num; - NumIns++) - { - InsInLst = &Gbl.Hierarchy.Inss.Lst[NumIns]; - HTM_OPTION (HTM_Type_LONG,&InsInLst->InsCod, - InsInLst->InsCod == Dpt_EditingDpt->InsCod, // Selected? - HTM_OPTION_ENABLED, - "%s",InsInLst->ShrtName); - } - HTM_SELECT_End (); - HTM_TD_End (); + HTM_TD_End (); - /***** Department short name *****/ - HTM_TD_Begin ("class=\"CM\""); - HTM_INPUT_TEXT ("ShortName",Cns_HIERARCHY_MAX_CHARS_SHRT_NAME,Dpt_EditingDpt->ShrtName, - HTM_DONT_SUBMIT_ON_CHANGE, - "class=\"INPUT_SHORT_NAME INPUT_%s\"" - " required=\"required\"", - The_GetSuffix ()); - HTM_TD_End (); + /***** Number of teachers *****/ + HTM_TD_Begin ("class=\"RM DAT_%s\"",The_GetSuffix ()); + HTM_Unsigned (0); + HTM_TD_End (); - /***** Department full name *****/ - HTM_TD_Begin ("class=\"CM\""); - HTM_INPUT_TEXT ("FullName",Cns_HIERARCHY_MAX_CHARS_FULL_NAME,Dpt_EditingDpt->FullName, - HTM_DONT_SUBMIT_ON_CHANGE, - "class=\"INPUT_FULL_NAME INPUT_%s\"" - " required=\"required\"", - The_GetSuffix ()); - HTM_TD_End (); + HTM_TR_End (); - /***** Department WWW *****/ - HTM_TD_Begin ("class=\"CM\""); - HTM_INPUT_URL ("WWW",Dpt_EditingDpt->WWW,HTM_DONT_SUBMIT_ON_CHANGE, - "class=\"INPUT_WWW_NARROW INPUT_%s\"" - " required=\"required\"", - The_GetSuffix ()); - HTM_TD_End (); + /***** End table and send button *****/ + HTM_TABLE_End (); + Btn_PutButton (Btn_CREATE_BUTTON,Txt_Create); - HTM_TR_End (); + /***** End form *****/ + Frm_EndForm (); - /***** End table, send button and end box *****/ - Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_department); - - /***** End form *****/ - Frm_EndForm (); + /***** End fieldset *****/ + HTM_FIELDSET_End (); } /*****************************************************************************/ diff --git a/swad_text.c b/swad_text.c index fe5a56f19..df7cf8f4d 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_department = -#if L==1 // ca - "Crear departament"; -#elif L==2 // de - "Abteilung eingeben"; -#elif L==3 // en - "Create department"; -#elif L==4 // es - "Crear departamento"; -#elif L==5 // fr - "Créer département"; -#elif L==6 // gn - "Crear departamento"; // Okoteve traducción -#elif L==7 // it - "Crea dipartimento"; -#elif L==8 // pl - "Utwórz działu"; -#elif L==9 // pt - "Criar departamento"; -#elif L==10 // tr - "Create department"; // Çeviri lazim! -#endif - const char *Txt_Create_email_domain = #if L==1 // ca "Crear domini de correu"; diff --git a/swad_text_action.c b/swad_text_action.c index 5adfcbfac..b46ca0d8f 100644 --- a/swad_text_action.c +++ b/swad_text_action.c @@ -3535,25 +3535,25 @@ const char *Txt_Actions[ActLst_NUM_ACTIONS] = , [ActNewDpt] = #if L==1 // ca - "Request creation of a department" // Necessita traducció + "Crear departament" #elif L==2 // de - "Request creation of a department" // Need Übersetzung + "Abteilung eingeben" #elif L==3 // en - "Request creation of a department" + "Create department" #elif L==4 // es - "Solicitar creación de un departamento" + "Crear departamento" #elif L==5 // fr - "Request creation of a department" // Besoin de traduction + "Créer département" #elif L==6 // gn - "Solicitar creación de un departamento" // Okoteve traducción + "Crear departamento" // Okoteve traducción #elif L==7 // it - "Request creation of a department" // Bisogno di traduzione + "Crea dipartimento" #elif L==8 // pl - "Request creation of a department" // Potrzebujesz tlumaczenie + "Utwórz działu" #elif L==9 // pt - "Request creation of a department" // Precisa de tradução + "Criar departamento" #elif L==10 // tr - "Request creation of a department" // Çeviri lazim! + "Create department" // Çeviri lazim! #endif , [ActRemDpt] =