From a1cc7eebfb788cc72f78bc7f3db76c217b5e3056 Mon Sep 17 00:00:00 2001 From: acanas Date: Fri, 22 Jul 2022 21:12:39 +0200 Subject: [PATCH] Version 21.112.1: Jul 22, 2022 Changes in edition of program items. --- swad_changelog.h | 3 ++- swad_program.c | 26 ++++++++++---------------- swad_program_resource.c | 8 ++++---- 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index d257196a9..0dac0dc37 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -606,10 +606,11 @@ TODO: Fix bug: error al enviar un mensaje a dos recipientes, error on duplicate TODO: Attach pdf files in multimedia. */ -#define Log_PLATFORM_VERSION "SWAD 21.112 (2022-07-21)" +#define Log_PLATFORM_VERSION "SWAD 21.112.1 (2022-07-22)" #define CSS_FILE "swad21.107.1.css" #define JS_FILE "swad21.100.js" /* + Version 21.112.1: Jul 22, 2022 Changes in edition of program items. (329058 lines) Version 21.112: Jul 21, 2022 Code refactoring in hide/unhide icons. Fixed bugs in edition of banners. Fixed bug hidding/unhiding exam sessions. diff --git a/swad_program.c b/swad_program.c index ca1d9b104..8c3c228de 100644 --- a/swad_program.c +++ b/swad_program.c @@ -101,6 +101,8 @@ static struct .Levels = NULL }; +static const char *Prg_ITEM_SECTION_ID = "item_section"; + /*****************************************************************************/ /***************************** Private prototypes ****************************/ /*****************************************************************************/ @@ -392,7 +394,7 @@ static void Prg_PutIconToCreateNewItem (void) { long ItmCod = -1L; - Ico_PutContextualIconToAdd (ActFrmNewPrgItm,"item_form", + Ico_PutContextualIconToAdd (ActFrmNewPrgItm,Prg_ITEM_SECTION_ID, Prg_PutParams,&ItmCod); } @@ -405,7 +407,7 @@ static void Prg_PutButtonToCreateNewItem (void) extern const char *Txt_New_item; long ItmCod = -1L; - Frm_BeginFormAnchor (ActFrmNewPrgItm,"item_form"); + Frm_BeginFormAnchor (ActFrmNewPrgItm,Prg_ITEM_SECTION_ID); Prg_PutParams (&ItmCod); Btn_PutConfirmButton (Txt_New_item); Frm_EndForm (); @@ -489,7 +491,7 @@ static void Prg_WriteRowItem (Prg_ListingType_t ListingType, ColSpan,TitleClass,The_GetColorRows ()); if (ListingType == Prg_EDIT_ITEM || ListingType == Prg_END_EDIT_ITEM) - HTM_ARTICLE_Begin ("item_form"); + HTM_ARTICLE_Begin (Prg_ITEM_SECTION_ID); HTM_Txt (Item->Title); if (ListingType == Prg_EDIT_ITEM || ListingType == Prg_END_EDIT_ITEM) @@ -560,15 +562,7 @@ static void Prg_WriteRowItem (Prg_ListingType_t ListingType, { case Prg_EDIT_ITEM: /* Form to change item title, dates and text */ - HTM_ARTICLE_Begin ("item_form"); - Prg_ShowFormToChangeItem (Item->Hierarchy.ItmCod); - HTM_ARTICLE_End (); - break; - case Prg_END_EDIT_ITEM: - /* Text */ - HTM_ARTICLE_Begin ("item_form"); - Prg_WriteItemText (Item->Hierarchy.ItmCod,LightStyle); - HTM_ARTICLE_End (); + Prg_ShowFormToChangeItem (Item->Hierarchy.ItmCod); break; default: /* Text */ @@ -653,7 +647,7 @@ static void Prg_WriteRowToCreateItem (long ItmCod,unsigned FormLevel) HTM_TD_Begin ("colspan=\"%u\" class=\"PRG_MAIN %s\"", ColSpan,The_GetColorRows ()); /* Form for item data */ - HTM_ARTICLE_Begin ("item_form"); + HTM_ARTICLE_Begin (Prg_ITEM_SECTION_ID); Prg_ShowFormToCreateItem (ItmCod); HTM_ARTICLE_End (); HTM_TD_End (); @@ -873,17 +867,17 @@ static void Prg_PutFormsToRemEditOneItem (Prg_ListingType_t ListingType, switch (ListingType) { case Prg_EDIT_ITEM: - Ico_PutContextualIconToView (ActSeePrgItm,"item_form", + Ico_PutContextualIconToView (ActSeePrgItm,Prg_ITEM_SECTION_ID, Prg_PutParams,&Item->Hierarchy.ItmCod); break; default: - Ico_PutContextualIconToEdit (ActFrmChgPrgItm,"item_form", + Ico_PutContextualIconToEdit (ActFrmChgPrgItm,Prg_ITEM_SECTION_ID, Prg_PutParams,&Item->Hierarchy.ItmCod); break; } /***** Icon to add a new child item inside this item *****/ - Ico_PutContextualIconToAdd (ActFrmNewPrgItm,"item_form", + Ico_PutContextualIconToAdd (ActFrmNewPrgItm,Prg_ITEM_SECTION_ID, Prg_PutParams,&Item->Hierarchy.ItmCod); HTM_BR (); diff --git a/swad_program_resource.c b/swad_program_resource.c index 8154e59e9..0f715a3b4 100644 --- a/swad_program_resource.c +++ b/swad_program_resource.c @@ -465,12 +465,12 @@ static void PrgRsc_PutFormsToRemEditOneResource (unsigned NumRsc, Resource->Hidden); /***** Icon to edit program resource *****/ - // Ico_PutContextualIconToEdit (ActFrmChgPrgItm,"item_form", - // Prg_PutParams,&Item->Hierarchy.ItmCod); + // Ico_PutContextualIconToEdit (ActFrmChgPrgRsc,PrgRsc_RESOURCE_SECTION_ID, + // PrgRsc_PutParams,&Resource->Rsc.Cod,); /***** Icon to add a new resource after this resource *****/ - // Ico_PutContextualIconToAdd (ActFrmNewPrgItm,"item_form", - // Prg_PutParams,&Item->Hierarchy.ItmCod); + // Ico_PutContextualIconToAdd (ActFrmNewPrgRsc,PrgRsc_RESOURCE_SECTION_ID, + // PrgRsc_PutParams,&Resource->Rsc.Cod,); /***** Icon to move up the item *****/ if (NumRsc > 0)