Version19.36

This commit is contained in:
Antonio Cañas Vargas 2019-10-16 00:06:02 +02:00
parent 2f9bff9a27
commit 65fdd65f53
15 changed files with 105 additions and 54 deletions

View File

@ -533,6 +533,12 @@ a:hover /* Default ==> underlined */
margin:1px;
}
/******************************** Search *************************************/
.WHAT_TO_SEARCH
{
width:186px;
}
/***************************** Notifications *********************************/
#msg /* Notifications, used for AJAX based refresh */
{
@ -1248,7 +1254,6 @@ a:hover /* Default ==> underlined */
{
box-sizing:border-box;
width:148px;
margin:6px 0;
background:white;
border-style:solid;
border-width:1px;
@ -1260,13 +1265,17 @@ a:hover /* Default ==> underlined */
}
#MFU_actions ul
{
display:inline-block;
box-sizing:border-box;
width:138px;
margin-top:2px;
padding-top:2px;
margin:2px 0;
padding:2px 0 0 0;
border-style:solid;
border-width:1px 0 0 0;
border-color:#DDECF1;
list-style-type:none;
text-align:left;
vertical-align:middle;
}
#MFU_actions li
{
@ -2174,7 +2183,7 @@ a:hover img.CENTRE_PHOTO_SHOW
}
/*********************************** Lists ***********************************/
.LIST_LEFT
.LIST_TABS
{
display:inline-block;
list-style-type:none;
@ -2183,6 +2192,15 @@ a:hover img.CENTRE_PHOTO_SHOW
text-align:left;
vertical-align:middle;
}
.LIST_LEFT
{
display:inline-block;
list-style-type:none;
padding:0;
margin:12px 0;
text-align:left;
vertical-align:middle;
}
/******************************* File browsers *******************************/
.FILENAME
@ -2589,6 +2607,11 @@ a:hover img.CENTRE_PHOTO_SHOW
text-align:left;
vertical-align:top;
}
.TEST_FILE_CONTENT
{
padding-bottom:20px;
}
/********************************** Matches **********************************/
.MATCH_CONT
@ -2897,6 +2920,12 @@ a:hover img.CENTRE_PHOTO_SHOW
.BT_I {background-color:#642075; border-color:#4b1858;} /* purple */
.BT_J {background-color:#f5e800; border-color:#b8ad00;} /* light yellow */
/********************************* Surveys ***********************************/
.SVY_OPT
{
width:50px;
}
/******************************* Time table **********************************/
.TT
{
@ -2962,9 +2991,15 @@ a:hover img.CENTRE_PHOTO_SHOW
.TT_LECT {box-sizing:border-box; height:16px; background-color:#C0DAE4; border:solid 2px; border-color:#D5F1FC #AAC1C9 #AAC1C9 #D5F1FC;}
.TT_PRAC {box-sizing:border-box; height:16px; background-color:#DBE5E9; border:solid 2px; border-color:#EDF8FC #C7D0D4 #C7D0D4 #EDF8FC;}
.TT_TUTO {box-sizing:border-box; height:16px; background-color:#D6E9C3; border:solid 2px; border-color:#E8FCD3 #C2D4B1 #C2D4B1 #E8FCD3;}
.TT_TYP, .TT_DUR, .TT_GRP, .TT_INF
{
width:80px;
font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif;
font-size:10pt;
border:0;
}
/********************************* Preference ********************************/
.PREF_CONTAINERS
{
margin:0 auto;
@ -3536,7 +3571,7 @@ a:hover img.CENTRE_PHOTO_SHOW
font-size:13pt;
line-height:1.4;
}
.MSG_TIT {color:#4D88A1; font-size:13pt;}
.MSG_TIT {color:#4D88A1; font-size:13pt;}
.MSG_TIT_NEW {color:#4D88A1; font-size:13pt; font-weight:bold;}
.MSG_TIT_REM {color:#AFC4CC; font-size:13pt;}
.MSG_TIT_BG
@ -3685,6 +3720,25 @@ a.PAG:hover, .PAG_CUR
height:10px;
}
/********************************** Statistics *******************************/
.STAT_SEL
{
width:300px;
}
/******************************** User's report ******************************/
.TITLE_REPORT
{
margin-bottom:10px;
}
/******************************* Users' ranking ******************************/
.RANK_PHOTO
{
width:34px;
height:48px;
}
/***************************** Public user's profile *************************/
.PRF_FIG_LEFT_CONTAINER
{

View File

@ -285,7 +285,7 @@ void MFU_WriteSmallMFUActions (struct MFU_ListMFUActions *ListMFUActions)
Frm_EndForm ();
/***** Write list of frequently used actions *****/
fprintf (Gbl.F.Out,"<ul class=\"LIST_LEFT\">");
fprintf (Gbl.F.Out,"<ul>");
for (NumAct = 0;
NumAct < ListMFUActions->NumActions;
NumAct++)

View File

@ -487,13 +487,14 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 19.35 (2019-10-15)"
#define CSS_FILE "swad19.35.css"
#define Log_PLATFORM_VERSION "SWAD 19.36 (2019-10-15)"
#define CSS_FILE "swad19.36.css"
#define JS_FILE "swad19.35.js"
/*
// TODO: Perico: poner un candado de bloqueo de creación/edición de proyectos (por ejemplo en asignaturas obsoletas)
// TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.)
Version 19.36: Oct 15, 2019 Some CSS styles converted to CSS classes. (245424 lines)
Version 19.35: Oct 15, 2019 Changes in CSS. (245373 lines)
Version 19.34.2: Oct 14, 2019 Fixed bug in IDs.
Fixed bug in timetable.

View File

@ -960,7 +960,7 @@ static void Enr_PutActionsRegRemSeveralUsrs (void)
extern const char *Txt_Eliminate_from_the_platform_the_users_indicated_in_step_1;
/***** Start list of options *****/
fprintf (Gbl.F.Out,"<ul class=\"LIST_LEFT %s\" style=\"margin:12px;\">",
fprintf (Gbl.F.Out,"<ul class=\"LIST_LEFT %s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
/***** Register / remove users listed or not listed *****/
@ -1505,7 +1505,7 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
}
/***** Start list of options *****/
fprintf (Gbl.F.Out,"<ul class=\"LIST_LEFT %s\" style=\"margin:12px;\">",
fprintf (Gbl.F.Out,"<ul class=\"LIST_LEFT %s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
/***** Register user in course / Modify user's data *****/
@ -2288,7 +2288,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
Sco_GetScope ("ScopeEnr");
/***** Start box *****/
Box_StartBox ("100%",Txt_Enrolment_requests,NULL,
Box_StartBox (NULL,Txt_Enrolment_requests,NULL,
Hlp_USERS_Requests,Box_NOT_CLOSABLE);
/***** Selection of scope and roles *****/

View File

@ -1566,7 +1566,7 @@ void Prf_ShowRankingFigure (MYSQL_RES **mysql_res,unsigned NumUsrs)
Prf_ShowUsrInRanking (&UsrDat,Rank);
Tbl_TD_Begin ("class=\"RM COLOR%u\" style=\"height:50px;\"",Gbl.RowEvenOdd);
Tbl_TD_Begin ("class=\"RM COLOR%u\"",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"%ld",Figure);
Tbl_TD_End ();
@ -1731,7 +1731,7 @@ void Prf_GetAndShowRankingClicksPerDay (void)
/***** Show row *****/
Tbl_TR_Begin (NULL);
Prf_ShowUsrInRanking (&UsrDat,Rank);
Tbl_TD_Begin ("class=\"RM COLOR%u\" style=\"height:50px;\"",Gbl.RowEvenOdd);
Tbl_TD_Begin ("class=\"RM COLOR%u\"",Gbl.RowEvenOdd);
Str_WriteFloatNumToFile (Gbl.F.Out,NumClicksPerDay);
Tbl_TD_End ();
Tbl_TR_End ();
@ -1758,12 +1758,12 @@ static void Prf_ShowUsrInRanking (struct UsrData *UsrDat,unsigned Rank)
char PhotoURL[PATH_MAX + 1];
bool Visible = Pri_ShowingIsAllowed (UsrDat->BaPrfVisibility,UsrDat);
Tbl_TD_Begin ("class=\"RANK RM COLOR%u\" style=\"height:50px;\"",Gbl.RowEvenOdd);
Tbl_TD_Begin ("class=\"RANK RM COLOR%u\"",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"#%u",Rank);
Tbl_TD_End ();
/***** Check if I can see the public profile *****/
Tbl_TD_Begin ("class=\"COLOR%u\" style=\"width:35px; height:50px;\"",Gbl.RowEvenOdd);
Tbl_TD_Begin ("class=\"RANK_PHOTO COLOR%u\"",Gbl.RowEvenOdd);
if (Visible)
{
/***** User's photo *****/
@ -1775,7 +1775,7 @@ static void Prf_ShowUsrInRanking (struct UsrData *UsrDat,unsigned Rank)
Tbl_TD_End ();
/***** Put form to go to public profile *****/
Tbl_TD_Begin ("class=\"COLOR%u\" style=\"height:50px;\"",Gbl.RowEvenOdd);
Tbl_TD_Begin ("class=\"COLOR%u\"",Gbl.RowEvenOdd);
if (Visible)
{
Frm_StartForm (ActSeeOthPubPrf);

View File

@ -106,7 +106,7 @@ extern struct Globals Gbl;
static void Rep_CreateMyUsageReport (struct Rep_Report *Report);
static void Rep_PutLinkToMyUsageReport (struct Rep_Report *Report);
static void Req_TitleReport (struct Rep_CurrentTimeUTC *CurrentTimeUTC);
static void Rep_TitleReport (struct Rep_CurrentTimeUTC *CurrentTimeUTC);
static void Rep_GetCurrentDateTimeUTC (struct Rep_Report *Report);
@ -163,7 +163,7 @@ void Rep_ReqMyUsageReport (void)
Hlp_ANALYTICS_Report,Box_NOT_CLOSABLE);
/***** Header *****/
Req_TitleReport (NULL); // NULL means do not write date
Rep_TitleReport (NULL); // NULL means do not write date
/***** Send button and end box *****/
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Generate_report);
@ -270,7 +270,7 @@ static void Rep_PutLinkToMyUsageReport (struct Rep_Report *Report)
Hlp_ANALYTICS_Report,Box_NOT_CLOSABLE);
/***** Header *****/
Req_TitleReport (&Report->CurrentTimeUTC);
Rep_TitleReport (&Report->CurrentTimeUTC);
/***** Put anchor and report filename *****/
fprintf (Gbl.F.Out,"<div class=\"FILENAME_TXT CM\">"
@ -298,12 +298,12 @@ static void Rep_PutLinkToMyUsageReport (struct Rep_Report *Report)
/*****************************************************************************/
// CurrentTimeUTC == NULL ==> do not write date
static void Req_TitleReport (struct Rep_CurrentTimeUTC *CurrentTimeUTC)
static void Rep_TitleReport (struct Rep_CurrentTimeUTC *CurrentTimeUTC)
{
extern const char *Txt_User[Usr_NUM_SEXS];
extern const char *Txt_Date;
fprintf (Gbl.F.Out,"<div class=\"DAT\" style=\"margin-bottom:10px;\">");
fprintf (Gbl.F.Out,"<div class=\"TITLE_REPORT DAT\">");
/***** User *****/
fprintf (Gbl.F.Out,"%s: <span class=\"DAT_N_BOLD\">%s</span>",

View File

@ -164,7 +164,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Hie
fprintf (Gbl.F.Out,"<label class=\"%s\">"
" %s&nbsp;",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_SEARCH_X_in_Y);
fprintf (Gbl.F.Out,"<select name=\"WhatToSearch\" style=\"width:186px;\">");
fprintf (Gbl.F.Out,"<select name=\"WhatToSearch\" class=\"WHAT_TO_SEARCH\">");
for (WhatToSearch = (Sch_WhatToSearch_t) 0;
WhatToSearch < Sch_NUM_WHAT_TO_SEARCH;
WhatToSearch++)
@ -257,7 +257,7 @@ void Sch_PutInputStringToSearch (const char *IdInputText)
if (!Gbl.Search.Str[0])
fprintf (Gbl.F.Out," placeholder=\"%s&hellip;\"",
Txt_Search);
fprintf (Gbl.F.Out," style=\"margin:0;\" />");
fprintf (Gbl.F.Out," />");
}
/*****************************************************************************/

View File

@ -552,7 +552,7 @@ void Sta_AskShowGblHits (void)
Tbl_TD_End ();
Tbl_TD_Begin ("colspan=\"2\" class=\"LM\"");
fprintf (Gbl.F.Out,"<select id=\"Role\" name=\"Role\">");
fprintf (Gbl.F.Out,"<select id=\"Role\" name=\"Role\" class=\"STAT_SEL\">");
for (RoleStat = (Sta_Role_t) 0;
RoleStat < Sta_NUM_ROLES_STAT;
RoleStat++)
@ -721,8 +721,7 @@ static void Sta_WriteSelectorAction (void)
Tbl_TD_End ();
Tbl_TD_Begin ("colspan=\"2\" class=\"LM\"");
fprintf (Gbl.F.Out,"<select id=\"StatAct\" name=\"StatAct\""
" style=\"width:375px;\">");
fprintf (Gbl.F.Out,"<select id=\"StatAct\" name=\"StatAct\" class=\"STAT_SEL\">");
for (Action = (Act_Action_t) 0;
Action < Act_NUM_ACTIONS;
Action++)
@ -1611,7 +1610,7 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql
Par_PutHiddenParamLong ("RowsPage",Gbl.Stat.RowsPerPage);
Usr_PutHiddenParSelectedUsrsCods ();
}
Tbl_TD_Begin ("class=\"LM\" style=\"width:20%%;\"");
Tbl_TD_Begin ("class=\"LM\"");
if (FirstRow > 1)
{
snprintf (Gbl.Title,sizeof (Gbl.Title),
@ -1626,7 +1625,7 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql
Frm_EndForm ();
/* Write number of current page */
Tbl_TD_Begin ("class=\"DAT_N CM\" style=\"width:60%%;\"");
Tbl_TD_Begin ("class=\"DAT_N CM\"");
fprintf (Gbl.F.Out,"<strong>"
"%s %lu-%lu %s %lu (%s %ld %s %lu)"
"</strong>",
@ -1647,7 +1646,7 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql
Par_PutHiddenParamUnsigned ("RowsPage" ,(unsigned) Gbl.Stat.RowsPerPage);
Usr_PutHiddenParSelectedUsrsCods ();
}
Tbl_TD_Begin ("class=\"RM\" style=\"width:20%%;\"");
Tbl_TD_Begin ("class=\"RM\"");
if (LastRow < NumRows)
{
snprintf (Gbl.Title,sizeof (Gbl.Title),

View File

@ -3440,7 +3440,7 @@ static void Svy_WriteAnswersOfAQst (struct Survey *Svy,
}
/* Write the number of option */
Tbl_TD_Begin ("class=\"LT\" style=\"width:50px;\"");
Tbl_TD_Begin ("class=\"SVY_OPT LT\"");
fprintf (Gbl.F.Out,"<label for=\"Ans%010u_%010u\" class=\"DAT\">"
"%u)"
"</label>",
@ -3502,7 +3502,7 @@ static void Svy_DrawBarNumUsrs (unsigned NumUsrs,unsigned MaxUsrs)
(float) MaxUsrs) + 0.5);
if (BarWidth < 2)
BarWidth = 2;
fprintf (Gbl.F.Out,"<img src=\"%s/c1x16.gif\" alt=\"%s\" title=\"%s\""
fprintf (Gbl.F.Out,"<img src=\"%s/o1x1.png\" alt=\"%s\" title=\"%s\""
" class=\"LT\" style=\"width:%upx; height:20px;\" />"
"&nbsp;",
Cfg_URL_ICON_PUBLIC,

View File

@ -139,18 +139,16 @@ void Syl_PutFormWhichSyllabus (void)
extern const char *Txt_SYLLABUS_WHICH_SYLLABUS[Syl_NUM_WHICH_SYLLABUS];
Syl_WhichSyllabus_t WhichSyllabus;
/***** Form to select which forums I want to see
(all my forums or only the forums of current institution/degree/course) *****/
/***** Form to select which syllabus I want to see (lectures/practicals) *****/
Frm_StartForm (ActSeeSyl);
fprintf (Gbl.F.Out,"<div class=\"CM\">"
"<ul class=\"LIST_LEFT\" style=\"margin:12px;\">");
"<ul class=\"LIST_LEFT\">");
for (WhichSyllabus = (Syl_WhichSyllabus_t) 0;
WhichSyllabus < For_NUM_FORUM_SETS;
WhichSyllabus++)
{
fprintf (Gbl.F.Out,"<li class=\"DAT LM\""
" style=\"display:inline;\">"
fprintf (Gbl.F.Out,"<li class=\"DAT LM\">"
"<label>"
"<input type=\"radio\" name=\"WhichSyllabus\" value=\"%u\"",
(unsigned) WhichSyllabus);

View File

@ -100,7 +100,7 @@ void Tab_DrawTabs (void)
/***** Start tabs container *****/
fprintf (Gbl.F.Out,"<div class=\"%s\">"
"<nav id=\"tabs\">"
"<ul class=\"LIST_LEFT\">",
"<ul class=\"LIST_TABS\">",
ClassHeadRow3[Gbl.Prefs.Theme]);
/***** Draw the tabs *****/

View File

@ -472,8 +472,7 @@ void Tst_ShowNewTest (void)
Tbl_TABLE_End ();
/***** Test result will be saved? *****/
fprintf (Gbl.F.Out,"<div class=\"CM\""
" style=\"margin-top:20px;\">"
fprintf (Gbl.F.Out,"<div class=\"CM\">"
"<label class=\"%s\">"
"<input type=\"checkbox\" name=\"Save\""
" value=\"Y\"",
@ -645,8 +644,7 @@ void Tst_ShowTstTotalMark (unsigned NumQsts,double TotalScore)
double TotalScoreOverSCORE_MAX = TotalScore * Tst_SCORE_MAX / (double) NumQsts;
/***** Write total mark ****/
fprintf (Gbl.F.Out,"<div class=\"DAT CM\""
" style=\"margin-top:20px;\">"
fprintf (Gbl.F.Out,"<div class=\"DAT CM\">"
"%s: <span class=\"%s\">%.2lf (%.2lf %s %u)</span>"
"</div>",
Txt_Score,

View File

@ -509,7 +509,7 @@ static void TsI_ImportQuestionsFromXMLBuffer (const char *XMLBuffer)
Hlp_ASSESSMENT_Tests,Box_NOT_CLOSABLE);
/***** Print XML tree *****/
fprintf (Gbl.F.Out,"<div class=\"CM\" style=\"padding-bottom:20px;\">"
fprintf (Gbl.F.Out,"<div class=\"TEST_FILE_CONTENT\">"
"<textarea title=\"%s\" cols=\"60\" rows=\"5\""
" spellcheck=\"false\" readonly>",
Txt_XML_file_content);

View File

@ -1311,8 +1311,7 @@ static void TT_TimeTableDrawDaysCells (void)
DayColumn++)
{
Weekday = (DayColumn + Gbl.Prefs.FirstDayOfWeek) % 7;
Tbl_TD_Begin ("colspan=\"%u\" class=\"%s CM\""
" style=\"width:%u%%;\"",
Tbl_TD_Begin ("colspan=\"%u\" class=\"%s CM\" style=\"width:%u%%;\"",
TT_NUM_MINICOLUMNS_PER_DAY,
Weekday == 6 ? "TT_SUNDAY" : // Sunday drawn in red
"TT_DAY", // Monday to Saturday
@ -1596,7 +1595,7 @@ static void TT_TimeTableDrawCell (unsigned Weekday,unsigned Interval,unsigned Co
Par_PutHiddenParamUnsigned ("TTCol",Column);
/***** Class type *****/
fprintf (Gbl.F.Out,"<select name=\"TTTyp\" style=\"width:68px;\""
fprintf (Gbl.F.Out,"<select name=\"TTTyp\" class=\"TT_TYP\""
" onchange=\"document.getElementById('%s').submit();\">",
Gbl.Form.Id);
for (CT = (TT_ClassType_t) 0;
@ -1634,7 +1633,7 @@ static void TT_TimeTableDrawCell (unsigned Weekday,unsigned Interval,unsigned Co
else
{
/***** Class duration *****/
fprintf (Gbl.F.Out,"<select name=\"TTDur\" style=\"width:57px;\""
fprintf (Gbl.F.Out,"<select name=\"TTDur\" class=\"TT_DUR\""
" onchange=\"document.getElementById('%s').submit();\">",
Gbl.Form.Id);
for (i = Interval + TT_TimeTable[Weekday][Interval].Columns[Column].DurationIntervals;
@ -1667,7 +1666,7 @@ static void TT_TimeTableDrawCell (unsigned Weekday,unsigned Interval,unsigned Co
"%s"
"</label>"
"<select id=\"TTGrp%s\" name=\"TTGrp\""
" style=\"width:110px;\""
" class=\"TT_GRP\""
" onchange=\"document.getElementById('%s').submit();\">",
CellStr,
Txt_Group,
@ -1710,7 +1709,7 @@ static void TT_TimeTableDrawCell (unsigned Weekday,unsigned Interval,unsigned Co
"</label>"
"<input id=\"TTInf%s\" name=\"TTInf\""
" type=\"text\" size=\"1\" maxlength=\"%u\""
" value=\"%s\""
" value=\"%s\" class=\"TT_INF\""
" onchange=\"document.getElementById('%s').submit();\" />",
CellStr,
Txt_Info,
@ -1729,7 +1728,7 @@ static void TT_TimeTableDrawCell (unsigned Weekday,unsigned Interval,unsigned Co
"</label>"
"<input id=\"TTInf%s\" name=\"TTInf\""
" type=\"text\" size=\"12\" maxlength=\"%u\""
" value=\"%s\""
" value=\"%s\" class=\"TT_INF\""
" onchange=\"document.getElementById('%s').submit();\" />",
CellStr,
Txt_Info,

View File

@ -7365,12 +7365,14 @@ void Usr_ListDataAdms (void)
if (Gbl.Usrs.LstUsrs[Rol_DEG_ADM].NumUsrs)
{
/****** Show photos? *****/
fprintf (Gbl.F.Out,"<div class=\"CM\" style=\"margin-bottom:8px;\">");
fprintf (Gbl.F.Out,"<div class=\"PREF_CONTAINER\">"
"<div class=\"PREF_OFF\">");
Frm_StartForm (ActLstOth);
Sco_PutParamCurrentScope ();
Usr_PutCheckboxListWithPhotos ();
Frm_EndForm ();
fprintf (Gbl.F.Out,"</div>");
fprintf (Gbl.F.Out,"</div>"
"</div>");
/***** Heading row with column names *****/
Tbl_TABLE_Begin (NULL);
@ -8367,7 +8369,7 @@ static void Usr_PutOptionsListUsrs (const bool ICanChooseOption[Usr_LIST_USRS_NU
/***** Write list of options *****/
/* Start list of options */
fprintf (Gbl.F.Out,"<ul class=\"LIST_LEFT %s\" style=\"margin:12px;\">",
fprintf (Gbl.F.Out,"<ul class=\"LIST_LEFT %s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
/* Show option items */