From 9806bd942893c0b5f3042ec8565a5d032bdefe23 Mon Sep 17 00:00:00 2001 From: acanas Date: Sun, 11 Feb 2024 23:29:50 +0100 Subject: [PATCH] Version 23.66: Feb 11, 2024 Responsive design in hierarchy configurations. --- css/{swad23.65.css => swad23.66.css} | 24 +++--- swad_assignment.c | 3 +- swad_banner.c | 4 +- swad_calendar.c | 3 +- swad_center.c | 4 +- swad_center_config.c | 111 ++++++++------------------- swad_changelog.h | 5 +- swad_country.c | 4 +- swad_country_config.c | 60 +++++---------- swad_course_config.c | 61 +++------------ swad_degree.c | 4 +- swad_degree_config.c | 77 ++++--------------- swad_department.c | 4 +- swad_hierarchy_config.c | 26 +++---- swad_institution.c | 4 +- swad_institution_config.c | 94 +++++------------------ swad_link.c | 4 +- swad_name.c | 7 ++ swad_project.c | 3 +- swad_system_config.c | 58 +++++--------- swad_text.c | 2 +- swad_user.c | 9 +-- 22 files changed, 164 insertions(+), 407 deletions(-) rename css/{swad23.65.css => swad23.66.css} (99%) diff --git a/css/swad23.65.css b/css/swad23.66.css similarity index 99% rename from css/swad23.65.css rename to css/swad23.66.css index d30cb6bd..bb26473b 100644 --- a/css/swad23.65.css +++ b/css/swad23.66.css @@ -1451,12 +1451,11 @@ a:hover /* Default ==> underlined */ display:inline-block; margin:0 6px; vertical-align:top; - width:480px; + width:520px; } @media only screen and (max-width:590px) { /* For mobile-phones (maximum width visible on Moto G4 vertical) */ - .HIE_CFG_WIDTH {width:260px;} .COUNTRY_MAP_SHOW, .COUNTRY_MAP_PRINT { box-sizing:border-box; @@ -1473,7 +1472,6 @@ a:hover /* Default ==> underlined */ } @media only screen and (min-width:590px) { /* For tablets and desktop (maximum width visible on Moto G4 horizontal) */ - .HIE_CFG_WIDTH {width:480px;} .COUNTRY_MAP_SHOW, .COUNTRY_MAP_PRINT { box-sizing:border-box; @@ -3281,7 +3279,7 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} width:276px; } } -@media only screen and (min-width:600px) and (max-width:1024px) +@media only screen and (min-width:600px) { /* For desktop */ .Frm_C1 { @@ -3303,8 +3301,9 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} width:382px; } } +/* @media only screen and (min-width:1024px) - { /* For desktop */ + { * For desktop * .Frm_C1 { box-sizing:border-box; @@ -3325,7 +3324,7 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} width:700px; } } - +*/ /******************************** Class photo ********************************/ .CLASSPHOTO_TITLE { @@ -5350,16 +5349,11 @@ table.TBL_WIDE > tbody > tr > th {padding:2px;} box-sizing:border-box; width:100px; } -.INPUT_WWW_NARROW +.INPUT_WWW { box-sizing:border-box; width:90px; } -.INPUT_WWW_WIDE - { - box-sizing:border-box; - width:180px; - } .INPUT_COORD { box-sizing:border-box; @@ -5385,9 +5379,9 @@ table.TBL_WIDE > tbody > tr > th {padding:2px;} /******************************** Last clicks ********************************/ .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_ROL {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:100px; max-width:100px; 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:90px; max-width:90px; 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;} /*********************** Listing my courses as a tree ************************/ diff --git a/swad_assignment.c b/swad_assignment.c index 95fe52de..8e5860aa 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -775,8 +775,7 @@ static void Asg_PutIconsToRemEditOneAsg (struct Asg_Assignments *Assignments, case Rol_STD: case Rol_NET: /***** Icon to print assignment *****/ - Ico_PutContextualIconToPrint (ActPrnOneAsg, - Asg_PutPars,Assignments); + Ico_PutContextualIconToPrint (ActPrnOneAsg,Asg_PutPars,Assignments); break; default: break; diff --git a/swad_banner.c b/swad_banner.c index ac0ced9e..5ca7f685 100644 --- a/swad_banner.c +++ b/swad_banner.c @@ -465,7 +465,7 @@ static void Ban_ListBannersForEdition (struct Ban_Banners *Banners) Frm_BeginForm (ActChgBanWWW); ParCod_PutPar (ParCod_Ban,Banners->BanCodToEdit); HTM_INPUT_URL ("WWW",Ban->WWW,HTM_SUBMIT_ON_CHANGE, - "class=\"INPUT_WWW_NARROW INPUT_%s\"" + "class=\"INPUT_WWW INPUT_%s\"" " required=\"required\"", The_GetSuffix ()); Frm_EndForm (); @@ -810,7 +810,7 @@ static void Ban_PutFormToCreateBanner (const struct Ban_Banner *Ban) /* Banner WWW */ HTM_TD_Begin ("class=\"LM\""); HTM_INPUT_URL ("WWW",Ban->WWW,HTM_DONT_SUBMIT_ON_CHANGE, - "class=\"INPUT_WWW_NARROW INPUT_%s\"" + "class=\"INPUT_WWW INPUT_%s\"" " required=\"required\"", The_GetSuffix ()); HTM_TD_End (); diff --git a/swad_calendar.c b/swad_calendar.c index dd20ef3c..7b90d05c 100644 --- a/swad_calendar.c +++ b/swad_calendar.c @@ -308,8 +308,7 @@ static void Cal_DrawCalendar (Act_Action_t ActionSeeCalendar, static void Cal_PutIconsCalendar (__attribute__((unused)) void *Args) { /***** Print calendar *****/ - Ico_PutContextualIconToPrint (ActPrnCal, - NULL,NULL); + Ico_PutContextualIconToPrint (ActPrnCal,NULL,NULL); /***** View holidays *****/ if (Gbl.Hierarchy.Level == Hie_INS) // Institution selected diff --git a/swad_center.c b/swad_center.c index 45006674..8d757022 100644 --- a/swad_center.c +++ b/swad_center.c @@ -845,7 +845,7 @@ static void Ctr_ListCentersForEdition (const struct Plc_Places *Places) Frm_BeginForm (ActChgCtrWWW); ParCod_PutPar (ParCod_OthHie,Ctr->HieCod); HTM_INPUT_URL ("WWW",Ctr->WWW,HTM_SUBMIT_ON_CHANGE, - "class=\"INPUT_WWW_NARROW INPUT_%s\"" + "class=\"INPUT_WWW INPUT_%s\"" " required=\"required\"", The_GetSuffix ()); Frm_EndForm (); @@ -1292,7 +1292,7 @@ static void Ctr_PutFormToCreateCenter (const struct Plc_Places *Places) /***** Center WWW *****/ HTM_TD_Begin ("class=\"LM\""); 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\"", The_GetSuffix ()); HTM_TD_End (); diff --git a/swad_center_config.c b/swad_center_config.c index f1033e9f..cf5a49ed 100644 --- a/swad_center_config.c +++ b/swad_center_config.c @@ -88,12 +88,7 @@ static void CtrCfg_Photo (Vie_ViewType_t ViewType, static void CtrCfg_GetPhotoAttr (long CtrCod,char **PhotoAttribution); static void CtrCfg_FreePhotoAttr (char **PhotoAttribution); 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_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_NumDegs (void); static void CtrCfg_NumCrss (void); @@ -173,17 +168,17 @@ static void CtrCfg_Configuration (Vie_ViewType_t ViewType) HieCfg_Title (PutLink,Hie_CTR); /**************************** Left part ***********************************/ - HTM_DIV_Begin ("class=\"HIE_CFG_LEFT HIE_CFG_WIDTH\""); + HTM_DIV_Begin ("class=\"HIE_CFG_LEFT\""); /***** Begin table *****/ - HTM_TABLE_BeginWidePadding (2); + HTM_TABLE_BeginPadding (2); /***** Institution *****/ CtrCfg_Institution (ViewType,PutFormIns); /***** Center name *****/ - CtrCfg_FullName (PutFormName); - CtrCfg_ShrtName (PutFormName); + HieCfg_Name (PutFormName,Hie_CTR,Nam_FULL_NAME); + HieCfg_Name (PutFormName,Hie_CTR,Nam_SHRT_NAME); /***** Place *****/ CtrCfg_Place (PutFormPlc); @@ -197,10 +192,10 @@ static void CtrCfg_Configuration (Vie_ViewType_t ViewType) } /***** Center WWW *****/ - CtrCfg_WWW (ViewType,PutFormWWW); + HieCfg_WWW (ViewType,PutFormWWW,ActChgCtrWWWCfg,Gbl.Hierarchy.Node[Hie_CTR].WWW); /***** Shortcut to the center *****/ - CtrCfg_Shortcut (ViewType); + HieCfg_Shortcut (ViewType,ParCod_Ctr,Gbl.Hierarchy.Node[Hie_CTR].HieCod); switch (ViewType) { @@ -220,7 +215,7 @@ static void CtrCfg_Configuration (Vie_ViewType_t ViewType) break; case Vie_PRINT: /***** QR code with link to the center *****/ - CtrCfg_QR (); + HieCfg_QR (ParCod_Ctr,Gbl.Hierarchy.Node[Hie_CTR].HieCod); break; default: Err_WrongTypeExit (); @@ -247,7 +242,7 @@ static void CtrCfg_Configuration (Vie_ViewType_t ViewType) if (MapIsAvailable || PhotoExists) { - HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT HIE_CFG_WIDTH\""); + HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT\""); /***** Center map *****/ if (MapIsAvailable) @@ -271,8 +266,7 @@ static void CtrCfg_Configuration (Vie_ViewType_t ViewType) static void CtrCfg_PutIconsCtrConfig (__attribute__((unused)) void *Args) { /***** Put icon to print info about center *****/ - Ico_PutContextualIconToPrint (ActPrnCtrInf, - NULL,NULL); + Ico_PutContextualIconToPrint (ActPrnCtrInf,NULL,NULL); /***** Put icon to view places *****/ Plc_PutIconToViewPlaces (); @@ -350,10 +344,10 @@ static void CtrCfg_Latitude (double Latitude) HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT","Latitude",Txt_Latitude); + Frm_LabelColumn ("Frm_C1 RT","Latitude",Txt_Latitude); /* Data */ - HTM_TD_Begin ("class=\"LB\""); + HTM_TD_Begin ("class=\"Frm_C2 LB\""); Frm_BeginForm (ActChgCtrLatCfg); HTM_INPUT_FLOAT ("Latitude", -90.0, // South Pole @@ -361,7 +355,7 @@ static void CtrCfg_Latitude (double Latitude) 0.0, // step="any" Latitude, HTM_SUBMIT_ON_CHANGE,false, - "class=\"INPUT_COORD INPUT_%s\"" + "class=\"Frm_C2_INPUT INPUT_%s\"" " required=\"required\"", The_GetSuffix ()); Frm_EndForm (); @@ -378,10 +372,10 @@ static void CtrCfg_Longitude (double Longitude) HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT","Longitude",Txt_Longitude); + Frm_LabelColumn ("Frm_C1 RT","Longitude",Txt_Longitude); /* Data */ - HTM_TD_Begin ("class=\"LB\""); + HTM_TD_Begin ("class=\"Frm_C2 LB\""); Frm_BeginForm (ActChgCtrLgtCfg); HTM_INPUT_FLOAT ("Longitude", -180.0, // West @@ -389,7 +383,7 @@ static void CtrCfg_Longitude (double Longitude) 0.0, // step="any" Longitude, HTM_SUBMIT_ON_CHANGE,false, - "class=\"INPUT_COORD INPUT_%s\"" + "class=\"Frm_C2_INPUT INPUT_%s\"" " required=\"required\"", The_GetSuffix ()); Frm_EndForm (); @@ -406,10 +400,10 @@ static void CtrCfg_Altitude (double Altitude) HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT","Altitude",Txt_Altitude); + Frm_LabelColumn ("Frm_C1 RT","Altitude",Txt_Altitude); /* Data */ - HTM_TD_Begin ("class=\"LB\""); + HTM_TD_Begin ("class=\"Frm_C2 LB\""); Frm_BeginForm (ActChgCtrAltCfg); HTM_INPUT_FLOAT ("Altitude", -413.0, // Dead Sea shore @@ -417,7 +411,7 @@ static void CtrCfg_Altitude (double Altitude) 0.0, // step="any" Altitude, HTM_SUBMIT_ON_CHANGE,false, - "class=\"INPUT_COORD INPUT_%s\"" + "class=\"Frm_C2_INPUT INPUT_%s\"" " required=\"required\"", The_GetSuffix ()); Frm_EndForm (); @@ -564,10 +558,10 @@ static void CtrCfg_Institution (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm) HTM_TR_Begin (NULL); /* 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 */ - HTM_TD_Begin ("class=\"LT DAT_%s\"",The_GetSuffix ()); + HTM_TD_Begin ("class=\"Frm_C2 LT DAT_%s\"",The_GetSuffix ()); switch (PutForm) { case Frm_DONT_PUT_FORM: @@ -598,7 +592,7 @@ static void CtrCfg_Institution (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm) Frm_BeginForm (ActChgCtrInsCfg); HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,NULL, "id=\"OthInsCod\" name=\"OthInsCod\"" - " class=\"INPUT_SHORT_NAME INPUT_%s\"", + " class=\"Frm_C2_INPUT INPUT_%s\"", The_GetSuffix ()); for (NumIns = 0; 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 (); } -/*****************************************************************************/ -/************** 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 ******************/ /*****************************************************************************/ @@ -666,10 +642,10 @@ static void CtrCfg_Place (Frm_PutForm_t PutForm) HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT",Id[PutForm],Txt_Place); + Frm_LabelColumn ("Frm_C1 RT",Id[PutForm],Txt_Place); /* Data */ - HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); + HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ()); switch (PutForm) { @@ -688,7 +664,7 @@ static void CtrCfg_Place (Frm_PutForm_t PutForm) Frm_BeginForm (ActChgCtrPlcCfg); HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,NULL, "name=\"PlcCod\"" - " class=\"INPUT_SHORT_NAME INPUT_%s\"", + " class=\"Frm_C2_INPUT INPUT_%s\"", The_GetSuffix ()); HTM_OPTION (HTM_Type_STRING,"0", 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 (); } -/*****************************************************************************/ -/***************** 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. ****/ /*****************************************************************************/ @@ -755,10 +704,10 @@ static void CtrCfg_NumUsrs (void) HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT",NULL,Txt_Users_of_the_center); + Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_Users_of_the_center); /* 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, &Gbl.Hierarchy.Node[Hie_CTR])); HTM_TD_End (); @@ -780,10 +729,10 @@ static void CtrCfg_NumDegs (void) HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_DEG]); + Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_DEG]); /* Data */ - HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); + HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ()); Frm_BeginFormGoTo (ActSeeDeg); ParCod_PutPar (ParCod_Ctr,Gbl.Hierarchy.Node[Hie_CTR].HieCod); if (asprintf (&Title,Txt_Degrees_of_CENTER_X, @@ -813,10 +762,10 @@ static void CtrCfg_NumCrss (void) HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CRS]); + Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CRS]); /* 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... Hie_CTR, // ...in center Gbl.Hierarchy.Node[Hie_CTR].HieCod)); diff --git a/swad_changelog.h b/swad_changelog.h index ca365063..f44cf623 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -633,10 +633,11 @@ Me sale este error, no s "can npt create received message (duplicated entry '243218-2160773' for key 'UsrCod_MsgCod') */ -#define Log_PLATFORM_VERSION "SWAD 23.65 (2024-02-09)" -#define CSS_FILE "swad23.65.css" +#define Log_PLATFORM_VERSION "SWAD 23.66 (2024-02-10)" +#define CSS_FILE "swad23.66.css" #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.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) diff --git a/swad_country.c b/swad_country.c index a4a80100..f23ad464 100644 --- a/swad_country.c +++ b/swad_country.c @@ -1130,7 +1130,7 @@ static void Cty_ListCountriesForEdition (void) ParCod_PutPar (ParCod_OthCty,Cty->HieCod); Par_PutParUnsigned (NULL,"Lan",(unsigned) Lan); HTM_INPUT_URL ("WWW",WWWInSeveralLanguages[Lan],HTM_SUBMIT_ON_CHANGE, - "class=\"INPUT_WWW_NARROW INPUT_%s\"" + "class=\"INPUT_WWW INPUT_%s\"" " required=\"required\"", The_GetSuffix ()); Frm_EndForm (); @@ -1463,7 +1463,7 @@ static void Cty_PutFormToCreateCountry (void) HTM_TD_Begin ("class=\"LM\""); snprintf (StrName,sizeof (StrName),"WWW_%s",Lan_STR_LANG_ID[Lan]); HTM_INPUT_URL (StrName,"",HTM_DONT_SUBMIT_ON_CHANGE, - "class=\"INPUT_WWW_NARROW INPUT_%s\"" + "class=\"INPUT_WWW INPUT_%s\"" " required=\"required\"", The_GetSuffix ()); HTM_TD_End (); diff --git a/swad_country_config.c b/swad_country_config.c index b32750d1..9083277a 100644 --- a/swad_country_config.c +++ b/swad_country_config.c @@ -65,8 +65,6 @@ static void CtyCfg_Map (void); static void CtyCfg_MapImage (Vie_ViewType_t ViewType,Hie_PutLink_t PutLink); static void CtyCfg_Platform (Vie_ViewType_t ViewType); 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_NumInss (void); static void CtyCfg_NumDegs (void); @@ -128,10 +126,10 @@ static void CtyCfg_Configuration (Vie_ViewType_t ViewType) CtyCfg_Title (PutLink); /**************************** Left part ***********************************/ - HTM_DIV_Begin ("class=\"HIE_CFG_LEFT HIE_CFG_WIDTH\""); + HTM_DIV_Begin ("class=\"HIE_CFG_LEFT\""); /* Begin table */ - HTM_TABLE_BeginWidePadding (2); + HTM_TABLE_BeginPadding (2); /* Platform */ CtyCfg_Platform (ViewType); @@ -140,7 +138,7 @@ static void CtyCfg_Configuration (Vie_ViewType_t ViewType) CtyCfg_Name (PutLink); /* 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); switch (ViewType) @@ -157,8 +155,7 @@ static void CtyCfg_Configuration (Vie_ViewType_t ViewType) number of courses */ CtyCfg_NumUsrs (); CtyCfg_NumInss (); - HieCfg_NumCtrs (NumCtrs, - false); // Don't put form + HieCfg_NumCtrs (NumCtrs,Frm_DONT_PUT_FORM); HieCfg_NumCtrsWithMap (NumCtrs,NumCtrsWithMap); CtyCfg_NumDegs (); CtyCfg_NumCrss (); @@ -171,7 +168,7 @@ static void CtyCfg_Configuration (Vie_ViewType_t ViewType) break; case Vie_PRINT: /* QR code with link to the country */ - CtyCfg_QR (); + HieCfg_QR (ParCod_Cty,Gbl.Hierarchy.Node[Hie_CTY].HieCod); break; default: Err_WrongTypeExit (); @@ -191,7 +188,7 @@ static void CtyCfg_Configuration (Vie_ViewType_t ViewType) if (NumCtrsWithMap || MapImageExists) { /* Begin container */ - HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT HIE_CFG_WIDTH\""); + HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT\""); /* Country map */ if (NumCtrsWithMap) @@ -215,8 +212,7 @@ static void CtyCfg_Configuration (Vie_ViewType_t ViewType) static void CtyCfg_PutIconToPrint (__attribute__((unused)) void *Args) { - Ico_PutContextualIconToPrint (ActPrnCtyInf, - NULL,NULL); + Ico_PutContextualIconToPrint (ActPrnCtyInf,NULL,NULL); } /*****************************************************************************/ @@ -381,10 +377,10 @@ static void CtyCfg_Platform (Vie_ViewType_t ViewType) HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_SINGUL_Abc[Hie_SYS]); + Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_SINGUL_Abc[Hie_SYS]); /* 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) { Frm_BeginFormGoTo (ActSeeSysInf); @@ -417,10 +413,10 @@ static void CtyCfg_Name (Hie_PutLink_t PutLink) HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_SINGUL_Abc[Hie_CTY]); + Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_SINGUL_Abc[Hie_CTY]); /* 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) HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"DAT_STRONG_%s\"", Gbl.Hierarchy.Node[Hie_CTY].WWW, @@ -433,24 +429,6 @@ static void CtyCfg_Name (Hie_PutLink_t PutLink) 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. **/ /*****************************************************************************/ @@ -463,10 +441,10 @@ static void CtyCfg_NumUsrs (void) HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT",NULL,Txt_Users_of_the_country); + Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_Users_of_the_country); /* 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, &Gbl.Hierarchy.Node[Hie_CTY])); HTM_TD_End (); @@ -488,10 +466,10 @@ static void CtyCfg_NumInss (void) HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_INS]); + Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_INS]); /* Data */ - HTM_TD_Begin ("class=\"LT DAT_%s\"",The_GetSuffix ()); + HTM_TD_Begin ("class=\"Frm_C2 LT DAT_%s\"",The_GetSuffix ()); Frm_BeginFormGoTo (ActSeeIns); ParCod_PutPar (ParCod_Cty,Gbl.Hierarchy.Node[Hie_CTY].HieCod); if (asprintf (&Title,Txt_Institutions_of_COUNTRY_X, @@ -521,10 +499,10 @@ static void CtyCfg_NumDegs (void) HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_DEG]); + Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_DEG]); /* 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... Hie_CTY, // ...in country Gbl.Hierarchy.Node[Hie_CTY].HieCod)); @@ -545,10 +523,10 @@ static void CtyCfg_NumCrss (void) HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CRS]); + Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CRS]); /* 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... Hie_CTY, // ...in country Gbl.Hierarchy.Node[Hie_CTY].HieCod)); diff --git a/swad_course_config.c b/swad_course_config.c index 397dbc2e..d0fdf314 100644 --- a/swad_course_config.c +++ b/swad_course_config.c @@ -61,13 +61,9 @@ extern struct Globals Gbl; static void CrsCfg_PutIconToPrint (__attribute__((unused)) void *Args); 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_InstitutionalCode (Frm_PutForm_t PutForm); static void CrsCfg_InternalCode (void); -static void CrsCfg_Shortcut (Vie_ViewType_t ViewType); -static void CrsCfg_QR (void); static void CrsCfg_Indicators (void); /*****************************************************************************/ @@ -123,17 +119,17 @@ void CrsCfg_Configuration (Vie_ViewType_t ViewType) HieCfg_Title (PutLink,Hie_CRS); /**************************** Left part ***********************************/ - HTM_DIV_Begin ("class=\"HIE_CFG_LEFT HIE_CFG_WIDTH\""); + HTM_DIV_Begin ("class=\"HIE_CFG_LEFT\""); /***** Begin table *****/ - HTM_TABLE_BeginWidePadding (2); + HTM_TABLE_BeginPadding (2); /***** Degree *****/ CrsCfg_Degree (ViewType,PutFormDeg); /***** Course name *****/ - CrsCfg_FullName (PutFormName); - CrsCfg_ShrtName (PutFormName); + HieCfg_Name (PutFormName,Hie_CRS,Nam_FULL_NAME); + HieCfg_Name (PutFormName,Hie_CRS,Nam_SHRT_NAME); /***** Course year *****/ CrsCfg_Year (PutFormYear); @@ -148,7 +144,7 @@ void CrsCfg_Configuration (Vie_ViewType_t ViewType) } /***** Shortcut to the couse *****/ - CrsCfg_Shortcut (ViewType); + HieCfg_Shortcut (ViewType,ParCod_Crs,Gbl.Hierarchy.Node[Hie_CRS].HieCod); switch (ViewType) { @@ -164,7 +160,7 @@ void CrsCfg_Configuration (Vie_ViewType_t ViewType) break; case Vie_PRINT: /***** QR code with link to the course *****/ - CrsCfg_QR (); + HieCfg_QR (ParCod_Crs,Gbl.Hierarchy.Node[Hie_CRS].HieCod); break; default: Err_WrongTypeExit (); @@ -187,8 +183,7 @@ void CrsCfg_Configuration (Vie_ViewType_t ViewType) static void CrsCfg_PutIconToPrint (__attribute__((unused)) void *Args) { - Ico_PutContextualIconToPrint (ActPrnCrsInf, - NULL,NULL); + Ico_PutContextualIconToPrint (ActPrnCrsInf,NULL,NULL); } /*****************************************************************************/ @@ -220,10 +215,10 @@ static void CrsCfg_Degree (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm) HTM_TR_Begin (NULL); /* 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 */ - HTM_TD_Begin ("class=\"LT DAT_%s\"",The_GetSuffix ()); + HTM_TD_Begin ("class=\"Frm_C2 LT DAT_%s\"",The_GetSuffix ()); switch (PutForm) { 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); HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,NULL, "id=\"OthDegCod\" name=\"OthDegCod\"" - " class=\"INPUT_SHORT_NAME INPUT_%s\"", + " class=\"Frm_C2_INPUT INPUT_%s\"", The_GetSuffix ()); for (NumDeg = 0; 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 (); } -/*****************************************************************************/ -/************** 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 ******************/ /*****************************************************************************/ @@ -413,24 +390,6 @@ static void CrsCfg_InternalCode (void) 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 ******************/ /*****************************************************************************/ diff --git a/swad_degree.c b/swad_degree.c index 88ed8526..d2b44372 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -428,7 +428,7 @@ static void Deg_ListDegreesForEdition (const struct DegTyp_DegTypes *DegTypes) Frm_BeginForm (ActChgDegWWW); ParCod_PutPar (ParCod_OthHie,Deg->HieCod); HTM_INPUT_URL ("WWW",Deg->WWW,HTM_SUBMIT_ON_CHANGE, - "class=\"INPUT_WWW_NARROW INPUT_%s\"" + "class=\"INPUT_WWW INPUT_%s\"" " required=\"required\"", The_GetSuffix ()); Frm_EndForm (); @@ -561,7 +561,7 @@ static void Deg_PutFormToCreateDegree (const struct DegTyp_DegTypes *DegTypes) /***** Degree WWW *****/ HTM_TD_Begin ("class=\"LM\""); 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\"", The_GetSuffix ()); HTM_TD_End (); diff --git a/swad_degree_config.c b/swad_degree_config.c index 37889f2f..404ab1eb 100644 --- a/swad_degree_config.c +++ b/swad_degree_config.c @@ -60,11 +60,6 @@ extern struct Globals Gbl; static void DegCfg_Configuration (Vie_ViewType_t ViewType); static void DegCfg_PutIconsToPrintAndUpload (__attribute__((unused)) void *Args); 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); /*****************************************************************************/ @@ -129,23 +124,23 @@ static void DegCfg_Configuration (Vie_ViewType_t ViewType) HieCfg_Title (PutLink,Hie_DEG); /**************************** Left part ***********************************/ - HTM_DIV_Begin ("class=\"HIE_CFG_LEFT HIE_CFG_WIDTH\""); + HTM_DIV_Begin ("class=\"HIE_CFG_LEFT\""); /***** Begin table *****/ - HTM_TABLE_BeginWidePadding (2); + HTM_TABLE_BeginPadding (2); /***** Center *****/ DegCfg_Center (ViewType,PutFormCtr); /***** Degree name *****/ - DegCfg_FullName (PutFormName); - DegCfg_ShrtName (PutFormName); + HieCfg_Name (PutFormName,Hie_DEG,Nam_FULL_NAME); + HieCfg_Name (PutFormName,Hie_DEG,Nam_SHRT_NAME); /***** Degree WWW *****/ - DegCfg_WWW (ViewType,PutFormWWW); + HieCfg_WWW (ViewType,PutFormWWW,ActChgDegWWWCfg,Gbl.Hierarchy.Node[Hie_DEG].WWW); /***** Shortcut to the degree *****/ - DegCfg_Shortcut (ViewType); + HieCfg_Shortcut (ViewType,ParCod_Deg,Gbl.Hierarchy.Node[Hie_DEG].HieCod); switch (ViewType) { @@ -161,7 +156,7 @@ static void DegCfg_Configuration (Vie_ViewType_t ViewType) break; case Vie_PRINT: /***** QR code with link to the degree *****/ - DegCfg_QR (); + HieCfg_QR (ParCod_Deg,Gbl.Hierarchy.Node[Hie_DEG].HieCod); break; default: Err_WrongTypeExit (); @@ -184,8 +179,7 @@ static void DegCfg_Configuration (Vie_ViewType_t ViewType) static void DegCfg_PutIconsToPrintAndUpload (__attribute__((unused)) void *Args) { /***** Link to print info about degree *****/ - Ico_PutContextualIconToPrint (ActPrnDegInf, - NULL,NULL); + Ico_PutContextualIconToPrint (ActPrnDegInf,NULL,NULL); if (Gbl.Usrs.Me.Role.Logged >= Rol_DEG_ADM) // 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); /* 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 */ - HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); + HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ()); switch (PutForm) { 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); HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,NULL, "id=\"OthCtrCod\" name=\"OthCtrCod\"" - " class=\"INPUT_SHORT_NAME INPUT_%s\"", + " class=\"Frm_C2_INPUT INPUT_%s\"", The_GetSuffix ()); for (NumCtr = 0; 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 (); } -/*****************************************************************************/ -/************** 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 ***************/ /*****************************************************************************/ @@ -331,10 +280,10 @@ static void DegCfg_NumCrss (void) HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CRS]); + Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CRS]); /* Data */ - HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); + HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ()); Frm_BeginFormGoTo (ActSeeCrs); ParCod_PutPar (ParCod_Deg,Gbl.Hierarchy.Node[Hie_DEG].HieCod); if (asprintf (&Title,Txt_Courses_of_DEGREE_X, diff --git a/swad_department.c b/swad_department.c index 65735f8d..6cd1a4f0 100644 --- a/swad_department.c +++ b/swad_department.c @@ -522,7 +522,7 @@ static void Dpt_ListDepartmentsForEdition (const struct Dpt_Departments *Departm Frm_BeginForm (ActChgDptWWW); ParCod_PutPar (ParCod_Dpt,Dpt->DptCod); HTM_INPUT_URL ("WWW",Dpt->WWW,HTM_SUBMIT_ON_CHANGE, - "class=\"INPUT_WWW_NARROW INPUT_%s\"" + "class=\"INPUT_WWW INPUT_%s\"" " required=\"required\"", The_GetSuffix ()); Frm_EndForm (); @@ -820,7 +820,7 @@ static void Dpt_PutFormToCreateDepartment (void) /***** Department WWW *****/ HTM_TD_Begin ("class=\"LM\""); 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\"", The_GetSuffix ()); HTM_TD_End (); diff --git a/swad_hierarchy_config.c b/swad_hierarchy_config.c index a0167f47..7d518c30 100644 --- a/swad_hierarchy_config.c +++ b/swad_hierarchy_config.c @@ -117,12 +117,12 @@ void HieCfg_Name (Frm_PutForm_t PutForm,Hie_Level_t Level, HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT",Id[PutForm], + Frm_LabelColumn ("Frm_C1 RT",Id[PutForm], ShrtOrFull == Nam_SHRT_NAME ? Txt_Short_name : Txt_HIERARCHY_SINGUL_Abc[Level]); /* 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) { 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); /* Label */ - Frm_LabelColumn ("RT",Id[PutForm],Txt_Web); + Frm_LabelColumn ("Frm_C1 RT",Id[PutForm],Txt_Web); /* Data */ - HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); + HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ()); switch (PutForm) { 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 */ Frm_BeginForm (NextAction); 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\"", The_GetSuffix ()); Frm_EndForm (); @@ -212,10 +212,10 @@ void HieCfg_Shortcut (Vie_ViewType_t ViewType,ParCod_Param_t ParCode,long HieCod HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT",NULL,Txt_Shortcut); + Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_Shortcut); /* 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 (ParCode == ParCod_None) @@ -257,10 +257,10 @@ void HieCfg_NumCtrs (unsigned NumCtrs,Frm_PutForm_t PutForm) HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CTR]); + Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CTR]); /* 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) { Frm_BeginFormGoTo (ActSeeCtr); @@ -294,10 +294,10 @@ void HieCfg_NumCtrsWithMap (unsigned NumCtrs,unsigned NumCtrsWithMap) HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT",NULL,Txt_Centers_with_map); + Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_Centers_with_map); /* 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%%)", NumCtrsWithMap, 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); /* Label */ - Frm_LabelColumn ("RT",NULL, + Frm_LabelColumn ("Frm_C1 RT",NULL, Role == Rol_UNK ? Txt_Users_in_courses : Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); /* 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, Role == Rol_UNK ? (1 << Rol_STD) | (1 << Rol_NET) | diff --git a/swad_institution.c b/swad_institution.c index 0327276f..5bc3283a 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -956,7 +956,7 @@ static void Ins_ListInstitutionsForEdition (void) Frm_BeginForm (ActChgInsWWW); ParCod_PutPar (ParCod_OthHie,Ins->HieCod); HTM_INPUT_URL ("WWW",Ins->WWW,HTM_SUBMIT_ON_CHANGE, - "class=\"INPUT_WWW_NARROW INPUT_%s\"" + "class=\"INPUT_WWW INPUT_%s\"" " required=\"required\"", The_GetSuffix ()); Frm_EndForm (); @@ -1364,7 +1364,7 @@ static void Ins_PutFormToCreateInstitution (void) /***** Institution WWW *****/ HTM_TD_Begin ("class=\"LM\""); 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 ()); HTM_TD_End (); diff --git a/swad_institution_config.c b/swad_institution_config.c index 7e540439..c1680231 100644 --- a/swad_institution_config.c +++ b/swad_institution_config.c @@ -66,11 +66,6 @@ static void InsCfg_Configuration (Vie_ViewType_t ViewType); static void InsCfg_PutIconsToPrintAndUpload (__attribute__((unused)) void *Args); static void InsCfg_Map (void); 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_NumDegs (void); static void InsCfg_NumCrss (void); @@ -138,23 +133,23 @@ static void InsCfg_Configuration (Vie_ViewType_t ViewType) HieCfg_Title (PutLink,Hie_INS); /**************************** Left part ***********************************/ - HTM_DIV_Begin ("class=\"HIE_CFG_LEFT HIE_CFG_WIDTH\""); + HTM_DIV_Begin ("class=\"HIE_CFG_LEFT\""); /***** Begin table *****/ - HTM_TABLE_BeginWidePadding (2); + HTM_TABLE_BeginPadding (2); /***** Country *****/ InsCfg_Country (ViewType,PutFormCty); /***** Institution name *****/ - InsCfg_FullName (PutFormName); - InsCfg_ShrtName (PutFormName); + HieCfg_Name (PutFormName,Hie_INS,Nam_FULL_NAME); + HieCfg_Name (PutFormName,Hie_INS,Nam_SHRT_NAME); /***** Institution WWW *****/ - InsCfg_WWW (ViewType,PutFormWWW); + HieCfg_WWW (ViewType,PutFormWWW,ActChgInsWWWCfg,Gbl.Hierarchy.Node[Hie_INS].WWW); /***** 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); @@ -171,8 +166,7 @@ static void InsCfg_Configuration (Vie_ViewType_t ViewType) number of courses, number of departments *****/ InsCfg_NumUsrs (); - HieCfg_NumCtrs (NumCtrs, - true); // Put form + HieCfg_NumCtrs (NumCtrs,Frm_PUT_FORM); HieCfg_NumCtrsWithMap (NumCtrs,NumCtrsWithMap); InsCfg_NumDegs (); InsCfg_NumCrss (); @@ -186,7 +180,7 @@ static void InsCfg_Configuration (Vie_ViewType_t ViewType) break; case Vie_PRINT: /***** QR code with link to the institution *****/ - InsCfg_QR (); + HieCfg_QR (ParCod_Ins,Gbl.Hierarchy.Node[Hie_INS].HieCod); break; default: Err_WrongTypeExit (); @@ -202,7 +196,7 @@ static void InsCfg_Configuration (Vie_ViewType_t ViewType) /**************************** Right part **********************************/ if (NumCtrsWithMap) { - HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT HIE_CFG_WIDTH\""); + HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT\""); /***** Institution map *****/ InsCfg_Map (); @@ -221,8 +215,7 @@ static void InsCfg_Configuration (Vie_ViewType_t ViewType) static void InsCfg_PutIconsToPrintAndUpload (__attribute__((unused)) void *Args) { /***** Icon to print info about institution *****/ - Ico_PutContextualIconToPrint (ActPrnInsInf, - NULL,NULL); + Ico_PutContextualIconToPrint (ActPrnInsInf,NULL,NULL); if (Gbl.Usrs.Me.Role.Logged >= Rol_INS_ADM) /***** 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); /* 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 */ - HTM_TD_Begin ("class=\"LT DAT_%s\"",The_GetSuffix ()); + HTM_TD_Begin ("class=\"Frm_C2 LT DAT_%s\"",The_GetSuffix ()); switch (PutForm) { 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); HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,NULL, "id=\"OthCtyCod\" name=\"OthCtyCod\"" - " class=\"INPUT_SHORT_NAME INPUT_%s\"", + " class=\"Frm_C2_INPUT INPUT_%s\"", The_GetSuffix ()); for (NumCty = 0; 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 } -/*****************************************************************************/ -/********* 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. ***/ /*****************************************************************************/ @@ -433,10 +381,10 @@ static void InsCfg_NumUsrs (void) HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT",NULL,Txt_Users_of_the_institution); + Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_Users_of_the_institution); /* 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, &Gbl.Hierarchy.Node[Hie_INS])); HTM_TD_End (); @@ -456,10 +404,10 @@ static void InsCfg_NumDegs (void) HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_DEG]); + Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_DEG]); /* 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... Hie_INS, // ...in institution Gbl.Hierarchy.Node[Hie_INS].HieCod)); @@ -480,10 +428,10 @@ static void InsCfg_NumCrss (void) HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CRS]); + Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CRS]); /* 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... Hie_INS, // ...in institution Gbl.Hierarchy.Node[Hie_INS].HieCod)); @@ -504,10 +452,10 @@ static void InsCfg_NumDpts (void) HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT",NULL,Txt_Departments); + Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_Departments); /* 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_TD_End (); diff --git a/swad_link.c b/swad_link.c index 3d673c53..3157ac3c 100644 --- a/swad_link.c +++ b/swad_link.c @@ -443,7 +443,7 @@ static void Lnk_ListLinksForEdition (const struct Lnk_Links *Links) Frm_BeginForm (ActChgLnkWWW); ParCod_PutPar (ParCod_Lnk,Lnk->LnkCod); HTM_INPUT_URL ("WWW",Lnk->WWW,HTM_SUBMIT_ON_CHANGE, - "class=\"INPUT_WWW_NARROW INPUT_%s\"" + "class=\"INPUT_WWW INPUT_%s\"" " required=\"required\"", The_GetSuffix ()); Frm_EndForm (); @@ -672,7 +672,7 @@ static void Lnk_PutFormToCreateLink (void) /***** Link WWW *****/ HTM_TD_Begin ("class=\"LM\""); 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\"", The_GetSuffix ()); HTM_TD_End (); diff --git a/swad_name.c b/swad_name.c index 27dfaed4..d4ce9119 100644 --- a/swad_name.c +++ b/swad_name.c @@ -56,11 +56,18 @@ unsigned Nam_MaxBytes[Nam_NUM_SHRT_FULL_NAMES] = [Nam_SHRT_NAME] = Nam_MAX_BYTES_SHRT_NAME, [Nam_FULL_NAME] = Nam_MAX_BYTES_FULL_NAME, }; +/* const char *Nam_Classes[Nam_NUM_SHRT_FULL_NAMES] = { [Nam_SHRT_NAME] = "INPUT_SHRT_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 ***********************/ diff --git a/swad_project.c b/swad_project.c index 848d1bc9..81b486da 100644 --- a/swad_project.c +++ b/swad_project.c @@ -3200,8 +3200,7 @@ static void Prj_PutIconsToRemEditOnePrj (struct Prj_Projects *Projects, Prj_PutCurrentPars,Projects); /***** Icon to print project *****/ - Ico_PutContextualIconToPrint (ActPrnOnePrj, - Prj_PutCurrentPars,Projects); + Ico_PutContextualIconToPrint (ActPrnOnePrj,Prj_PutCurrentPars,Projects); /***** Locked/unlocked project edition *****/ if (PrjCfg_CheckIfICanConfig ()) diff --git a/swad_system_config.c b/swad_system_config.c index af93c2af..42123ef4 100644 --- a/swad_system_config.c +++ b/swad_system_config.c @@ -63,8 +63,6 @@ static void SysCfg_Configuration (Vie_ViewType_t ViewType); static void SysCfg_PutIconToPrint (__attribute__((unused)) void *Args); static void SysCfg_Map (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_NumInss (void); static void SysCfg_NumDegs (void); @@ -109,16 +107,16 @@ static void SysCfg_Configuration (Vie_ViewType_t ViewType) NULL,Box_NOT_CLOSABLE); /**************************** Left part ***********************************/ - HTM_DIV_Begin ("class=\"HIE_CFG_LEFT HIE_CFG_WIDTH\""); + HTM_DIV_Begin ("class=\"HIE_CFG_LEFT\""); /***** Begin table *****/ - HTM_TABLE_BeginWidePadding (2); + HTM_TABLE_BeginPadding (2); /***** Platform *****/ SysCfg_Platform (); - /***** Shortcut to the country *****/ - SysCfg_Shortcut (ViewType); + /***** Shortcut to the system *****/ + HieCfg_Shortcut (ViewType,ParCod_None,-1L); /***** Get number of centers with map *****/ NumCtrsWithMap = Ctr_GetCachedNumCtrsWithMapInSys (); @@ -138,8 +136,7 @@ static void SysCfg_Configuration (Vie_ViewType_t ViewType) number of courses *****/ SysCfg_NumCtys (); SysCfg_NumInss (); - HieCfg_NumCtrs (NumCtrs, - false); // Don't put form + HieCfg_NumCtrs (NumCtrs,Frm_DONT_PUT_FORM); HieCfg_NumCtrsWithMap (NumCtrs,NumCtrsWithMap); SysCfg_NumDegs (); SysCfg_NumCrss (); @@ -152,7 +149,7 @@ static void SysCfg_Configuration (Vie_ViewType_t ViewType) break; case Vie_PRINT: /***** QR code with link to the country *****/ - SysCfg_QR (); + HieCfg_QR (ParCod_None,-1L); break; default: Err_WrongTypeExit (); @@ -168,7 +165,7 @@ static void SysCfg_Configuration (Vie_ViewType_t ViewType) /**************************** Right part **********************************/ if (NumCtrsWithMap) { - HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT HIE_CFG_WIDTH\""); + HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT\""); /***** Country map *****/ SysCfg_Map (); @@ -186,8 +183,7 @@ static void SysCfg_Configuration (Vie_ViewType_t ViewType) static void SysCfg_PutIconToPrint (__attribute__((unused)) void *Args) { - Ico_PutContextualIconToPrint (ActPrnSysInf, - NULL,NULL); + Ico_PutContextualIconToPrint (ActPrnSysInf,NULL,NULL); } /*****************************************************************************/ @@ -275,34 +271,16 @@ static void SysCfg_Platform (void) HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_SINGUL_Abc[Hie_SYS]); + Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_SINGUL_Abc[Hie_SYS]); /* 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_TD_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 ***************/ /*****************************************************************************/ @@ -315,10 +293,10 @@ static void SysCfg_NumCtys (void) HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CTY]); + Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CTY]); /* Data */ - HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ()); + HTM_TD_Begin ("class=\"Frm_C2 LB DAT_%s\"",The_GetSuffix ()); Frm_BeginFormGoTo (ActSeeCty); HTM_BUTTON_Submit_Begin (Txt_HIERARCHY_PLURAL_Abc[Hie_CTY], "class=\"LB BT_LINK\""); @@ -344,10 +322,10 @@ static void SysCfg_NumInss (void) HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_INS]); + Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_INS]); /* 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... Hie_SYS, // ...in system Gbl.Hierarchy.Node[Hie_SYS].HieCod)); @@ -368,10 +346,10 @@ static void SysCfg_NumDegs (void) HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_DEG]); + Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_DEG]); /* 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... Hie_SYS, // ...in system Gbl.Hierarchy.Node[Hie_SYS].HieCod)); @@ -392,10 +370,10 @@ static void SysCfg_NumCrss (void) HTM_TR_Begin (NULL); /* Label */ - Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_DEG]); + Frm_LabelColumn ("Frm_C1 RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CRS]); /* 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... Hie_SYS, // ...in system Gbl.Hierarchy.Node[Hie_SYS].HieCod)); diff --git a/swad_text.c b/swad_text.c index e5fcb596..b3cbb5f9 100644 --- a/swad_text.c +++ b/swad_text.c @@ -18712,7 +18712,7 @@ const char *Txt_Latitude = #elif L==9 // pt "Latitude"; #elif L==10 // tr - "Latitude"; // Çeviri lazim! + "Enlem"; #endif const char *Txt_LAYOUT_SIDE_COLUMNS[4] = diff --git a/swad_user.c b/swad_user.c index 21b5cea9..def8f20c 100644 --- a/swad_user.c +++ b/swad_user.c @@ -5855,20 +5855,17 @@ static void Usr_PutIconsListTchs (__attribute__((unused)) void *Args) static void Usr_PutIconToPrintGsts (void) { - Ico_PutContextualIconToPrint (ActPrnGstPho, - Usr_ShowGstsAllDataPars,NULL); + Ico_PutContextualIconToPrint (ActPrnGstPho,Usr_ShowGstsAllDataPars,NULL); } static void Usr_PutIconToPrintStds (void) { - Ico_PutContextualIconToPrint (ActPrnStdPho, - Usr_ShowStdsAllDataPars,NULL); + Ico_PutContextualIconToPrint (ActPrnStdPho,Usr_ShowStdsAllDataPars,NULL); } static void Usr_PutIconToPrintTchs (void) { - Ico_PutContextualIconToPrint (ActPrnTchPho, - Usr_ShowTchsAllDataPars,NULL); + Ico_PutContextualIconToPrint (ActPrnTchPho,Usr_ShowTchsAllDataPars,NULL); } /*****************************************************************************/