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.66: Feb 11, 2024 Responsive design in hierarchy configurations.

This commit is contained in:
acanas 2024-02-11 23:29:50 +01:00
parent 931cccc596
commit 9806bd9428
22 changed files with 164 additions and 407 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
css/swad23.65.css → css/swad23.66.css
View File

@ -1451,12 +1451,11 @@ a:hover /* Default ==> underlined */
display:inline-block; display:inline-block;
margin:0 6px; margin:0 6px;
vertical-align:top; vertical-align:top;
width:480px; width:520px;
} }
@media only screen and (max-width:590px) @media only screen and (max-width:590px)
{ /* For mobile-phones (maximum width visible on Moto G4 vertical) */ { /* For mobile-phones (maximum width visible on Moto G4 vertical) */
.HIE_CFG_WIDTH {width:260px;}
.COUNTRY_MAP_SHOW, .COUNTRY_MAP_PRINT .COUNTRY_MAP_SHOW, .COUNTRY_MAP_PRINT
{ {
box-sizing:border-box; box-sizing:border-box;
@ -1473,7 +1472,6 @@ a:hover /* Default ==> underlined */
} }
@media only screen and (min-width:590px) @media only screen and (min-width:590px)
{ /* For tablets and desktop (maximum width visible on Moto G4 horizontal) */ { /* For tablets and desktop (maximum width visible on Moto G4 horizontal) */
.HIE_CFG_WIDTH {width:480px;}
.COUNTRY_MAP_SHOW, .COUNTRY_MAP_PRINT .COUNTRY_MAP_SHOW, .COUNTRY_MAP_PRINT
{ {
box-sizing:border-box; box-sizing:border-box;
@ -3281,7 +3279,7 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
width:276px; width:276px;
} }
} }
@media only screen and (min-width:600px) and (max-width:1024px) @media only screen and (min-width:600px)
{ /* For desktop */ { /* For desktop */
.Frm_C1 .Frm_C1
{ {
@ -3303,8 +3301,9 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
width:382px; width:382px;
} }
} }
/*
@media only screen and (min-width:1024px) @media only screen and (min-width:1024px)
{ /* For desktop */ { * For desktop *
.Frm_C1 .Frm_C1
{ {
box-sizing:border-box; box-sizing:border-box;
@ -3325,7 +3324,7 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
width:700px; width:700px;
} }
} }
*/
/******************************** Class photo ********************************/ /******************************** Class photo ********************************/
.CLASSPHOTO_TITLE .CLASSPHOTO_TITLE
{ {
@ -5350,16 +5349,11 @@ table.TBL_WIDE > tbody > tr > th {padding:2px;}
box-sizing:border-box; box-sizing:border-box;
width:100px; width:100px;
} }
.INPUT_WWW_NARROW .INPUT_WWW
{ {
box-sizing:border-box; box-sizing:border-box;
width:90px; width:90px;
} }
.INPUT_WWW_WIDE
{
box-sizing:border-box;
width:180px;
}
.INPUT_COORD .INPUT_COORD
{ {
box-sizing:border-box; box-sizing:border-box;
@ -5385,9 +5379,9 @@ table.TBL_WIDE > tbody > tr > th {padding:2px;}
/******************************** Last clicks ********************************/ /******************************** Last clicks ********************************/
.LC_CLK {text-align:right; vertical-align:top; min-width:60px;} .LC_CLK {text-align:right; vertical-align:top; min-width:60px;}
.LC_TIM {text-align:right; vertical-align:top; min-width:60px; max-width:60px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} .LC_TIM {text-align:right; vertical-align:top; min-width:60px; max-width:60px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
.LC_ROL {text-align:left; vertical-align:top; min-width:100px; max-width:100px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} .LC_ROL {text-align:left; vertical-align:top; min-width:90px; max-width:90px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
.LC_HIE {text-align:left; vertical-align:top; min-width:100px; max-width:100px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} .LC_HIE {text-align:left; vertical-align:top; min-width:90px; max-width:90px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
.LC_ACT {text-align:left; vertical-align:top; min-width:200px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} .LC_ACT {text-align:left; vertical-align:top; min-width:200px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
/*********************** Listing my courses as a tree ************************/ /*********************** Listing my courses as a tree ************************/

3
swad_assignment.c
View File

@ -775,8 +775,7 @@ static void Asg_PutIconsToRemEditOneAsg (struct Asg_Assignments *Assignments,
case Rol_STD: case Rol_STD:
case Rol_NET: case Rol_NET:
/***** Icon to print assignment *****/ /***** Icon to print assignment *****/
Ico_PutContextualIconToPrint (ActPrnOneAsg, Ico_PutContextualIconToPrint (ActPrnOneAsg,Asg_PutPars,Assignments);
Asg_PutPars,Assignments);
break; break;
default: default:
break; break;

4
swad_banner.c
View File

@ -465,7 +465,7 @@ static void Ban_ListBannersForEdition (struct Ban_Banners *Banners)
Frm_BeginForm (ActChgBanWWW); Frm_BeginForm (ActChgBanWWW);
ParCod_PutPar (ParCod_Ban,Banners->BanCodToEdit); ParCod_PutPar (ParCod_Ban,Banners->BanCodToEdit);
HTM_INPUT_URL ("WWW",Ban->WWW,HTM_SUBMIT_ON_CHANGE, HTM_INPUT_URL ("WWW",Ban->WWW,HTM_SUBMIT_ON_CHANGE,
"class=\"INPUT_WWW_NARROW INPUT_%s\"" "class=\"INPUT_WWW INPUT_%s\""
" required=\"required\"", " required=\"required\"",
The_GetSuffix ()); The_GetSuffix ());
Frm_EndForm (); Frm_EndForm ();
@ -810,7 +810,7 @@ static void Ban_PutFormToCreateBanner (const struct Ban_Banner *Ban)
/* Banner WWW */ /* Banner WWW */
HTM_TD_Begin ("class=\"LM\""); HTM_TD_Begin ("class=\"LM\"");
HTM_INPUT_URL ("WWW",Ban->WWW,HTM_DONT_SUBMIT_ON_CHANGE, HTM_INPUT_URL ("WWW",Ban->WWW,HTM_DONT_SUBMIT_ON_CHANGE,
"class=\"INPUT_WWW_NARROW INPUT_%s\"" "class=\"INPUT_WWW INPUT_%s\""
" required=\"required\"", " required=\"required\"",
The_GetSuffix ()); The_GetSuffix ());
HTM_TD_End (); HTM_TD_End ();

3
swad_calendar.c
View File

@ -308,8 +308,7 @@ static void Cal_DrawCalendar (Act_Action_t ActionSeeCalendar,
static void Cal_PutIconsCalendar (__attribute__((unused)) void *Args) static void Cal_PutIconsCalendar (__attribute__((unused)) void *Args)
{ {
/***** Print calendar *****/ /***** Print calendar *****/
Ico_PutContextualIconToPrint (ActPrnCal, Ico_PutContextualIconToPrint (ActPrnCal,NULL,NULL);
NULL,NULL);
/***** View holidays *****/ /***** View holidays *****/
if (Gbl.Hierarchy.Level == Hie_INS) // Institution selected if (Gbl.Hierarchy.Level == Hie_INS) // Institution selected

4
swad_center.c
View File

@ -845,7 +845,7 @@ static void Ctr_ListCentersForEdition (const struct Plc_Places *Places)
Frm_BeginForm (ActChgCtrWWW); Frm_BeginForm (ActChgCtrWWW);
ParCod_PutPar (ParCod_OthHie,Ctr->HieCod); ParCod_PutPar (ParCod_OthHie,Ctr->HieCod);
HTM_INPUT_URL ("WWW",Ctr->WWW,HTM_SUBMIT_ON_CHANGE, HTM_INPUT_URL ("WWW",Ctr->WWW,HTM_SUBMIT_ON_CHANGE,
"class=\"INPUT_WWW_NARROW INPUT_%s\"" "class=\"INPUT_WWW INPUT_%s\""
" required=\"required\"", " required=\"required\"",
The_GetSuffix ()); The_GetSuffix ());
Frm_EndForm (); Frm_EndForm ();
@ -1292,7 +1292,7 @@ static void Ctr_PutFormToCreateCenter (const struct Plc_Places *Places)
/***** Center WWW *****/ /***** Center WWW *****/
HTM_TD_Begin ("class=\"LM\""); HTM_TD_Begin ("class=\"LM\"");
HTM_INPUT_URL ("WWW",Ctr_EditingCtr->WWW,HTM_DONT_SUBMIT_ON_CHANGE, HTM_INPUT_URL ("WWW",Ctr_EditingCtr->WWW,HTM_DONT_SUBMIT_ON_CHANGE,
"class=\"INPUT_WWW_NARROW INPUT_%s\"" "class=\"INPUT_WWW INPUT_%s\""
" required=\"required\"", " required=\"required\"",
The_GetSuffix ()); The_GetSuffix ());
HTM_TD_End (); HTM_TD_End ();

111
swad_center_config.c
View File

@ -88,12 +88,7 @@ static void CtrCfg_Photo (Vie_ViewType_t ViewType,
static void CtrCfg_GetPhotoAttr (long CtrCod,char **PhotoAttribution); static void CtrCfg_GetPhotoAttr (long CtrCod,char **PhotoAttribution);
static void CtrCfg_FreePhotoAttr (char **PhotoAttribution); static void CtrCfg_FreePhotoAttr (char **PhotoAttribution);
static void CtrCfg_Institution (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm); static void CtrCfg_Institution (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm);
static void CtrCfg_FullName (Frm_PutForm_t PutForm);
static void CtrCfg_ShrtName (Frm_PutForm_t PutForm);
static void CtrCfg_Place (Frm_PutForm_t PutForm); static void CtrCfg_Place (Frm_PutForm_t PutForm);
static void CtrCfg_WWW (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm);
static void CtrCfg_Shortcut (Vie_ViewType_t ViewType);
static void CtrCfg_QR (void);
static void CtrCfg_NumUsrs (void); static void CtrCfg_NumUsrs (void);
static void CtrCfg_NumDegs (void); static void CtrCfg_NumDegs (void);
static void CtrCfg_NumCrss (void); static void CtrCfg_NumCrss (void);
@ -173,17 +168,17 @@ static void CtrCfg_Configuration (Vie_ViewType_t ViewType)
HieCfg_Title (PutLink,Hie_CTR); HieCfg_Title (PutLink,Hie_CTR);
/**************************** Left part ***********************************/ /**************************** Left part ***********************************/
HTM_DIV_Begin ("class=\"HIE_CFG_LEFT HIE_CFG_WIDTH\""); HTM_DIV_Begin ("class=\"HIE_CFG_LEFT\"");
/***** Begin table *****/ /***** Begin table *****/
HTM_TABLE_BeginWidePadding (2); HTM_TABLE_BeginPadding (2);
/***** Institution *****/ /***** Institution *****/
CtrCfg_Institution (ViewType,PutFormIns); CtrCfg_Institution (ViewType,PutFormIns);
/***** Center name *****/ /***** Center name *****/
CtrCfg_FullName (PutFormName); HieCfg_Name (PutFormName,Hie_CTR,Nam_FULL_NAME);
CtrCfg_ShrtName (PutFormName); HieCfg_Name (PutFormName,Hie_CTR,Nam_SHRT_NAME);
/***** Place *****/ /***** Place *****/
CtrCfg_Place (PutFormPlc); CtrCfg_Place (PutFormPlc);
@ -197,10 +192,10 @@ static void CtrCfg_Configuration (Vie_ViewType_t ViewType)
} }
/***** Center WWW *****/ /***** Center WWW *****/
CtrCfg_WWW (ViewType,PutFormWWW); HieCfg_WWW (ViewType,PutFormWWW,ActChgCtrWWWCfg,Gbl.Hierarchy.Node[Hie_CTR].WWW);
/***** Shortcut to the center *****/ /***** Shortcut to the center *****/
CtrCfg_Shortcut (ViewType); HieCfg_Shortcut (ViewType,ParCod_Ctr,Gbl.Hierarchy.Node[Hie_CTR].HieCod);
switch (ViewType) switch (ViewType)
{ {
@ -220,7 +215,7 @@ static void CtrCfg_Configuration (Vie_ViewType_t ViewType)
break; break;
case Vie_PRINT: case Vie_PRINT:
/***** QR code with link to the center *****/ /***** QR code with link to the center *****/
CtrCfg_QR (); HieCfg_QR (ParCod_Ctr,Gbl.Hierarchy.Node[Hie_CTR].HieCod);
break; break;
default: default:
Err_WrongTypeExit (); Err_WrongTypeExit ();
@ -247,7 +242,7 @@ static void CtrCfg_Configuration (Vie_ViewType_t ViewType)
if (MapIsAvailable || PhotoExists) if (MapIsAvailable || PhotoExists)
{ {
HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT HIE_CFG_WIDTH\""); HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT\"");
/***** Center map *****/ /***** Center map *****/
if (MapIsAvailable) if (MapIsAvailable)
@ -271,8 +266,7 @@ static void CtrCfg_Configuration (Vie_ViewType_t ViewType)
static void CtrCfg_PutIconsCtrConfig (__attribute__((unused)) void *Args) static void CtrCfg_PutIconsCtrConfig (__attribute__((unused)) void *Args)
{ {
/***** Put icon to print info about center *****/ /***** Put icon to print info about center *****/
Ico_PutContextualIconToPrint (ActPrnCtrInf, Ico_PutContextualIconToPrint (ActPrnCtrInf,NULL,NULL);
NULL,NULL);
/***** Put icon to view places *****/ /***** Put icon to view places *****/
Plc_PutIconToViewPlaces (); Plc_PutIconToViewPlaces ();
@ -350,10 +344,10 @@ static void CtrCfg_Latitude (double Latitude)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT","Latitude",Txt_Latitude); Frm_LabelColumn ("Frm_C1 RT","Latitude",Txt_Latitude);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB\""); HTM_TD_Begin ("class=\"Frm_C2 LB\"");
Frm_BeginForm (ActChgCtrLatCfg); Frm_BeginForm (ActChgCtrLatCfg);
HTM_INPUT_FLOAT ("Latitude", HTM_INPUT_FLOAT ("Latitude",
-90.0, // South Pole -90.0, // South Pole
@ -361,7 +355,7 @@ static void CtrCfg_Latitude (double Latitude)
0.0, // step="any" 0.0, // step="any"
Latitude, Latitude,
HTM_SUBMIT_ON_CHANGE,false, HTM_SUBMIT_ON_CHANGE,false,
"class=\"INPUT_COORD INPUT_%s\"" "class=\"Frm_C2_INPUT INPUT_%s\""
" required=\"required\"", " required=\"required\"",
The_GetSuffix ()); The_GetSuffix ());
Frm_EndForm (); Frm_EndForm ();
@ -378,10 +372,10 @@ static void CtrCfg_Longitude (double Longitude)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT","Longitude",Txt_Longitude); Frm_LabelColumn ("Frm_C1 RT","Longitude",Txt_Longitude);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB\""); HTM_TD_Begin ("class=\"Frm_C2 LB\"");
Frm_BeginForm (ActChgCtrLgtCfg); Frm_BeginForm (ActChgCtrLgtCfg);
HTM_INPUT_FLOAT ("Longitude", HTM_INPUT_FLOAT ("Longitude",
-180.0, // West -180.0, // West
@ -389,7 +383,7 @@ static void CtrCfg_Longitude (double Longitude)
0.0, // step="any" 0.0, // step="any"
Longitude, Longitude,
HTM_SUBMIT_ON_CHANGE,false, HTM_SUBMIT_ON_CHANGE,false,
"class=\"INPUT_COORD INPUT_%s\"" "class=\"Frm_C2_INPUT INPUT_%s\""
" required=\"required\"", " required=\"required\"",
The_GetSuffix ()); The_GetSuffix ());
Frm_EndForm (); Frm_EndForm ();
@ -406,10 +400,10 @@ static void CtrCfg_Altitude (double Altitude)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT","Altitude",Txt_Altitude); Frm_LabelColumn ("Frm_C1 RT","Altitude",Txt_Altitude);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB\""); HTM_TD_Begin ("class=\"Frm_C2 LB\"");
Frm_BeginForm (ActChgCtrAltCfg); Frm_BeginForm (ActChgCtrAltCfg);
HTM_INPUT_FLOAT ("Altitude", HTM_INPUT_FLOAT ("Altitude",
-413.0, // Dead Sea shore -413.0, // Dead Sea shore
@ -417,7 +411,7 @@ static void CtrCfg_Altitude (double Altitude)
0.0, // step="any" 0.0, // step="any"
Altitude, Altitude,
HTM_SUBMIT_ON_CHANGE,false, HTM_SUBMIT_ON_CHANGE,false,
"class=\"INPUT_COORD INPUT_%s\"" "class=\"Frm_C2_INPUT INPUT_%s\""
" required=\"required\"", " required=\"required\"",
The_GetSuffix ()); The_GetSuffix ());
Frm_EndForm (); Frm_EndForm ();
@ -564,10 +558,10 @@ static void CtrCfg_Institution (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",Id[PutForm],Txt_HIERARCHY_SINGUL_Abc[Hie_INS]); Frm_LabelColumn ("Frm_C1 RT",Id[PutForm],Txt_HIERARCHY_SINGUL_Abc[Hie_INS]);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LT DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LT DAT_%s\"",The_GetSuffix ());
switch (PutForm) switch (PutForm)
{ {
case Frm_DONT_PUT_FORM: case Frm_DONT_PUT_FORM:
@ -598,7 +592,7 @@ static void CtrCfg_Institution (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm)
Frm_BeginForm (ActChgCtrInsCfg); Frm_BeginForm (ActChgCtrInsCfg);
HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,NULL, HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,NULL,
"id=\"OthInsCod\" name=\"OthInsCod\"" "id=\"OthInsCod\" name=\"OthInsCod\""
" class=\"INPUT_SHORT_NAME INPUT_%s\"", " class=\"Frm_C2_INPUT INPUT_%s\"",
The_GetSuffix ()); The_GetSuffix ());
for (NumIns = 0; for (NumIns = 0;
NumIns < Gbl.Hierarchy.List[Hie_CTY].Num; NumIns < Gbl.Hierarchy.List[Hie_CTY].Num;
@ -623,24 +617,6 @@ static void CtrCfg_Institution (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm)
HTM_TR_End (); HTM_TR_End ();
} }
/*****************************************************************************/
/************** Show center full name in center configuration ****************/
/*****************************************************************************/
static void CtrCfg_FullName (Frm_PutForm_t PutForm)
{
HieCfg_Name (PutForm,Hie_CTR,Nam_FULL_NAME);
}
/*****************************************************************************/
/************** Show center short name in center configuration ***************/
/*****************************************************************************/
static void CtrCfg_ShrtName (Frm_PutForm_t PutForm)
{
HieCfg_Name (PutForm,Hie_CTR,Nam_SHRT_NAME);
}
/*****************************************************************************/ /*****************************************************************************/
/**************** Show center place in center configuration ******************/ /**************** Show center place in center configuration ******************/
/*****************************************************************************/ /*****************************************************************************/
@ -666,10 +642,10 @@ static void CtrCfg_Place (Frm_PutForm_t PutForm)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",Id[PutForm],Txt_Place); Frm_LabelColumn ("Frm_C1 RT",Id[PutForm],Txt_Place);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ());
switch (PutForm) switch (PutForm)
{ {
@ -688,7 +664,7 @@ static void CtrCfg_Place (Frm_PutForm_t PutForm)
Frm_BeginForm (ActChgCtrPlcCfg); Frm_BeginForm (ActChgCtrPlcCfg);
HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,NULL, HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,NULL,
"name=\"PlcCod\"" "name=\"PlcCod\""
" class=\"INPUT_SHORT_NAME INPUT_%s\"", " class=\"Frm_C2_INPUT INPUT_%s\"",
The_GetSuffix ()); The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"0", HTM_OPTION (HTM_Type_STRING,"0",
Gbl.Hierarchy.Node[Hie_CTR].Specific.PlcCod == 0 ? HTM_OPTION_SELECTED : Gbl.Hierarchy.Node[Hie_CTR].Specific.PlcCod == 0 ? HTM_OPTION_SELECTED :
@ -716,33 +692,6 @@ static void CtrCfg_Place (Frm_PutForm_t PutForm)
HTM_TR_End (); HTM_TR_End ();
} }
/*****************************************************************************/
/***************** Show center WWW in center configuration *******************/
/*****************************************************************************/
static void CtrCfg_WWW (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm)
{
HieCfg_WWW (ViewType,PutForm,ActChgCtrWWWCfg,Gbl.Hierarchy.Node[Hie_CTR].WWW);
}
/*****************************************************************************/
/*************** Show center shortcut in center configuration ****************/
/*****************************************************************************/
static void CtrCfg_Shortcut (Vie_ViewType_t ViewType)
{
HieCfg_Shortcut (ViewType,ParCod_Ctr,Gbl.Hierarchy.Node[Hie_CTR].HieCod);
}
/*****************************************************************************/
/****************** Show center QR in center configuration *******************/
/*****************************************************************************/
static void CtrCfg_QR (void)
{
HieCfg_QR (ParCod_Ctr,Gbl.Hierarchy.Node[Hie_CTR].HieCod);
}
/*****************************************************************************/ /*****************************************************************************/
/*** Show number of users who claim to belong to center in center config. ****/ /*** Show number of users who claim to belong to center in center config. ****/
/*****************************************************************************/ /*****************************************************************************/
@ -755,10 +704,10 @@ static void CtrCfg_NumUsrs (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",NULL,Txt_Users_of_the_center); Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_Users_of_the_center);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ());
HTM_Unsigned (Hie_GetCachedNumUsrsWhoClaimToBelongTo (Hie_CTR, HTM_Unsigned (Hie_GetCachedNumUsrsWhoClaimToBelongTo (Hie_CTR,
&Gbl.Hierarchy.Node[Hie_CTR])); &Gbl.Hierarchy.Node[Hie_CTR]));
HTM_TD_End (); HTM_TD_End ();
@ -780,10 +729,10 @@ static void CtrCfg_NumDegs (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_DEG]); Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_DEG]);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ());
Frm_BeginFormGoTo (ActSeeDeg); Frm_BeginFormGoTo (ActSeeDeg);
ParCod_PutPar (ParCod_Ctr,Gbl.Hierarchy.Node[Hie_CTR].HieCod); ParCod_PutPar (ParCod_Ctr,Gbl.Hierarchy.Node[Hie_CTR].HieCod);
if (asprintf (&Title,Txt_Degrees_of_CENTER_X, if (asprintf (&Title,Txt_Degrees_of_CENTER_X,
@ -813,10 +762,10 @@ static void CtrCfg_NumCrss (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CRS]); Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CRS]);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ());
HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_CRS, // Number of courses... HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_CRS, // Number of courses...
Hie_CTR, // ...in center Hie_CTR, // ...in center
Gbl.Hierarchy.Node[Hie_CTR].HieCod)); Gbl.Hierarchy.Node[Hie_CTR].HieCod));

5
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') "can npt create received message (duplicated entry '243218-2160773' for key 'UsrCod_MsgCod')
*/ */
#define Log_PLATFORM_VERSION "SWAD 23.65 (2024-02-09)" #define Log_PLATFORM_VERSION "SWAD 23.66 (2024-02-10)"
#define CSS_FILE "swad23.65.css" #define CSS_FILE "swad23.66.css"
#define JS_FILE "swad23.53.6.js" #define JS_FILE "swad23.53.6.js"
/* /*
Version 23.66: Feb 11, 2024 Responsive design in hierarchy configurations. (335306 lines)
Version 23.65: Feb 09, 2024 Responsive design in last clicks. (335502 lines) Version 23.65: Feb 09, 2024 Responsive design in last clicks. (335502 lines)
Version 23.64.1: Feb 06, 2024 Fixed CSS bug. Reported by Francisco Ocaña Lara. (335505 lines) Version 23.64.1: Feb 06, 2024 Fixed CSS bug. Reported by Francisco Ocaña Lara. (335505 lines)
Version 23.64: Jan 30, 2024 Responsive design. (335503 lines) Version 23.64: Jan 30, 2024 Responsive design. (335503 lines)

4
swad_country.c
View File

@ -1130,7 +1130,7 @@ static void Cty_ListCountriesForEdition (void)
ParCod_PutPar (ParCod_OthCty,Cty->HieCod); ParCod_PutPar (ParCod_OthCty,Cty->HieCod);
Par_PutParUnsigned (NULL,"Lan",(unsigned) Lan); Par_PutParUnsigned (NULL,"Lan",(unsigned) Lan);
HTM_INPUT_URL ("WWW",WWWInSeveralLanguages[Lan],HTM_SUBMIT_ON_CHANGE, HTM_INPUT_URL ("WWW",WWWInSeveralLanguages[Lan],HTM_SUBMIT_ON_CHANGE,
"class=\"INPUT_WWW_NARROW INPUT_%s\"" "class=\"INPUT_WWW INPUT_%s\""
" required=\"required\"", " required=\"required\"",
The_GetSuffix ()); The_GetSuffix ());
Frm_EndForm (); Frm_EndForm ();
@ -1463,7 +1463,7 @@ static void Cty_PutFormToCreateCountry (void)
HTM_TD_Begin ("class=\"LM\""); HTM_TD_Begin ("class=\"LM\"");
snprintf (StrName,sizeof (StrName),"WWW_%s",Lan_STR_LANG_ID[Lan]); snprintf (StrName,sizeof (StrName),"WWW_%s",Lan_STR_LANG_ID[Lan]);
HTM_INPUT_URL (StrName,"",HTM_DONT_SUBMIT_ON_CHANGE, HTM_INPUT_URL (StrName,"",HTM_DONT_SUBMIT_ON_CHANGE,
"class=\"INPUT_WWW_NARROW INPUT_%s\"" "class=\"INPUT_WWW INPUT_%s\""
" required=\"required\"", " required=\"required\"",
The_GetSuffix ()); The_GetSuffix ());
HTM_TD_End (); HTM_TD_End ();

60
swad_country_config.c
View File

@ -65,8 +65,6 @@ static void CtyCfg_Map (void);
static void CtyCfg_MapImage (Vie_ViewType_t ViewType,Hie_PutLink_t PutLink); static void CtyCfg_MapImage (Vie_ViewType_t ViewType,Hie_PutLink_t PutLink);
static void CtyCfg_Platform (Vie_ViewType_t ViewType); static void CtyCfg_Platform (Vie_ViewType_t ViewType);
static void CtyCfg_Name (Hie_PutLink_t PutLink); static void CtyCfg_Name (Hie_PutLink_t PutLink);
static void CtyCfg_Shortcut (Vie_ViewType_t ViewType);
static void CtyCfg_QR (void);
static void CtyCfg_NumUsrs (void); static void CtyCfg_NumUsrs (void);
static void CtyCfg_NumInss (void); static void CtyCfg_NumInss (void);
static void CtyCfg_NumDegs (void); static void CtyCfg_NumDegs (void);
@ -128,10 +126,10 @@ static void CtyCfg_Configuration (Vie_ViewType_t ViewType)
CtyCfg_Title (PutLink); CtyCfg_Title (PutLink);
/**************************** Left part ***********************************/ /**************************** Left part ***********************************/
HTM_DIV_Begin ("class=\"HIE_CFG_LEFT HIE_CFG_WIDTH\""); HTM_DIV_Begin ("class=\"HIE_CFG_LEFT\"");
/* Begin table */ /* Begin table */
HTM_TABLE_BeginWidePadding (2); HTM_TABLE_BeginPadding (2);
/* Platform */ /* Platform */
CtyCfg_Platform (ViewType); CtyCfg_Platform (ViewType);
@ -140,7 +138,7 @@ static void CtyCfg_Configuration (Vie_ViewType_t ViewType)
CtyCfg_Name (PutLink); CtyCfg_Name (PutLink);
/* Shortcut to the country */ /* Shortcut to the country */
CtyCfg_Shortcut (ViewType); HieCfg_Shortcut (ViewType,ParCod_Cty,Gbl.Hierarchy.Node[Hie_CTY].HieCod);
NumCtrsWithMap = Ctr_GetCachedNumCtrsWithMapInCty (Gbl.Hierarchy.Node[Hie_CTY].HieCod); NumCtrsWithMap = Ctr_GetCachedNumCtrsWithMapInCty (Gbl.Hierarchy.Node[Hie_CTY].HieCod);
switch (ViewType) switch (ViewType)
@ -157,8 +155,7 @@ static void CtyCfg_Configuration (Vie_ViewType_t ViewType)
number of courses */ number of courses */
CtyCfg_NumUsrs (); CtyCfg_NumUsrs ();
CtyCfg_NumInss (); CtyCfg_NumInss ();
HieCfg_NumCtrs (NumCtrs, HieCfg_NumCtrs (NumCtrs,Frm_DONT_PUT_FORM);
false); // Don't put form
HieCfg_NumCtrsWithMap (NumCtrs,NumCtrsWithMap); HieCfg_NumCtrsWithMap (NumCtrs,NumCtrsWithMap);
CtyCfg_NumDegs (); CtyCfg_NumDegs ();
CtyCfg_NumCrss (); CtyCfg_NumCrss ();
@ -171,7 +168,7 @@ static void CtyCfg_Configuration (Vie_ViewType_t ViewType)
break; break;
case Vie_PRINT: case Vie_PRINT:
/* QR code with link to the country */ /* QR code with link to the country */
CtyCfg_QR (); HieCfg_QR (ParCod_Cty,Gbl.Hierarchy.Node[Hie_CTY].HieCod);
break; break;
default: default:
Err_WrongTypeExit (); Err_WrongTypeExit ();
@ -191,7 +188,7 @@ static void CtyCfg_Configuration (Vie_ViewType_t ViewType)
if (NumCtrsWithMap || MapImageExists) if (NumCtrsWithMap || MapImageExists)
{ {
/* Begin container */ /* Begin container */
HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT HIE_CFG_WIDTH\""); HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT\"");
/* Country map */ /* Country map */
if (NumCtrsWithMap) if (NumCtrsWithMap)
@ -215,8 +212,7 @@ static void CtyCfg_Configuration (Vie_ViewType_t ViewType)
static void CtyCfg_PutIconToPrint (__attribute__((unused)) void *Args) static void CtyCfg_PutIconToPrint (__attribute__((unused)) void *Args)
{ {
Ico_PutContextualIconToPrint (ActPrnCtyInf, Ico_PutContextualIconToPrint (ActPrnCtyInf,NULL,NULL);
NULL,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -381,10 +377,10 @@ static void CtyCfg_Platform (Vie_ViewType_t ViewType)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_SINGUL_Abc[Hie_SYS]); Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_SINGUL_Abc[Hie_SYS]);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LT DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LT DAT_%s\"",The_GetSuffix ());
if (ViewType == Vie_VIEW) if (ViewType == Vie_VIEW)
{ {
Frm_BeginFormGoTo (ActSeeSysInf); Frm_BeginFormGoTo (ActSeeSysInf);
@ -417,10 +413,10 @@ static void CtyCfg_Name (Hie_PutLink_t PutLink)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_SINGUL_Abc[Hie_CTY]); Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_SINGUL_Abc[Hie_CTY]);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB DAT_STRONG_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LB DAT_STRONG_%s\"",The_GetSuffix ());
if (PutLink == Hie_PUT_LINK) if (PutLink == Hie_PUT_LINK)
HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"DAT_STRONG_%s\"", HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"DAT_STRONG_%s\"",
Gbl.Hierarchy.Node[Hie_CTY].WWW, Gbl.Hierarchy.Node[Hie_CTY].WWW,
@ -433,24 +429,6 @@ static void CtyCfg_Name (Hie_PutLink_t PutLink)
HTM_TR_End (); HTM_TR_End ();
} }
/*****************************************************************************/
/************** Show country shortcut in country configuration ***************/
/*****************************************************************************/
static void CtyCfg_Shortcut (Vie_ViewType_t ViewType)
{
HieCfg_Shortcut (ViewType,ParCod_Cty,Gbl.Hierarchy.Node[Hie_CTY].HieCod);
}
/*****************************************************************************/
/***************** Show country QR in country configuration ******************/
/*****************************************************************************/
static void CtyCfg_QR (void)
{
HieCfg_QR (ParCod_Cty,Gbl.Hierarchy.Node[Hie_CTY].HieCod);
}
/*****************************************************************************/ /*****************************************************************************/
/*** Show number of users who claim to belong to country in country config. **/ /*** Show number of users who claim to belong to country in country config. **/
/*****************************************************************************/ /*****************************************************************************/
@ -463,10 +441,10 @@ static void CtyCfg_NumUsrs (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",NULL,Txt_Users_of_the_country); Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_Users_of_the_country);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ());
HTM_Unsigned (Hie_GetCachedNumUsrsWhoClaimToBelongTo (Hie_CTY, HTM_Unsigned (Hie_GetCachedNumUsrsWhoClaimToBelongTo (Hie_CTY,
&Gbl.Hierarchy.Node[Hie_CTY])); &Gbl.Hierarchy.Node[Hie_CTY]));
HTM_TD_End (); HTM_TD_End ();
@ -488,10 +466,10 @@ static void CtyCfg_NumInss (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_INS]); Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_INS]);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LT DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LT DAT_%s\"",The_GetSuffix ());
Frm_BeginFormGoTo (ActSeeIns); Frm_BeginFormGoTo (ActSeeIns);
ParCod_PutPar (ParCod_Cty,Gbl.Hierarchy.Node[Hie_CTY].HieCod); ParCod_PutPar (ParCod_Cty,Gbl.Hierarchy.Node[Hie_CTY].HieCod);
if (asprintf (&Title,Txt_Institutions_of_COUNTRY_X, if (asprintf (&Title,Txt_Institutions_of_COUNTRY_X,
@ -521,10 +499,10 @@ static void CtyCfg_NumDegs (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_DEG]); Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_DEG]);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ());
HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_DEG, // Number of degrees... HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_DEG, // Number of degrees...
Hie_CTY, // ...in country Hie_CTY, // ...in country
Gbl.Hierarchy.Node[Hie_CTY].HieCod)); Gbl.Hierarchy.Node[Hie_CTY].HieCod));
@ -545,10 +523,10 @@ static void CtyCfg_NumCrss (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CRS]); Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CRS]);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ());
HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_CRS, // Number of courses... HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_CRS, // Number of courses...
Hie_CTY, // ...in country Hie_CTY, // ...in country
Gbl.Hierarchy.Node[Hie_CTY].HieCod)); Gbl.Hierarchy.Node[Hie_CTY].HieCod));

61
swad_course_config.c
View File

@ -61,13 +61,9 @@ extern struct Globals Gbl;
static void CrsCfg_PutIconToPrint (__attribute__((unused)) void *Args); static void CrsCfg_PutIconToPrint (__attribute__((unused)) void *Args);
static void CrsCfg_Degree (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm); static void CrsCfg_Degree (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm);
static void CrsCfg_FullName (Frm_PutForm_t PutForm);
static void CrsCfg_ShrtName (Frm_PutForm_t PutForm);
static void CrsCfg_Year (Frm_PutForm_t PutForm); static void CrsCfg_Year (Frm_PutForm_t PutForm);
static void CrsCfg_InstitutionalCode (Frm_PutForm_t PutForm); static void CrsCfg_InstitutionalCode (Frm_PutForm_t PutForm);
static void CrsCfg_InternalCode (void); static void CrsCfg_InternalCode (void);
static void CrsCfg_Shortcut (Vie_ViewType_t ViewType);
static void CrsCfg_QR (void);
static void CrsCfg_Indicators (void); static void CrsCfg_Indicators (void);
/*****************************************************************************/ /*****************************************************************************/
@ -123,17 +119,17 @@ void CrsCfg_Configuration (Vie_ViewType_t ViewType)
HieCfg_Title (PutLink,Hie_CRS); HieCfg_Title (PutLink,Hie_CRS);
/**************************** Left part ***********************************/ /**************************** Left part ***********************************/
HTM_DIV_Begin ("class=\"HIE_CFG_LEFT HIE_CFG_WIDTH\""); HTM_DIV_Begin ("class=\"HIE_CFG_LEFT\"");
/***** Begin table *****/ /***** Begin table *****/
HTM_TABLE_BeginWidePadding (2); HTM_TABLE_BeginPadding (2);
/***** Degree *****/ /***** Degree *****/
CrsCfg_Degree (ViewType,PutFormDeg); CrsCfg_Degree (ViewType,PutFormDeg);
/***** Course name *****/ /***** Course name *****/
CrsCfg_FullName (PutFormName); HieCfg_Name (PutFormName,Hie_CRS,Nam_FULL_NAME);
CrsCfg_ShrtName (PutFormName); HieCfg_Name (PutFormName,Hie_CRS,Nam_SHRT_NAME);
/***** Course year *****/ /***** Course year *****/
CrsCfg_Year (PutFormYear); CrsCfg_Year (PutFormYear);
@ -148,7 +144,7 @@ void CrsCfg_Configuration (Vie_ViewType_t ViewType)
} }
/***** Shortcut to the couse *****/ /***** Shortcut to the couse *****/
CrsCfg_Shortcut (ViewType); HieCfg_Shortcut (ViewType,ParCod_Crs,Gbl.Hierarchy.Node[Hie_CRS].HieCod);
switch (ViewType) switch (ViewType)
{ {
@ -164,7 +160,7 @@ void CrsCfg_Configuration (Vie_ViewType_t ViewType)
break; break;
case Vie_PRINT: case Vie_PRINT:
/***** QR code with link to the course *****/ /***** QR code with link to the course *****/
CrsCfg_QR (); HieCfg_QR (ParCod_Crs,Gbl.Hierarchy.Node[Hie_CRS].HieCod);
break; break;
default: default:
Err_WrongTypeExit (); Err_WrongTypeExit ();
@ -187,8 +183,7 @@ void CrsCfg_Configuration (Vie_ViewType_t ViewType)
static void CrsCfg_PutIconToPrint (__attribute__((unused)) void *Args) static void CrsCfg_PutIconToPrint (__attribute__((unused)) void *Args)
{ {
Ico_PutContextualIconToPrint (ActPrnCrsInf, Ico_PutContextualIconToPrint (ActPrnCrsInf,NULL,NULL);
NULL,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -220,10 +215,10 @@ static void CrsCfg_Degree (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",Id[PutForm],Txt_HIERARCHY_SINGUL_Abc[Hie_DEG]); Frm_LabelColumn ("Frm_C1 RT",Id[PutForm],Txt_HIERARCHY_SINGUL_Abc[Hie_DEG]);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LT DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LT DAT_%s\"",The_GetSuffix ());
switch (PutForm) switch (PutForm)
{ {
case Frm_DONT_PUT_FORM: // I can not move course to another degree case Frm_DONT_PUT_FORM: // I can not move course to another degree
@ -252,7 +247,7 @@ static void CrsCfg_Degree (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm)
Frm_BeginForm (ActChgCrsDegCfg); Frm_BeginForm (ActChgCrsDegCfg);
HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,NULL, HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,NULL,
"id=\"OthDegCod\" name=\"OthDegCod\"" "id=\"OthDegCod\" name=\"OthDegCod\""
" class=\"INPUT_SHORT_NAME INPUT_%s\"", " class=\"Frm_C2_INPUT INPUT_%s\"",
The_GetSuffix ()); The_GetSuffix ());
for (NumDeg = 0; for (NumDeg = 0;
NumDeg < Gbl.Hierarchy.List[Hie_CTR].Num; NumDeg < Gbl.Hierarchy.List[Hie_CTR].Num;
@ -277,24 +272,6 @@ static void CrsCfg_Degree (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm)
HTM_TR_End (); HTM_TR_End ();
} }
/*****************************************************************************/
/************** Show course full name in course configuration ****************/
/*****************************************************************************/
static void CrsCfg_FullName (Frm_PutForm_t PutForm)
{
HieCfg_Name (PutForm,Hie_CRS,Nam_FULL_NAME);
}
/*****************************************************************************/
/************** Show course short name in course configuration ***************/
/*****************************************************************************/
static void CrsCfg_ShrtName (Frm_PutForm_t PutForm)
{
HieCfg_Name (PutForm,Hie_CRS,Nam_SHRT_NAME);
}
/*****************************************************************************/ /*****************************************************************************/
/***************** Show course year in course configuration ******************/ /***************** Show course year in course configuration ******************/
/*****************************************************************************/ /*****************************************************************************/
@ -413,24 +390,6 @@ static void CrsCfg_InternalCode (void)
HTM_TR_End (); HTM_TR_End ();
} }
/*****************************************************************************/
/*************** Show course shortcut in course configuration ****************/
/*****************************************************************************/
static void CrsCfg_Shortcut (Vie_ViewType_t ViewType)
{
HieCfg_Shortcut (ViewType,ParCod_Crs,Gbl.Hierarchy.Node[Hie_CRS].HieCod);
}
/*****************************************************************************/
/****************** Show course QR in course configuration *******************/
/*****************************************************************************/
static void CrsCfg_QR (void)
{
HieCfg_QR (ParCod_Crs,Gbl.Hierarchy.Node[Hie_CRS].HieCod);
}
/*****************************************************************************/ /*****************************************************************************/
/****************** Show indicators in course configuration ******************/ /****************** Show indicators in course configuration ******************/
/*****************************************************************************/ /*****************************************************************************/

4
swad_degree.c
View File

@ -428,7 +428,7 @@ static void Deg_ListDegreesForEdition (const struct DegTyp_DegTypes *DegTypes)
Frm_BeginForm (ActChgDegWWW); Frm_BeginForm (ActChgDegWWW);
ParCod_PutPar (ParCod_OthHie,Deg->HieCod); ParCod_PutPar (ParCod_OthHie,Deg->HieCod);
HTM_INPUT_URL ("WWW",Deg->WWW,HTM_SUBMIT_ON_CHANGE, HTM_INPUT_URL ("WWW",Deg->WWW,HTM_SUBMIT_ON_CHANGE,
"class=\"INPUT_WWW_NARROW INPUT_%s\"" "class=\"INPUT_WWW INPUT_%s\""
" required=\"required\"", " required=\"required\"",
The_GetSuffix ()); The_GetSuffix ());
Frm_EndForm (); Frm_EndForm ();
@ -561,7 +561,7 @@ static void Deg_PutFormToCreateDegree (const struct DegTyp_DegTypes *DegTypes)
/***** Degree WWW *****/ /***** Degree WWW *****/
HTM_TD_Begin ("class=\"LM\""); HTM_TD_Begin ("class=\"LM\"");
HTM_INPUT_URL ("WWW",Deg_EditingDeg->WWW,HTM_DONT_SUBMIT_ON_CHANGE, HTM_INPUT_URL ("WWW",Deg_EditingDeg->WWW,HTM_DONT_SUBMIT_ON_CHANGE,
"class=\"INPUT_WWW_NARROW INPUT_%s\"" "class=\"INPUT_WWW INPUT_%s\""
" required=\"required\"", " required=\"required\"",
The_GetSuffix ()); The_GetSuffix ());
HTM_TD_End (); HTM_TD_End ();

77
swad_degree_config.c
View File

@ -60,11 +60,6 @@ extern struct Globals Gbl;
static void DegCfg_Configuration (Vie_ViewType_t ViewType); static void DegCfg_Configuration (Vie_ViewType_t ViewType);
static void DegCfg_PutIconsToPrintAndUpload (__attribute__((unused)) void *Args); static void DegCfg_PutIconsToPrintAndUpload (__attribute__((unused)) void *Args);
static void DegCfg_Center (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm); static void DegCfg_Center (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm);
static void DegCfg_FullName (Frm_PutForm_t PutForm);
static void DegCfg_ShrtName (Frm_PutForm_t PutForm);
static void DegCfg_WWW (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm);
static void DegCfg_Shortcut (Vie_ViewType_t ViewType);
static void DegCfg_QR (void);
static void DegCfg_NumCrss (void); static void DegCfg_NumCrss (void);
/*****************************************************************************/ /*****************************************************************************/
@ -129,23 +124,23 @@ static void DegCfg_Configuration (Vie_ViewType_t ViewType)
HieCfg_Title (PutLink,Hie_DEG); HieCfg_Title (PutLink,Hie_DEG);
/**************************** Left part ***********************************/ /**************************** Left part ***********************************/
HTM_DIV_Begin ("class=\"HIE_CFG_LEFT HIE_CFG_WIDTH\""); HTM_DIV_Begin ("class=\"HIE_CFG_LEFT\"");
/***** Begin table *****/ /***** Begin table *****/
HTM_TABLE_BeginWidePadding (2); HTM_TABLE_BeginPadding (2);
/***** Center *****/ /***** Center *****/
DegCfg_Center (ViewType,PutFormCtr); DegCfg_Center (ViewType,PutFormCtr);
/***** Degree name *****/ /***** Degree name *****/
DegCfg_FullName (PutFormName); HieCfg_Name (PutFormName,Hie_DEG,Nam_FULL_NAME);
DegCfg_ShrtName (PutFormName); HieCfg_Name (PutFormName,Hie_DEG,Nam_SHRT_NAME);
/***** Degree WWW *****/ /***** Degree WWW *****/
DegCfg_WWW (ViewType,PutFormWWW); HieCfg_WWW (ViewType,PutFormWWW,ActChgDegWWWCfg,Gbl.Hierarchy.Node[Hie_DEG].WWW);
/***** Shortcut to the degree *****/ /***** Shortcut to the degree *****/
DegCfg_Shortcut (ViewType); HieCfg_Shortcut (ViewType,ParCod_Deg,Gbl.Hierarchy.Node[Hie_DEG].HieCod);
switch (ViewType) switch (ViewType)
{ {
@ -161,7 +156,7 @@ static void DegCfg_Configuration (Vie_ViewType_t ViewType)
break; break;
case Vie_PRINT: case Vie_PRINT:
/***** QR code with link to the degree *****/ /***** QR code with link to the degree *****/
DegCfg_QR (); HieCfg_QR (ParCod_Deg,Gbl.Hierarchy.Node[Hie_DEG].HieCod);
break; break;
default: default:
Err_WrongTypeExit (); Err_WrongTypeExit ();
@ -184,8 +179,7 @@ static void DegCfg_Configuration (Vie_ViewType_t ViewType)
static void DegCfg_PutIconsToPrintAndUpload (__attribute__((unused)) void *Args) static void DegCfg_PutIconsToPrintAndUpload (__attribute__((unused)) void *Args)
{ {
/***** Link to print info about degree *****/ /***** Link to print info about degree *****/
Ico_PutContextualIconToPrint (ActPrnDegInf, Ico_PutContextualIconToPrint (ActPrnDegInf,NULL,NULL);
NULL,NULL);
if (Gbl.Usrs.Me.Role.Logged >= Rol_DEG_ADM) if (Gbl.Usrs.Me.Role.Logged >= Rol_DEG_ADM)
// Only degree admins, center admins, institution admins and system admins // Only degree admins, center admins, institution admins and system admins
@ -214,10 +208,10 @@ static void DegCfg_Center (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",Id[PutForm],Txt_HIERARCHY_SINGUL_Abc[Hie_CTR]); Frm_LabelColumn ("Frm_C1 RT",Id[PutForm],Txt_HIERARCHY_SINGUL_Abc[Hie_CTR]);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ());
switch (PutForm) switch (PutForm)
{ {
case Frm_DONT_PUT_FORM: // I can not move degree to another center case Frm_DONT_PUT_FORM: // I can not move degree to another center
@ -246,7 +240,7 @@ static void DegCfg_Center (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm)
Frm_BeginForm (ActChgDegCtrCfg); Frm_BeginForm (ActChgDegCtrCfg);
HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,NULL, HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,NULL,
"id=\"OthCtrCod\" name=\"OthCtrCod\"" "id=\"OthCtrCod\" name=\"OthCtrCod\""
" class=\"INPUT_SHORT_NAME INPUT_%s\"", " class=\"Frm_C2_INPUT INPUT_%s\"",
The_GetSuffix ()); The_GetSuffix ());
for (NumCtr = 0; for (NumCtr = 0;
NumCtr < Gbl.Hierarchy.List[Hie_INS].Num; NumCtr < Gbl.Hierarchy.List[Hie_INS].Num;
@ -271,51 +265,6 @@ static void DegCfg_Center (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm)
HTM_TR_End (); HTM_TR_End ();
} }
/*****************************************************************************/
/************** Show degree full name in degree configuration ****************/
/*****************************************************************************/
static void DegCfg_FullName (Frm_PutForm_t PutForm)
{
HieCfg_Name (PutForm,Hie_DEG,Nam_FULL_NAME);
}
/*****************************************************************************/
/************** Show degree short name in degree configuration ***************/
/*****************************************************************************/
static void DegCfg_ShrtName (Frm_PutForm_t PutForm)
{
HieCfg_Name (PutForm,Hie_DEG,Nam_SHRT_NAME);
}
/*****************************************************************************/
/***************** Show degree WWW in degree configuration *******************/
/*****************************************************************************/
static void DegCfg_WWW (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm)
{
HieCfg_WWW (ViewType,PutForm,ActChgDegWWWCfg,Gbl.Hierarchy.Node[Hie_DEG].WWW);
}
/*****************************************************************************/
/*************** Show degree shortcut in degree configuration ****************/
/*****************************************************************************/
static void DegCfg_Shortcut (Vie_ViewType_t ViewType)
{
HieCfg_Shortcut (ViewType,ParCod_Deg,Gbl.Hierarchy.Node[Hie_DEG].HieCod);
}
/*****************************************************************************/
/****************** Show degree QR in degree configuration *******************/
/*****************************************************************************/
static void DegCfg_QR (void)
{
HieCfg_QR (ParCod_Deg,Gbl.Hierarchy.Node[Hie_DEG].HieCod);
}
/*****************************************************************************/ /*****************************************************************************/
/************** Show number of courses in degree configuration ***************/ /************** Show number of courses in degree configuration ***************/
/*****************************************************************************/ /*****************************************************************************/
@ -331,10 +280,10 @@ static void DegCfg_NumCrss (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CRS]); Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CRS]);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ());
Frm_BeginFormGoTo (ActSeeCrs); Frm_BeginFormGoTo (ActSeeCrs);
ParCod_PutPar (ParCod_Deg,Gbl.Hierarchy.Node[Hie_DEG].HieCod); ParCod_PutPar (ParCod_Deg,Gbl.Hierarchy.Node[Hie_DEG].HieCod);
if (asprintf (&Title,Txt_Courses_of_DEGREE_X, if (asprintf (&Title,Txt_Courses_of_DEGREE_X,

4
swad_department.c
View File

@ -522,7 +522,7 @@ static void Dpt_ListDepartmentsForEdition (const struct Dpt_Departments *Departm
Frm_BeginForm (ActChgDptWWW); Frm_BeginForm (ActChgDptWWW);
ParCod_PutPar (ParCod_Dpt,Dpt->DptCod); ParCod_PutPar (ParCod_Dpt,Dpt->DptCod);
HTM_INPUT_URL ("WWW",Dpt->WWW,HTM_SUBMIT_ON_CHANGE, HTM_INPUT_URL ("WWW",Dpt->WWW,HTM_SUBMIT_ON_CHANGE,
"class=\"INPUT_WWW_NARROW INPUT_%s\"" "class=\"INPUT_WWW INPUT_%s\""
" required=\"required\"", " required=\"required\"",
The_GetSuffix ()); The_GetSuffix ());
Frm_EndForm (); Frm_EndForm ();
@ -820,7 +820,7 @@ static void Dpt_PutFormToCreateDepartment (void)
/***** Department WWW *****/ /***** Department WWW *****/
HTM_TD_Begin ("class=\"LM\""); HTM_TD_Begin ("class=\"LM\"");
HTM_INPUT_URL ("WWW",Dpt_EditingDpt->WWW,HTM_DONT_SUBMIT_ON_CHANGE, HTM_INPUT_URL ("WWW",Dpt_EditingDpt->WWW,HTM_DONT_SUBMIT_ON_CHANGE,
"class=\"INPUT_WWW_NARROW INPUT_%s\"" "class=\"INPUT_WWW INPUT_%s\""
" required=\"required\"", " required=\"required\"",
The_GetSuffix ()); The_GetSuffix ());
HTM_TD_End (); HTM_TD_End ();

26
swad_hierarchy_config.c
View File

@ -117,12 +117,12 @@ void HieCfg_Name (Frm_PutForm_t PutForm,Hie_Level_t Level,
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",Id[PutForm], Frm_LabelColumn ("Frm_C1 RT",Id[PutForm],
ShrtOrFull == Nam_SHRT_NAME ? Txt_Short_name : ShrtOrFull == Nam_SHRT_NAME ? Txt_Short_name :
Txt_HIERARCHY_SINGUL_Abc[Level]); Txt_HIERARCHY_SINGUL_Abc[Level]);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB DAT_STRONG_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LB DAT_STRONG_%s\"",The_GetSuffix ());
switch (PutForm) switch (PutForm)
{ {
case Frm_DONT_PUT_FORM: // I can not edit full name case Frm_DONT_PUT_FORM: // I can not edit full name
@ -167,10 +167,10 @@ void HieCfg_WWW (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm,
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",Id[PutForm],Txt_Web); Frm_LabelColumn ("Frm_C1 RT",Id[PutForm],Txt_Web);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ());
switch (PutForm) switch (PutForm)
{ {
case Frm_DONT_PUT_FORM: // I can not change web case Frm_DONT_PUT_FORM: // I can not change web
@ -188,7 +188,7 @@ void HieCfg_WWW (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm,
/* Form to change web */ /* Form to change web */
Frm_BeginForm (NextAction); Frm_BeginForm (NextAction);
HTM_INPUT_URL ("WWW",WWW,HTM_SUBMIT_ON_CHANGE, HTM_INPUT_URL ("WWW",WWW,HTM_SUBMIT_ON_CHANGE,
"id=\"WWW\" class=\"INPUT_WWW_WIDE INPUT_%s\"" "id=\"WWW\" class=\"Frm_C2_INPUT INPUT_%s\""
" required=\"required\"", " required=\"required\"",
The_GetSuffix ()); The_GetSuffix ());
Frm_EndForm (); Frm_EndForm ();
@ -212,10 +212,10 @@ void HieCfg_Shortcut (Vie_ViewType_t ViewType,ParCod_Param_t ParCode,long HieCod
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",NULL,Txt_Shortcut); Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_Shortcut);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ());
if (ViewType == Vie_VIEW) if (ViewType == Vie_VIEW)
{ {
if (ParCode == ParCod_None) if (ParCode == ParCod_None)
@ -257,10 +257,10 @@ void HieCfg_NumCtrs (unsigned NumCtrs,Frm_PutForm_t PutForm)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CTR]); Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CTR]);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ());
if (PutForm == Frm_PUT_FORM) if (PutForm == Frm_PUT_FORM)
{ {
Frm_BeginFormGoTo (ActSeeCtr); Frm_BeginFormGoTo (ActSeeCtr);
@ -294,10 +294,10 @@ void HieCfg_NumCtrsWithMap (unsigned NumCtrs,unsigned NumCtrsWithMap)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",NULL,Txt_Centers_with_map); Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_Centers_with_map);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ());
HTM_TxtF ("%u (%.1lf%%)", HTM_TxtF ("%u (%.1lf%%)",
NumCtrsWithMap, NumCtrsWithMap,
NumCtrs ? (double) NumCtrsWithMap * 100.0 / NumCtrs ? (double) NumCtrsWithMap * 100.0 /
@ -343,12 +343,12 @@ void HieCfg_NumUsrsInCrss (Hie_Level_t Level,long Cod,Rol_Role_t Role)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",NULL, Frm_LabelColumn ("Frm_C1 RT",NULL,
Role == Rol_UNK ? Txt_Users_in_courses : Role == Rol_UNK ? Txt_Users_in_courses :
Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ());
HTM_Unsigned (Enr_GetCachedNumUsrsInCrss (Level,Cod, HTM_Unsigned (Enr_GetCachedNumUsrsInCrss (Level,Cod,
Role == Rol_UNK ? (1 << Rol_STD) | Role == Rol_UNK ? (1 << Rol_STD) |
(1 << Rol_NET) | (1 << Rol_NET) |

4
swad_institution.c
View File

@ -956,7 +956,7 @@ static void Ins_ListInstitutionsForEdition (void)
Frm_BeginForm (ActChgInsWWW); Frm_BeginForm (ActChgInsWWW);
ParCod_PutPar (ParCod_OthHie,Ins->HieCod); ParCod_PutPar (ParCod_OthHie,Ins->HieCod);
HTM_INPUT_URL ("WWW",Ins->WWW,HTM_SUBMIT_ON_CHANGE, HTM_INPUT_URL ("WWW",Ins->WWW,HTM_SUBMIT_ON_CHANGE,
"class=\"INPUT_WWW_NARROW INPUT_%s\"" "class=\"INPUT_WWW INPUT_%s\""
" required=\"required\"", " required=\"required\"",
The_GetSuffix ()); The_GetSuffix ());
Frm_EndForm (); Frm_EndForm ();
@ -1364,7 +1364,7 @@ static void Ins_PutFormToCreateInstitution (void)
/***** Institution WWW *****/ /***** Institution WWW *****/
HTM_TD_Begin ("class=\"LM\""); HTM_TD_Begin ("class=\"LM\"");
HTM_INPUT_URL ("WWW",Ins_EditingIns->WWW,HTM_DONT_SUBMIT_ON_CHANGE, HTM_INPUT_URL ("WWW",Ins_EditingIns->WWW,HTM_DONT_SUBMIT_ON_CHANGE,
"class=\"INPUT_WWW_NARROW INPUT_%s\"" "class=\"INPUT_WWW INPUT_%s\""
" required=\"required\"",The_GetSuffix ()); " required=\"required\"",The_GetSuffix ());
HTM_TD_End (); HTM_TD_End ();

94
swad_institution_config.c
View File

@ -66,11 +66,6 @@ static void InsCfg_Configuration (Vie_ViewType_t ViewType);
static void InsCfg_PutIconsToPrintAndUpload (__attribute__((unused)) void *Args); static void InsCfg_PutIconsToPrintAndUpload (__attribute__((unused)) void *Args);
static void InsCfg_Map (void); static void InsCfg_Map (void);
static void InsCfg_Country (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm); static void InsCfg_Country (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm);
static void InsCfg_FullName (Frm_PutForm_t PutForm);
static void InsCfg_ShrtName (Frm_PutForm_t PutForm);
static void InsCfg_WWW (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm);
static void InsCfg_Shortcut (Vie_ViewType_t ViewType);
static void InsCfg_QR (void);
static void InsCfg_NumUsrs (void); static void InsCfg_NumUsrs (void);
static void InsCfg_NumDegs (void); static void InsCfg_NumDegs (void);
static void InsCfg_NumCrss (void); static void InsCfg_NumCrss (void);
@ -138,23 +133,23 @@ static void InsCfg_Configuration (Vie_ViewType_t ViewType)
HieCfg_Title (PutLink,Hie_INS); HieCfg_Title (PutLink,Hie_INS);
/**************************** Left part ***********************************/ /**************************** Left part ***********************************/
HTM_DIV_Begin ("class=\"HIE_CFG_LEFT HIE_CFG_WIDTH\""); HTM_DIV_Begin ("class=\"HIE_CFG_LEFT\"");
/***** Begin table *****/ /***** Begin table *****/
HTM_TABLE_BeginWidePadding (2); HTM_TABLE_BeginPadding (2);
/***** Country *****/ /***** Country *****/
InsCfg_Country (ViewType,PutFormCty); InsCfg_Country (ViewType,PutFormCty);
/***** Institution name *****/ /***** Institution name *****/
InsCfg_FullName (PutFormName); HieCfg_Name (PutFormName,Hie_INS,Nam_FULL_NAME);
InsCfg_ShrtName (PutFormName); HieCfg_Name (PutFormName,Hie_INS,Nam_SHRT_NAME);
/***** Institution WWW *****/ /***** Institution WWW *****/
InsCfg_WWW (ViewType,PutFormWWW); HieCfg_WWW (ViewType,PutFormWWW,ActChgInsWWWCfg,Gbl.Hierarchy.Node[Hie_INS].WWW);
/***** Shortcut to the institution *****/ /***** Shortcut to the institution *****/
InsCfg_Shortcut (ViewType); HieCfg_Shortcut (ViewType,ParCod_Ins,Gbl.Hierarchy.Node[Hie_INS].HieCod);
NumCtrsWithMap = Ctr_GetCachedNumCtrsWithMapInIns (Gbl.Hierarchy.Node[Hie_INS].HieCod); NumCtrsWithMap = Ctr_GetCachedNumCtrsWithMapInIns (Gbl.Hierarchy.Node[Hie_INS].HieCod);
@ -171,8 +166,7 @@ static void InsCfg_Configuration (Vie_ViewType_t ViewType)
number of courses, number of courses,
number of departments *****/ number of departments *****/
InsCfg_NumUsrs (); InsCfg_NumUsrs ();
HieCfg_NumCtrs (NumCtrs, HieCfg_NumCtrs (NumCtrs,Frm_PUT_FORM);
true); // Put form
HieCfg_NumCtrsWithMap (NumCtrs,NumCtrsWithMap); HieCfg_NumCtrsWithMap (NumCtrs,NumCtrsWithMap);
InsCfg_NumDegs (); InsCfg_NumDegs ();
InsCfg_NumCrss (); InsCfg_NumCrss ();
@ -186,7 +180,7 @@ static void InsCfg_Configuration (Vie_ViewType_t ViewType)
break; break;
case Vie_PRINT: case Vie_PRINT:
/***** QR code with link to the institution *****/ /***** QR code with link to the institution *****/
InsCfg_QR (); HieCfg_QR (ParCod_Ins,Gbl.Hierarchy.Node[Hie_INS].HieCod);
break; break;
default: default:
Err_WrongTypeExit (); Err_WrongTypeExit ();
@ -202,7 +196,7 @@ static void InsCfg_Configuration (Vie_ViewType_t ViewType)
/**************************** Right part **********************************/ /**************************** Right part **********************************/
if (NumCtrsWithMap) if (NumCtrsWithMap)
{ {
HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT HIE_CFG_WIDTH\""); HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT\"");
/***** Institution map *****/ /***** Institution map *****/
InsCfg_Map (); InsCfg_Map ();
@ -221,8 +215,7 @@ static void InsCfg_Configuration (Vie_ViewType_t ViewType)
static void InsCfg_PutIconsToPrintAndUpload (__attribute__((unused)) void *Args) static void InsCfg_PutIconsToPrintAndUpload (__attribute__((unused)) void *Args)
{ {
/***** Icon to print info about institution *****/ /***** Icon to print info about institution *****/
Ico_PutContextualIconToPrint (ActPrnInsInf, Ico_PutContextualIconToPrint (ActPrnInsInf,NULL,NULL);
NULL,NULL);
if (Gbl.Usrs.Me.Role.Logged >= Rol_INS_ADM) if (Gbl.Usrs.Me.Role.Logged >= Rol_INS_ADM)
/***** Icon to upload logo of institution *****/ /***** Icon to upload logo of institution *****/
@ -323,10 +316,10 @@ static void InsCfg_Country (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",Id[PutForm],Txt_HIERARCHY_SINGUL_Abc[Hie_CTY]); Frm_LabelColumn ("Frm_C1 RT",Id[PutForm],Txt_HIERARCHY_SINGUL_Abc[Hie_CTY]);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LT DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LT DAT_%s\"",The_GetSuffix ());
switch (PutForm) switch (PutForm)
{ {
case Frm_DONT_PUT_FORM: // I can not move institution to another country case Frm_DONT_PUT_FORM: // I can not move institution to another country
@ -352,7 +345,7 @@ static void InsCfg_Country (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm)
Frm_BeginForm (ActChgInsCtyCfg); Frm_BeginForm (ActChgInsCtyCfg);
HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,NULL, HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,NULL,
"id=\"OthCtyCod\" name=\"OthCtyCod\"" "id=\"OthCtyCod\" name=\"OthCtyCod\""
" class=\"INPUT_SHORT_NAME INPUT_%s\"", " class=\"Frm_C2_INPUT INPUT_%s\"",
The_GetSuffix ()); The_GetSuffix ());
for (NumCty = 0; for (NumCty = 0;
NumCty < Gbl.Hierarchy.List[Hie_SYS].Num; NumCty < Gbl.Hierarchy.List[Hie_SYS].Num;
@ -376,51 +369,6 @@ static void InsCfg_Country (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm)
// Do not free list of countries here, because it can be reused // Do not free list of countries here, because it can be reused
} }
/*****************************************************************************/
/********* Show institution full name in institution configuration ***********/
/*****************************************************************************/
static void InsCfg_FullName (Frm_PutForm_t PutForm)
{
HieCfg_Name (PutForm,Hie_INS,Nam_FULL_NAME);
}
/*****************************************************************************/
/********* Show institution short name in institution configuration **********/
/*****************************************************************************/
static void InsCfg_ShrtName (Frm_PutForm_t PutForm)
{
HieCfg_Name (PutForm,Hie_INS,Nam_SHRT_NAME);
}
/*****************************************************************************/
/************ Show institution WWW in institution configuration **************/
/*****************************************************************************/
static void InsCfg_WWW (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm)
{
HieCfg_WWW (ViewType,PutForm,ActChgInsWWWCfg,Gbl.Hierarchy.Node[Hie_INS].WWW);
}
/*****************************************************************************/
/********** Show institution shortcut in institution configuration ***********/
/*****************************************************************************/
static void InsCfg_Shortcut (Vie_ViewType_t ViewType)
{
HieCfg_Shortcut (ViewType,ParCod_Ins,Gbl.Hierarchy.Node[Hie_INS].HieCod);
}
/*****************************************************************************/
/************* Show institution QR in institution configuration **************/
/*****************************************************************************/
static void InsCfg_QR (void)
{
HieCfg_QR (ParCod_Ins,Gbl.Hierarchy.Node[Hie_INS].HieCod);
}
/*****************************************************************************/ /*****************************************************************************/
/** Show number of users who claim to belong to instit. in instit. config. ***/ /** Show number of users who claim to belong to instit. in instit. config. ***/
/*****************************************************************************/ /*****************************************************************************/
@ -433,10 +381,10 @@ static void InsCfg_NumUsrs (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",NULL,Txt_Users_of_the_institution); Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_Users_of_the_institution);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ());
HTM_Unsigned (Hie_GetCachedNumUsrsWhoClaimToBelongTo (Hie_INS, HTM_Unsigned (Hie_GetCachedNumUsrsWhoClaimToBelongTo (Hie_INS,
&Gbl.Hierarchy.Node[Hie_INS])); &Gbl.Hierarchy.Node[Hie_INS]));
HTM_TD_End (); HTM_TD_End ();
@ -456,10 +404,10 @@ static void InsCfg_NumDegs (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_DEG]); Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_DEG]);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ());
HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_DEG, // Number of degrees... HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_DEG, // Number of degrees...
Hie_INS, // ...in institution Hie_INS, // ...in institution
Gbl.Hierarchy.Node[Hie_INS].HieCod)); Gbl.Hierarchy.Node[Hie_INS].HieCod));
@ -480,10 +428,10 @@ static void InsCfg_NumCrss (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CRS]); Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CRS]);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ());
HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_CRS, // Number of courses... HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_CRS, // Number of courses...
Hie_INS, // ...in institution Hie_INS, // ...in institution
Gbl.Hierarchy.Node[Hie_INS].HieCod)); Gbl.Hierarchy.Node[Hie_INS].HieCod));
@ -504,10 +452,10 @@ static void InsCfg_NumDpts (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",NULL,Txt_Departments); Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_Departments);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ());
HTM_Unsigned (Dpt_GetNumDptsInIns (Gbl.Hierarchy.Node[Hie_INS].HieCod)); HTM_Unsigned (Dpt_GetNumDptsInIns (Gbl.Hierarchy.Node[Hie_INS].HieCod));
HTM_TD_End (); HTM_TD_End ();

4
swad_link.c
View File

@ -443,7 +443,7 @@ static void Lnk_ListLinksForEdition (const struct Lnk_Links *Links)
Frm_BeginForm (ActChgLnkWWW); Frm_BeginForm (ActChgLnkWWW);
ParCod_PutPar (ParCod_Lnk,Lnk->LnkCod); ParCod_PutPar (ParCod_Lnk,Lnk->LnkCod);
HTM_INPUT_URL ("WWW",Lnk->WWW,HTM_SUBMIT_ON_CHANGE, HTM_INPUT_URL ("WWW",Lnk->WWW,HTM_SUBMIT_ON_CHANGE,
"class=\"INPUT_WWW_NARROW INPUT_%s\"" "class=\"INPUT_WWW INPUT_%s\""
" required=\"required\"", " required=\"required\"",
The_GetSuffix ()); The_GetSuffix ());
Frm_EndForm (); Frm_EndForm ();
@ -672,7 +672,7 @@ static void Lnk_PutFormToCreateLink (void)
/***** Link WWW *****/ /***** Link WWW *****/
HTM_TD_Begin ("class=\"LM\""); HTM_TD_Begin ("class=\"LM\"");
HTM_INPUT_URL ("WWW",Lnk_EditingLnk->WWW,HTM_DONT_SUBMIT_ON_CHANGE, HTM_INPUT_URL ("WWW",Lnk_EditingLnk->WWW,HTM_DONT_SUBMIT_ON_CHANGE,
"class=\"INPUT_WWW_NARROW INPUT_%s\"" "class=\"INPUT_WWW INPUT_%s\""
" required=\"required\"", " required=\"required\"",
The_GetSuffix ()); The_GetSuffix ());
HTM_TD_End (); HTM_TD_End ();

7
swad_name.c
View File

@ -56,11 +56,18 @@ unsigned Nam_MaxBytes[Nam_NUM_SHRT_FULL_NAMES] =
[Nam_SHRT_NAME] = Nam_MAX_BYTES_SHRT_NAME, [Nam_SHRT_NAME] = Nam_MAX_BYTES_SHRT_NAME,
[Nam_FULL_NAME] = Nam_MAX_BYTES_FULL_NAME, [Nam_FULL_NAME] = Nam_MAX_BYTES_FULL_NAME,
}; };
/*
const char *Nam_Classes[Nam_NUM_SHRT_FULL_NAMES] = const char *Nam_Classes[Nam_NUM_SHRT_FULL_NAMES] =
{ {
[Nam_SHRT_NAME] = "INPUT_SHRT_NAME", [Nam_SHRT_NAME] = "INPUT_SHRT_NAME",
[Nam_FULL_NAME] = "INPUT_FULL_NAME", [Nam_FULL_NAME] = "INPUT_FULL_NAME",
}; };
*/
const char *Nam_Classes[Nam_NUM_SHRT_FULL_NAMES] =
{
[Nam_SHRT_NAME] = "Frm_C2_INPUT",
[Nam_FULL_NAME] = "Frm_C2_INPUT",
};
/*****************************************************************************/ /*****************************************************************************/
/************************ Get short name and full name ***********************/ /************************ Get short name and full name ***********************/

3
swad_project.c
View File

@ -3200,8 +3200,7 @@ static void Prj_PutIconsToRemEditOnePrj (struct Prj_Projects *Projects,
Prj_PutCurrentPars,Projects); Prj_PutCurrentPars,Projects);
/***** Icon to print project *****/ /***** Icon to print project *****/
Ico_PutContextualIconToPrint (ActPrnOnePrj, Ico_PutContextualIconToPrint (ActPrnOnePrj,Prj_PutCurrentPars,Projects);
Prj_PutCurrentPars,Projects);
/***** Locked/unlocked project edition *****/ /***** Locked/unlocked project edition *****/
if (PrjCfg_CheckIfICanConfig ()) if (PrjCfg_CheckIfICanConfig ())

58
swad_system_config.c
View File

@ -63,8 +63,6 @@ static void SysCfg_Configuration (Vie_ViewType_t ViewType);
static void SysCfg_PutIconToPrint (__attribute__((unused)) void *Args); static void SysCfg_PutIconToPrint (__attribute__((unused)) void *Args);
static void SysCfg_Map (void); static void SysCfg_Map (void);
static void SysCfg_Platform (void); static void SysCfg_Platform (void);
static void SysCfg_Shortcut (Vie_ViewType_t ViewType);
static void SysCfg_QR (void);
static void SysCfg_NumCtys (void); static void SysCfg_NumCtys (void);
static void SysCfg_NumInss (void); static void SysCfg_NumInss (void);
static void SysCfg_NumDegs (void); static void SysCfg_NumDegs (void);
@ -109,16 +107,16 @@ static void SysCfg_Configuration (Vie_ViewType_t ViewType)
NULL,Box_NOT_CLOSABLE); NULL,Box_NOT_CLOSABLE);
/**************************** Left part ***********************************/ /**************************** Left part ***********************************/
HTM_DIV_Begin ("class=\"HIE_CFG_LEFT HIE_CFG_WIDTH\""); HTM_DIV_Begin ("class=\"HIE_CFG_LEFT\"");
/***** Begin table *****/ /***** Begin table *****/
HTM_TABLE_BeginWidePadding (2); HTM_TABLE_BeginPadding (2);
/***** Platform *****/ /***** Platform *****/
SysCfg_Platform (); SysCfg_Platform ();
/***** Shortcut to the country *****/ /***** Shortcut to the system *****/
SysCfg_Shortcut (ViewType); HieCfg_Shortcut (ViewType,ParCod_None,-1L);
/***** Get number of centers with map *****/ /***** Get number of centers with map *****/
NumCtrsWithMap = Ctr_GetCachedNumCtrsWithMapInSys (); NumCtrsWithMap = Ctr_GetCachedNumCtrsWithMapInSys ();
@ -138,8 +136,7 @@ static void SysCfg_Configuration (Vie_ViewType_t ViewType)
number of courses *****/ number of courses *****/
SysCfg_NumCtys (); SysCfg_NumCtys ();
SysCfg_NumInss (); SysCfg_NumInss ();
HieCfg_NumCtrs (NumCtrs, HieCfg_NumCtrs (NumCtrs,Frm_DONT_PUT_FORM);
false); // Don't put form
HieCfg_NumCtrsWithMap (NumCtrs,NumCtrsWithMap); HieCfg_NumCtrsWithMap (NumCtrs,NumCtrsWithMap);
SysCfg_NumDegs (); SysCfg_NumDegs ();
SysCfg_NumCrss (); SysCfg_NumCrss ();
@ -152,7 +149,7 @@ static void SysCfg_Configuration (Vie_ViewType_t ViewType)
break; break;
case Vie_PRINT: case Vie_PRINT:
/***** QR code with link to the country *****/ /***** QR code with link to the country *****/
SysCfg_QR (); HieCfg_QR (ParCod_None,-1L);
break; break;
default: default:
Err_WrongTypeExit (); Err_WrongTypeExit ();
@ -168,7 +165,7 @@ static void SysCfg_Configuration (Vie_ViewType_t ViewType)
/**************************** Right part **********************************/ /**************************** Right part **********************************/
if (NumCtrsWithMap) if (NumCtrsWithMap)
{ {
HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT HIE_CFG_WIDTH\""); HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT\"");
/***** Country map *****/ /***** Country map *****/
SysCfg_Map (); SysCfg_Map ();
@ -186,8 +183,7 @@ static void SysCfg_Configuration (Vie_ViewType_t ViewType)
static void SysCfg_PutIconToPrint (__attribute__((unused)) void *Args) static void SysCfg_PutIconToPrint (__attribute__((unused)) void *Args)
{ {
Ico_PutContextualIconToPrint (ActPrnSysInf, Ico_PutContextualIconToPrint (ActPrnSysInf,NULL,NULL);
NULL,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -275,34 +271,16 @@ static void SysCfg_Platform (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_SINGUL_Abc[Hie_SYS]); Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_SINGUL_Abc[Hie_SYS]);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB DAT_STRONG_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LB DAT_STRONG_%s\"",The_GetSuffix ());
HTM_Txt (Cfg_PLATFORM_SHORT_NAME); HTM_Txt (Cfg_PLATFORM_SHORT_NAME);
HTM_TD_End (); HTM_TD_End ();
HTM_TR_End (); HTM_TR_End ();
} }
/*****************************************************************************/
/************** Show platform shortcut in system configuration ***************/
/*****************************************************************************/
static void SysCfg_Shortcut (Vie_ViewType_t ViewType)
{
HieCfg_Shortcut (ViewType,ParCod_None,-1L);
}
/*****************************************************************************/
/***************** Show country QR in country configuration ******************/
/*****************************************************************************/
static void SysCfg_QR (void)
{
HieCfg_QR (ParCod_None,-1L);
}
/*****************************************************************************/ /*****************************************************************************/
/************ Show number of countries in system configuration ***************/ /************ Show number of countries in system configuration ***************/
/*****************************************************************************/ /*****************************************************************************/
@ -315,10 +293,10 @@ static void SysCfg_NumCtys (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CTY]); Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CTY]);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ());
Frm_BeginFormGoTo (ActSeeCty); Frm_BeginFormGoTo (ActSeeCty);
HTM_BUTTON_Submit_Begin (Txt_HIERARCHY_PLURAL_Abc[Hie_CTY], HTM_BUTTON_Submit_Begin (Txt_HIERARCHY_PLURAL_Abc[Hie_CTY],
"class=\"LB BT_LINK\""); "class=\"LB BT_LINK\"");
@ -344,10 +322,10 @@ static void SysCfg_NumInss (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_INS]); Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_INS]);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ());
HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_INS, // Number of institutions... HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_INS, // Number of institutions...
Hie_SYS, // ...in system Hie_SYS, // ...in system
Gbl.Hierarchy.Node[Hie_SYS].HieCod)); Gbl.Hierarchy.Node[Hie_SYS].HieCod));
@ -368,10 +346,10 @@ static void SysCfg_NumDegs (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_DEG]); Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_DEG]);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ());
HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_DEG, // Number of degrees... HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_DEG, // Number of degrees...
Hie_SYS, // ...in system Hie_SYS, // ...in system
Gbl.Hierarchy.Node[Hie_SYS].HieCod)); Gbl.Hierarchy.Node[Hie_SYS].HieCod));
@ -392,10 +370,10 @@ static void SysCfg_NumCrss (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Label */ /* Label */
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_DEG]); Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CRS]);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ());
HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_CRS, // Number of courses... HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_CRS, // Number of courses...
Hie_SYS, // ...in system Hie_SYS, // ...in system
Gbl.Hierarchy.Node[Hie_SYS].HieCod)); Gbl.Hierarchy.Node[Hie_SYS].HieCod));

2
swad_text.c
View File

@ -18712,7 +18712,7 @@ const char *Txt_Latitude =
#elif L==9 // pt #elif L==9 // pt
"Latitude"; "Latitude";
#elif L==10 // tr #elif L==10 // tr
"Latitude"; // Çeviri lazim! "Enlem";
#endif #endif
const char *Txt_LAYOUT_SIDE_COLUMNS[4] = const char *Txt_LAYOUT_SIDE_COLUMNS[4] =

9
swad_user.c
View File

@ -5855,20 +5855,17 @@ static void Usr_PutIconsListTchs (__attribute__((unused)) void *Args)
static void Usr_PutIconToPrintGsts (void) static void Usr_PutIconToPrintGsts (void)
{ {
Ico_PutContextualIconToPrint (ActPrnGstPho, Ico_PutContextualIconToPrint (ActPrnGstPho,Usr_ShowGstsAllDataPars,NULL);
Usr_ShowGstsAllDataPars,NULL);
} }
static void Usr_PutIconToPrintStds (void) static void Usr_PutIconToPrintStds (void)
{ {
Ico_PutContextualIconToPrint (ActPrnStdPho, Ico_PutContextualIconToPrint (ActPrnStdPho,Usr_ShowStdsAllDataPars,NULL);
Usr_ShowStdsAllDataPars,NULL);
} }
static void Usr_PutIconToPrintTchs (void) static void Usr_PutIconToPrintTchs (void)
{ {
Ico_PutContextualIconToPrint (ActPrnTchPho, Ico_PutContextualIconToPrint (ActPrnTchPho,Usr_ShowTchsAllDataPars,NULL);
Usr_ShowTchsAllDataPars,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/