Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 23.52: Dec 07, 2023 Responsive design in calendar.

This commit is contained in:
acanas 2023-12-07 14:17:09 +01:00
parent b8c13f58b7
commit 4767a2dfdb
4 changed files with 65 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
css/swad23.51.2.css → css/swad23.52.css
View File

@ -1540,12 +1540,12 @@ a:hover img.CENTER_PHOTO_SHOW
.BLD_SEL, .ROOM_TYPE_SEL {width:80px;}
/*********************************** Month ***********************************/
.CALENDAR
{
margin:0 auto;
border-spacing:12px 0;
}
.MONTH_CONT
{
display:inline-block;
margin:0 6px;
}
.MONTH
{
box-sizing:border-box;
width:148px;
@ -1555,8 +1555,6 @@ a:hover img.CENTER_PHOTO_SHOW
border-width:1px;
border-color:#8cbcce;
border-radius:2px;
text-align:center;
overflow:hidden;
}
.MONTH_TABLE_DAYS
{
@ -1568,7 +1566,7 @@ a:hover img.CENTER_PHOTO_SHOW
border-width:1px 0 0 0;
border-color:rgba(140,188,206,0.2);
}
.MONTH
.MONTH_NAME
{
font-size:9pt;
white-space:nowrap;
@ -1642,14 +1640,15 @@ a:hover img.CENTER_PHOTO_SHOW
.DAY
{
border:solid 1px;
border:solid 2px;
border-color:transparent;
font-size:9pt;
text-align:center;
}
.TODAY
{
border:solid 1px;
border:solid 2px;
border-radius:2px;
border-color:#50b800;
font-size:9pt;
text-align:center;
@ -3326,13 +3325,13 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
.CLASSPHOTO_DARK {color:#d0d0d0;}
/************************** Left column menu *********************************/
.INS_LNK_WHITE, .MFU_WHITE, .MONTH_WHITE,
.INS_LNK_GREY, .MFU_GREY, .MONTH_GREY,
.INS_LNK_PURPLE, .MFU_PURPLE, .MONTH_PURPLE,
.INS_LNK_BLUE, .MFU_BLUE, .MONTH_BLUE,
.INS_LNK_YELLOW, .MFU_YELLOW, .MONTH_YELLOW,
.INS_LNK_PINK, .MFU_PINK, .MONTH_PINK {color:#4d88a1;}
.INS_LNK_DARK, .MFU_DARK, .MONTH_DARK {color:#8cbcce;}
.INS_LNK_WHITE, .MFU_WHITE, .MONTH_NAME_WHITE,
.INS_LNK_GREY, .MFU_GREY, .MONTH_NAME_GREY,
.INS_LNK_PURPLE, .MFU_PURPLE, .MONTH_NAME_PURPLE,
.INS_LNK_BLUE, .MFU_BLUE, .MONTH_NAME_BLUE,
.INS_LNK_YELLOW, .MFU_YELLOW, .MONTH_NAME_YELLOW,
.INS_LNK_PINK, .MFU_PINK, .MONTH_NAME_PINK {color:#4d88a1;}
.INS_LNK_DARK, .MFU_DARK, .MONTH_NAME_DARK {color:#8cbcce;}
/***************** Text decoration of fieldset and legend ********************/
fieldset
@ -4799,7 +4798,7 @@ legend {font-size:12pt;}
.Ntf_TYPE {display:none;}
.Ntf_LOCATION {
display:inline-block;
max-width:80px;
max-width:72px;
overflow:hidden;
text-overflow:ellipsis;
text-align:left;

73
js/swad23.47.3.js → js/swad23.52.js
View File

@ -1764,7 +1764,7 @@ function disableDetailedClicks () {
function Cal_DrawCalendar (id,FirstDayOfWeek,
TimeUTC,CurrentPlcCod,PrintView,ColorSuffix,
CGI,FormGoToCalendarParams,FormEventParams) {
var StartingMonth = [ // Calendar starts one row before current month
/* var StartingMonth = [ // Calendar starts one row before current month
10, // January --> October
10, // February --> October
10, // Mars --> October
@ -1777,48 +1777,52 @@ function Cal_DrawCalendar (id,FirstDayOfWeek,
7, // October --> July
7, // November --> July
7 // December --> July
]; */
var StartingMonth = [ // Calendar starts one row before current month
2, // January --> February
3, // February --> Mars
4, // Mars --> April
5, // April --> May
6, // May --> June
7, // June --> July
8, // July --> August
9, // August --> September
10, // September --> October
11, // October --> November
12, // November --> December
1 // December --> January
];
var d = new Date();
d.setTime(TimeUTC * 1000);
var CurrentMonth = d.getMonth() + 1;
var CurrentYear = d.getFullYear();
var CurrentMonth = d.getMonth() + 1;
var CurrentDay = d.getDate();
var Month = StartingMonth[CurrentMonth - 1];
var Year = (Month < CurrentMonth) ? CurrentYear :
CurrentYear - 1;
var Row;
var Col;
var i;
var MonthIdNum = 0;
var MonthId;
/***** Draw several months *****/
Gbl_HTMLContent += '<table class="CALENDAR">';
for (i = 0;
i < 24;
i++) {
MonthIdNum++;
MonthId = id + '_month_' + MonthIdNum;
for (Row = 0;
Row < 5;
Row++) {
Gbl_HTMLContent += '<tr>';
for (Col = 0;
Col < 3;
Col++) {
MonthIdNum++;
MonthId = id + '_month_' + MonthIdNum;
Gbl_HTMLContent += '<td class="CT" style="width:150px;">';
DrawMonth (MonthId,FirstDayOfWeek,
Year,Month,
CurrentMonth,CurrentDay,
CurrentPlcCod,true,PrintView,ColorSuffix,
CGI,FormGoToCalendarParams,FormEventParams);
Gbl_HTMLContent += '</td>';
if (++Month == 13) {
Month = 1;
Year++;
}
Gbl_HTMLContent += '<div class="MONTH_CONT">';
DrawMonth (MonthId,FirstDayOfWeek,
Year,Month,
CurrentYear,CurrentMonth,CurrentDay,
CurrentPlcCod,true,PrintView,ColorSuffix,
CGI,FormGoToCalendarParams,FormEventParams);
Gbl_HTMLContent += '</div>';
if (++Month == 13) {
Month = 1;
Year++;
}
Gbl_HTMLContent += '</tr>';
}
Gbl_HTMLContent += '</table>';
document.getElementById(id).innerHTML = Gbl_HTMLContent;
}
@ -1837,7 +1841,7 @@ function DrawCurrentMonth (id,FirstDayOfWeek,TimeUTC,CurrentPlcCod,ColorSuffix,
DrawMonth (id,FirstDayOfWeek,
Year,Month,
Month,CurrentDay,
Year,Month,CurrentDay,
CurrentPlcCod,false,false,ColorSuffix,
CGI,FormGoToCalendarParams,FormEventParams);
document.getElementById(id).innerHTML = Gbl_HTMLContent;
@ -1851,7 +1855,7 @@ function DrawCurrentMonth (id,FirstDayOfWeek,TimeUTC,CurrentPlcCod,ColorSuffix,
function DrawMonth (id,FirstDayOfWeek,
YearToDraw,MonthToDraw,
CurrentMonth,CurrentDay,
CurrentYear,CurrentMonth,CurrentDay,
CurrentPlcCod,DrawingCalendar,PrintView,ColorSuffix,
CGI,FormGoToCalendarParams,FormEventParams) {
var Hld_HOLIDAY = 0;
@ -1901,17 +1905,17 @@ function DrawMonth (id,FirstDayOfWeek,
}
/***** Start of month *****/
Gbl_HTMLContent += '<div class="MONTH_CONT">';
Gbl_HTMLContent += '<div class="MONTH">';
/***** Month name *****/
if (DrawingCalendar)
Gbl_HTMLContent += '<div class="MONTH MONTH_' + ColorSuffix + '">';
Gbl_HTMLContent += '<div class="MONTH_NAME MONTH_NAME_' + ColorSuffix + '">';
else {
FormId = id + '_show_calendar';
Gbl_HTMLContent += '<form method="post" action="' + CGI + '" id="' + FormId + '">' +
FormGoToCalendarParams +
'<div class="MONTH">' +
'<a href="" class="MONTH_' + ColorSuffix +
'<div class="MONTH_NAME">' +
'<a href="" class="MONTH_NAME_' + ColorSuffix +
'" onclick="document.getElementById(\'' + FormId +
'\').submit();return false;">';
}
@ -1985,6 +1989,7 @@ function DrawMonth (id,FirstDayOfWeek,
/* Date being drawn is today? */
IsToday = (Yea == YearToDraw &&
Mon == MonthToDraw &&
Yea == CurrentYear &&
Mon == CurrentMonth &&
Day == CurrentDay);

7
swad_changelog.h
View File

@ -633,10 +633,11 @@ Me sale este error, no s
"can npt create received message (duplicated entry '243218-2160773' for key 'UsrCod_MsgCod')
*/
#define Log_PLATFORM_VERSION "SWAD 23.51.2 (2023-12-06)"
#define CSS_FILE "swad23.51.2.css"
#define JS_FILE "swad23.47.3.js"
#define Log_PLATFORM_VERSION "SWAD 23.52 (2023-12-07)"
#define CSS_FILE "swad23.52.css"
#define JS_FILE "swad23.52.js"
/*
Version 23.52: Dec 07, 2023 Responsive design in calendar. (335783 lines)
Version 23.51.2: Dec 06, 2023 Responsive design in notifications. (335778 lines)
Version 23.51.1: Dec 06, 2023 Code refactoring in notifications. (335743 lines)
Version 23.51: Dec 06, 2023 Code refactoring in notifications and hierarchy. (335718 lines)

11
swad_notification.c
View File

@ -456,18 +456,17 @@ static void Ntf_PutIconsNotif (__attribute__((unused)) void *Args)
static void Ntf_WriteHeading (void)
{
extern const char *Txt_Event;
extern const char *Txt_MSG_From;
extern const char *Txt_Location;
extern const char *Txt_Date;
extern const char *Txt_Email;
HTM_TR_Begin (NULL);
HTM_TH_Span (Txt_Event ,HTM_HEAD_LEFT ,1,2,NULL);
HTM_TH (Txt_MSG_From,HTM_HEAD_LEFT );
HTM_TH (Txt_Location,HTM_HEAD_LEFT );
HTM_TH (Txt_Date ,HTM_HEAD_RIGHT);
HTM_TH (Txt_Email ,HTM_HEAD_LEFT );
HTM_TH_Empty (2);
HTM_TH (Txt_MSG_From,HTM_HEAD_LEFT );
HTM_TH (Txt_Location,HTM_HEAD_LEFT );
HTM_TH (Txt_Date ,HTM_HEAD_RIGHT);
HTM_TH (Txt_Email ,HTM_HEAD_LEFT );
HTM_TR_End ();
}