diff --git a/css/swad21.66.3.css b/css/swad21.67.css similarity index 99% rename from css/swad21.66.3.css rename to css/swad21.67.css index 097295c70..9cf4a6288 100644 --- a/css/swad21.66.3.css +++ b/css/swad21.67.css @@ -1112,21 +1112,6 @@ a:hover /* Default ==> underlined */ .MENU_TXT_YELLOW {color:#7c4d2a;} .MENU_TXT_PINK {color:#63474e;} -/****************** Title of current action in main block ********************/ -.TITLE_ACTION_WHITE {color:#404040; font-size:20pt;} -.TITLE_ACTION_GREY {color:#606060; font-size:20pt;} -.TITLE_ACTION_PURPLE {color:#573c4d; font-size:20pt;} -.TITLE_ACTION_BLUE {color:#4D88A1; font-size:20pt;} -.TITLE_ACTION_YELLOW {color:#7c4d2a; font-size:20pt;} -.TITLE_ACTION_PINK {color:#63474e; font-size:20pt;} - -.SUBTITLE_ACTION_WHITE {color:#404040; font-size:12pt;} -.SUBTITLE_ACTION_GREY {color:#606060; font-size:12pt;} -.SUBTITLE_ACTION_PURPLE {color:#573c4d; font-size:12pt;} -.SUBTITLE_ACTION_BLUE {color:#4D88A1; font-size:12pt;} -.SUBTITLE_ACTION_YELLOW {color:#7c4d2a; font-size:12pt;} -.SUBTITLE_ACTION_PINK {color:#63474e; font-size:12pt;} - /***************************** Users connected *******************************/ .CONNECTED { diff --git a/js/swad21.59.js b/js/swad21.67.js similarity index 98% rename from js/swad21.59.js rename to js/swad21.67.js index fd6fa6ae3..66a84b8b8 100644 --- a/js/swad21.59.js +++ b/js/swad21.67.js @@ -106,7 +106,7 @@ function writeLocalDateHMSFromUTC (id,TimeUTC,DateFormat,Separator,Language, var Hou; var Min; var Sec; - var StrDate; + var StrDat; var StrMon; var StrDay; var StrHou; @@ -132,25 +132,25 @@ function writeLocalDateHMSFromUTC (id,TimeUTC,DateFormat,Separator,Language, writeLocalDateHMSFromUTC.lastd = d; // Update last date for the next call /* Set date */ - StrDate = ''; + StrDat = ''; if (WriteDate) { WriteToday = WriteToday && (Yea == todayYea && Mon == todayMon && Day == todayDay); // Date is today if (WriteToday) - StrDate = txtToday[Language]; + StrDat = txtToday[Language]; else switch (DateFormat) { case 0: // Dat_FORMAT_YYYY_MM_DD StrMon = ((Mon < 10) ? '0' : '') + Mon; StrDay = ((Day < 10) ? '0' : '') + Day; - StrDate = Yea.toString() + '-' + StrMon + '-' + StrDay; + StrDat = Yea.toString() + '-' + StrMon + '-' + StrDay; break; case 1: // Dat_FORMAT_DD_MONTH_YYYY - StrDate = Day.toString() + ' ' + MonthsShort[Mon - 1] + ' ' + Yea.toString(); + StrDat = Day.toString() + ' ' + MonthsShort[Mon - 1] + ' ' + Yea.toString(); break; case 2: // Dat_FORMAT_MONTH_DD_YYYY - StrDate = MonthsShort[Mon - 1] + ' ' + Day.toString() + ', ' + Yea.toString(); + StrDat = MonthsShort[Mon - 1] + ' ' + Day.toString() + ', ' + Yea.toString(); break; default: break; @@ -159,9 +159,9 @@ function writeLocalDateHMSFromUTC (id,TimeUTC,DateFormat,Separator,Language, if (WriteWeekDay) { DayOfWeek = d.getDay(); DayOfWeek = (DayOfWeek == 0) ? 6 : DayOfWeek - 1; - StrDate += Separator + DAYS[DayOfWeek]; + StrDat += Separator + DAYS[DayOfWeek]; } - StrDate += Separator; + StrDat += Separator; } /* Set HH:MM:SS */ @@ -185,7 +185,7 @@ function writeLocalDateHMSFromUTC (id,TimeUTC,DateFormat,Separator,Language, } /* Write date and time */ - document.getElementById(id).innerHTML = StrDate + StrHou + StrMin + StrSec; + document.getElementById(id).innerHTML = StrDat + StrHou + StrMin + StrSec; } /*****************************************************************************/ @@ -1137,10 +1137,9 @@ function updateDivHiddenComments (form,Params) { // This function is called when user submit a form just inside a parent div function updateDivLockUnlockProject (form,Params) { - var objXMLHttp = false; var id = form.parentNode.id; - objXMLHttp = AJAXCreateObject (); + var objXMLHttp = AJAXCreateObject (); if (objXMLHttp) { /* Send request to server */ // onreadystatechange must be lowercase @@ -1166,10 +1165,9 @@ function updateDivLockUnlockProject (form,Params) { // This function is called when user submit a form inside two parent divs function updateDivFaversSharers (form,Params) { - var objXMLHttp = false; var id = form.parentNode.parentNode.id; - objXMLHttp = AJAXCreateObject (); + var objXMLHttp = AJAXCreateObject (); if (objXMLHttp) { /* Send request to server */ // onreadystatechange must be lowercase @@ -1416,10 +1414,8 @@ function toggleOffGIF (elem, staticURL) { function toggleNewComment (id) { var iconDiv = document.getElementById (id + '_ico'); - if (iconDiv.className == 'Tml_ICO_COM_OFF') - iconDiv.className = 'Tml_ICO_COM_ON'; - else - iconDiv.className = 'Tml_ICO_COM_OFF'; + iconDiv.className = (iconDiv.className == 'Tml_ICO_COM_OFF') ? 'Tml_ICO_COM_ON' : + 'Tml_ICO_COM_OFF'; toggleDisplay(id); } @@ -1826,7 +1822,7 @@ function DrawMonth (id,FirstDayOfWeek,YearToDraw,MonthToDraw,CurrentMonth,Curren var ExaCod; var StrMon; var StrDay; - var StrDate; + var StrDat; var Week; var DayOfWeek; /* 0, 1, 2, 3, 4, 5, 6 */ var NumDaysInMonth; @@ -1965,7 +1961,7 @@ function DrawMonth (id,FirstDayOfWeek,YearToDraw,MonthToDraw,CurrentMonth,Curren ExaCod = LstExamAnnouncements[NumExamAnnouncement].ExaCod; StrMon = ((Mon < 10) ? '0' : '') + Mon; StrDay = ((Day < 10) ? '0' : '') + Day; - StrDate = Yea + StrMon + StrDay; // YYYYMMDD + StrDat = Yea + StrMon + StrDay; // YYYYMMDD TextForDay = STR_EXAM; } break; // Only last exam in the day (list is ordered from more recent to older) @@ -1989,7 +1985,7 @@ function DrawMonth (id,FirstDayOfWeek,YearToDraw,MonthToDraw,CurrentMonth,Curren '" id="' + FormId + '">' + FormEventParams + '
= 0) - Lay_WriteTitleAction (); - Gbl.Layout.WritingHTMLStart = false; Gbl.Layout.HTMLStartWritten = true; @@ -1092,36 +1085,6 @@ static void Lay_WriteBreadcrumb (void) HTM_Txt (""); } -/*****************************************************************************/ -/*********** Write icon and title associated to the current action ***********/ -/*****************************************************************************/ - -static void Lay_WriteTitleAction (void) - { - extern const char *The_ClassTitleAction[The_NUM_THEMES]; - extern const char *The_ClassSubtitleAction[The_NUM_THEMES]; - extern const char *Txt_TABS_TXT[Tab_NUM_TABS]; - - /***** Container start *****/ - HTM_DIV_Begin ("id=\"action_title\" style=\"background-image:url('%s/%s');\"", - Gbl.Prefs.URLIconSet, - Act_GetIcon (Act_GetSuperAction (Gbl.Action.Act))); - - /***** Title *****/ - HTM_DIV_Begin ("class=\"%s\"",The_ClassTitleAction[Gbl.Prefs.Theme]); - HTM_TxtF ("%s > %s",Txt_TABS_TXT[Act_GetTab (Gbl.Action.Act)], - Act_GetTitleAction (Gbl.Action.Act)); - HTM_DIV_End (); - - /***** Subtitle *****/ - HTM_DIV_Begin ("class=\"%s\"",The_ClassSubtitleAction[Gbl.Prefs.Theme]); - HTM_Txt (Act_GetSubtitleAction (Gbl.Action.Act)); - HTM_DIV_End (); - - /***** Container end *****/ - HTM_DIV_End (); - } - /*****************************************************************************/ /***************************** Show left column ******************************/ /*****************************************************************************/ diff --git a/swad_theme.c b/swad_theme.c index aca125e24..30619ad9e 100644 --- a/swad_theme.c +++ b/swad_theme.c @@ -172,26 +172,6 @@ const char *The_ClassTxtTabOn[The_NUM_THEMES] = [The_THEME_PINK ] = "TAB_ON_TXT_PINK", }; -const char *The_ClassTitleAction[The_NUM_THEMES] = - { - [The_THEME_WHITE ] = "TITLE_ACTION_WHITE", - [The_THEME_GREY ] = "TITLE_ACTION_GREY", - [The_THEME_PURPLE] = "TITLE_ACTION_PURPLE", - [The_THEME_BLUE ] = "TITLE_ACTION_BLUE", - [The_THEME_YELLOW] = "TITLE_ACTION_YELLOW", - [The_THEME_PINK ] = "TITLE_ACTION_PINK", - }; - -const char *The_ClassSubtitleAction[The_NUM_THEMES] = - { - [The_THEME_WHITE ] = "SUBTITLE_ACTION_WHITE", - [The_THEME_GREY ] = "SUBTITLE_ACTION_GREY", - [The_THEME_PURPLE] = "SUBTITLE_ACTION_PURPLE", - [The_THEME_BLUE ] = "SUBTITLE_ACTION_BLUE", - [The_THEME_YELLOW] = "SUBTITLE_ACTION_YELLOW", - [The_THEME_PINK ] = "SUBTITLE_ACTION_PINK", - }; - const char *The_ClassTitle[The_NUM_THEMES] = { [The_THEME_WHITE ] = "TITLE_WHITE",