diff --git a/css/swad21.91.2.css b/css/swad21.91.2.css index fd7142b3..4c4b3f77 100644 --- a/css/swad21.91.2.css +++ b/css/swad21.91.2.css @@ -2534,6 +2534,7 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} .LST_REC_HID {color:#406020; font-size:11pt; white-space:nowrap;} .LST_EDIT {width:250px; font-weight:bold; font-size:11pt; height:20px; padding:0; margin:-1px; border-width:1px; border-style:solid;} +.LST_EDIT_ROWS {width:30px; font-weight:bold; font-size:11pt; height:20px; padding:0; margin:-1px; border-width:1px; border-style:solid;} .LST_EDIT_WHITE, .LST_EDIT_GREY, @@ -2541,7 +2542,7 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} .LST_EDIT_BLUE, .LST_EDIT_YELLOW, .LST_EDIT_PINK {color:#202020; border-color:#ece9d8;} -.LST_EDIT_DARK {color:#e0e0e0; border-color:#ece9d8;} +.LST_EDIT_DARK {color:#e0e0e0; border-color:#404040;} .LST_EDIT_HID_WHITE, .LST_EDIT_HID_GREY, @@ -2549,7 +2550,7 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} .LST_EDIT_HID_BLUE, .LST_EDIT_HID_YELLOW, .LST_EDIT_HID_PINK {color:#a0a0a0; border-color:#ece9d8;} -.LST_EDIT_HID_DARK {color:#909090; border-color:#ece9d8;} +.LST_EDIT_HID_DARK {color:#909090; border-color:#404040;} .LST_EDIT_REC_WHITE, .LST_EDIT_REC_GREY, @@ -2557,7 +2558,7 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} .LST_EDIT_REC_BLUE, .LST_EDIT_REC_YELLOW, .LST_EDIT_REC_PINK {color:#008000; border-color:#ece9d8;} -.LST_EDIT_REC_DARK {color:#008000; border-color:#ece9d8;} +.LST_EDIT_REC_DARK {color:#008000; border-color:#404040;} .LST_EDIT_REC_HID_WHITE, .LST_EDIT_REC_HID_GREY, @@ -2565,9 +2566,7 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} .LST_EDIT_REC_HID_BLUE, .LST_EDIT_REC_HID_YELLOW, .LST_EDIT_REC_HID_PINK {color:#89be87; border-color:#ece9d8;} -.LST_EDIT_REC_HID_DARK {color:#89be87; border-color:#ece9d8;} - -.LST_EDIT_ROWS {width:30px; color:#202020; font-weight:bold; font-size:11pt; height:20px; padding:0; margin:-1px; border-width:1px; border-style:solid; border-color:#ECE9D8;} +.LST_EDIT_REC_HID_DARK {color:#89be87; border-color:#404040;} .PUBLIC_FILE {max-width:400px;} .LICENSE {max-width:400px;} @@ -2581,9 +2580,29 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} /*****************************************************************************/ -.T1 {color:#202020; font-size:15pt;} -.T2 {color:#202020; font-size:13pt;} -.T3 {color:#202020; font-size:12pt;} +.SYL1_WHITE, +.SYL1_GREY, +.SYL1_PURPLE, +.SYL1_BLUE, +.SYL1_YELLOW, +.SYL1_PINK {color:#202020; font-size:15pt;} +.SYL1_DARK {color:#e0e0e0; font-size:15pt;} + +.SYL2_WHITE, +.SYL2_GREY, +.SYL2_PURPLE, +.SYL2_BLUE, +.SYL2_YELLOW, +.SYL2_PINK {color:#202020; font-size:13pt;} +.SYL2_DARK {color:#e0e0e0; font-size:13pt;} + +.SYL3_WHITE, +.SYL3_GREY, +.SYL3_PURPLE, +.SYL3_BLUE, +.SYL3_YELLOW, +.SYL3_PINK {color:#202020; font-size:12pt;} +.SYL3_DARK {color:#e0e0e0; font-size:12pt;} .DAT_WHITE, .DAT_GREY, diff --git a/swad_changelog.h b/swad_changelog.h index 8c1504f7..dcc1dae8 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.91.3 (2022-04-05)" +#define Log_PLATFORM_VERSION "SWAD 21.91.4 (2022-04-05)" #define CSS_FILE "swad21.91.2.css" #define JS_FILE "swad21.78.2.js" /* + Version 21.91.4: Apr 05, 2022 Working on design of dark theme. (323247 lines) Version 21.91.3: Apr 05, 2022 Changes in syllabus. (323227 lines) Version 21.91.2: Apr 05, 2022 Working on design of dark theme. (323232 lines) Version 21.91.1: Apr 05, 2022 Working on design of dark theme. (323232 lines) diff --git a/swad_indicator.c b/swad_indicator.c index 13343d19..4f35befe 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -188,7 +188,7 @@ void Ind_ReqIndicatorsCourses (void) /* Selection of the number of indicators */ HTM_TR_Begin (NULL); - HTM_TD_Begin ("class=\"RT %s\"",The_GetSuffix ()); + HTM_TD_Begin ("class=\"RT DAT_%s\"",The_GetSuffix ()); HTM_TxtColon (Txt_Number_of_indicators); HTM_TD_End (); @@ -203,7 +203,7 @@ void Ind_ReqIndicatorsCourses (void) Frm_EndForm (); /***** Show the stats of courses *****/ - for (Ind = 0, NumCrssToList = 0; + for (Ind = 0, NumCrssToList = 0; Ind <= Ind_NUM_INDICATORS; Ind++) if (Indicators.IndicatorsSelected[Ind]) diff --git a/swad_mark.c b/swad_mark.c index 9f62c180..a544fa29 100644 --- a/swad_mark.c +++ b/swad_mark.c @@ -108,8 +108,8 @@ void Mrk_GetAndWriteNumRowsHeaderAndFooter (void) snprintf (StrHeadOrFoot,sizeof (StrHeadOrFoot),"%u",Marks.Header); HTM_INPUT_TEXT (Mrk_HeadOrFootStr[Brw_HEADER],Cns_MAX_DECIMAL_DIGITS_UINT,StrHeadOrFoot, HTM_SUBMIT_ON_CHANGE, - "size=\"1\" class=\"LST_EDIT_ROWS %s\"", - The_GetColorRows ()); + "size=\"1\" class=\"LST_EDIT_ROWS LST_EDIT_%s %s\"", + The_GetSuffix (),The_GetColorRows ()); HTM_LABEL_End (); Frm_EndForm (); HTM_TD_End (); @@ -126,8 +126,8 @@ void Mrk_GetAndWriteNumRowsHeaderAndFooter (void) snprintf (StrHeadOrFoot,sizeof (StrHeadOrFoot),"%u",Marks.Footer); HTM_INPUT_TEXT (Mrk_HeadOrFootStr[Brw_FOOTER],Cns_MAX_DECIMAL_DIGITS_UINT,StrHeadOrFoot, HTM_SUBMIT_ON_CHANGE, - "size=\"1\" class=\"LST_EDIT_ROWS %s\"", - The_GetColorRows ()); + "size=\"1\" class=\"LST_EDIT_ROWS LST_EDIT_%s %s\"", + The_GetSuffix (),The_GetColorRows ()); HTM_LABEL_End (); Frm_EndForm (); HTM_TD_End (); diff --git a/swad_syllabus.c b/swad_syllabus.c index 9505bd10..87f25107 100644 --- a/swad_syllabus.c +++ b/swad_syllabus.c @@ -68,19 +68,19 @@ extern struct Globals Gbl; #define Syl_WIDTH_NUM_SYLLABUS 20 -static const char *StyleSyllabus[1 + Syl_MAX_LEVELS_SYLLABUS] = +static const char *ClassSyllabus[1 + Syl_MAX_LEVELS_SYLLABUS] = { [ 0] = "", - [ 1] = "T1", - [ 2] = "T2", - [ 3] = "T3", - [ 4] = "T3", - [ 5] = "T3", - [ 6] = "T3", - [ 7] = "T3", - [ 8] = "T3", - [ 9] = "T3", - [10] = "T3", + [ 1] = "SYL1", + [ 2] = "SYL2", + [ 3] = "SYL3", + [ 4] = "SYL3", + [ 5] = "SYL3", + [ 6] = "SYL3", + [ 7] = "SYL3", + [ 8] = "SYL3", + [ 9] = "SYL3", + [10] = "SYL3", }; /*****************************************************************************/ @@ -105,6 +105,8 @@ struct LstItemsSyllabus Syl_LstItemsSyllabus; /***************************** Private prototypes ****************************/ /*****************************************************************************/ +static void Syl_PutFormWhichSyllabus (Syl_WhichSyllabus_t SyllabusSelected); + static unsigned Syl_GetParamItemNumber (void); static void Syl_SetSyllabusTypeFromAction (struct Syl_Syllabus *Syllabus); @@ -153,7 +155,7 @@ Syl_WhichSyllabus_t Syl_GetParamWhichSyllabus (void) /************************ Write form to select syllabus **********************/ /*****************************************************************************/ -void Syl_PutFormWhichSyllabus (Syl_WhichSyllabus_t SyllabusSelected) +static void Syl_PutFormWhichSyllabus (Syl_WhichSyllabus_t SyllabusSelected) { extern const char *Txt_SYLLABUS_WHICH_SYLLABUS[Syl_NUM_WHICH_SYLLABUS]; Syl_WhichSyllabus_t WhichSyl; @@ -742,8 +744,9 @@ static void Syl_ShowRowSyllabus (struct Syl_Syllabus *Syllabus,unsigned NumItem, } /***** Code of the item *****/ - HTM_TD_Begin ("class=\"%s RT %s\" style=\"width:%dpx;\"", - StyleSyllabus[Level],The_GetColorRows (), + HTM_TD_Begin ("class=\"RT %s_%s %s\" style=\"width:%dpx;\"", + ClassSyllabus[Level],The_GetSuffix (), + The_GetColorRows (), Level * Syl_WIDTH_NUM_SYLLABUS); if (Level == 1) HTM_NBSP (); @@ -751,9 +754,9 @@ static void Syl_ShowRowSyllabus (struct Syl_Syllabus *Syllabus,unsigned NumItem, HTM_TD_End (); /***** Text of the item *****/ - HTM_TD_Begin ("colspan=\"%d\" class=\"%s LT %s\"", + HTM_TD_Begin ("colspan=\"%d\" class=\"LT %s_%s %s\"", Syl_LstItemsSyllabus.NumLevels - Level + 1, - StyleSyllabus[Level], + ClassSyllabus[Level],The_GetSuffix (), The_GetColorRows ()); HTM_Txt (Text); HTM_TD_End (); @@ -782,7 +785,7 @@ void Syl_WriteSyllabusIntoHTMLTmpFile (FILE *FileHTMLTmp) /***** Set width of columns of the table *****/ fprintf (FileHTMLTmp,"\n"); - for (i = 1; + for (i = 1; i <= Syl_LstItemsSyllabus.NumLevels; i++) fprintf (FileHTMLTmp,"\n", @@ -800,26 +803,26 @@ void Syl_WriteSyllabusIntoHTMLTmpFile (FILE *FileHTMLTmp) /***** Indent depending on the level *****/ if (Syl_LstItemsSyllabus.Lst[NumItem].Level > 1) - fprintf (FileHTMLTmp,"", + fprintf (FileHTMLTmp,"" + "", Syl_LstItemsSyllabus.Lst[NumItem].Level - 1); /***** Code of the item *****/ - fprintf (FileHTMLTmp,"", - StyleSyllabus[Syl_LstItemsSyllabus.Lst[NumItem].Level], + fprintf (FileHTMLTmp,"", Syl_LstItemsSyllabus.Lst[NumItem].Level * Syl_WIDTH_NUM_SYLLABUS); if (Syl_LstItemsSyllabus.Lst[NumItem].Level == 1) fprintf (FileHTMLTmp," "); Syl_WriteNumItem (NULL,FileHTMLTmp, Syl_LstItemsSyllabus.Lst[NumItem].Level, Syl_LstItemsSyllabus.Lst[NumItem].CodItem); - fprintf (FileHTMLTmp," "); + fprintf (FileHTMLTmp," " + ""); /***** Text of the item *****/ - fprintf (FileHTMLTmp,"" + fprintf (FileHTMLTmp,"" "%s" "", Syl_LstItemsSyllabus.NumLevels - Syl_LstItemsSyllabus.Lst[NumItem].Level + 1, - StyleSyllabus[Syl_LstItemsSyllabus.Lst[NumItem].Level], Syl_LstItemsSyllabus.Lst[NumItem].Text); /***** End of the row *****/ @@ -861,8 +864,8 @@ static void Syl_PutFormItemSyllabus (struct Syl_Syllabus *Syllabus, } else { - HTM_TD_Begin ("class=\"%s LM %s\" style=\"width:%dpx;\"", - StyleSyllabus[Level],The_GetColorRows (), + HTM_TD_Begin ("class=\"LM %s_%s %s\" style=\"width:%dpx;\"", + ClassSyllabus[Level],The_GetSuffix (),The_GetColorRows (), Level * Syl_WIDTH_NUM_SYLLABUS); if (Level == 1) HTM_NBSP (); diff --git a/swad_syllabus.h b/swad_syllabus.h index b64e0f0f..60ffb598 100644 --- a/swad_syllabus.h +++ b/swad_syllabus.h @@ -82,7 +82,6 @@ struct Syl_Syllabus void Syl_ResetSyllabus (struct Syl_Syllabus *Syllabus); Syl_WhichSyllabus_t Syl_GetParamWhichSyllabus (void); -void Syl_PutFormWhichSyllabus (Syl_WhichSyllabus_t SyllabusSelected); bool Syl_CheckSyllabus (struct Syl_Syllabus *Syllabus,long CrsCod); bool Syl_CheckAndEditSyllabus (struct Syl_Syllabus *Syllabus);