diff --git a/css/swad22.107.css b/css/swad22.107.css
index 7bfcc697..ef6e888e 100644
--- a/css/swad22.107.css
+++ b/css/swad22.107.css
@@ -2023,10 +2023,10 @@ a:hover img.CENTER_PHOTO_SHOW
.ALERT_TXT_DARK {color:white;}
/*********************************** Icons ***********************************/
-.ICOx16 { height:16px; vertical-align:middle;}
+.ICOx16 { height:16px; vertical-align:middle;}
.ICO16x16 {width:16px; height:16px; vertical-align:middle;}
.ICO20x20 {width:20px; height:20px; vertical-align:middle;}
-.ICOx20 { height:20px; vertical-align:middle; margin:0 auto;}
+.ICOx20 { height:20px; vertical-align:middle; margin:0 auto;}
.ICO25x25 {width:25px; height:25px; vertical-align:middle;}
.ICO40x40 {width:40px; height:40px; vertical-align:middle;}
.ICO64x64 {width:64px; height:64px; vertical-align:middle;}
diff --git a/swad_HTML.c b/swad_HTML.c
index 021fe58d..8b2bc8ea 100644
--- a/swad_HTML.c
+++ b/swad_HTML.c
@@ -222,19 +222,11 @@ void HTM_TABLE_BeginWide (void)
void HTM_TABLE_BeginWideMarginPadding (unsigned CellPadding)
{
if (CellPadding)
- {
HTM_TxtF ("
",
CellPadding); // CellPadding must be 0, 1, 2, 5, 10, 20
- HTM_TABLE_NestingLevel++;
- }
else
- HTM_TABLE_BeginWideMargin ();
- }
-
-void HTM_TABLE_BeginWideMargin (void)
- {
- HTM_Txt ("");
+ HTM_Txt ("");
HTM_TABLE_NestingLevel++;
}
diff --git a/swad_HTML.h b/swad_HTML.h
index 96f737e4..7676a28f 100644
--- a/swad_HTML.h
+++ b/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,...);
diff --git a/swad_changelog.h b/swad_changelog.h
index 5131eff8..741d983c 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.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)
diff --git a/swad_exam.c b/swad_exam.c
index 55cfc75f..36415da5 100644
--- a/swad_exam.c
+++ b/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);
diff --git a/swad_question.c b/swad_question.c
index f33bbfce..070249e9 100644
--- a/swad_question.c
+++ b/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);
diff --git a/swad_rubric.c b/swad_rubric.c
index 1356b9b7..37ef9f32 100644
--- a/swad_rubric.c
+++ b/swad_rubric.c
@@ -821,21 +821,40 @@ void Rub_ReqCreatOrEditRubric (void)
void Rub_PutFormsOneRubric (struct Rub_Rubrics *Rubrics,
Rub_ExistingNewRubric_t ExistingNewRubric)
{
- /***** Put form to create/edit a rubric *****/
- Rub_PutFormEditionRubric (Rubrics,ExistingNewRubric);
-
- /***** Show other lists *****/
- switch (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) =
{
- case Rub_EXISTING_RUBRIC:
- /* Show list of criteria */
+ [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 list of criteria inside box *****/
+ if (ExistingNewRubric == Rub_EXISTING_RUBRIC)
RubCri_ListCriteriaForEdition (Rubrics);
- break;
- case Rub_NEW_RUBRIC:
- /* Show rubrics again */
- Rub_ListAllRubrics (Rubrics);
- break;
- }
+
+ /***** End box ****/
+ Box_BoxEnd ();
+
+ /***** Show rubrics again outside box *****/
+ if (ExistingNewRubric == Rub_NEW_RUBRIC)
+ Rub_ListAllRubrics (Rubrics);
}
/*****************************************************************************/
@@ -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,78 +878,63 @@ 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 form *****/
- Frm_BeginForm (NextAction[ExistingNewRubric]);
- Rub_PutPars (Rubrics);
+ /***** Begin table *****/
+ HTM_TABLE_BeginCenterPadding (2);
- /***** Begin table *****/
- HTM_TABLE_BeginWidePadding (2);
+ /***** Rubric title *****/
+ HTM_TR_Begin (NULL);
- /***** Rubric title *****/
- HTM_TR_Begin (NULL);
+ /* Label */
+ Frm_LabelColumn ("RT","Title",Txt_Title);
- /* Label */
- Frm_LabelColumn ("RT","Title",Txt_Title);
+ /* Data */
+ HTM_TD_Begin ("class=\"LT\"");
+ HTM_INPUT_TEXT ("Title",Rub_MAX_CHARS_TITLE,Rubrics->Rubric.Title,
+ HTM_DONT_SUBMIT_ON_CHANGE,
+ "id=\"Title\""
+ " class=\"TITLE_DESCRIPTION_WIDTH INPUT_%s\""
+ " required=\"required\"",
+ The_GetSuffix ());
+ HTM_TD_End ();
- /* Data */
- HTM_TD_Begin ("class=\"LT\"");
- HTM_INPUT_TEXT ("Title",Rub_MAX_CHARS_TITLE,Rubrics->Rubric.Title,
- HTM_DONT_SUBMIT_ON_CHANGE,
- "id=\"Title\""
- " class=\"TITLE_DESCRIPTION_WIDTH INPUT_%s\""
- " required=\"required\"",
- The_GetSuffix ());
- HTM_TD_End ();
+ HTM_TR_End ();
- HTM_TR_End ();
+ /***** Rubric text *****/
+ HTM_TR_Begin (NULL);
- /***** Rubric text *****/
- HTM_TR_Begin (NULL);
+ /* Label */
+ Frm_LabelColumn ("RT","Txt",Txt_Description);
- /* Label */
- Frm_LabelColumn ("RT","Txt",Txt_Description);
+ /* Data */
+ HTM_TD_Begin ("class=\"LT\"");
+ HTM_TEXTAREA_Begin ("id=\"Txt\" name=\"Txt\" rows=\"5\""
+ " class=\"TITLE_DESCRIPTION_WIDTH INPUT_%s\"",
+ The_GetSuffix ());
+ HTM_Txt (Rubrics->Rubric.Txt);
+ HTM_TEXTAREA_End ();
+ HTM_TD_End ();
- /* Data */
- HTM_TD_Begin ("class=\"LT\"");
- HTM_TEXTAREA_Begin ("id=\"Txt\" name=\"Txt\" rows=\"5\""
- " class=\"TITLE_DESCRIPTION_WIDTH INPUT_%s\"",
- The_GetSuffix ());
- HTM_Txt (Rubrics->Rubric.Txt);
- HTM_TEXTAREA_End ();
- HTM_TD_End ();
+ HTM_TR_End ();
- HTM_TR_End ();
+ /***** End table ****/
+ HTM_TABLE_End ();
- /***** End table ****/
- HTM_TABLE_End ();
+ /***** Send button *****/
+ Btn_PutButton (Button[ExistingNewRubric],
+ TxtButton[ExistingNewRubric]);
- /***** Send button *****/
- Btn_PutButton (Button[ExistingNewRubric],
- TxtButton[ExistingNewRubric]);
-
- /***** End form *****/
- Frm_EndForm ();
-
- /***** End box ****/
- Box_BoxEnd ();
+ /***** End form *****/
+ Frm_EndForm ();
}
/*****************************************************************************/