diff --git a/css/swad21.83.css b/css/swad21.83.1.css similarity index 97% rename from css/swad21.83.css rename to css/swad21.83.1.css index 354c7546..fa0d4a2c 100644 --- a/css/swad21.83.css +++ b/css/swad21.83.1.css @@ -2502,7 +2502,8 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} overflow:hidden; text-overflow:ellipsis; } -.FILENAME_TXT + +.FILENAME_BIG { color:#202020; font-size:18pt; @@ -2516,12 +2517,40 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} box-sizing:border-box; width:100%; } -.LST {color:#202020; font-size:11pt; white-space:nowrap;} -.LST_HID {color:#A0A0A0; font-size:11pt; white-space:nowrap;} -.LST_REC {color:#008000; font-size:11pt; white-space:nowrap;} -.LST_REC_HID {color:#89be87; font-size:11pt; white-space:nowrap;} +.LST_WHITE {color:#202020; font-size:11pt; white-space:nowrap;} +.LST_GREY {color:#202020; font-size:11pt; white-space:nowrap;} +.LST_PURPLE {color:#202020; font-size:11pt; white-space:nowrap;} +.LST_BLUE {color:#202020; font-size:11pt; white-space:nowrap;} +.LST_YELLOW {color:#202020; font-size:11pt; white-space:nowrap;} +.LST_PINK {color:#202020; font-size:11pt; white-space:nowrap;} +.LST_DARK {color:#e0e0e0; font-size:11pt; white-space:nowrap;} + +.LST_HID_WHITE {color:#a0a0a0; font-size:11pt; white-space:nowrap;} +.LST_HID_GREY {color:#a0a0a0; font-size:11pt; white-space:nowrap;} +.LST_HID_PURPLE {color:#a0a0a0; font-size:11pt; white-space:nowrap;} +.LST_HID_BLUE {color:#a0a0a0; font-size:11pt; white-space:nowrap;} +.LST_HID_YELLOW {color:#a0a0a0; font-size:11pt; white-space:nowrap;} +.LST_HID_PINK {color:#a0a0a0; font-size:11pt; white-space:nowrap;} +.LST_HID_DARK {color:#909090; font-size:11pt; white-space:nowrap;} + +.LST_REC_WHITE {color:#246600; font-size:11pt; white-space:nowrap;} +.LST_REC_GREY {color:#246600; font-size:11pt; white-space:nowrap;} +.LST_REC_PURPLE {color:#246600; font-size:11pt; white-space:nowrap;} +.LST_REC_BLUE {color:#246600; font-size:11pt; white-space:nowrap;} +.LST_REC_YELLOW {color:#246600; font-size:11pt; white-space:nowrap;} +.LST_REC_PINK {color:#246600; font-size:11pt; white-space:nowrap;} +.LST_REC_DARK {color:#80c040; font-size:11pt; white-space:nowrap;} + +.LST_REC_HID {color:#92b380; font-size:11pt; white-space:nowrap;} +.LST_REC_HID {color:#92b380; font-size:11pt; white-space:nowrap;} +.LST_REC_HID {color:#92b380; font-size:11pt; white-space:nowrap;} +.LST_REC_HID {color:#92b380; font-size:11pt; white-space:nowrap;} +.LST_REC_HID {color:#92b380; font-size:11pt; white-space:nowrap;} +.LST_REC_HID {color:#92b380; font-size:11pt; white-space:nowrap;} +.LST_REC_HID {color:#406020; font-size:11pt; white-space:nowrap;} + .LST_EDIT {width:250px; 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_HID {width:250px; color:#A0A0A0; font-weight:bold; font-size:11pt; height:20px; padding:0; margin:-1px; border-width:1px; border-style:solid; border-color:#ECE9D8;} +.LST_EDIT_HID {width:250px; color:#a0a0a0; font-weight:bold; font-size:11pt; height:20px; padding:0; margin:-1px; border-width:1px; border-style:solid; border-color:#ECE9D8;} .LST_EDIT_REC {width:250px; color:#008000; 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 {width:250px; color:#89be87; font-weight:bold; font-size:11pt; height:20px; padding:0; margin:-1px; border-width:1px; border-style:solid; 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;} @@ -2648,7 +2677,7 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} .DAT_SMALL_GREEN_BLUE {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#246600; font-size:12pt;} .DAT_SMALL_GREEN_YELLOW {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#246600; font-size:12pt;} .DAT_SMALL_GREEN_PINK {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#246600; font-size:12pt;} -.DAT_SMALL_GREEN_DARK {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#246600; font-size:12pt;} +.DAT_SMALL_GREEN_DARK {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#80c040; font-size:12pt;} .DAT_SMALL_RED_WHITE {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#660000; font-size:12pt;} .DAT_SMALL_RED_GREY {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#660000; font-size:12pt;} @@ -2656,7 +2685,7 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} .DAT_SMALL_RED_BLUE {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#660000; font-size:12pt;} .DAT_SMALL_RED_YELLOW {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#660000; font-size:12pt;} .DAT_SMALL_RED_PINK {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#660000; font-size:12pt;} -.DAT_SMALL_RED_DARK {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#660000; font-size:12pt;} +.DAT_SMALL_RED_DARK {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#ff8080; font-size:12pt;} .DAT_SMALL_YELLOW_WHITE {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#C0C000; font-size:12pt;} .DAT_SMALL_YELLOW_GREY {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#C0C000; font-size:12pt;} @@ -2837,15 +2866,15 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} .DATE_RED {color:#660000; font-size:13pt;} .DATE_RED_LIGHT {color:#f98a8a; font-size:13pt;} -.DATE_GREEN {color:#008000; font-size:13pt;} +.DATE_GREEN {color:#246600; font-size:13pt;} .DATE_GREEN_LIGHT {color:#89be87; font-size:13pt;} .DATE_BLUE {color:#4d88a1; font-size:13pt;} .DATE_BLUE_LIGHT {color:#afc4cc; font-size:13pt;} -.ASG_LST_DATE_GREEN {color:#008000; font-size:11pt; white-space:nowrap;} +.ASG_LST_DATE_GREEN {color:#246600; font-size:11pt; white-space:nowrap;} .ASG_LST_DATE_RED {color:#660000; font-size:11pt; white-space:nowrap;} -.STATUS_GREEN {color:#008000; font-size:12pt;} +.STATUS_GREEN {color:#246600; font-size:12pt;} .STATUS_GREEN_LIGHT {color:#89be87; font-size:12pt;} .STATUS_RED {color:#660000; font-size:12pt;} .STATUS_RED_LIGHT {color:#f98a8a; font-size:12pt;} @@ -4144,14 +4173,8 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} .MSG_DATE_NEW {color:#4d88a1; font-size:11pt; font-weight:bold;} .BT {width:20px; text-align:center; vertical-align:top;} -.BT0 {width:20px; text-align:center; vertical-align:top; background-color:#F4F2EA;} -.BT1 {width:20px; text-align:center; vertical-align:top; background-color:#FBFAF7;} - .BM {width:20px; text-align:center; vertical-align:middle;} -.BM_SEL {width:20px; text-align:center; vertical-align:middle; background-color:#C0FF40;} - -.BM0 {width:20px; text-align:center; vertical-align:middle; background-color:#F4F2EA;} -.BM1 {width:20px; text-align:center; vertical-align:middle; background-color:#FBFAF7;} +.BM_SEL {width:20px; text-align:center; vertical-align:middle; background-color:#c0ff40;} /******************************** Pagination *********************************/ .PAG @@ -4163,7 +4186,7 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} border-style:solid; border-width:1px; border-radius:2px; - border-color:#C0DAE4; + border-color:#c0dae4; } a.PAG:hover, .PAG_CUR { @@ -4174,8 +4197,8 @@ a.PAG:hover, .PAG_CUR border-style:solid; border-width:1px; border-radius:2px; - border-color:#C0DAE4; - background-color:#DDECF1; + border-color:#c0dae4; + background-color:#ddecf1; text-decoration:none; } .PAG_TXT diff --git a/swad_attendance.c b/swad_attendance.c index 5a8c234f..42f9b885 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -3255,7 +3255,7 @@ static void Att_ListAttEventsForAStd (const struct Att_Events *Events, HTM_TD_ColouredEmpty (2); - HTM_TD_Begin ("class=\"BT%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BT %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); HTM_TD_End (); HTM_TD_Begin ("class=\"%s LM %s\"", diff --git a/swad_browser.c b/swad_browser.c index 12a067d4..b275850c 100644 --- a/swad_browser.c +++ b/swad_browser.c @@ -4432,6 +4432,7 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,const char *RowId, bool TreeContracted, Brw_IconTree_t IconThisRow) { + extern const char *The_Colors[The_NUM_THEMES]; char *Anchor; bool RowSetAsHidden = false; bool RowSetAsPublic = false; @@ -4508,10 +4509,13 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,const char *RowId, IsRecent = true; /* Style of the text in this row */ - Gbl.FileBrowser.TxtStyle = (LightStyle ? (Gbl.FileBrowser.FilFolLnk.Type == Brw_IS_FOLDER || !IsRecent ? "LST_HID" : - "LST_REC_HID") : - (Gbl.FileBrowser.FilFolLnk.Type == Brw_IS_FOLDER || !IsRecent ? "LST" : - "LST_REC")); + snprintf (Gbl.FileBrowser.TxtStyle,sizeof (Gbl.FileBrowser.TxtStyle), + "%s_%s", + LightStyle ? (Gbl.FileBrowser.FilFolLnk.Type == Brw_IS_FOLDER || !IsRecent ? "LST_HID" : + "LST_REC_HID") : + (Gbl.FileBrowser.FilFolLnk.Type == Brw_IS_FOLDER || !IsRecent ? "LST" : + "LST_REC"), + The_Colors[Gbl.Prefs.Theme]); Gbl.FileBrowser.InputStyle = (LightStyle ? (Gbl.FileBrowser.FilFolLnk.Type == Brw_IS_FOLDER || !IsRecent ? "LST_EDIT_HID" : "LST_EDIT_REC_HID") : (Gbl.FileBrowser.FilFolLnk.Type == Brw_IS_FOLDER || !IsRecent ? "LST_EDIT" : @@ -4652,7 +4656,7 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,const char *RowId, if (Gbl.FileBrowser.FilFolLnk.Type == Brw_IS_FOLDER) { /***** Put icon to download ZIP of folder *****/ - HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BM %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); if (Gbl.Usrs.Me.Role.Logged >= Rol_STD && // Only ZIP folders if I am student, teacher... !SeeMarks && // Do not ZIP folders when seeing marks !(SeeDocsZone && RowSetAsHidden)) // When seeing docs, if folder is not hidden (this could happen for Level == 0) @@ -4748,7 +4752,7 @@ static bool Brw_CheckIfCanPasteIn (unsigned Level) static void Brw_PutIconRemove (void) { - HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BM %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); if (Brw_GetIfICanEditFileOrFolder ()) // Can I remove this? switch (Gbl.FileBrowser.FilFolLnk.Type) @@ -4779,7 +4783,7 @@ static void Brw_PutIconRemove (void) static void Brw_PutIconCopy (void) { - HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BM %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); /***** Form to copy into the clipboard *****/ Ico_PutContextualIconToCopy (Brw_ActCopy[Gbl.FileBrowser.Type], @@ -4796,7 +4800,7 @@ static void Brw_PutIconPaste (unsigned Level) { extern const char *Txt_Copy_not_allowed; - HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BM %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); if (Gbl.FileBrowser.FilFolLnk.Type == Brw_IS_FOLDER) // Can't paste in a file or link { @@ -4829,7 +4833,7 @@ static void Brw_IndentAndWriteIconExpandContract (unsigned Level, Brw_IndentDependingOnLevel (Level); /***** Icon to expand/contract *****/ - HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BM %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); switch (IconThisRow) { case Brw_ICON_TREE_NOTHING: @@ -4873,7 +4877,7 @@ static void Brw_IndentDependingOnLevel (unsigned Level) i < Level; i++) { - HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BM %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); Ico_PutIcon ("tr16x16.gif",Ico_UNCHANGED,"","ICO20x20"); HTM_TD_End (); } @@ -4950,7 +4954,7 @@ static void Brw_PutIconToContractFolder (const char *FileBrowserId,const char *R static void Brw_PutIconShow (const char *Anchor) { - HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BM %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); Ico_PutContextualIconToUnhide (Brw_ActShow[Gbl.FileBrowser.Type],Anchor, Brw_PutImplicitParamsFileBrowser,&Gbl.FileBrowser.FilFolLnk); HTM_TD_End (); @@ -4962,7 +4966,7 @@ static void Brw_PutIconShow (const char *Anchor) static void Brw_PutIconHide (const char *Anchor) { - HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BM %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); Ico_PutContextualIconToHide (Brw_ActHide[Gbl.FileBrowser.Type],Anchor, Brw_PutImplicitParamsFileBrowser,&Gbl.FileBrowser.FilFolLnk); HTM_TD_End (); @@ -4996,7 +5000,7 @@ static void Brw_PutIconFolder (unsigned Level, bool ICanCreate; /***** Begin cell *****/ - HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BM %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); /***** Put icon to create a new file or folder *****/ if ((ICanCreate = Brw_CheckIfICanCreateIntoFolder (Level))) // I can create a new file or folder @@ -5068,11 +5072,13 @@ static void Brw_PutIconFolderWithoutPlus (const char *FileBrowserId,const char * extern const char *Txt_Folder; /***** Begin container *****/ - HTM_DIV_Begin (Hidden ? "id=\"folder_%s_%s_%s\" style=\"display:none;\"" : - "id=\"folder_%s_%s_%s\"", + HTM_DIV_Begin ("id=\"folder_%s_%s_%s\" class=\"%s\" %s", Open ? "open" : "closed", - FileBrowserId,RowId); + FileBrowserId,RowId, + Gbl.ColorRows[Gbl.RowEvenOdd], + Hidden ? " style=\"display:none;\"" : + ""); /***** Icon *****/ Ico_PutIcon (Open ? "folder-open-yellow.png" : @@ -5092,11 +5098,13 @@ static void Brw_PutIconFolderWithPlus (const char *FileBrowserId,const char *Row bool Open,bool Hidden) { /***** Begin container *****/ - HTM_DIV_Begin (Hidden ? "id=\"folder_%s_%s_%s\" style=\"display:none;\"" : - "id=\"folder_%s_%s_%s\"", + HTM_DIV_Begin ("id=\"folder_%s_%s_%s\" class=\"%s\" %s", Open ? "open" : "closed", - FileBrowserId,RowId); + FileBrowserId,RowId, + Gbl.ColorRows[Gbl.RowEvenOdd], + Hidden ? " style=\"display:none;\"" : + ""); /***** Form and icon *****/ Ico_PutContextualIconToCreateInFolder (Brw_ActFormCreate[Gbl.FileBrowser.Type], @@ -5116,7 +5124,7 @@ static void Brw_PutIconNewFileOrFolder (void) extern const char *Txt_New_FILE_OR_FOLDER; /***** Icon that indicates new file *****/ - HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BM %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); Ico_PutIcon ("star16x16.gif",Ico_UNCHANGED,Txt_New_FILE_OR_FOLDER,"ICO20x20"); HTM_TD_End (); } @@ -5129,7 +5137,7 @@ static void Brw_PutIconNewFileOrFolder (void) static void Brw_PutIconFileWithLinkToViewMetadata (struct FileMetadata *FileMetadata) { /***** Begin cell *****/ - HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BM %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); /***** Begin form *****/ Frm_BeginForm (Brw_ActReqDatFile[Gbl.FileBrowser.Type]); @@ -5493,7 +5501,7 @@ static void Brw_WriteFileOrFolderPublisher (unsigned Level,long UsrCod) Usr_DONT_GET_ROLE_IN_CURRENT_CRS); } - HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BM %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); if (ShowUsr) /***** Show photo *****/ @@ -8012,7 +8020,7 @@ void Brw_ShowFileMetadata (void) /***** Link to download the file *****/ HTM_TR_Begin (NULL); - HTM_TD_Begin ("colspan=\"2\" class=\"FILENAME_TXT CM\""); + HTM_TD_Begin ("colspan=\"2\" class=\"FILENAME_BIG CM\""); Brw_WriteBigLinkToDownloadFile (URL,&FileMetadata,FileNameToShow); HTM_TD_End (); @@ -8547,7 +8555,7 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL, Txt_Download; /* Put anchor and filename */ - HTM_A_Begin ("href=\"%s\" class=\"FILENAME_TXT\" title=\"%s\" target=\"_blank\"", + HTM_A_Begin ("href=\"%s\" class=\"FILENAME_BIG\" title=\"%s\" target=\"_blank\"", URL,Title); Brw_PutIconFile (FileMetadata->FilFolLnk.Type,FileMetadata->FilFolLnk.Name, "ICO40x40",false); diff --git a/swad_changelog.h b/swad_changelog.h index 1f543a41..90b116d7 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -602,10 +602,11 @@ TODO: FIX BUG, URGENT! En las fechas como par TODO: En las encuestas, que los estudiantes no puedan ver los resultados hasta que no finalice el plazo. */ -#define Log_PLATFORM_VERSION "SWAD 21.83 (2022-01-09)" -#define CSS_FILE "swad21.83.css" +#define Log_PLATFORM_VERSION "SWAD 21.83.1 (2022-01-10)" +#define CSS_FILE "swad21.83.1.css" #define JS_FILE "swad21.78.2.js" /* + Version 21.83.1: Jan 10, 2022 Working on design of dark theme. (322887 lines) Version 21.83: Jan 09, 2022 Working on design of dark theme. (322857 lines) Version 21.82: Jan 03, 2022 Functions moved from swad_figure to other modules. (322550 lines) Version 21.81.2: Jan 02, 2022 Functions moved from swad_figure to other modules. (322523 lines) diff --git a/swad_exam_session.c b/swad_exam_session.c index bfb9404b..c5e1d265 100644 --- a/swad_exam_session.c +++ b/swad_exam_session.c @@ -438,7 +438,7 @@ static void ExaSes_ListOneOrMoreSessionsIcons (struct Exa_Exams *Exams, Exams->SesCod = Session->SesCod; /***** Begin cell *****/ - HTM_TD_Begin ("class=\"BT%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BT %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); /***** Icon to remove the exam session *****/ Ico_PutContextualIconToRemove (ActReqRemExaSes,NULL, diff --git a/swad_exam_set.c b/swad_exam_set.c index 3fa7bb56..22ecaf4c 100644 --- a/swad_exam_set.c +++ b/swad_exam_set.c @@ -776,7 +776,8 @@ static void ExaSet_ListOneOrMoreSetsForEdition (struct Exa_Exams *Exams, HTM_TR_Begin (NULL); /***** Icons *****/ - HTM_TD_Begin ("rowspan=\"2\" class=\"BT%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("rowspan=\"2\" class=\"BT %s\"", + Gbl.ColorRows[Gbl.RowEvenOdd]); /* Put icon to remove the set */ if (ICanEditSets) @@ -1000,7 +1001,7 @@ static void ExaSet_ListOneOrMoreQuestionsForEdition (struct Exa_Exams *Exams, HTM_TR_Begin (NULL); /***** Icons *****/ - HTM_TD_Begin ("class=\"BT%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BT %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); /* Put icon to remove the question */ if (ICanEditQuestions) diff --git a/swad_game.c b/swad_game.c index 7871854e..6342dcf6 100644 --- a/swad_game.c +++ b/swad_game.c @@ -1758,7 +1758,7 @@ static void Gam_ListOneOrMoreQuestionsForEdition (struct Gam_Games *Games, HTM_TR_Begin (NULL); /***** Icons *****/ - HTM_TD_Begin ("class=\"BT%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BT %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); /* Put icon to remove the question */ if (ICanEditQuestions) diff --git a/swad_global.h b/swad_global.h index 24e29121..4402416b 100644 --- a/swad_global.h +++ b/swad_global.h @@ -421,7 +421,7 @@ struct Globals char R[NAME_MAX + 1]; // Right directory: rest of chars } TmpPubDir; bool HiddenLevels[1 + Brw_MAX_DIR_LEVELS]; - const char *TxtStyle; + char TxtStyle[64]; const char *InputStyle; struct Asg_Assignment Asg; // Data of assignment when browsing level 1 or an assignment zone. // TODO: Remove from global? diff --git a/swad_match.c b/swad_match.c index b5af16a0..13f86e24 100644 --- a/swad_match.c +++ b/swad_match.c @@ -560,7 +560,7 @@ static void Mch_ListOneOrMoreMatchesIcons (struct Gam_Games *Games, const struct Mch_Match *Match, const char *Anchor) { - HTM_TD_Begin ("class=\"BT%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BT %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); if (Mch_CheckIfICanEditThisMatch (Match)) { diff --git a/swad_question.c b/swad_question.c index 45158e37..871f0fae 100644 --- a/swad_question.c +++ b/swad_question.c @@ -979,7 +979,7 @@ void Qst_WriteQuestionListing (struct Qst_Questions *Questions,unsigned QstInd) HTM_TR_Begin (NULL); /***** Icons *****/ - HTM_TD_Begin ("class=\"BT%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BT %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); /* Write icon to remove the question */ Ico_PutContextualIconToRemove (ActReqRemOneTstQst,NULL, @@ -1304,7 +1304,7 @@ void Qst_WriteQuestionRowForSelection (unsigned QstInd, HTM_TR_Begin (NULL); /* Write checkbox to select the question */ - HTM_TD_Begin ("class=\"BT%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BT %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); HTM_INPUT_CHECKBOX ("QstCods",HTM_DONT_SUBMIT_ON_CHANGE, "value=\"%ld\" onclick=\"checkParent(this,'AllQsts');\"", Question->QstCod); @@ -1535,7 +1535,7 @@ void Qst_WriteChoAnsBank (struct Qst_Question *Question, HTM_TR_Begin (NULL); /* Put an icon that indicates whether the answer is correct or wrong */ - HTM_TD_Begin ("class=\"BT%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BT %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); if (Question->Answer.Options[NumOpt].Correct) Ico_PutIcon ("check.svg",Ico_BLACK, Txt_TST_Answer_given_by_the_teachers,"CONTEXT_ICO16x16"); diff --git a/swad_question_import.c b/swad_question_import.c index 592683c8..adc4cf37 100644 --- a/swad_question_import.c +++ b/swad_question_import.c @@ -884,7 +884,7 @@ static void QstImp_WriteRowImportedQst (struct XMLElement *StemElem, HTM_TR_Begin (NULL); /***** Put icon to indicate that a question does not exist in database *****/ - HTM_TD_Begin ("class=\"BT%u CT\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BT %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); if (QuestionExists) Ico_PutIcon ("tr16x16.gif" ,Ico_UNCHANGED, Txt_Existing_question,"CONTEXT_ICO16x16"); @@ -1017,7 +1017,7 @@ static void QstImp_WriteRowImportedQst (struct XMLElement *StemElem, HTM_TR_Begin (NULL); /* Put an icon that indicates whether the answer is correct or wrong */ - HTM_TD_Begin ("class=\"BT%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BT %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); if (Question->Answer.Options[NumOpt].Correct) Ico_PutIcon ("check.svg",Ico_BLACK, Txt_TST_Answer_given_by_the_teachers, diff --git a/swad_report.c b/swad_report.c index ea9fad2c..528f1cd5 100644 --- a/swad_report.c +++ b/swad_report.c @@ -245,8 +245,8 @@ static void Rep_PutLinkToMyUsageReport (struct Rep_Report *Report) Rep_TitleReport (&Report->CurrentTimeUTC); /***** Put anchor and report filename *****/ - HTM_DIV_Begin ("class=\"FILENAME_TXT CM\""); - HTM_A_Begin ("href=\"%s\" class=\"FILENAME_TXT\" title=\"%s\" target=\"_blank\"", + HTM_DIV_Begin ("class=\"FILENAME_BIG CM\""); + HTM_A_Begin ("href=\"%s\" class=\"FILENAME_BIG\" title=\"%s\" target=\"_blank\"", Report->Permalink, Txt_Report); Ico_PutIcon ("file-alt.svg",Ico_BLACK,Txt_Report,"ICO64x64"); diff --git a/swad_survey.c b/swad_survey.c index 5d2e3c96..30c6c2ad 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -2816,7 +2816,7 @@ static void Svy_ListSvyQuestions (struct Svy_Surveys *Surveys, if (Svy->Status.ICanEdit) { - HTM_TD_Begin ("class=\"BT%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BT %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); /* Initialize context */ Surveys->SvyCod = Svy->SvyCod; diff --git a/swad_syllabus.c b/swad_syllabus.c index 3b0e3f0a..122823ae 100644 --- a/swad_syllabus.c +++ b/swad_syllabus.c @@ -633,7 +633,7 @@ static void Syl_ShowRowSyllabus (struct Syl_Syllabus *Syllabus,unsigned NumItem, else { /***** Icon to remove the row *****/ - HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BM %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); if (Syl_LstItemsSyllabus.Lst[NumItem].HasChildren) Ico_PutIconRemovalNotAllowed (); else @@ -644,7 +644,7 @@ static void Syl_ShowRowSyllabus (struct Syl_Syllabus *Syllabus,unsigned NumItem, /***** Icon to get up an item *****/ Syl_CalculateUpSubtreeSyllabus (&Subtree,NumItem); - HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BM %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); if (Subtree.MovAllowed) { if (asprintf (&Title,Syl_LstItemsSyllabus.Lst[NumItem].HasChildren ? Txt_Move_up_X_and_its_subsections : @@ -665,7 +665,7 @@ static void Syl_ShowRowSyllabus (struct Syl_Syllabus *Syllabus,unsigned NumItem, /***** Icon to get down item *****/ Syl_CalculateDownSubtreeSyllabus (&Subtree,NumItem); - HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BM %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); if (Subtree.MovAllowed) { if (asprintf (&Title,Syl_LstItemsSyllabus.Lst[NumItem].HasChildren ? Txt_Move_down_X_and_its_subsections : @@ -685,7 +685,7 @@ static void Syl_ShowRowSyllabus (struct Syl_Syllabus *Syllabus,unsigned NumItem, HTM_TD_End (); /***** Icon to increase the level of an item *****/ - HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BM %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); if (Level > 1) { if (asprintf (&Title,Txt_Increase_level_of_X,StrItemCod) < 0) @@ -703,7 +703,7 @@ static void Syl_ShowRowSyllabus (struct Syl_Syllabus *Syllabus,unsigned NumItem, HTM_TD_End (); /***** Icon to decrease level item *****/ - HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd); + HTM_TD_Begin ("class=\"BM %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); if (Level < LastLevel + 1 && Level < Syl_MAX_LEVELS_SYLLABUS) { diff --git a/swad_zip.c b/swad_zip.c index 7e51fe18..bc2cac14 100644 --- a/swad_zip.c +++ b/swad_zip.c @@ -537,8 +537,8 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL, /***** Link to download the file *****/ HTM_TR_Begin (NULL); - HTM_TD_Begin ("colspan=\"2\" class=\"FILENAME_TXT CM\""); - HTM_A_Begin ("href=\"%s\" class=\"FILENAME_TXT\" title=\"%s\" target=\"_blank\"", + HTM_TD_Begin ("colspan=\"2\" class=\"FILENAME_BIG CM\""); + HTM_A_Begin ("href=\"%s\" class=\"FILENAME_BIG\" title=\"%s\" target=\"_blank\"", URL,FileName); HTM_IMG (CfG_URL_ICON_FILEXT_PUBLIC "32x32","zip32x32.gif",Txt_ZIP_file, "class=\"ICO40x40\"");