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.101.5

This commit is contained in:
Antonio Cañas Vargas 2019-12-28 19:13:37 +01:00
parent b9a4251d77
commit ee0549e3cb
4 changed files with 40 additions and 4086 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4064
css/swad19.101.1.css
View File

File diff suppressed because it is too large Load Diff

2
swad_centre.c
View File

@ -697,7 +697,7 @@ static void Ctr_ConfigPhoto (bool PrintView,bool PutForm,bool PutLink,
{
HTM_DIV_Begin ("class=\"CM\"");
Frm_StartForm (ActChgCtrPhoAtt);
HTM_TEXTAREA_Begin ("id=\"AttributionArea\" name=\"Attribution\" rows=\"2\""
HTM_TEXTAREA_Begin ("id=\"AttributionArea\" name=\"Attribution\" rows=\"3\""
" onchange=\"document.getElementById('%s').submit();return false;\"",
Gbl.Form.Id);
if (PhotoAttribution)

7
swad_changelog.h
View File

@ -492,8 +492,8 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 19.101.4 (2019-12-28)"
#define CSS_FILE "swad19.101.1.css"
#define Log_PLATFORM_VERSION "SWAD 19.101.5 (2019-12-28)"
#define CSS_FILE "swad19.101.5.css"
#define JS_FILE "swad19.91.1.js"
/*
// TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.)
@ -502,7 +502,8 @@ ps2pdf source.ps destination.pdf
Version 19.103: Dec 28, 2019 Map in country information. (? lines)
Version 19.102: Dec 28, 2019 Map in institution information. (? lines)
Version 19.101.4: Dec 28, 2019 Insti. information is splitted into two columns. (249324 lines)
Version 19.101.5: Dec 28, 2019 Country information is splitted into two columns. (249330 lines)
Version 19.101.4: Dec 28, 2019 Institution information is splitted into two columns. (249324 lines)
Version 19.101.3: Dec 28, 2019 Course information is splitted into two columns. (249308 lines)
Version 19.101.2: Dec 28, 2019 Degree information is splitted into two columns. (249303 lines)
Version 19.101.1: Dec 28, 2019 Centre information is splitted into two columns. (249297 lines)

53
swad_country.c
View File

@ -247,6 +247,7 @@ static void Cty_Configuration (bool PrintView)
{
extern const char *Hlp_COUNTRY_Information;
bool PutLink;
bool MapExists;
/***** Trivial check *****/
if (Gbl.Hierarchy.Cty.CtyCod <= 0) // No country selected
@ -266,9 +267,8 @@ static void Cty_Configuration (bool PrintView)
/***** Title *****/
Cty_ConfigTitle (PutLink);
/***** Country map *****/
if (Cty_CheckIfCountryMapExists (&Gbl.Hierarchy.Cty))
Cty_ConfigMap (PrintView,PutLink);
/**************************** Left part ***********************************/
HTM_DIV_Begin ("class=\"HIE_CFG_LEFT\"");
/***** Begin table *****/
HTM_TABLE_BeginWidePadding (2);
@ -305,6 +305,23 @@ static void Cty_Configuration (bool PrintView)
/***** End table *****/
HTM_TABLE_End ();
/***** End of left part *****/
HTM_DIV_End ();
/**************************** Right part **********************************/
/***** Check map *****/
MapExists = Cty_CheckIfCountryMapExists (&Gbl.Hierarchy.Cty);
if (MapExists)
{
HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT\"");
/***** Country map *****/
Cty_ConfigMap (PrintView,PutLink);
HTM_DIV_End ();
}
/***** End box *****/
Box_BoxEnd ();
}
@ -363,7 +380,7 @@ static void Cty_ConfigMap (bool PrintView,bool PutLink)
{
HTM_DIV_Begin ("class=\"CM\"");
Frm_StartForm (ActChgCtyMapAtt);
HTM_TEXTAREA_Begin ("name=\"Attribution\" cols=\"50\" rows=\"2\""
HTM_TEXTAREA_Begin ("id=\"AttributionArea\" name=\"Attribution\" rows=\"3\""
" onchange=\"document.getElementById('%s').submit();return false;\"",
Gbl.Form.Id);
if (MapAttribution)
@ -395,10 +412,10 @@ static void Cty_ConfigName (bool PutLink)
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RM",NULL,Txt_Country);
Frm_LabelColumn ("RT",NULL,Txt_Country);
/* Data */
HTM_TD_Begin ("class=\"DAT_N LM\"");
HTM_TD_Begin ("class=\"DAT_N LB\"");
if (PutLink)
HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"DAT_N\"",
Gbl.Hierarchy.Cty.WWW[Gbl.Prefs.Language]);
@ -440,10 +457,10 @@ static void Cty_ConfigNumUsrs (void)
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RM",NULL,Txt_Users_of_the_country);
Frm_LabelColumn ("RT",NULL,Txt_Users_of_the_country);
/* Data */
HTM_TD_Begin ("class=\"DAT LM\"");
HTM_TD_Begin ("class=\"DAT LB\"");
HTM_Unsigned (Usr_GetNumUsrsWhoClaimToBelongToCty (Gbl.Hierarchy.Cty.CtyCod));
HTM_TD_End ();
@ -463,10 +480,10 @@ static void Cty_ConfigNumInss (void)
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RM",NULL,Txt_Institutions);
Frm_LabelColumn ("RT",NULL,Txt_Institutions);
/* Data */
HTM_TD_Begin ("class=\"LM\"");
HTM_TD_Begin ("class=\"LB\"");
Frm_StartFormGoTo (ActSeeIns);
Cty_PutParamCtyCod (Gbl.Hierarchy.Cty.CtyCod);
snprintf (Gbl.Title,sizeof (Gbl.Title),
@ -493,10 +510,10 @@ static void Cty_ConfigNumCtrs (void)
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RM",NULL,Txt_Centres);
Frm_LabelColumn ("RT",NULL,Txt_Centres);
/* Data */
HTM_TD_Begin ("class=\"DAT LM\"");
HTM_TD_Begin ("class=\"DAT LB\"");
HTM_Unsigned (Ctr_GetNumCtrsInCty (Gbl.Hierarchy.Cty.CtyCod));
HTM_TD_End ();
@ -515,10 +532,10 @@ static void Cty_ConfigNumDegs (void)
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RM",NULL,Txt_Degrees);
Frm_LabelColumn ("RT",NULL,Txt_Degrees);
/* Data */
HTM_TD_Begin ("class=\"DAT LM\"");
HTM_TD_Begin ("class=\"DAT LB\"");
HTM_Unsigned (Deg_GetNumDegsInCty (Gbl.Hierarchy.Cty.CtyCod));
HTM_TD_End ();
@ -537,10 +554,10 @@ static void Cty_ConfigNumCrss (void)
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RM",NULL,Txt_Courses);
Frm_LabelColumn ("RT",NULL,Txt_Courses);
/* Data */
HTM_TD_Begin ("class=\"DAT LM\"");
HTM_TD_Begin ("class=\"DAT LB\"");
HTM_Unsigned (Crs_GetNumCrssInCty (Gbl.Hierarchy.Cty.CtyCod));
HTM_TD_End ();
@ -560,12 +577,12 @@ static void Cty_ShowNumUsrsInCrssOfCty (Rol_Role_t Role)
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RM",NULL,
Frm_LabelColumn ("RT",NULL,
Role == Rol_UNK ? Txt_Users_in_courses :
Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]);
/* Data */
HTM_TD_Begin ("class=\"DAT LM\"");
HTM_TD_Begin ("class=\"DAT LB\"");
HTM_Unsigned (Usr_GetNumUsrsInCrssOfCty (Role,Gbl.Hierarchy.Cty.CtyCod));
HTM_TD_End ();