mirror of
https://github.com/acanas/swad-core.git
synced 2024-06-01 06:15:31 +02:00
Version 16.119
This commit is contained in:
parent
89d88b5f90
commit
f763f45bd2
|
@ -269,12 +269,43 @@ a:hover /* Default ==> underlined */
|
|||
box-sizing:border-box;
|
||||
width:160px;
|
||||
text-align:center;
|
||||
vertical-align:top;
|
||||
vertical-align:middle;
|
||||
}
|
||||
.WHITE_CUR_TIME {color:#808080; font-size:14pt; font-weight:bold;}
|
||||
.GREY_CUR_TIME {color:#E0E0E0; font-size:14pt; font-weight:bold;}
|
||||
.BLUE_CUR_TIME {color:#BAD2DA; font-size:14pt; font-weight:bold;}
|
||||
.YELLOW_CUR_TIME {color:#B3B0B3; font-size:14pt; font-weight:bold;}
|
||||
#current_date
|
||||
{
|
||||
box-sizing:border-box;
|
||||
width:80px;
|
||||
/* margin-left:6px; */
|
||||
margin:0 auto;
|
||||
border-radius:4px;
|
||||
box-shadow: 0 2px 2px 0 rgba(0,0,0,0.14), 0 2px 1px -2px rgba(0,0,0,0.2), 0 1px 5px 0 rgba(0,0,0,0.12);
|
||||
}
|
||||
#current_month
|
||||
{
|
||||
border-radius:4px 4px 0 0;
|
||||
background-color:rgba(172, 64, 64, 0.8);;
|
||||
color:white;
|
||||
font-size:12pt;
|
||||
font-weight:bold;
|
||||
white-space:nowrap;
|
||||
overflow:hidden;
|
||||
}
|
||||
#current_day
|
||||
{
|
||||
background-color:rgba(255, 255, 255, 0.8);;
|
||||
color:#606060;
|
||||
font-size:20pt;
|
||||
font-weight:bold;
|
||||
line-height:100%;
|
||||
}
|
||||
#current_time
|
||||
{
|
||||
background-color:rgba(255, 255, 255, 0.8);;
|
||||
color:#606060;
|
||||
font-size:12pt;
|
||||
font-weight:bold;
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 1024px)
|
||||
{ /* For mobile phones */
|
||||
#head_row_2_time
|
||||
|
@ -282,13 +313,6 @@ a:hover /* Default ==> underlined */
|
|||
display:none;
|
||||
}
|
||||
}
|
||||
@media only screen and (min-width: 1024px) and (max-width: 1280px)
|
||||
{ /* For tablets */
|
||||
#current_date
|
||||
{
|
||||
display:none;
|
||||
}
|
||||
}
|
||||
|
||||
/****** Breadcrumb (platform/country/institution/centre/degree/course) *******/
|
||||
#head_row_2_hierarchy
|
|
@ -350,11 +350,13 @@ function writeLocalClock () {
|
|||
Hou = d.getHours();
|
||||
Min = d.getMinutes();
|
||||
StrMin = ((Min < 10) ? '0' : '') + Min;
|
||||
document.getElementById('hm').innerHTML = '<span id="current_date">' +
|
||||
Months[Mon] + ' ' + Day + ', ' +
|
||||
'</span><span id="current_time">' +
|
||||
document.getElementById('hm').innerHTML = '<div id="current_date"><div id="current_month">' +
|
||||
Months[Mon] +
|
||||
'</div><div id="current_day">' +
|
||||
Day +
|
||||
'</div><div id="current_time">' +
|
||||
Hou + ':' + StrMin +
|
||||
'</span>';
|
||||
'</div></div>';
|
||||
}
|
||||
|
||||
function writeClockConnected () {
|
|
@ -808,8 +808,11 @@ bool Att_GetDataOfAttEventByCod (struct AttendanceEvent *Att)
|
|||
|
||||
static void Att_ResetAttendanceEvent (struct AttendanceEvent *Att)
|
||||
{
|
||||
if (Att->AttCod <= 0) // If > 0 ==> keep value
|
||||
if (Att->AttCod <= 0) // If > 0 ==> keep values of AttCod and Selected
|
||||
{
|
||||
Att->AttCod = -1L;
|
||||
Att->Selected = false;
|
||||
}
|
||||
Att->CrsCod = -1L;
|
||||
Att->Hidden = false;
|
||||
Att->UsrCod = -1L;
|
||||
|
@ -820,7 +823,6 @@ static void Att_ResetAttendanceEvent (struct AttendanceEvent *Att)
|
|||
Att->CommentTchVisible = false;
|
||||
Att->NumStdsTotal = 0;
|
||||
Att->NumStdsFromList = 0;
|
||||
Att->Selected = false;
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -191,14 +191,16 @@
|
|||
/****************************** Public constants *****************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
#define Log_PLATFORM_VERSION "SWAD 16.118.2 (2017-01-17)"
|
||||
#define CSS_FILE "swad16.111.5.css"
|
||||
#define JS_FILE "swad16.114.js"
|
||||
#define Log_PLATFORM_VERSION "SWAD 16.119 (2017-01-17)"
|
||||
#define CSS_FILE "swad16.119.css"
|
||||
#define JS_FILE "swad16.119.js"
|
||||
|
||||
// Number of lines (includes comments but not blank lines) has been got with the following command:
|
||||
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
|
||||
/*
|
||||
Version 16.118.2: Jan 17, 2017 Fix bug in string concatenation. (? lines)
|
||||
Version 16.119: Jan 17, 2017 Changes in layout of current data and time.
|
||||
Fixed bug in attendance, reported by Javier Fernández Baldomero. (211874 lines)
|
||||
Version 16.118.2: Jan 17, 2017 Fix bug in string concatenation. (211854 lines)
|
||||
Version 16.118.1: Jan 17, 2017 Code refactoring related to string concatenation. (211850 lines)
|
||||
Version 16.118: Jan 17, 2017 Code refactoring related to string copy. (211676 lines)
|
||||
Version 16.117.1: Jan 16, 2017 Code refactoring related to string concatenation. (211229 lines)
|
||||
|
|
|
@ -97,7 +97,7 @@ void Con_ShowConnectedUsrs (void)
|
|||
/* Current time */
|
||||
sprintf (Gbl.Title,"%s<br />%s %u, %u:%02u",
|
||||
Txt_Connected_users,
|
||||
Txt_MONTHS_SMALL_SHORT[Gbl.Now.Date.Month-1],
|
||||
Txt_MONTHS_SMALL_SHORT[Gbl.Now.Date.Month - 1],
|
||||
Gbl.Now.Date.Day,
|
||||
Gbl.Now.Time.Hour,
|
||||
Gbl.Now.Time.Minute);
|
||||
|
|
10
swad_date.c
10
swad_date.c
|
@ -160,16 +160,12 @@ bool Dat_GetDateFromYYYYMMDD (struct Date *Date,const char *YYYYMMDD)
|
|||
|
||||
void Dat_ShowClientLocalTime (void)
|
||||
{
|
||||
extern const char *The_ClassCurrentTime[The_NUM_THEMES];
|
||||
|
||||
fprintf (Gbl.F.Out,"<div id=\"hm\" class=\"%s\""
|
||||
" style=\"padding-top:10px;\">"
|
||||
fprintf (Gbl.F.Out,"<div id=\"hm\">"
|
||||
"</div>"
|
||||
"<script type=\"text/javascript\">\n"
|
||||
"secondsSince1970UTC = %ld;\n"
|
||||
"writeLocalClock();"
|
||||
"</script>",
|
||||
The_ClassCurrentTime[Gbl.Prefs.Theme],
|
||||
(long) Gbl.StartExecutionTimeUTC);
|
||||
}
|
||||
|
||||
|
@ -1274,7 +1270,7 @@ void Dat_AssignDate (struct Date *DateDst,struct Date *DateSrc)
|
|||
|
||||
void Dat_WriteScriptMonths (void)
|
||||
{
|
||||
extern const char *Txt_MONTHS_SMALL_SHORT[12];
|
||||
extern const char *Txt_MONTHS_SMALL[12];
|
||||
unsigned NumMonth;
|
||||
|
||||
fprintf (Gbl.F.Out,"var Months = [");
|
||||
|
@ -1284,7 +1280,7 @@ void Dat_WriteScriptMonths (void)
|
|||
{
|
||||
if (NumMonth)
|
||||
fprintf (Gbl.F.Out,",");
|
||||
fprintf (Gbl.F.Out,"'%s'",Txt_MONTHS_SMALL_SHORT[NumMonth]);
|
||||
fprintf (Gbl.F.Out,"'%s'",Txt_MONTHS_SMALL[NumMonth]);
|
||||
}
|
||||
fprintf (Gbl.F.Out,"];\n");
|
||||
}
|
||||
|
|
|
@ -892,6 +892,7 @@ unsigned Par_GetParMultiToText (const char *ParamName,char *ParamValue,size_t Ma
|
|||
{
|
||||
unsigned NumTimes = Par_GetParameter (Par_PARAM_MULTIPLE,ParamName,
|
||||
ParamValue,MaxBytes,NULL);
|
||||
|
||||
Str_ChangeFormat (Str_FROM_FORM,Str_TO_TEXT,
|
||||
ParamValue,MaxBytes,true);
|
||||
return NumTimes;
|
||||
|
|
|
@ -103,14 +103,6 @@ const char *The_ClassTagline[The_NUM_THEMES] =
|
|||
"YELLOW_TAGLINE",
|
||||
};
|
||||
|
||||
const char *The_ClassCurrentTime[The_NUM_THEMES] =
|
||||
{
|
||||
"WHITE_CUR_TIME",
|
||||
"GREY_CUR_TIME",
|
||||
"BLUE_CUR_TIME",
|
||||
"YELLOW_CUR_TIME",
|
||||
};
|
||||
|
||||
const char *The_ClassNotif[The_NUM_THEMES] =
|
||||
{
|
||||
"WHITE_NOTIF",
|
||||
|
|
Loading…
Reference in New Issue
Block a user