mirror of https://github.com/acanas/swad-core.git
Version 21.67: Dec 04, 2021 Removed title of action associated to vertical menu.
This commit is contained in:
parent
32d502d1b2
commit
a3fd73928a
|
@ -1112,21 +1112,6 @@ a:hover /* Default ==> underlined */
|
||||||
.MENU_TXT_YELLOW {color:#7c4d2a;}
|
.MENU_TXT_YELLOW {color:#7c4d2a;}
|
||||||
.MENU_TXT_PINK {color:#63474e;}
|
.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 *******************************/
|
/***************************** Users connected *******************************/
|
||||||
.CONNECTED
|
.CONNECTED
|
||||||
{
|
{
|
|
@ -106,7 +106,7 @@ function writeLocalDateHMSFromUTC (id,TimeUTC,DateFormat,Separator,Language,
|
||||||
var Hou;
|
var Hou;
|
||||||
var Min;
|
var Min;
|
||||||
var Sec;
|
var Sec;
|
||||||
var StrDate;
|
var StrDat;
|
||||||
var StrMon;
|
var StrMon;
|
||||||
var StrDay;
|
var StrDay;
|
||||||
var StrHou;
|
var StrHou;
|
||||||
|
@ -132,25 +132,25 @@ function writeLocalDateHMSFromUTC (id,TimeUTC,DateFormat,Separator,Language,
|
||||||
writeLocalDateHMSFromUTC.lastd = d; // Update last date for the next call
|
writeLocalDateHMSFromUTC.lastd = d; // Update last date for the next call
|
||||||
|
|
||||||
/* Set date */
|
/* Set date */
|
||||||
StrDate = '';
|
StrDat = '';
|
||||||
if (WriteDate) {
|
if (WriteDate) {
|
||||||
WriteToday = WriteToday && (Yea == todayYea &&
|
WriteToday = WriteToday && (Yea == todayYea &&
|
||||||
Mon == todayMon &&
|
Mon == todayMon &&
|
||||||
Day == todayDay); // Date is today
|
Day == todayDay); // Date is today
|
||||||
if (WriteToday)
|
if (WriteToday)
|
||||||
StrDate = txtToday[Language];
|
StrDat = txtToday[Language];
|
||||||
else
|
else
|
||||||
switch (DateFormat) {
|
switch (DateFormat) {
|
||||||
case 0: // Dat_FORMAT_YYYY_MM_DD
|
case 0: // Dat_FORMAT_YYYY_MM_DD
|
||||||
StrMon = ((Mon < 10) ? '0' : '') + Mon;
|
StrMon = ((Mon < 10) ? '0' : '') + Mon;
|
||||||
StrDay = ((Day < 10) ? '0' : '') + Day;
|
StrDay = ((Day < 10) ? '0' : '') + Day;
|
||||||
StrDate = Yea.toString() + '-' + StrMon + '-' + StrDay;
|
StrDat = Yea.toString() + '-' + StrMon + '-' + StrDay;
|
||||||
break;
|
break;
|
||||||
case 1: // Dat_FORMAT_DD_MONTH_YYYY
|
case 1: // Dat_FORMAT_DD_MONTH_YYYY
|
||||||
StrDate = Day.toString() + ' ' + MonthsShort[Mon - 1] + ' ' + Yea.toString();
|
StrDat = Day.toString() + ' ' + MonthsShort[Mon - 1] + ' ' + Yea.toString();
|
||||||
break;
|
break;
|
||||||
case 2: // Dat_FORMAT_MONTH_DD_YYYY
|
case 2: // Dat_FORMAT_MONTH_DD_YYYY
|
||||||
StrDate = MonthsShort[Mon - 1] + ' ' + Day.toString() + ', ' + Yea.toString();
|
StrDat = MonthsShort[Mon - 1] + ' ' + Day.toString() + ', ' + Yea.toString();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
@ -159,9 +159,9 @@ function writeLocalDateHMSFromUTC (id,TimeUTC,DateFormat,Separator,Language,
|
||||||
if (WriteWeekDay) {
|
if (WriteWeekDay) {
|
||||||
DayOfWeek = d.getDay();
|
DayOfWeek = d.getDay();
|
||||||
DayOfWeek = (DayOfWeek == 0) ? 6 : DayOfWeek - 1;
|
DayOfWeek = (DayOfWeek == 0) ? 6 : DayOfWeek - 1;
|
||||||
StrDate += Separator + DAYS[DayOfWeek];
|
StrDat += Separator + DAYS[DayOfWeek];
|
||||||
}
|
}
|
||||||
StrDate += Separator;
|
StrDat += Separator;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Set HH:MM:SS */
|
/* Set HH:MM:SS */
|
||||||
|
@ -185,7 +185,7 @@ function writeLocalDateHMSFromUTC (id,TimeUTC,DateFormat,Separator,Language,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Write date and time */
|
/* 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
|
// This function is called when user submit a form just inside a parent div
|
||||||
function updateDivLockUnlockProject (form,Params) {
|
function updateDivLockUnlockProject (form,Params) {
|
||||||
var objXMLHttp = false;
|
|
||||||
var id = form.parentNode.id;
|
var id = form.parentNode.id;
|
||||||
|
|
||||||
objXMLHttp = AJAXCreateObject ();
|
var objXMLHttp = AJAXCreateObject ();
|
||||||
if (objXMLHttp) {
|
if (objXMLHttp) {
|
||||||
/* Send request to server */
|
/* Send request to server */
|
||||||
// onreadystatechange must be lowercase
|
// 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
|
// This function is called when user submit a form inside two parent divs
|
||||||
function updateDivFaversSharers (form,Params) {
|
function updateDivFaversSharers (form,Params) {
|
||||||
var objXMLHttp = false;
|
|
||||||
var id = form.parentNode.parentNode.id;
|
var id = form.parentNode.parentNode.id;
|
||||||
|
|
||||||
objXMLHttp = AJAXCreateObject ();
|
var objXMLHttp = AJAXCreateObject ();
|
||||||
if (objXMLHttp) {
|
if (objXMLHttp) {
|
||||||
/* Send request to server */
|
/* Send request to server */
|
||||||
// onreadystatechange must be lowercase
|
// onreadystatechange must be lowercase
|
||||||
|
@ -1416,10 +1414,8 @@ function toggleOffGIF (elem, staticURL) {
|
||||||
function toggleNewComment (id) {
|
function toggleNewComment (id) {
|
||||||
var iconDiv = document.getElementById (id + '_ico');
|
var iconDiv = document.getElementById (id + '_ico');
|
||||||
|
|
||||||
if (iconDiv.className == 'Tml_ICO_COM_OFF')
|
iconDiv.className = (iconDiv.className == 'Tml_ICO_COM_OFF') ? 'Tml_ICO_COM_ON' :
|
||||||
iconDiv.className = 'Tml_ICO_COM_ON';
|
'Tml_ICO_COM_OFF';
|
||||||
else
|
|
||||||
iconDiv.className = 'Tml_ICO_COM_OFF';
|
|
||||||
toggleDisplay(id);
|
toggleDisplay(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1826,7 +1822,7 @@ function DrawMonth (id,FirstDayOfWeek,YearToDraw,MonthToDraw,CurrentMonth,Curren
|
||||||
var ExaCod;
|
var ExaCod;
|
||||||
var StrMon;
|
var StrMon;
|
||||||
var StrDay;
|
var StrDay;
|
||||||
var StrDate;
|
var StrDat;
|
||||||
var Week;
|
var Week;
|
||||||
var DayOfWeek; /* 0, 1, 2, 3, 4, 5, 6 */
|
var DayOfWeek; /* 0, 1, 2, 3, 4, 5, 6 */
|
||||||
var NumDaysInMonth;
|
var NumDaysInMonth;
|
||||||
|
@ -1965,7 +1961,7 @@ function DrawMonth (id,FirstDayOfWeek,YearToDraw,MonthToDraw,CurrentMonth,Curren
|
||||||
ExaCod = LstExamAnnouncements[NumExamAnnouncement].ExaCod;
|
ExaCod = LstExamAnnouncements[NumExamAnnouncement].ExaCod;
|
||||||
StrMon = ((Mon < 10) ? '0' : '') + Mon;
|
StrMon = ((Mon < 10) ? '0' : '') + Mon;
|
||||||
StrDay = ((Day < 10) ? '0' : '') + Day;
|
StrDay = ((Day < 10) ? '0' : '') + Day;
|
||||||
StrDate = Yea + StrMon + StrDay; // YYYYMMDD
|
StrDat = Yea + StrMon + StrDay; // YYYYMMDD
|
||||||
TextForDay = STR_EXAM;
|
TextForDay = STR_EXAM;
|
||||||
}
|
}
|
||||||
break; // Only last exam in the day (list is ordered from more recent to older)
|
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 + '">' +
|
'" id="' + FormId + '">' +
|
||||||
FormEventParams +
|
FormEventParams +
|
||||||
'<input type="hidden" name=\"Date\" value="' +
|
'<input type="hidden" name=\"Date\" value="' +
|
||||||
StrDate +
|
StrDat +
|
||||||
'" /><div class="' + ClassForDay + '"';
|
'" /><div class="' + ClassForDay + '"';
|
||||||
if (TextForDay.length)
|
if (TextForDay.length)
|
||||||
Gbl_HTMLContent += ' title="' + TextForDay + '"';
|
Gbl_HTMLContent += ' title="' + TextForDay + '"';
|
|
@ -602,13 +602,14 @@ 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.
|
TODO: En las encuestas, que los estudiantes no puedan ver los resultados hasta que no finalice el plazo.
|
||||||
*/
|
*/
|
||||||
#define Log_PLATFORM_VERSION "SWAD 21.66.4 (2021-12-02)"
|
#define Log_PLATFORM_VERSION "SWAD 21.67 (2021-12-04)"
|
||||||
#define CSS_FILE "swad21.66.3.css"
|
#define CSS_FILE "swad21.67.css"
|
||||||
#define JS_FILE "swad21.59.js"
|
#define JS_FILE "swad21.67.js"
|
||||||
/*
|
/*
|
||||||
TODO: Rename CENTRE to CENTER in help wiki.
|
TODO: Rename CENTRE to CENTER in help wiki.
|
||||||
TODO: Rename ASSESSMENT.Announcements to ASSESSMENT.Calls_for_exams
|
TODO: Rename ASSESSMENT.Announcements to ASSESSMENT.Calls_for_exams
|
||||||
|
|
||||||
|
Version 21.67: Dec 04, 2021 Removed title of action associated to vertical menu. (320316 lines)
|
||||||
Version 21.66.4: Dec 02, 2021 Removed code used to fix problem on tests and matches. (320379 lines)
|
Version 21.66.4: Dec 02, 2021 Removed code used to fix problem on tests and matches. (320379 lines)
|
||||||
Version 21.66.3: Dec 02, 2021 Fixed issue in CSS for background. (320874 lines)
|
Version 21.66.3: Dec 02, 2021 Fixed issue in CSS for background. (320874 lines)
|
||||||
Version 21.66: Dec 02, 2021 New module swad_photo_shape for user photo shapes. (320876 lines)
|
Version 21.66: Dec 02, 2021 New module swad_photo_shape for user photo shapes. (320876 lines)
|
||||||
|
|
|
@ -91,8 +91,6 @@ static void Lay_WriteScriptCustomDropzone (void);
|
||||||
static void Lay_WritePageTopHeading (void);
|
static void Lay_WritePageTopHeading (void);
|
||||||
static void Lay_WriteBreadcrumb (void);
|
static void Lay_WriteBreadcrumb (void);
|
||||||
|
|
||||||
static void Lay_WriteTitleAction (void);
|
|
||||||
|
|
||||||
static void Lay_ShowLeftColumn (void);
|
static void Lay_ShowLeftColumn (void);
|
||||||
static void Lay_ShowRightColumn (void);
|
static void Lay_ShowRightColumn (void);
|
||||||
|
|
||||||
|
@ -362,11 +360,6 @@ void Lay_WriteStartOfPage (void)
|
||||||
if (Gbl.Crs.Info.ShowMsgMustBeRead)
|
if (Gbl.Crs.Info.ShowMsgMustBeRead)
|
||||||
Inf_WriteMsgYouMustReadInfo ();
|
Inf_WriteMsgYouMustReadInfo ();
|
||||||
|
|
||||||
/* Write title of the current action */
|
|
||||||
if (Gbl.Prefs.Menu == Mnu_MENU_VERTICAL &&
|
|
||||||
Act_GetIndexInMenu (Gbl.Action.Act) >= 0)
|
|
||||||
Lay_WriteTitleAction ();
|
|
||||||
|
|
||||||
Gbl.Layout.WritingHTMLStart = false;
|
Gbl.Layout.WritingHTMLStart = false;
|
||||||
Gbl.Layout.HTMLStartWritten = true;
|
Gbl.Layout.HTMLStartWritten = true;
|
||||||
|
|
||||||
|
@ -1092,36 +1085,6 @@ static void Lay_WriteBreadcrumb (void)
|
||||||
HTM_Txt ("</nav>");
|
HTM_Txt ("</nav>");
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
|
||||||
/*********** 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 ******************************/
|
/***************************** Show left column ******************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
20
swad_theme.c
20
swad_theme.c
|
@ -172,26 +172,6 @@ const char *The_ClassTxtTabOn[The_NUM_THEMES] =
|
||||||
[The_THEME_PINK ] = "TAB_ON_TXT_PINK",
|
[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] =
|
const char *The_ClassTitle[The_NUM_THEMES] =
|
||||||
{
|
{
|
||||||
[The_THEME_WHITE ] = "TITLE_WHITE",
|
[The_THEME_WHITE ] = "TITLE_WHITE",
|
||||||
|
|
Loading…
Reference in New Issue