Version 15.147.4

This commit is contained in:
Antonio Cañas Vargas 2016-03-16 15:46:12 +01:00
parent bab7ef9ff8
commit b6bf726440
2 changed files with 11 additions and 13 deletions

View File

@ -129,13 +129,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.147.3 (2016-03-16)" #define Log_PLATFORM_VERSION "SWAD 15.147.4 (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.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)

View File

@ -59,7 +59,7 @@ extern struct Globals Gbl;
/*****************************************************************************/ /*****************************************************************************/
static void Plc_GetParamPlcOrderType (void); static void Plc_GetParamPlcOrderType (void);
static void Plc_PutFormToEditPlcs (void); static void Plc_PutIconToEdit (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);
@ -92,13 +92,12 @@ void Plc_SeePlaces (void)
/***** Get list of places *****/ /***** Get list of places *****/
Plc_GetListPlaces (); Plc_GetListPlaces ();
/***** Put link (form) to edit places *****/
if (Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM) // Institution admins and system admins can edit places
Plc_PutFormToEditPlcs ();
/***** Table head *****/ /***** Table head *****/
Lay_StartRoundFrameTable (NULL,2,Txt_Places); Lay_StartRoundFrame (NULL,Txt_Places,
fprintf (Gbl.F.Out,"<tr>"); Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM ? Plc_PutIconToEdit :
NULL);
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">"
"<tr>");
for (Order = Plc_ORDER_BY_PLACE; for (Order = Plc_ORDER_BY_PLACE;
Order <= Plc_ORDER_BY_NUM_CTRS; Order <= Plc_ORDER_BY_NUM_CTRS;
Order++) Order++)
@ -171,6 +170,7 @@ void Plc_SeePlaces (void)
NumCtrsWithPlc); NumCtrsWithPlc);
/***** Table end *****/ /***** Table end *****/
fprintf (Gbl.F.Out,"</table>");
Lay_EndRoundFrameTable (); Lay_EndRoundFrameTable ();
/***** Free list of places *****/ /***** Free list of places *****/
@ -198,14 +198,11 @@ static void Plc_GetParamPlcOrderType (void)
/********************** Put a link (form) to edit places *********************/ /********************** Put a link (form) to edit places *********************/
/*****************************************************************************/ /*****************************************************************************/
static void Plc_PutFormToEditPlcs (void) static void Plc_PutIconToEdit (void)
{ {
extern const char *Txt_Edit; extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">"); Lay_PutContextualLink (ActEdiPlc,NULL,"edit64x64.png",Txt_Edit,NULL);
Lay_PutContextualLink (ActEdiPlc,NULL,"edit64x64.png",
Txt_Edit,Txt_Edit);
fprintf (Gbl.F.Out,"</div>");
} }
/*****************************************************************************/ /*****************************************************************************/