diff --git a/swad_changelog.h b/swad_changelog.h index b5f48b95..8c1504f7 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.2 (2022-04-05)" +#define Log_PLATFORM_VERSION "SWAD 21.91.3 (2022-04-05)" #define CSS_FILE "swad21.91.2.css" #define JS_FILE "swad21.78.2.js" /* + 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) Version 21.91: Apr 05, 2022 Working on design of dark theme. (323235 lines) diff --git a/swad_info.c b/swad_info.c index de72f2e6..ff6c5331 100644 --- a/swad_info.c +++ b/swad_info.c @@ -311,16 +311,6 @@ void Inf_ShowInfo (void) Gbl.Crs.Info.Type, &FromDB); - switch (Gbl.Crs.Info.Type) - { - case Inf_LECTURES: - case Inf_PRACTICALS: - Syl_PutFormWhichSyllabus (Syllabus.WhichSyllabus); - break; - default: - break; - } - switch (Gbl.Usrs.Me.Role.Logged) { case Rol_STD: diff --git a/swad_syllabus.c b/swad_syllabus.c index 63fafdef..9505bd10 100644 --- a/swad_syllabus.c +++ b/swad_syllabus.c @@ -160,14 +160,14 @@ void Syl_PutFormWhichSyllabus (Syl_WhichSyllabus_t SyllabusSelected) /***** Form to select which syllabus I want to see (lectures/practicals) *****/ Frm_BeginForm (ActSeeSyl); - HTM_DIV_Begin ("class=\"CM\""); - HTM_UL_Begin ("class=\"LIST_LEFT\""); + HTM_DIV_Begin ("class=\"SEL_BELOW_TITLE DAT_%s\"",The_GetSuffix ()); + HTM_UL_Begin (NULL); for (WhichSyl = (Syl_WhichSyllabus_t) 0; WhichSyl <= (Syl_WhichSyllabus_t) (For_NUM_FORUM_SETS - 1); WhichSyl++) { - HTM_LI_Begin ("class=\"LM DAT_%s\"",The_GetSuffix ()); + HTM_LI_Begin (NULL); HTM_LABEL_Begin (NULL); HTM_INPUT_RADIO ("WhichSyllabus",true, "value=\"%u\"%s", @@ -526,54 +526,59 @@ static void Syl_ShowSyllabus (struct Syl_Syllabus *Syllabus) Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM; bool PutIconToEdit = ICanEdit && !Syllabus->EditionIsActive; - /***** Begin box and table *****/ + /***** Begin box *****/ if (PutIconToEdit) - Box_BoxTableBegin (NULL,Txt_INFO_TITLE[Gbl.Crs.Info.Type], + Box_BoxBegin (NULL,Txt_INFO_TITLE[Gbl.Crs.Info.Type], Inf_PutIconToEditInfo,&Gbl.Crs.Info.Type, Syllabus->EditionIsActive ? Hlp_COURSE_Syllabus_edit : Hlp_COURSE_Syllabus, - Box_NOT_CLOSABLE,0); + Box_NOT_CLOSABLE); else - Box_BoxTableBegin (NULL,Txt_INFO_TITLE[Gbl.Crs.Info.Type], + Box_BoxBegin (NULL,Txt_INFO_TITLE[Gbl.Crs.Info.Type], NULL,NULL, Syllabus->EditionIsActive ? Hlp_COURSE_Syllabus_edit : Hlp_COURSE_Syllabus, - Box_NOT_CLOSABLE,0); + Box_NOT_CLOSABLE); - /***** Set width of columns of the table *****/ - HTM_Txt (""); - for (i = 0; - i < NumButtons; - i++) - HTM_Txt (""); - for (i = 1; - i <= Syl_LstItemsSyllabus.NumLevels; - i++) - HTM_TxtF ("",i * Syl_WIDTH_NUM_SYLLABUS); - HTM_Txt (""); - HTM_Txt (""); + Syl_PutFormWhichSyllabus (Syllabus->WhichSyllabus); - if (Syl_LstItemsSyllabus.NumItems) - /***** Loop writing all items of the syllabus *****/ - for (NumItem = 0; - NumItem < Syl_LstItemsSyllabus.NumItems; - NumItem++) - { - Syl_ShowRowSyllabus (Syllabus,NumItem, - Syl_LstItemsSyllabus.Lst[NumItem].Level, - Syl_LstItemsSyllabus.Lst[NumItem].CodItem, - Syl_LstItemsSyllabus.Lst[NumItem].Text,false); - if (ShowRowInsertNewItem && NumItem == Syllabus->NumItem) - // Mostrar a new row where se puede insert a new item - Syl_ShowRowSyllabus (Syllabus,NumItem + 1, - Syl_LstItemsSyllabus.Lst[NumItem].Level,NULL, - "",true); - } - else if (Syllabus->EditionIsActive) - /***** If the syllabus is empty ==> - show form to add a iten to the end *****/ - Syl_ShowRowSyllabus (Syllabus,0, - 1,Syl_LstItemsSyllabus.Lst[0].CodItem,"",true); + /***** Begin table *****/ + HTM_TABLE_BeginWide (); + + /***** Set width of columns of the table *****/ + HTM_Txt (""); + for (i = 0; + i < NumButtons; + i++) + HTM_Txt (""); + for (i = 1; + i <= Syl_LstItemsSyllabus.NumLevels; + i++) + HTM_TxtF ("",i * Syl_WIDTH_NUM_SYLLABUS); + HTM_Txt (""); + HTM_Txt (""); + + if (Syl_LstItemsSyllabus.NumItems) + /***** Loop writing all items of the syllabus *****/ + for (NumItem = 0; + NumItem < Syl_LstItemsSyllabus.NumItems; + NumItem++) + { + Syl_ShowRowSyllabus (Syllabus,NumItem, + Syl_LstItemsSyllabus.Lst[NumItem].Level, + Syl_LstItemsSyllabus.Lst[NumItem].CodItem, + Syl_LstItemsSyllabus.Lst[NumItem].Text,false); + if (ShowRowInsertNewItem && NumItem == Syllabus->NumItem) + // Mostrar a new row where se puede insert a new item + Syl_ShowRowSyllabus (Syllabus,NumItem + 1, + Syl_LstItemsSyllabus.Lst[NumItem].Level,NULL, + "",true); + } + else if (Syllabus->EditionIsActive) + /***** If the syllabus is empty ==> + show form to add a iten to the end *****/ + Syl_ShowRowSyllabus (Syllabus,0, + 1,Syl_LstItemsSyllabus.Lst[0].CodItem,"",true); /***** End table *****/ HTM_TABLE_End (); diff --git a/swad_text.c b/swad_text.c index 8d73041f..8226c26d 100644 --- a/swad_text.c +++ b/swad_text.c @@ -16824,44 +16824,44 @@ const char *Txt_INFO_TITLE[Inf_NUM_TYPES] = , [Inf_LECTURES] = #if L==1 // ca - "Temari teoria" + "Temari" #elif L==2 // de - "Studienplan (Vorlesungen)" + "Studienplan" #elif L==3 // en - "Topics (lectures)" + "Topics" #elif L==4 // es - "Temario teoría" + "Temario" #elif L==5 // fr - "Plan théorie" + "Plan" #elif L==6 // gn - "Temario teoría" // Okoteve traducción + "Temario" // Okoteve traducción #elif L==7 // it - "Temi teoria" + "Temi" #elif L==8 // pl - "Sylabus (wyklady)" + "Sylabus" #elif L==9 // pt - "Conteúdo teoria" + "Conteúdo" #endif , [Inf_PRACTICALS] = #if L==1 // ca - "Temari pràctiques" + "Temari" #elif L==2 // de - "Studienplan (Übungen)" + "Studienplan" #elif L==3 // en - "Topics (practicals)" + "Topics" #elif L==4 // es - "Temario prácticas" + "Temario" #elif L==5 // fr - "Temi pratique" + "Plan" #elif L==6 // gn - "Temario prácticas" // Okoteve traducción + "Temario" // Okoteve traducción #elif L==7 // it - "Programma pratica" + "Temi" #elif L==8 // pl - "Sylabus (practicals)" + "Sylabus" #elif L==9 // pt - "Conteúdo prática" + "Conteúdo" #endif , [Inf_BIBLIOGRAPHY] =