diff --git a/swad_action.c b/swad_action.c index 67e89833..d40c0244 100644 --- a/swad_action.c +++ b/swad_action.c @@ -1361,7 +1361,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActSeeCty */{ 862, 1,TabSys,ActSeeCty ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,Cty_ListCountries1 ,Cty_ListCountries2 ,"earth64x64.gif" }, /* ActSeePen */{1060, 2,TabSys,ActSeePen ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Deg_SeePending ,"mygroups64x64.gif" }, /* ActReqRemOldCrs */{1109, 3,TabSys,ActReqRemOldCrs ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Crs_AskRemoveOldCrss ,"removeusers64x64.gif" }, - /* ActSeeDegTyp */{1013, 4,TabSys,ActSeeDegTyp ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Deg_SeeDegTypes ,"grouptypes64x64.gif" }, + /* ActSeeDegTyp */{1013, 4,TabSys,ActSeeDegTyp ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,DT_SeeDegreeTypes ,"grouptypes64x64.gif" }, /* ActSeeMai */{ 855, 5,TabSys,ActSeeMai ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Mai_SeeMailDomains ,"email64x64.gif" }, /* ActSeeBan */{1137, 6,TabSys,ActSeeBan ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Ban_SeeBanners ,"picture64x64.gif" }, /* ActSeeLnk */{ 748, 7,TabSys,ActSeeLnk ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Lnk_SeeLinks ,"link64x64.gif" }, @@ -1370,7 +1370,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = // Actions not in menu: /* ActSysSch */{ 628,-1,TabSys,ActSysReqSch ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,Sch_GetParamsSearch ,Sch_SysSearch ,NULL}, - /* ActEdiDegTyp */{ 573,-1,TabSys,ActSeeDegTyp ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Deg_ReqEditDegreeTypes ,NULL}, + /* ActEdiDegTyp */{ 573,-1,TabSys,ActSeeDegTyp ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,DT_ReqEditDegreeTypes ,NULL}, /* ActEdiCty */{ 863,-1,TabSys,ActSeeCty ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Cty_EditCountries ,NULL}, /* ActNewCty */{ 864,-1,TabSys,ActSeeCty ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Cty_RecFormNewCountry ,NULL}, @@ -1378,9 +1378,9 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActRenCty */{ 866,-1,TabSys,ActSeeCty ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Cty_RenameCountry ,NULL}, /* ActChgCtyWWW */{1157,-1,TabSys,ActSeeCty ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Cty_ChangeCtyWWW ,NULL}, - /* ActNewDegTyp */{ 537,-1,TabSys,ActSeeDegTyp ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Deg_RecFormNewDegTyp ,NULL}, - /* ActRemDegTyp */{ 545,-1,TabSys,ActSeeDegTyp ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Deg_RemoveDegreeType ,NULL}, - /* ActRenDegTyp */{ 538,-1,TabSys,ActSeeDegTyp ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Deg_RenameDegreeType ,NULL}, + /* ActNewDegTyp */{ 537,-1,TabSys,ActSeeDegTyp ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,DT_RecFormNewDegreeType ,NULL}, + /* ActRemDegTyp */{ 545,-1,TabSys,ActSeeDegTyp ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,DT_RemoveDegreeType ,NULL}, + /* ActRenDegTyp */{ 538,-1,TabSys,ActSeeDegTyp ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,DT_RenameDegreeType ,NULL}, /* ActRemOldCrs */{1110,-1,TabSys,ActReqRemOldCrs ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Crs_RemoveOldCrss ,NULL}, @@ -1574,7 +1574,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActRemDeg */{ 542,-1,TabCtr,ActSeeDeg ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Deg_RemoveDegree ,NULL}, /* ActRenDegSho */{ 546,-1,TabCtr,ActSeeDeg ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,Deg_RenameDegreeShort ,Deg_ContEditAfterChgDeg ,NULL}, /* ActRenDegFul */{ 547,-1,TabCtr,ActSeeDeg ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,Deg_RenameDegreeFull ,Deg_ContEditAfterChgDeg ,NULL}, - /* ActChgDegTyp */{ 544,-1,TabCtr,ActSeeDeg ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Deg_ChangeDegreeType ,NULL}, + /* ActChgDegTyp */{ 544,-1,TabCtr,ActSeeDeg ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,DT_ChangeDegreeType ,NULL}, /* ActChgDegCtr */{1049,-1,TabCtr,ActSeeDeg ,0x1C0,0x1C0,0x1C0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Deg_ChangeDegreeCtr ,NULL}, /* ActChgDegWWW */{ 554,-1,TabCtr,ActSeeDeg ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Deg_ChangeDegWWW ,NULL}, /* ActChgDegSta */{1207,-1,TabCtr,ActSeeDeg ,0x1C0,0x1C0,0x1C0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Deg_ChangeDegStatus ,NULL}, diff --git a/swad_changelog.h b/swad_changelog.h index 713c1d16..f8d6404d 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -134,13 +134,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.157 (2016-03-20)" +#define Log_PLATFORM_VERSION "SWAD 15.157.1 (2016-03-20)" #define CSS_FILE "swad15.157.css" #define JS_FILE "swad15.131.3.js" // Number of lines (includes comments but not blank lines) has been got with the following command: // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1 /* + Version 15.157.1: Mar 20, 2016 Changed names of functions related to degree types. (196237 lines) Version 15.157: Mar 20, 2016 Changes in tagline and title. (196227 lines) Version 15.156.1: Mar 20, 2016 Change in layout of banners. Changes in layout of types of degree. (196139 lines) diff --git a/swad_config.h b/swad_config.h index 32cf69d2..8d66d17a 100644 --- a/swad_config.h +++ b/swad_config.h @@ -48,9 +48,8 @@ */ #if defined LOCALHOST_UBUNTU // localhost (Ubuntu) ****************** -#define Cfg_PLATFORM_SHORT_NAME "SWAD" +#define Cfg_PLATFORM_SHORT_NAME "SWAD local" #define Cfg_PLATFORM_FULL_NAME "SWAD (Shared Workspace At a Distance)" -#define Cfg_PLATFORM_PAGE_TITLE "SWAD local" // This title will appear on browser top #define Cfg_PLATFORM_SERVER "localhost" // Server name (main part of the URL) #define Cfg_HTTPS_URL_SWAD_CGI "https://localhost/swad" // Without ending slash #define Cfg_HTTPS_URL_SWAD_PUBLIC "https://localhost/swad" // Without ending slash @@ -102,7 +101,6 @@ #define Cfg_PLATFORM_SHORT_NAME "OpenSWAD" #define Cfg_PLATFORM_FULL_NAME "OpenSWAD (Open Shared Workspace At a Distance)" -#define Cfg_PLATFORM_PAGE_TITLE "OpenSWAD" // This title will appear on browser top #define Cfg_PLATFORM_SERVER "openswad.org" // Server name (main part of the URL) #define Cfg_HTTPS_URL_SWAD_CGI "https://openswad.org" // Without ending slash #define Cfg_HTTPS_URL_SWAD_PUBLIC "https://openswad.org/swad" // Without ending slash @@ -171,7 +169,6 @@ #define Cfg_PLATFORM_SHORT_NAME "SWAD" #define Cfg_PLATFORM_FULL_NAME "SWAD (Shared Workspace At a Distance)" -#define Cfg_PLATFORM_PAGE_TITLE "SWAD" // This title will appear on browser top #define Cfg_PLATFORM_SERVER "swad.ugr.es" // Server name (main part of the URL) #define Cfg_HTTPS_URL_SWAD_CGI "https://swad.ugr.es" // Without ending slash #define Cfg_HTTPS_URL_SWAD_PUBLIC "https://swad.ugr.es/swad" // Without ending slash @@ -230,7 +227,6 @@ #define Cfg_PLATFORM_SHORT_NAME "SWAD" #define Cfg_PLATFORM_FULL_NAME "SWAD (Shared Workspace At a Distance)" -#define Cfg_PLATFORM_PAGE_TITLE "SWAD" // This title will appear on browser top #define Cfg_PLATFORM_SERVER "www.cevuna.una.py" // Server name (main part of the URL) #define Cfg_HTTPS_URL_SWAD_CGI "https://www.cevuna.una.py/swad" // Without ending slash #define Cfg_HTTPS_URL_SWAD_PUBLIC "https://www.cevuna.una.py/swad" // Without ending slash diff --git a/swad_degree.c b/swad_degree.c index 044dde6e..1b9a2d6c 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -798,6 +798,7 @@ void Deg_WriteHierarchyBreadcrumb (void) void Deg_WriteBigNameCtyInsCtrDegCrs (void) { extern const char *The_ClassCourse[The_NUM_THEMES]; + extern const char *Txt_TAGLINE; fprintf (Gbl.F.Out,"

", The_ClassCourse[Gbl.Prefs.Theme]); @@ -823,31 +824,41 @@ void Deg_WriteBigNameCtyInsCtrDegCrs (void) Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME); /***** Text *****/ - fprintf (Gbl.F.Out,"
" - "
" - "%s" // Full name - "
" - "
" - " / " // To separate - "
" - "
" - "%s" // Short name - "
" - "
", - (Gbl.CurrentCrs.Crs.CrsCod > 0) ? Gbl.CurrentCrs.Crs.FullName : - ((Gbl.CurrentDeg.Deg.DegCod > 0) ? Gbl.CurrentDeg.Deg.FullName : - ((Gbl.CurrentCtr.Ctr.CtrCod > 0) ? Gbl.CurrentCtr.Ctr.FullName : - ((Gbl.CurrentIns.Ins.InsCod > 0) ? Gbl.CurrentIns.Ins.FullName : - ((Gbl.CurrentCty.Cty.CtyCod > 0) ? Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language] : - Cfg_PLATFORM_FULL_NAME)))), - (Gbl.CurrentCrs.Crs.CrsCod > 0) ? Gbl.CurrentCrs.Crs.ShortName : - ((Gbl.CurrentDeg.Deg.DegCod > 0) ? Gbl.CurrentDeg.Deg.ShortName : - ((Gbl.CurrentCtr.Ctr.CtrCod > 0) ? Gbl.CurrentCtr.Ctr.ShortName : - ((Gbl.CurrentIns.Ins.InsCod > 0) ? Gbl.CurrentIns.Ins.ShortName : - ((Gbl.CurrentCty.Cty.CtyCod > 0) ? Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language] : - Cfg_PLATFORM_SHORT_NAME))))); - - fprintf (Gbl.F.Out,"

"); + fprintf (Gbl.F.Out,"
"); + if (Gbl.CurrentCty.Cty.CtyCod > 0) + fprintf (Gbl.F.Out,"
" + "%s" // Full name + "
" + "
" + " / " // To separate + "
" + "
" + "%s" // Short name + "
", + (Gbl.CurrentCrs.Crs.CrsCod > 0) ? Gbl.CurrentCrs.Crs.FullName : + ((Gbl.CurrentDeg.Deg.DegCod > 0) ? Gbl.CurrentDeg.Deg.FullName : + ((Gbl.CurrentCtr.Ctr.CtrCod > 0) ? Gbl.CurrentCtr.Ctr.FullName : + ((Gbl.CurrentIns.Ins.InsCod > 0) ? Gbl.CurrentIns.Ins.FullName : + Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]))), + (Gbl.CurrentCrs.Crs.CrsCod > 0) ? Gbl.CurrentCrs.Crs.ShortName : + ((Gbl.CurrentDeg.Deg.DegCod > 0) ? Gbl.CurrentDeg.Deg.ShortName : + ((Gbl.CurrentCtr.Ctr.CtrCod > 0) ? Gbl.CurrentCtr.Ctr.ShortName : + ((Gbl.CurrentIns.Ins.InsCod > 0) ? Gbl.CurrentIns.Ins.ShortName : + Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language])))); + else // No country specified ==> home page + fprintf (Gbl.F.Out,"
" + "%s: %s" // Full name + "
" + "
" + " / " // To separate + "
" + "
" + "%s" // Short name + "
", + Cfg_PLATFORM_SHORT_NAME,Txt_TAGLINE, + Cfg_PLATFORM_SHORT_NAME); + fprintf (Gbl.F.Out,"
" + ""); } /*****************************************************************************/ @@ -886,7 +897,7 @@ void Deg_InitCurrentCourse (void) Gbl.CurrentIns.Ins.InsCod = Deg_GetInsCodOfDegreeByCod (Gbl.CurrentDeg.Deg.DegCod); /***** Degree type is available, so get degree type data *****/ - if (!Deg_GetDataOfDegreeTypeByCod (&Gbl.CurrentDegTyp.DegTyp)) // Degree type not found + if (!DT_GetDataOfDegreeTypeByCod (&Gbl.CurrentDegTyp.DegTyp)) // Degree type not found { Gbl.YearOK = false; Gbl.CurrentIns.Ins.InsCod = @@ -1644,7 +1655,7 @@ static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg) /***** Get data of type of degree of this degree *****/ DegTyp.DegTypCod = Deg->DegTypCod; - if (!Deg_GetDataOfDegreeTypeByCod (&DegTyp)) + if (!DT_GetDataOfDegreeTypeByCod (&DegTyp)) Lay_ShowErrorAndExit ("Code of type of degree not found."); if (Deg->Status & Deg_STATUS_BIT_PENDING) @@ -1732,7 +1743,7 @@ void Deg_EditDegrees (void) if (Gbl.Ctrs.Num) { /***** Get list of degree types *****/ - Deg_GetListDegTypes (); + DT_GetListDegreeTypes (); if (Gbl.Degs.DegTypes.Num) { @@ -1755,7 +1766,7 @@ void Deg_EditDegrees (void) } /***** Free list of degree types *****/ - Deg_FreeListDegTypes (); + DT_FreeListDegreeTypes (); } else // No centres { @@ -1993,7 +2004,7 @@ static void Deg_RecFormRequestOrCreateDeg (unsigned Status) Par_GetParToText ("FullName",Deg->FullName,Deg_MAX_LENGTH_DEGREE_FULL_NAME); /* Get degree type */ - if ((Deg->DegTypCod = Deg_GetParamOtherDegTypCod ()) <= 0) + if ((Deg->DegTypCod = DT_GetParamOtherDegTypCod ()) <= 0) Lay_ShowAlert (Lay_ERROR,"Wrong type of degree."); /* Get degree WWW */ diff --git a/swad_degree_type.c b/swad_degree_type.c index fd4930e4..26a097c9 100644 --- a/swad_degree_type.c +++ b/swad_degree_type.c @@ -62,37 +62,37 @@ extern struct Globals Gbl; /**************************** Private prototypes *****************************/ /*****************************************************************************/ -static void Deg_ListDegreeTypes (void); -static void Deg_EditDegreeTypes (void); -static void Deg_ListDegreeTypesForSeeing (void); -static void Deg_PutIconToEditDegTypes (void); -static void Deg_ListDegreeTypesForEdition (void); +static void DT_ListDegreeTypes (void); +static void DT_EditDegreeTypes (void); +static void DT_ListDegreeTypesForSeeing (void); +static void DT_PutIconToEditDegTypes (void); +static void DT_ListDegreeTypesForEdition (void); -static void Deg_PutFormToCreateDegType (void); -static void Deg_PutHeadDegreeTypesForSeeing (void); -static void Deg_PutHeadDegreeTypesForEdition (void); -static void Deg_CreateDegreeType (struct DegreeType *DegTyp); +static void DT_PutFormToCreateDegreeType (void); +static void DT_PutHeadDegreeTypesForSeeing (void); +static void DT_PutHeadDegreeTypesForEdition (void); +static void DT_CreateDegreeType (struct DegreeType *DegTyp); -static void Deg_PutParamOtherDegTypCod (long DegTypCod); +static void DT_PutParamOtherDegTypCod (long DegTypCod); -static unsigned Deg_CountNumDegsOfType (long DegTypCod); -static void Deg_RemoveDegreeTypeCompletely (long DegTypCod); -static bool Deg_CheckIfDegreeTypeNameExists (const char *DegTypName,long DegTypCod); +static unsigned DT_CountNumDegsOfType (long DegTypCod); +static void DT_RemoveDegreeTypeCompletely (long DegTypCod); +static bool DT_CheckIfDegreeTypeNameExists (const char *DegTypName,long DegTypCod); /*****************************************************************************/ /************** Show selector of degree types for statistics *****************/ /*****************************************************************************/ -void Deg_WriteSelectorDegTypes (void) +void DT_WriteSelectorDegreeTypes (void) { extern const char *Txt_Any_type_of_degree; unsigned NumDegTyp; /***** Get degree type code *****/ - Gbl.Stat.DegTypCod = Deg_GetParamOtherDegTypCod (); + Gbl.Stat.DegTypCod = DT_GetParamOtherDegTypCod (); /***** Get list of degree types *****/ - Deg_GetListDegTypes (); + DT_GetListDegreeTypes (); /***** List degree types *****/ fprintf (Gbl.F.Out,""); /***** Free list of degree types *****/ - Deg_FreeListDegTypes (); + DT_FreeListDegreeTypes (); } /*****************************************************************************/ /***************************** Show degree types *****************************/ /*****************************************************************************/ -void Deg_SeeDegTypes (void) +void DT_SeeDegreeTypes (void) { /***** Get list of degree types *****/ - Deg_GetListDegTypes (); + DT_GetListDegreeTypes (); /***** List degree types *****/ - Deg_ListDegreeTypes (); + DT_ListDegreeTypes (); /***** Free list of degree types *****/ - Deg_FreeListDegTypes (); + DT_FreeListDegreeTypes (); } /*****************************************************************************/ /********************** Request edition of degree types **********************/ /*****************************************************************************/ -void Deg_ReqEditDegreeTypes (void) +void DT_ReqEditDegreeTypes (void) { /***** Get list of degree types *****/ - Deg_GetListDegTypes (); + DT_GetListDegreeTypes (); /***** Put form to edit degree types *****/ - Deg_EditDegreeTypes (); + DT_EditDegreeTypes (); /***** Free list of degree types *****/ - Deg_FreeListDegTypes (); + DT_FreeListDegreeTypes (); } /*****************************************************************************/ /***************************** List degree types *****************************/ /*****************************************************************************/ -static void Deg_ListDegreeTypes (void) +static void DT_ListDegreeTypes (void) { extern const char *Txt_There_are_no_types_of_degree; if (Gbl.Degs.DegTypes.Num) - Deg_ListDegreeTypesForSeeing (); + DT_ListDegreeTypesForSeeing (); else Lay_ShowAlert (Lay_INFO,Txt_There_are_no_types_of_degree); } @@ -165,7 +165,7 @@ static void Deg_ListDegreeTypes (void) /************************ Put forms to edit degree types *********************/ /*****************************************************************************/ -static void Deg_EditDegreeTypes (void) +static void DT_EditDegreeTypes (void) { extern const char *Txt_There_are_no_types_of_degree; @@ -174,18 +174,18 @@ static void Deg_EditDegreeTypes (void) Lay_ShowAlert (Lay_INFO,Txt_There_are_no_types_of_degree); /***** Put a form to create a new degree type *****/ - Deg_PutFormToCreateDegType (); + DT_PutFormToCreateDegreeType (); /***** Forms to edit current degree types *****/ if (Gbl.Degs.DegTypes.Num) - Deg_ListDegreeTypesForEdition (); + DT_ListDegreeTypesForEdition (); } /*****************************************************************************/ /******************* List current degree types for seeing ********************/ /*****************************************************************************/ -static void Deg_ListDegreeTypesForSeeing (void) +static void DT_ListDegreeTypesForSeeing (void) { extern const char *Txt_Types_of_degree; extern const char *Txt_TYPES_OF_DEGREE_With_degrees; @@ -195,10 +195,10 @@ static void Deg_ListDegreeTypesForSeeing (void) /***** Write heading *****/ Lay_StartRoundFrame (NULL,Txt_Types_of_degree, - Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? Deg_PutIconToEditDegTypes : + Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? DT_PutIconToEditDegTypes : NULL); fprintf (Gbl.F.Out,""); - Deg_PutHeadDegreeTypesForSeeing (); + DT_PutHeadDegreeTypesForSeeing (); /***** List degree types with forms for edition *****/ for (NumDegTyp = 0; @@ -250,7 +250,7 @@ static void Deg_ListDegreeTypesForSeeing (void) /******************* Put link (form) to edit degree types ********************/ /*****************************************************************************/ -static void Deg_PutIconToEditDegTypes (void) +static void DT_PutIconToEditDegTypes (void) { extern const char *Txt_Edit; @@ -261,14 +261,14 @@ static void Deg_PutIconToEditDegTypes (void) /******************* List current degree types for edition *******************/ /*****************************************************************************/ -static void Deg_ListDegreeTypesForEdition (void) +static void DT_ListDegreeTypesForEdition (void) { extern const char *Txt_Types_of_degree; unsigned NumDegTyp; /***** Write heading *****/ Lay_StartRoundFrameTable (NULL,2,Txt_Types_of_degree); - Deg_PutHeadDegreeTypesForEdition (); + DT_PutHeadDegreeTypesForEdition (); /***** List degree types with forms for edition *****/ for (NumDegTyp = 0; @@ -283,7 +283,7 @@ static void Deg_ListDegreeTypesForEdition (void) else { Act_FormStart (ActRemDegTyp); - Deg_PutParamOtherDegTypCod (Gbl.Degs.DegTypes.Lst[NumDegTyp].DegTypCod); + DT_PutParamOtherDegTypCod (Gbl.Degs.DegTypes.Lst[NumDegTyp].DegTypCod); Lay_PutIconRemove (); Act_FormEnd (); } @@ -298,7 +298,7 @@ static void Deg_ListDegreeTypesForEdition (void) /* Name of degree type */ fprintf (Gbl.F.Out,"" "
"); Act_FormStart (ActRenDegTyp); - Deg_PutParamOtherDegTypCod (Gbl.Degs.DegTypes.Lst[NumDegTyp].DegTypCod); + DT_PutParamOtherDegTypCod (Gbl.Degs.DegTypes.Lst[NumDegTyp].DegTypCod); fprintf (Gbl.F.Out,"", @@ -323,7 +323,7 @@ static void Deg_ListDegreeTypesForEdition (void) /******************** Put a form to create a new degree type *****************/ /*****************************************************************************/ -static void Deg_PutFormToCreateDegType (void) +static void DT_PutFormToCreateDegreeType (void) { extern const char *Txt_New_type_of_degree; extern const char *Txt_Type_of_degree; @@ -362,7 +362,7 @@ static void Deg_PutFormToCreateDegType (void) /***************** Write header with fields of a degree type *****************/ /*****************************************************************************/ -static void Deg_PutHeadDegreeTypesForSeeing (void) +static void DT_PutHeadDegreeTypesForSeeing (void) { extern const char *Txt_Type_of_degree; extern const char *Txt_Degrees; @@ -384,7 +384,7 @@ static void Deg_PutHeadDegreeTypesForSeeing (void) /***************** Write header with fields of a degree type *****************/ /*****************************************************************************/ -static void Deg_PutHeadDegreeTypesForEdition (void) +static void DT_PutHeadDegreeTypesForEdition (void) { extern const char *Txt_Code; extern const char *Txt_Type_of_degree; @@ -411,7 +411,7 @@ static void Deg_PutHeadDegreeTypesForEdition (void) /************************** Create a new degree type *************************/ /*****************************************************************************/ -static void Deg_CreateDegreeType (struct DegreeType *DegTyp) +static void DT_CreateDegreeType (struct DegreeType *DegTyp) { extern const char *Txt_Created_new_type_of_degree_X; char Query[128+Deg_MAX_LENGTH_DEGREE_TYPE_NAME]; @@ -431,7 +431,7 @@ static void Deg_CreateDegreeType (struct DegreeType *DegTyp) /**************** Create a list with all the degree types ********************/ /*****************************************************************************/ -void Deg_GetListDegTypes (void) +void DT_GetListDegreeTypes (void) { char Query[1024]; MYSQL_RES *mysql_res; @@ -486,7 +486,7 @@ void Deg_GetListDegTypes (void) /********* Free list of degree types and list of degrees of each type ********/ /*****************************************************************************/ -void Deg_FreeListDegTypes (void) +void DT_FreeListDegreeTypes (void) { /***** Free memory used by the list of degree types *****/ if (Gbl.Degs.DegTypes.Lst) @@ -501,7 +501,7 @@ void Deg_FreeListDegTypes (void) /***************** Receive form to create a new degree type ******************/ /*****************************************************************************/ -void Deg_RecFormNewDegTyp (void) +void DT_RecFormNewDegreeType (void) { extern const char *Txt_The_type_of_degree_X_already_exists; extern const char *Txt_You_must_specify_the_name_of_the_new_type_of_degree; @@ -516,14 +516,14 @@ void Deg_RecFormNewDegTyp (void) if (DegTyp->DegTypName[0]) // If there's a degree type name { /***** If name of degree type was in database... *****/ - if (Deg_CheckIfDegreeTypeNameExists (DegTyp->DegTypName,-1L)) + if (DT_CheckIfDegreeTypeNameExists (DegTyp->DegTypName,-1L)) { sprintf (Gbl.Message,Txt_The_type_of_degree_X_already_exists, DegTyp->DegTypName); Lay_ShowAlert (Lay_WARNING,Gbl.Message); } else // Add new degree type to database - Deg_CreateDegreeType (DegTyp); + DT_CreateDegreeType (DegTyp); } else // If there is not a degree type name { @@ -532,25 +532,25 @@ void Deg_RecFormNewDegTyp (void) } /***** Show the form again *****/ - Deg_ReqEditDegreeTypes (); + DT_ReqEditDegreeTypes (); } /*****************************************************************************/ /**************************** Remove a degree type ***************************/ /*****************************************************************************/ -void Deg_RemoveDegreeType (void) +void DT_RemoveDegreeType (void) { extern const char *Txt_To_remove_a_type_of_degree_you_must_first_remove_all_degrees_of_that_type; extern const char *Txt_Type_of_degree_X_removed; struct DegreeType DegTyp; /***** Get the code of the degree type *****/ - if ((DegTyp.DegTypCod = Deg_GetParamOtherDegTypCod ()) == -1L) + if ((DegTyp.DegTypCod = DT_GetParamOtherDegTypCod ()) == -1L) Lay_ShowErrorAndExit ("Code of type of degree is missing."); /***** Get data of the degree type from database *****/ - if (!Deg_GetDataOfDegreeTypeByCod (&DegTyp)) + if (!DT_GetDataOfDegreeTypeByCod (&DegTyp)) Lay_ShowErrorAndExit ("Code of type of degree not found."); /***** Check if this degree type has degrees *****/ @@ -559,7 +559,7 @@ void Deg_RemoveDegreeType (void) else // Degree type has no degrees ==> remove it { /***** Remove degree type *****/ - Deg_RemoveDegreeTypeCompletely (DegTyp.DegTypCod); + DT_RemoveDegreeTypeCompletely (DegTyp.DegTypCod); /***** Write message to show the change made *****/ sprintf (Gbl.Message,Txt_Type_of_degree_X_removed, @@ -568,14 +568,14 @@ void Deg_RemoveDegreeType (void) } /***** Show the form again *****/ - Deg_ReqEditDegreeTypes (); + DT_ReqEditDegreeTypes (); } /*****************************************************************************/ /***************** Write parameter with code of degree type ******************/ /*****************************************************************************/ -static void Deg_PutParamOtherDegTypCod (long DegTypCod) +static void DT_PutParamOtherDegTypCod (long DegTypCod) { Par_PutHiddenParamLong ("OthDegTypCod",DegTypCod); } @@ -584,7 +584,7 @@ static void Deg_PutParamOtherDegTypCod (long DegTypCod) /******************* Get parameter with code of degree type ******************/ /*****************************************************************************/ -long Deg_GetParamOtherDegTypCod (void) +long DT_GetParamOtherDegTypCod (void) { char LongStr[1+10+1]; @@ -597,7 +597,7 @@ long Deg_GetParamOtherDegTypCod (void) /**************** Count number of degrees in a degree type ******************/ /*****************************************************************************/ -static unsigned Deg_CountNumDegsOfType (long DegTypCod) +static unsigned DT_CountNumDegsOfType (long DegTypCod) { char Query[512]; @@ -611,7 +611,7 @@ static unsigned Deg_CountNumDegsOfType (long DegTypCod) /****************** Get data of a degree type from its code ******************/ /*****************************************************************************/ -bool Deg_GetDataOfDegreeTypeByCod (struct DegreeType *DegTyp) +bool DT_GetDataOfDegreeTypeByCod (struct DegreeType *DegTyp) { char Query[512]; MYSQL_RES *mysql_res; @@ -641,7 +641,7 @@ bool Deg_GetDataOfDegreeTypeByCod (struct DegreeType *DegTyp) strcpy (DegTyp->DegTypName,row[0]); /* Count number of degrees of this type */ - DegTyp->NumDegs = Deg_CountNumDegsOfType (DegTyp->DegTypCod); + DegTyp->NumDegs = DT_CountNumDegsOfType (DegTyp->DegTypCod); /* Set return value */ DegTypFound = true; @@ -666,7 +666,7 @@ bool Deg_GetDataOfDegreeTypeByCod (struct DegreeType *DegTyp) /******************** Remove a degree type and its degrees *******************/ /*****************************************************************************/ -static void Deg_RemoveDegreeTypeCompletely (long DegTypCod) +static void DT_RemoveDegreeTypeCompletely (long DegTypCod) { char Query[512]; MYSQL_RES *mysql_res; @@ -707,7 +707,7 @@ static void Deg_RemoveDegreeTypeCompletely (long DegTypCod) /**************************** Rename a degree type ***************************/ /*****************************************************************************/ -void Deg_RenameDegreeType (void) +void DT_RenameDegreeType (void) { extern const char *Txt_You_can_not_leave_the_name_of_the_type_of_degree_X_empty; extern const char *Txt_The_type_of_degree_X_already_exists; @@ -721,14 +721,14 @@ void Deg_RenameDegreeType (void) /***** Get parameters from form *****/ /* Get the code of the degree type */ - if ((DegTyp->DegTypCod = Deg_GetParamOtherDegTypCod ()) == -1L) + if ((DegTyp->DegTypCod = DT_GetParamOtherDegTypCod ()) == -1L) Lay_ShowErrorAndExit ("Code of type of degree is missing."); /* Get the new name for the degree type */ Par_GetParToText ("DegTypName",NewNameDegTyp,Deg_MAX_LENGTH_DEGREE_TYPE_NAME); /***** Get from the database the old name of the degree type *****/ - if (!Deg_GetDataOfDegreeTypeByCod (DegTyp)) + if (!DT_GetDataOfDegreeTypeByCod (DegTyp)) Lay_ShowErrorAndExit ("Code of type of degree not found."); /***** Check if new name is empty *****/ @@ -744,7 +744,7 @@ void Deg_RenameDegreeType (void) if (strcmp (DegTyp->DegTypName,NewNameDegTyp)) // Different names { /***** If degree type was in database... *****/ - if (Deg_CheckIfDegreeTypeNameExists (NewNameDegTyp,DegTyp->DegTypCod)) + if (DT_CheckIfDegreeTypeNameExists (NewNameDegTyp,DegTyp->DegTypCod)) { sprintf (Gbl.Message,Txt_The_type_of_degree_X_already_exists, NewNameDegTyp); @@ -774,14 +774,14 @@ void Deg_RenameDegreeType (void) /***** Show the form again *****/ strcpy (DegTyp->DegTypName,NewNameDegTyp); - Deg_ReqEditDegreeTypes (); + DT_ReqEditDegreeTypes (); } /*****************************************************************************/ /****************** Check if name of degree type exists **********************/ /*****************************************************************************/ -static bool Deg_CheckIfDegreeTypeNameExists (const char *DegTypName,long DegTypCod) +static bool DT_CheckIfDegreeTypeNameExists (const char *DegTypName,long DegTypCod) { char Query[512]; @@ -796,7 +796,7 @@ static bool Deg_CheckIfDegreeTypeNameExists (const char *DegTypName,long DegTypC /************************ Change the type of a degree ************************/ /*****************************************************************************/ -void Deg_ChangeDegreeType (void) +void DT_ChangeDegreeType (void) { extern const char *Txt_The_type_of_degree_of_the_degree_X_has_changed; struct Degree *Deg; @@ -811,7 +811,7 @@ void Deg_ChangeDegreeType (void) Lay_ShowErrorAndExit ("Code of degree is missing."); /* Get the new degree type */ - NewDegTypCod = Deg_GetParamOtherDegTypCod (); + NewDegTypCod = DT_GetParamOtherDegTypCod (); /***** Get data of degree *****/ Deg_GetDataOfDegreeByCod (Deg); diff --git a/swad_degree_type.h b/swad_degree_type.h index 0f712ac9..4e3253bd 100644 --- a/swad_degree_type.h +++ b/swad_degree_type.h @@ -31,7 +31,7 @@ /***************************** Public constants ******************************/ /*****************************************************************************/ -#define Deg_MAX_LENGTH_DEGREE_TYPE_NAME 32 +#define Deg_MAX_LENGTH_DEGREE_TYPE_NAME 32 /*****************************************************************************/ /******************************* Public types ********************************/ @@ -48,20 +48,21 @@ struct DegreeType /***************************** Public prototypes *****************************/ /*****************************************************************************/ -void Deg_WriteSelectorDegTypes (void); -void Deg_SeeDegTypes (void); -void Deg_ReqEditDegreeTypes (void); +void DT_WriteSelectorDegreeTypes (void); +void DT_SeeDegreeTypes (void); +void DT_ReqEditDegreeTypes (void); -void Deg_GetListDegTypes (void); -void Deg_FreeListDegTypes (void); +void DT_GetListDegreeTypes (void); +void DT_FreeListDegreeTypes (void); -void Deg_RecFormNewDegTyp (void); -void Deg_RemoveDegreeType (void); +void DT_RecFormNewDegreeType (void); -long Deg_GetParamOtherDegTypCod (void); +void DT_RemoveDegreeType (void); -bool Deg_GetDataOfDegreeTypeByCod (struct DegreeType *DegTyp); -void Deg_RenameDegreeType (void); -void Deg_ChangeDegreeType (void); +long DT_GetParamOtherDegTypCod (void); + +bool DT_GetDataOfDegreeTypeByCod (struct DegreeType *DegTyp); +void DT_RenameDegreeType (void); +void DT_ChangeDegreeType (void); #endif diff --git a/swad_global.c b/swad_global.c index 1ddab892..188bd192 100644 --- a/swad_global.c +++ b/swad_global.c @@ -447,7 +447,7 @@ void Gbl_Cleanup (void) Crs_FreeListCoursesInDegree (&Gbl.Degs.EditingDeg); Deg_FreeListMyAdminDegs (); Deg_FreeListAllDegs (); - Deg_FreeListDegTypes (); + DT_FreeListDegreeTypes (); Ins_FreeListInstitutions (); Ctr_FreeListCentres (); Cty_FreeListCountries (); diff --git a/swad_indicator.c b/swad_indicator.c index 83d54954..fb8a70b7 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -122,7 +122,7 @@ void Ind_ReqIndicatorsCourses (void) "", The_ClassForm[Gbl.Prefs.Theme],Txt_Types_of_degree); - Deg_WriteSelectorDegTypes (); + DT_WriteSelectorDegreeTypes (); fprintf (Gbl.F.Out," ("); fprintf (Gbl.F.Out,Txt_only_if_the_scope_is_X, Cfg_PLATFORM_SHORT_NAME); @@ -223,7 +223,7 @@ void Ind_ShowIndicatorsCourses (void) Sco_GetScope (); /***** Get degree type code *****/ - Gbl.Stat.DegTypCod = (Gbl.Scope.Current == Sco_SCOPE_SYS) ? Deg_GetParamOtherDegTypCod () : + Gbl.Stat.DegTypCod = (Gbl.Scope.Current == Sco_SCOPE_SYS) ? DT_GetParamOtherDegTypCod () : -1L; /***** Get department code *****/ diff --git a/swad_layout.c b/swad_layout.c index 8d015447..b0bd03ab 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -372,7 +372,7 @@ static void Lay_WritePageTitle (void) if (Gbl.GetMethod && Gbl.CurrentDeg.Deg.DegCod > 0) { fprintf (Gbl.F.Out,"%s > %s", - Cfg_PLATFORM_PAGE_TITLE, + Cfg_PLATFORM_SHORT_NAME, Gbl.CurrentDeg.Deg.ShortName); if (Gbl.CurrentCrs.Crs.CrsCod > 0) fprintf (Gbl.F.Out," > %s", @@ -380,7 +380,7 @@ static void Lay_WritePageTitle (void) } else fprintf (Gbl.F.Out,"%s: %s", - Cfg_PLATFORM_PAGE_TITLE,Txt_TAGLINE); + Cfg_PLATFORM_SHORT_NAME,Txt_TAGLINE); fprintf (Gbl.F.Out,"\n"); } diff --git a/swad_main.c b/swad_main.c index e1f46b94..84dcf944 100644 --- a/swad_main.c +++ b/swad_main.c @@ -90,7 +90,7 @@ int main (int argc, char *argv[]) "" "" "", - Cfg_PLATFORM_PAGE_TITLE, + Cfg_PLATFORM_SHORT_NAME, Cfg_PLATFORM_SHORT_NAME); exit (0); } diff --git a/swad_network.c b/swad_network.c index 3ad3987d..21da787e 100644 --- a/swad_network.c +++ b/swad_network.c @@ -201,7 +201,7 @@ void Net_ShowWebsAndSocialNets (const struct UsrData *UsrDat) /***** Show link to public profile *****/ Net_ShowAWebOrSocialNet (Prf_GetURLPublicProfile (URL,UsrDat->Nickname), - "swad64x64.gif",Cfg_PLATFORM_PAGE_TITLE); + "swad64x64.gif",Cfg_PLATFORM_SHORT_NAME); /***** Show the rest of webs / social networks *****/ for (NumURL = (Net_WebsAndSocialNetworks_t) 0;