Version 22.107.5: May 06, 2023 Changes in edition of rubric.

swad_HTML.c

@@ -222,18 +222,10 @@ void HTM_TABLE_BeginWide (void)
 void HTM_TABLE_BeginWideMarginPadding (unsigned CellPadding)
   {
    if (CellPadding)
-     {
       HTM_TxtF ("<table class=\"FRAME_TBL_WIDE_MARGIN CELLS_PAD_%u\">",
 	        CellPadding);	// CellPadding must be 0, 1, 2, 5, 10, 20
 
-      HTM_TABLE_NestingLevel++;
-     }
    else
-      HTM_TABLE_BeginWideMargin ();
-  }
-
-void HTM_TABLE_BeginWideMargin (void)
-  {
       HTM_Txt ("<table class=\"FRAME_TBL_WIDE_MARGIN\">");
 
    HTM_TABLE_NestingLevel++;

swad_HTML.h

@@ -80,7 +80,6 @@ void HTM_TABLE_BeginCenter (void);
 void HTM_TABLE_BeginWidePadding (unsigned CellPadding);
 void HTM_TABLE_BeginWide (void);
 void HTM_TABLE_BeginWideMarginPadding (unsigned CellPadding);
-void HTM_TABLE_BeginWideMargin (void);
 void HTM_TABLE_End (void);
 
 void HTM_TBODY_Begin (const char *fmt,...);

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.4 (2023-05-06)"
+#define Log_PLATFORM_VERSION	"SWAD 22.107.5 (2023-05-06)"
 #define CSS_FILE		"swad22.107.css"
 #define JS_FILE			"swad22.49.js"
 /*
+	Version 22.107.5: May 06, 2023  Changes in edition of rubric. (338027 lines)
 	Version 22.107.4: May 06, 2023  Changes in edition of exam. (338040 lines)
 	Version 22.107.3: May 06, 2023  Changes in edition of exam. (338045 lines)
 	Version 22.107.2: May 05, 2023  Removed unused action in exam sets. (338044 lines)

swad_exam.c

@@ -1345,7 +1345,7 @@ static void Exa_PutFormEditionExam (struct Exa_Exams *Exams,
       Exa_PutPars (Exams);
 
       /***** Begin table *****/
-      HTM_TABLE_BeginWidePadding (2);
+      HTM_TABLE_BeginCenterPadding (2);
 
 	 /***** Exam title *****/
 	 HTM_TR_Begin (NULL);

swad_question.c

@@ -159,7 +159,7 @@ void Qst_ShowFormRequestEditQsts (struct Qst_Questions *Questions)
 	 Frm_BeginForm (ActLstTstQst);
 	    Par_PutParUnsigned (NULL,"Order",(unsigned) Qst_DEFAULT_ORDER);
 
-	    HTM_TABLE_BeginPadding (2);
+	    HTM_TABLE_BeginCenterPadding (2);
 
 	       /***** Selection of tags *****/
 	       Tag_ShowFormSelTags (&Questions->Tags,mysql_res,false);

swad_rubric.c

@@ -821,21 +821,40 @@ void Rub_ReqCreatOrEditRubric (void)
 void Rub_PutFormsOneRubric (struct Rub_Rubrics *Rubrics,
 			    Rub_ExistingNewRubric_t ExistingNewRubric)
   {
+   extern const char *Hlp_ASSESSMENT_Rubrics_new_rubric;
+   extern const char *Hlp_ASSESSMENT_Rubrics_edit_rubric;
+   extern const char *Txt_Rubric;
+   static void (*FunctionToDrawContextualIcons[]) (void *Args) =
+     {
+      [Rub_EXISTING_RUBRIC] = Rub_PutIconsEditingOneRubric,
+      [Rub_NEW_RUBRIC     ] = NULL,
+     };
+   static const char **HelpLink[] =
+     {
+      [Rub_EXISTING_RUBRIC] = &Hlp_ASSESSMENT_Rubrics_edit_rubric,
+      [Rub_NEW_RUBRIC     ] = &Hlp_ASSESSMENT_Rubrics_new_rubric,
+     };
+
+   /***** Begin box *****/
+   Box_BoxBegin (NULL,
+		 Rubrics->Rubric.Title[0] ? Rubrics->Rubric.Title :
+					    Txt_Rubric,
+		 FunctionToDrawContextualIcons[ExistingNewRubric],Rubrics,
+		 *HelpLink[ExistingNewRubric],Box_NOT_CLOSABLE);
+
       /***** Put form to create/edit a rubric *****/
       Rub_PutFormEditionRubric (Rubrics,ExistingNewRubric);
 
-   /***** Show other lists *****/
+      /***** Show list of criteria inside box *****/
-   switch (ExistingNewRubric)
+      if (ExistingNewRubric == Rub_EXISTING_RUBRIC)
-     {
-      case Rub_EXISTING_RUBRIC:
-	 /* Show list of criteria */
 	 RubCri_ListCriteriaForEdition (Rubrics);
-         break;
+
-      case Rub_NEW_RUBRIC:
+   /***** End box ****/
-	 /* Show rubrics again */
+   Box_BoxEnd ();
+
+   /***** Show rubrics again outside box *****/
+   if (ExistingNewRubric == Rub_NEW_RUBRIC)
       Rub_ListAllRubrics (Rubrics);
-         break;
-     }
   }
 
 /*****************************************************************************/
@@ -845,18 +864,10 @@ void Rub_PutFormsOneRubric (struct Rub_Rubrics *Rubrics,
 static void Rub_PutFormEditionRubric (struct Rub_Rubrics *Rubrics,
 			              Rub_ExistingNewRubric_t ExistingNewRubric)
   {
-   extern const char *Hlp_ASSESSMENT_Rubrics_new_rubric;
-   extern const char *Hlp_ASSESSMENT_Rubrics_edit_rubric;
-   extern const char *Txt_Rubric;
    extern const char *Txt_Title;
    extern const char *Txt_Description;
    extern const char *Txt_Create_rubric;
    extern const char *Txt_Save_changes;
-   static void (*FunctionToDrawContextualIcons[]) (void *Args) =
-     {
-      [Rub_EXISTING_RUBRIC] = Rub_PutIconsEditingOneRubric,
-      [Rub_NEW_RUBRIC     ] = NULL,
-     };
    static Act_Action_t NextAction[] =
      {
       [Rub_EXISTING_RUBRIC] = ActChgRub,
@@ -867,30 +878,18 @@ static void Rub_PutFormEditionRubric (struct Rub_Rubrics *Rubrics,
       [Rub_EXISTING_RUBRIC] = Btn_CONFIRM_BUTTON,
       [Rub_NEW_RUBRIC     ] = Btn_CREATE_BUTTON,
      };
-   const char *HelpLink[] =
-     {
-      [Rub_EXISTING_RUBRIC] = Hlp_ASSESSMENT_Rubrics_edit_rubric,
-      [Rub_NEW_RUBRIC     ] = Hlp_ASSESSMENT_Rubrics_new_rubric,
-     };
    const char *TxtButton[] =
      {
       [Rub_EXISTING_RUBRIC] = Txt_Save_changes,
       [Rub_NEW_RUBRIC     ] = Txt_Create_rubric,
      };
 
-   /***** Begin box *****/
-   Box_BoxBegin (NULL,
-		 Rubrics->Rubric.Title[0] ? Rubrics->Rubric.Title :
-					    Txt_Rubric,
-		 FunctionToDrawContextualIcons[ExistingNewRubric],Rubrics,
-		 HelpLink[ExistingNewRubric],Box_NOT_CLOSABLE);
-
    /***** Begin form *****/
    Frm_BeginForm (NextAction[ExistingNewRubric]);
       Rub_PutPars (Rubrics);
 
       /***** Begin table *****/
-         HTM_TABLE_BeginWidePadding (2);
+      HTM_TABLE_BeginCenterPadding (2);
 
 	 /***** Rubric title *****/
 	 HTM_TR_Begin (NULL);
@@ -936,9 +935,6 @@ static void Rub_PutFormEditionRubric (struct Rub_Rubrics *Rubrics,
 
    /***** End form *****/
    Frm_EndForm ();
-
-   /***** End box ****/
-   Box_BoxEnd ();
   }
 
 /*****************************************************************************/