Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 15.147.5

This commit is contained in:
Antonio Cañas Vargas 2016-03-16 22:40:35 +01:00
parent b6bf726440
commit 352fa65491
9 changed files with 41 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
swad_centre.c
View File

@ -73,7 +73,7 @@ static void Ctr_Configuration (bool PrintView);
static void Ctr_ListCentres (void); static void Ctr_ListCentres (void);
static void Ctr_ListCentresForSeeing (bool ICanEdit); static void Ctr_ListCentresForSeeing (bool ICanEdit);
static void Ctr_PutIconToEdit (void); static void Ctr_PutIconToEditFrames (void);
static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr); static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr);
static void Ctr_GetParamCtrOrderType (void); static void Ctr_GetParamCtrOrderType (void);
static void Ctr_GetPhotoAttribution (long CtrCod,char **PhotoAttribution); static void Ctr_GetPhotoAttribution (long CtrCod,char **PhotoAttribution);
@ -622,7 +622,7 @@ static void Ctr_ListCentresForSeeing (bool ICanEdit)
sprintf (Gbl.Title,Txt_Centres_of_INSTITUTION_X, sprintf (Gbl.Title,Txt_Centres_of_INSTITUTION_X,
Gbl.CurrentIns.Ins.FullName); Gbl.CurrentIns.Ins.FullName);
Lay_StartRoundFrame (NULL,Gbl.Title, Lay_StartRoundFrame (NULL,Gbl.Title,
ICanEdit ? Ctr_PutIconToEdit : ICanEdit ? Ctr_PutIconToEditFrames :
NULL); NULL);
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">"); fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">");
Ctr_PutHeadCentresForSeeing (true); // Order selectable Ctr_PutHeadCentresForSeeing (true); // Order selectable
@ -642,7 +642,7 @@ static void Ctr_ListCentresForSeeing (bool ICanEdit)
/********************** Put link (form) to edit centres **********************/ /********************** Put link (form) to edit centres **********************/
/*****************************************************************************/ /*****************************************************************************/
static void Ctr_PutIconToEdit (void) static void Ctr_PutIconToEditFrames (void)
{ {
extern const char *Txt_Edit; extern const char *Txt_Edit;

5
swad_changelog.h
View File

@ -129,14 +129,15 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.147.4 (2016-03-16)" #define Log_PLATFORM_VERSION "SWAD 15.147.5 (2016-03-16)"
#define CSS_FILE "swad15.146.css" #define CSS_FILE "swad15.146.css"
#define JS_FILE "swad15.131.3.js" #define JS_FILE "swad15.131.3.js"
// Number of lines (includes comments but not blank lines) has been got with the following command: // 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 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/* /*
Version 15.147.4: Mar 16, 2016 Icon to edit places integrated in frame. (? lines) Version 15.147.5: Mar 16, 2016 Icon to edit links integrated in frame. (195863 lines)
Version 15.147.4: Mar 16, 2016 Icon to edit places integrated in frame. (195866 lines)
Version 15.147.3: Mar 16, 2016 Icon to edit groups integrated in frame. (195867 lines) Version 15.147.3: Mar 16, 2016 Icon to edit groups integrated in frame. (195867 lines)
Version 15.147.2: Mar 16, 2016 Icon to edit degree types integrated in frame. (195866 lines) Version 15.147.2: Mar 16, 2016 Icon to edit degree types integrated in frame. (195866 lines)
Version 15.147.1: Mar 16, 2016 Removed links to view when editing. (195854 lines) Version 15.147.1: Mar 16, 2016 Removed links to view when editing. (195854 lines)

6
swad_country.c
View File

@ -66,7 +66,7 @@ extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS];
static void Cty_Configuration (bool PrintView); static void Cty_Configuration (bool PrintView);
static void Cty_PutIconToEdit (void); static void Cty_PutIconToEditCountries (void);
static unsigned Cty_GetNumUsrsWhoClaimToBelongToCty (long CtyCod); static unsigned Cty_GetNumUsrsWhoClaimToBelongToCty (long CtyCod);
static void Cty_GetParamCtyOrderType (void); static void Cty_GetParamCtyOrderType (void);
@ -502,7 +502,7 @@ void Cty_ListCountries2 (void)
/***** Table head *****/ /***** Table head *****/
Lay_StartRoundFrame (NULL,Txt_Countries, Lay_StartRoundFrame (NULL,Txt_Countries,
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? Cty_PutIconToEdit : Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? Cty_PutIconToEditCountries :
NULL); NULL);
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">" fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">"
"<tr>"); "<tr>");
@ -682,7 +682,7 @@ void Cty_ListCountries2 (void)
/********************* Put link (form) to edit countries *********************/ /********************* Put link (form) to edit countries *********************/
/*****************************************************************************/ /*****************************************************************************/
static void Cty_PutIconToEdit (void) static void Cty_PutIconToEditCountries (void)
{ {
extern const char *Txt_Edit; extern const char *Txt_Edit;

6
swad_course.c
View File

@ -81,7 +81,7 @@ static void Crs_GetListCoursesInDegree (Crs_WhatCourses_t WhatCourses);
static void Crs_ListCourses (void); static void Crs_ListCourses (void);
static void Crs_EditCourses (void); static void Crs_EditCourses (void);
static void Crs_ListCoursesForSeeing (bool ICanEdit); static void Crs_ListCoursesForSeeing (bool ICanEdit);
static void Crs_PutIconToEdit (void); static void Crs_PutIconToEditCourses (void);
static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year); static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year);
static void Crs_ListCoursesForEdition (void); static void Crs_ListCoursesForEdition (void);
static bool Crs_CheckIfICanEdit (struct Course *Crs); static bool Crs_CheckIfICanEdit (struct Course *Crs);
@ -1151,7 +1151,7 @@ static void Crs_ListCoursesForSeeing (bool ICanEdit)
sprintf (Gbl.Title,Txt_Courses_of_DEGREE_X, sprintf (Gbl.Title,Txt_Courses_of_DEGREE_X,
Gbl.CurrentDeg.Deg.ShortName); Gbl.CurrentDeg.Deg.ShortName);
Lay_StartRoundFrame (NULL,Gbl.Title, Lay_StartRoundFrame (NULL,Gbl.Title,
ICanEdit ? Crs_PutIconToEdit : ICanEdit ? Crs_PutIconToEditCourses :
NULL); NULL);
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">"); fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">");
Crs_PutHeadCoursesForSeeing (); Crs_PutHeadCoursesForSeeing ();
@ -1173,7 +1173,7 @@ static void Crs_ListCoursesForSeeing (bool ICanEdit)
/********************** Put link (form) to edit courses **********************/ /********************** Put link (form) to edit courses **********************/
/*****************************************************************************/ /*****************************************************************************/
static void Crs_PutIconToEdit (void) static void Crs_PutIconToEditCourses (void)
{ {
extern const char *Txt_Edit; extern const char *Txt_Edit;

12
swad_degree.c
View File

@ -92,8 +92,8 @@ static void Deg_EditDegreeTypes (void);
static void Deg_ListDegreeTypesForSeeing (void); static void Deg_ListDegreeTypesForSeeing (void);
static void Deg_ListDegreeTypesForEdition (void); static void Deg_ListDegreeTypesForEdition (void);
static void Deg_ListDegreesForSeeing (bool ICanEdit); static void Deg_ListDegreesForSeeing (bool ICanEdit);
static void Deg_PutIconToEditDegTyp (void); static void Deg_PutIconToEditDegTypes (void);
static void Deg_PutIconToEditDeg (void); static void Deg_PutIconToEditDegrees (void);
static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg); static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg);
static void Deg_ListDegreesForEdition (void); static void Deg_ListDegreesForEdition (void);
static bool Deg_CheckIfICanEdit (struct Degree *Deg); static bool Deg_CheckIfICanEdit (struct Degree *Deg);
@ -1148,7 +1148,7 @@ static void Deg_ListDegreeTypesForSeeing (void)
/***** Write heading *****/ /***** Write heading *****/
Lay_StartRoundFrame (NULL,Txt_Types_of_degree, Lay_StartRoundFrame (NULL,Txt_Types_of_degree,
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? Deg_PutIconToEditDegTyp : Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? Deg_PutIconToEditDegTypes :
NULL); NULL);
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">"); fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">");
Deg_PutHeadDegreeTypesForSeeing (); Deg_PutHeadDegreeTypesForSeeing ();
@ -1274,7 +1274,7 @@ static void Deg_ListDegreesForSeeing (bool ICanEdit)
sprintf (Gbl.Title,Txt_Degrees_of_CENTRE_X, sprintf (Gbl.Title,Txt_Degrees_of_CENTRE_X,
Gbl.CurrentCtr.Ctr.ShortName); Gbl.CurrentCtr.Ctr.ShortName);
Lay_StartRoundFrame (NULL,Gbl.Title, Lay_StartRoundFrame (NULL,Gbl.Title,
ICanEdit ? Deg_PutIconToEditDeg : ICanEdit ? Deg_PutIconToEditDegrees :
NULL); NULL);
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">"); fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">");
Deg_PutHeadDegreesForSeeing (); Deg_PutHeadDegreesForSeeing ();
@ -1294,7 +1294,7 @@ static void Deg_ListDegreesForSeeing (bool ICanEdit)
/******************* Put link (form) to edit degree types ********************/ /******************* Put link (form) to edit degree types ********************/
/*****************************************************************************/ /*****************************************************************************/
static void Deg_PutIconToEditDegTyp (void) static void Deg_PutIconToEditDegTypes (void)
{ {
extern const char *Txt_Edit; extern const char *Txt_Edit;
@ -1305,7 +1305,7 @@ static void Deg_PutIconToEditDegTyp (void)
/********************** Put link (form) to edit degrees **********************/ /********************** Put link (form) to edit degrees **********************/
/*****************************************************************************/ /*****************************************************************************/
static void Deg_PutIconToEditDeg (void) static void Deg_PutIconToEditDegrees (void)
{ {
extern const char *Txt_Edit; extern const char *Txt_Edit;

6
swad_group.c
View File

@ -70,7 +70,7 @@ static void Grp_ListGroupTypesForEdition (void);
static void Grp_WriteHeadingGroupTypes (void); static void Grp_WriteHeadingGroupTypes (void);
static void Grp_ListGroupsForEdition (void); static void Grp_ListGroupsForEdition (void);
static void Grp_WriteHeadingGroups (void); static void Grp_WriteHeadingGroups (void);
static void Grp_PutIconToEdit (void); static void Grp_PutIconToEditGroups (void);
static void Grp_ShowWarningToStdsToChangeGrps (void); static void Grp_ShowWarningToStdsToChangeGrps (void);
static unsigned Grp_ListGrpsForChange (struct GroupType *GrpTyp); static unsigned Grp_ListGrpsForChange (struct GroupType *GrpTyp);
@ -1569,7 +1569,7 @@ void Grp_ShowLstGrpsToChgMyGrps (bool ShowWarningsToStudents)
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_My_groups, Lay_StartRoundFrame (NULL,Txt_My_groups,
ICanEdit ? Grp_PutIconToEdit : ICanEdit ? Grp_PutIconToEditGroups :
NULL); NULL);
/***** Start form *****/ /***** Start form *****/
@ -1604,7 +1604,7 @@ void Grp_ShowLstGrpsToChgMyGrps (bool ShowWarningsToStudents)
/*************************** Put icon to edit groups *************************/ /*************************** Put icon to edit groups *************************/
/*****************************************************************************/ /*****************************************************************************/
static void Grp_PutIconToEdit (void) static void Grp_PutIconToEditGroups (void)
{ {
extern const char *Txt_Edit; extern const char *Txt_Edit;

6
swad_institution.c
View File

@ -67,7 +67,7 @@ static void Ins_Configuration (bool PrintView);
static void Ins_ListInstitutions (void); static void Ins_ListInstitutions (void);
static void Ins_ListInstitutionsForSeeing (bool ICanEdit); static void Ins_ListInstitutionsForSeeing (bool ICanEdit);
static void Ins_PutIconToEdit (void); static void Ins_PutIconToEditInstitutions (void);
static void Ins_ListOneInstitutionForSeeing (struct Institution *Ins,unsigned NumIns); static void Ins_ListOneInstitutionForSeeing (struct Institution *Ins,unsigned NumIns);
static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable); static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable);
static void Ins_GetParamInsOrderType (void); static void Ins_GetParamInsOrderType (void);
@ -556,7 +556,7 @@ static void Ins_ListInstitutionsForSeeing (bool ICanEdit)
sprintf (Gbl.Title,Txt_Institutions_of_COUNTRY_X, sprintf (Gbl.Title,Txt_Institutions_of_COUNTRY_X,
Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]); Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]);
Lay_StartRoundFrame (NULL,Gbl.Title, Lay_StartRoundFrame (NULL,Gbl.Title,
ICanEdit ? Ins_PutIconToEdit : ICanEdit ? Ins_PutIconToEditInstitutions :
NULL); NULL);
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">"); fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">");
Ins_PutHeadInstitutionsForSeeing (true); // Order selectable Ins_PutHeadInstitutionsForSeeing (true); // Order selectable
@ -576,7 +576,7 @@ static void Ins_ListInstitutionsForSeeing (bool ICanEdit)
/******************** Put link (form) to edit institutions *******************/ /******************** Put link (form) to edit institutions *******************/
/*****************************************************************************/ /*****************************************************************************/
static void Ins_PutIconToEdit (void) static void Ins_PutIconToEditInstitutions (void)
{ {
extern const char *Txt_Edit; extern const char *Txt_Edit;

34
swad_link.c
View File

@ -58,9 +58,9 @@ extern struct Globals Gbl;
/***************************** Private prototypes ****************************/ /***************************** Private prototypes ****************************/
/*****************************************************************************/ /*****************************************************************************/
static void Lnk_PutIconToEditLinks (void);
static void Lnk_WriteListOfLinks (void); static void Lnk_WriteListOfLinks (void);
static void Lnk_PutFormToEditLinks (void);
static void Lnk_ListLinksForEdition (void); static void Lnk_ListLinksForEdition (void);
static void Lnk_PutParamLnkCod (long LnkCod); static void Lnk_PutParamLnkCod (long LnkCod);
static void Lnk_RenameLink (Cns_ShortOrFullName_t ShortOrFullName); static void Lnk_RenameLink (Cns_ShortOrFullName_t ShortOrFullName);
@ -80,14 +80,12 @@ void Lnk_SeeLinks (void)
/***** Get list of links *****/ /***** Get list of links *****/
Lnk_GetListLinks (); Lnk_GetListLinks ();
/***** Put link (form) to edit links *****/
if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
Lnk_PutFormToEditLinks ();
/***** Write all the links *****/ /***** Write all the links *****/
if (Gbl.Links.Num) if (Gbl.Links.Num)
{ {
Lay_StartRoundFrame (NULL,Txt_Links,NULL); Lay_StartRoundFrame (NULL,Txt_Links,
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? Lnk_PutIconToEditLinks :
NULL);
Lnk_WriteListOfLinks (); Lnk_WriteListOfLinks ();
Lay_EndRoundFrame (); Lay_EndRoundFrame ();
} }
@ -96,6 +94,16 @@ void Lnk_SeeLinks (void)
Lnk_FreeListLinks (); Lnk_FreeListLinks ();
} }
/*****************************************************************************/
/************************** Put icon to edit links ***************************/
/*****************************************************************************/
static void Lnk_PutIconToEditLinks (void)
{
extern const char *Txt_Edit;
Lay_PutContextualLink (ActEdiLnk,NULL,"edit64x64.png",Txt_Edit,NULL);
}
/*****************************************************************************/ /*****************************************************************************/
/***************** Write menu with some institutional links ******************/ /***************** Write menu with some institutional links ******************/
@ -150,20 +158,6 @@ static void Lnk_WriteListOfLinks (void)
fprintf (Gbl.F.Out,"</ul>"); fprintf (Gbl.F.Out,"</ul>");
} }
/*****************************************************************************/
/********************** Put a link (form) to edit links **********************/
/*****************************************************************************/
static void Lnk_PutFormToEditLinks (void)
{
extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActEdiLnk,NULL,"edit64x64.png",
Txt_Edit,Txt_Edit);
fprintf (Gbl.F.Out,"</div>");
}
/*****************************************************************************/ /*****************************************************************************/
/************************** Put forms to edit links **************************/ /************************** Put forms to edit links **************************/
/*****************************************************************************/ /*****************************************************************************/

6
swad_place.c
View File

@ -59,7 +59,7 @@ extern struct Globals Gbl;
/*****************************************************************************/ /*****************************************************************************/
static void Plc_GetParamPlcOrderType (void); static void Plc_GetParamPlcOrderType (void);
static void Plc_PutIconToEdit (void); static void Plc_PutIconToEditPlaces (void);
static void Plc_ListPlacesForEdition (void); static void Plc_ListPlacesForEdition (void);
static void Plc_PutParamPlcCod (long PlcCod); static void Plc_PutParamPlcCod (long PlcCod);
static void Plc_RenamePlace (Cns_ShortOrFullName_t ShortOrFullName); static void Plc_RenamePlace (Cns_ShortOrFullName_t ShortOrFullName);
@ -94,7 +94,7 @@ void Plc_SeePlaces (void)
/***** Table head *****/ /***** Table head *****/
Lay_StartRoundFrame (NULL,Txt_Places, Lay_StartRoundFrame (NULL,Txt_Places,
Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM ? Plc_PutIconToEdit : Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM ? Plc_PutIconToEditPlaces :
NULL); NULL);
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">" fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">"
"<tr>"); "<tr>");
@ -198,7 +198,7 @@ static void Plc_GetParamPlcOrderType (void)
/********************** Put a link (form) to edit places *********************/ /********************** Put a link (form) to edit places *********************/
/*****************************************************************************/ /*****************************************************************************/
static void Plc_PutIconToEdit (void) static void Plc_PutIconToEditPlaces (void)
{ {
extern const char *Txt_Edit; extern const char *Txt_Edit;