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

Version19.38.1

This commit is contained in:
Antonio Cañas Vargas 2019-10-17 15:40:21 +02:00
parent 648c77195b
commit 1ed5e35ce4
10 changed files with 46 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
css/swad19.36.css → css/swad19.38.1.css
View File

@ -1304,6 +1304,30 @@ a:hover /* Default ==> underlined */
vertical-align:middle; vertical-align:middle;
} }
/********************************* Hierarchy *********************************/
.HIE_SEL
{
width:175px;
}
.HIE_LOGO
{
text-align:left;
vertical-align:middle;
width:25px;
}
#chart_div
{
width:600px;
margin:12px auto;
}
/********************************* Hierarchy *********************************/
.PLC_SEL
{
width:60px;
}
/*********************************** Month ***********************************/ /*********************************** Month ***********************************/
.CALENDAR .CALENDAR
{ {

2
swad_attendance.c
View File

@ -3353,7 +3353,7 @@ static void Att_WriteRowUsrSeveralAttEvents (unsigned NumUsr,struct UsrData *Usr
/***** Show user's photo *****/ /***** Show user's photo *****/
if (Gbl.Usrs.Listing.WithPhotos) if (Gbl.Usrs.Listing.WithPhotos)
{ {
Tbl_TD_Begin ("class=\"LM COLOR%u\" style=\"width:22px;\"",Gbl.RowEvenOdd); Tbl_TD_Begin ("class=\"LM COLOR%u\"",Gbl.RowEvenOdd);
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL); ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL : Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
NULL, NULL,

13
swad_centre.c
View File

@ -1409,7 +1409,7 @@ void Ctr_WriteSelectorOfCentre (void)
/***** Start form *****/ /***** Start form *****/
Frm_StartFormGoTo (ActSeeDeg); Frm_StartFormGoTo (ActSeeDeg);
fprintf (Gbl.F.Out,"<select id=\"ctr\" name=\"ctr\" style=\"width:175px;\""); fprintf (Gbl.F.Out,"<select id=\"ctr\" name=\"ctr\" class=\"HIE_SEL\"");
if (Gbl.Hierarchy.Ins.InsCod > 0) if (Gbl.Hierarchy.Ins.InsCod > 0)
fprintf (Gbl.F.Out," onchange=\"document.getElementById('%s').submit();\"", fprintf (Gbl.F.Out," onchange=\"document.getElementById('%s').submit();\"",
Gbl.Form.Id); Gbl.Form.Id);
@ -1515,8 +1515,7 @@ static void Ctr_ListCentresForEdition (void)
Tbl_TD_End (); Tbl_TD_End ();
/* Centre logo */ /* Centre logo */
Tbl_TD_Begin ("title=\"%s\" class=\"LM\" style=\"width:25px;\"", Tbl_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",Ctr->FullName);
Ctr->FullName);
Log_DrawLogo (Hie_CTR,Ctr->CtrCod,Ctr->ShrtName,20,NULL,true); Log_DrawLogo (Hie_CTR,Ctr->CtrCod,Ctr->ShrtName,20,NULL,true);
Tbl_TD_End (); Tbl_TD_End ();
@ -1526,7 +1525,7 @@ static void Ctr_ListCentresForEdition (void)
{ {
Frm_StartForm (ActChgCtrPlc); Frm_StartForm (ActChgCtrPlc);
Ctr_PutParamOtherCtrCod (Ctr->CtrCod); Ctr_PutParamOtherCtrCod (Ctr->CtrCod);
fprintf (Gbl.F.Out,"<select name=\"PlcCod\" style=\"width:62px;\"" fprintf (Gbl.F.Out,"<select name=\"PlcCod\" class=\"PLC_SEL\""
" onchange=\"document.getElementById('%s').submit();\">", " onchange=\"document.getElementById('%s').submit();\">",
Gbl.Form.Id); Gbl.Form.Id);
fprintf (Gbl.F.Out,"<option value=\"0\""); fprintf (Gbl.F.Out,"<option value=\"0\"");
@ -1564,7 +1563,6 @@ static void Ctr_ListCentresForEdition (void)
" onchange=\"document.getElementById('%s').submit();\" />", " onchange=\"document.getElementById('%s').submit();\" />",
Hie_MAX_CHARS_SHRT_NAME,Ctr->ShrtName,Gbl.Form.Id); Hie_MAX_CHARS_SHRT_NAME,Ctr->ShrtName,Gbl.Form.Id);
Frm_EndForm (); Frm_EndForm ();
Tbl_TD_End ();
} }
else else
fprintf (Gbl.F.Out,"%s",Ctr->ShrtName); fprintf (Gbl.F.Out,"%s",Ctr->ShrtName);
@ -1582,7 +1580,6 @@ static void Ctr_ListCentresForEdition (void)
" onchange=\"document.getElementById('%s').submit();\" />", " onchange=\"document.getElementById('%s').submit();\" />",
Hie_MAX_CHARS_FULL_NAME,Ctr->FullName,Gbl.Form.Id); Hie_MAX_CHARS_FULL_NAME,Ctr->FullName,Gbl.Form.Id);
Frm_EndForm (); Frm_EndForm ();
Tbl_TD_End ();
} }
else else
fprintf (Gbl.F.Out,"%s",Ctr->FullName); fprintf (Gbl.F.Out,"%s",Ctr->FullName);
@ -2523,13 +2520,13 @@ static void Ctr_PutFormToCreateCentre (void)
Tbl_TD_End (); Tbl_TD_End ();
/***** Centre logo *****/ /***** Centre logo *****/
Tbl_TD_Begin ("class=\"LM\" style=\"width:25px;\""); Tbl_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",Ctr_EditingCtr->FullName);
Log_DrawLogo (Hie_CTR,-1L,"",20,NULL,true); Log_DrawLogo (Hie_CTR,-1L,"",20,NULL,true);
Tbl_TD_End (); Tbl_TD_End ();
/***** Place *****/ /***** Place *****/
Tbl_TD_Begin ("class=\"LM\""); Tbl_TD_Begin ("class=\"LM\"");
fprintf (Gbl.F.Out,"<select name=\"PlcCod\" style=\"width:62px;\">" fprintf (Gbl.F.Out,"<select name=\"PlcCod\" class=\"PLC_SEL\">"
"<option value=\"0\""); "<option value=\"0\"");
if (Ctr_EditingCtr->PlcCod == 0) if (Ctr_EditingCtr->PlcCod == 0)
fprintf (Gbl.F.Out," selected=\"selected\""); fprintf (Gbl.F.Out," selected=\"selected\"");

5
swad_changelog.h
View File

@ -487,13 +487,14 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD: En OpenSWAD:
ps2pdf source.ps destination.pdf ps2pdf source.ps destination.pdf
*/ */
#define Log_PLATFORM_VERSION "SWAD 19.37 (2019-10-17)" #define Log_PLATFORM_VERSION "SWAD 19.38.1 (2019-10-17)"
#define CSS_FILE "swad19.36.css" #define CSS_FILE "swad19.38.1.css"
#define JS_FILE "swad19.35.js" #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: 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.) // TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.)
Version 19.38.1: Oct 17, 2019 Some CSS styles converted to CSS classes. (245636 lines)
Version 19.38: Oct 17, 2019 Filter to select faulty/faltless projects. (245624 lines) Version 19.38: Oct 17, 2019 Filter to select faulty/faltless projects. (245624 lines)
Version 19.37: Oct 16, 2019 New filter to select faulty/faltless projects. Not yet filtered. (245543 lines) Version 19.37: Oct 16, 2019 New filter to select faulty/faltless projects. Not yet filtered. (245543 lines)
Version 19.36: Oct 16, 2019 Some CSS styles converted to CSS classes. (245424 lines) Version 19.36: Oct 16, 2019 Some CSS styles converted to CSS classes. (245424 lines)

8
swad_country.c
View File

@ -630,11 +630,7 @@ void Cty_ListCountries2 (void)
/***** Div for Google Geochart *****/ /***** Div for Google Geochart *****/
if (Gbl.Action.Act == ActSeeCty) if (Gbl.Action.Act == ActSeeCty)
{ fprintf (Gbl.F.Out,"<div id=\"chart_div\"></div>");
fprintf (Gbl.F.Out,"<div id=\"chart_div\""
" style=\"width:600px; margin:12px auto;\">"
"</div>");
}
/***** Free list of countries *****/ /***** Free list of countries *****/
Cty_FreeListCountries (); Cty_FreeListCountries ();
@ -1224,7 +1220,7 @@ void Cty_WriteSelectorOfCountry (void)
/***** Start form *****/ /***** Start form *****/
Frm_StartFormGoTo (ActSeeIns); Frm_StartFormGoTo (ActSeeIns);
fprintf (Gbl.F.Out,"<select id=\"cty\" name=\"cty\" style=\"width:175px;\"" fprintf (Gbl.F.Out,"<select id=\"cty\" name=\"cty\" class=\"HIE_SEL\""
" onchange=\"document.getElementById('%s').submit();\">" " onchange=\"document.getElementById('%s').submit();\">"
"<option value=\"\"", "<option value=\"\"",
Gbl.Form.Id); Gbl.Form.Id);

5
swad_course.c
View File

@ -487,8 +487,7 @@ static void Crs_Configuration (bool PrintView)
Txt_of_PART_OF_A_TOTAL,Ind_NUM_INDICATORS); Txt_of_PART_OF_A_TOTAL,Ind_NUM_INDICATORS);
Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL); Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL);
fprintf (Gbl.F.Out,"%s " fprintf (Gbl.F.Out,"%s "
"<img src=\"%s/%s\" alt=\"%s\"" "<img src=\"%s/%s\" alt=\"%s\" class=\"ICO16x16\" />",
" class=\"ICO16x16\" />",
Gbl.Title, Gbl.Title,
Cfg_URL_ICON_PUBLIC, Cfg_URL_ICON_PUBLIC,
(Indicators.NumIndicators == Ind_NUM_INDICATORS) ? "check-circle.svg" : (Indicators.NumIndicators == Ind_NUM_INDICATORS) ? "check-circle.svg" :
@ -928,7 +927,7 @@ void Crs_WriteSelectorOfCourse (void)
/***** Start form *****/ /***** Start form *****/
Frm_StartFormGoTo (ActSeeCrsInf); Frm_StartFormGoTo (ActSeeCrsInf);
fprintf (Gbl.F.Out,"<select id=\"crs\" name=\"crs\" style=\"width:175px;\""); fprintf (Gbl.F.Out,"<select id=\"crs\" name=\"crs\" class=\"HIE_SEL\"");
if (Gbl.Hierarchy.Deg.DegCod > 0) if (Gbl.Hierarchy.Deg.DegCod > 0)
fprintf (Gbl.F.Out," onchange=\"document.getElementById('%s').submit();\"", fprintf (Gbl.F.Out," onchange=\"document.getElementById('%s').submit();\"",
Gbl.Form.Id); Gbl.Form.Id);

7
swad_degree.c
View File

@ -611,7 +611,7 @@ void Deg_WriteSelectorOfDegree (void)
/***** Start form *****/ /***** Start form *****/
Frm_StartFormGoTo (ActSeeCrs); Frm_StartFormGoTo (ActSeeCrs);
fprintf (Gbl.F.Out,"<select id=\"deg\" name=\"deg\" style=\"width:175px;\""); fprintf (Gbl.F.Out,"<select id=\"deg\" name=\"deg\" class=\"HIE_SEL\"");
if (Gbl.Hierarchy.Ctr.CtrCod > 0) if (Gbl.Hierarchy.Ctr.CtrCod > 0)
fprintf (Gbl.F.Out," onchange=\"document.getElementById('%s').submit();\"", fprintf (Gbl.F.Out," onchange=\"document.getElementById('%s').submit();\"",
Gbl.Form.Id); Gbl.Form.Id);
@ -746,8 +746,7 @@ static void Deg_ListDegreesForEdition (void)
Tbl_TD_End (); Tbl_TD_End ();
/* Degree logo */ /* Degree logo */
Tbl_TD_Begin ("title=\"%s LM\" style=\"width:25px;\"", Tbl_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",Deg->FullName);
Deg->FullName);
Log_DrawLogo (Hie_DEG,Deg->DegCod,Deg->ShrtName,20,NULL,true); Log_DrawLogo (Hie_DEG,Deg->DegCod,Deg->ShrtName,20,NULL,true);
Tbl_TD_End (); Tbl_TD_End ();
@ -979,7 +978,7 @@ static void Deg_PutFormToCreateDegree (void)
Tbl_TD_End (); Tbl_TD_End ();
/***** Degree logo *****/ /***** Degree logo *****/
Tbl_TD_Begin ("class=\"LM\" style=\"width:25px;\""); Tbl_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",Deg_EditingDeg->FullName);
Log_DrawLogo (Hie_DEG,-1L,"",20,NULL,true); Log_DrawLogo (Hie_DEG,-1L,"",20,NULL,true);
Tbl_TD_End (); Tbl_TD_End ();

4
swad_holiday.c
View File

@ -585,7 +585,7 @@ static void Hld_ListHolidaysForEdition (void)
Tbl_TD_Begin ("class=\"CM\""); Tbl_TD_Begin ("class=\"CM\"");
Frm_StartForm (ActChgHldPlc); Frm_StartForm (ActChgHldPlc);
Hld_PutParamHldCod (Hld->HldCod); Hld_PutParamHldCod (Hld->HldCod);
fprintf (Gbl.F.Out,"<select name=\"PlcCod\" style=\"width:62px;\"" fprintf (Gbl.F.Out,"<select name=\"PlcCod\" class=\"PLC_COD\""
" onchange=\"document.getElementById('%s').submit();\">" " onchange=\"document.getElementById('%s').submit();\">"
"<option value=\"-1\"", "<option value=\"-1\"",
Gbl.Form.Id); Gbl.Form.Id);
@ -988,7 +988,7 @@ static void Hld_PutFormToCreateHoliday (void)
/***** Holiday place *****/ /***** Holiday place *****/
Tbl_TD_Begin ("class=\"CM\""); Tbl_TD_Begin ("class=\"CM\"");
fprintf (Gbl.F.Out,"<select name=\"PlcCod\" style=\"width:62px;\">" fprintf (Gbl.F.Out,"<select name=\"PlcCod\" class=\"PLC_COD\">"
"<option value=\"-1\""); "<option value=\"-1\"");
if (Hld_EditingHld->PlcCod <= 0) if (Hld_EditingHld->PlcCod <= 0)
fprintf (Gbl.F.Out," selected=\"selected\""); fprintf (Gbl.F.Out," selected=\"selected\"");

7
swad_institution.c
View File

@ -1387,7 +1387,7 @@ void Ins_WriteSelectorOfInstitution (void)
/***** Start form *****/ /***** Start form *****/
Frm_StartFormGoTo (ActSeeCtr); Frm_StartFormGoTo (ActSeeCtr);
fprintf (Gbl.F.Out,"<select id=\"ins\" name=\"ins\" style=\"width:175px;\""); fprintf (Gbl.F.Out,"<select id=\"ins\" name=\"ins\" class=\"HIE_SEL\"");
if (Gbl.Hierarchy.Cty.CtyCod > 0) if (Gbl.Hierarchy.Cty.CtyCod > 0)
fprintf (Gbl.F.Out," onchange=\"document.getElementById('%s').submit();\"", fprintf (Gbl.F.Out," onchange=\"document.getElementById('%s').submit();\"",
Gbl.Form.Id); Gbl.Form.Id);
@ -1492,8 +1492,7 @@ static void Ins_ListInstitutionsForEdition (void)
Tbl_TD_End (); Tbl_TD_End ();
/* Institution logo */ /* Institution logo */
Tbl_TD_Begin ("title=\"%s\" class=\"LM\" style=\"width:25px;\"", Tbl_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",Ins->FullName);
Ins->FullName);
Log_DrawLogo (Hie_INS,Ins->InsCod,Ins->ShrtName,20,NULL,true); Log_DrawLogo (Hie_INS,Ins->InsCod,Ins->ShrtName,20,NULL,true);
Tbl_TD_End (); Tbl_TD_End ();
@ -2232,7 +2231,7 @@ static void Ins_PutFormToCreateInstitution (void)
Tbl_TD_End (); Tbl_TD_End ();
/***** Institution logo *****/ /***** Institution logo *****/
Tbl_TD_Begin ("class=\"LM\" style=\"width:25px;\""); Tbl_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",Ins_EditingIns->FullName);
Log_DrawLogo (Hie_INS,-1L,"",20,NULL,true); Log_DrawLogo (Hie_INS,-1L,"",20,NULL,true);
Tbl_TD_End (); Tbl_TD_End ();

2
swad_table.c
View File

@ -410,7 +410,7 @@ static void Tbl_TD_BeginWithoutAttr (void)
void Tbl_TD_End (void) void Tbl_TD_End (void)
{ {
if (Tbl_TD_NestingLevel == 0) // No TH open if (Tbl_TD_NestingLevel == 0) // No TH open
Ale_ShowAlert (Ale_ERROR,"Trying to close unopened TR."); Ale_ShowAlert (Ale_ERROR,"Trying to close unopened TD.");
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");