Version 15.147.1

This commit is contained in:
Antonio Cañas Vargas 2016-03-16 13:28:16 +01:00
parent b39d853256
commit d6ee482477
15 changed files with 11 additions and 67 deletions

View File

@ -143,10 +143,7 @@ void Ban_EditBanners (void)
Ban_GetListBanners ("SELECT BanCod,Hidden,ShortName,FullName,Img,WWW"
" FROM banners ORDER BY ShortName");
if (Gbl.Banners.Num)
/***** Put link (form) to view banners *****/
Lay_PutFormToView (ActSeeBan);
else
if (!Gbl.Banners.Num)
/***** Help message *****/
Lay_ShowAlert (Lay_INFO,Txt_There_are_no_banners);

View File

@ -775,10 +775,6 @@ void Ctr_EditCentres (void)
/***** Get list of centres *****/
Ctr_GetListCentres (Gbl.CurrentIns.Ins.InsCod);
if (Gbl.Ctrs.Num)
/***** Put link (form) to view centres *****/
Lay_PutFormToView (ActSeeCtr);
/***** Put a form to create a new centre *****/
Ctr_PutFormToCreateCentre ();

View File

@ -129,13 +129,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.147 (2016-03-16)"
#define Log_PLATFORM_VERSION "SWAD 15.147.1 (2016-03-16)"
#define CSS_FILE "swad15.146.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.147.1: Mar 16, 2016 Removed links to view when editing. (195854 lines)
Version 15.147: Mar 16, 2016 New buttons to create another institution / centre / degree / course. (195903 lines)
Version 15.146.6: Mar 16, 2016 Icons to edit courses integrated in frame. (195814 lines)
Version 15.146.5: Mar 16, 2016 Icons to edit degrees integrated in frame. (195806 lines)

View File

@ -864,10 +864,7 @@ void Cty_EditCountries (void)
Gbl.Ctys.SelectedOrderType = Cty_ORDER_BY_COUNTRY;
Cty_GetListCountries (Cty_GET_EXTRA_DATA);
if (Gbl.Ctys.Num)
/***** Put link (form) to view countries *****/
Lay_PutFormToView (ActSeeCty);
else
if (!Gbl.Ctys.Num)
/***** Help message *****/
Lay_ShowAlert (Lay_INFO,Txt_No_countries_have_been_created);

View File

@ -1130,10 +1130,6 @@ static void Crs_ListCourses (void)
static void Crs_EditCourses (void)
{
if (Gbl.CurrentDeg.Deg.NumCrss)
/***** Put link (form) to view courses *****/
Lay_PutFormToView (ActSeeCrs);
/***** Put a form to create or request a new course *****/
Crs_PutFormToCreateCourse ();

View File

@ -1125,10 +1125,7 @@ static void Deg_EditDegreeTypes (void)
{
extern const char *Txt_There_are_no_types_of_degree;
if (Gbl.Degs.DegTypes.Num)
/***** Put link (form) to view degree types *****/
Lay_PutFormToView (ActSeeDegTyp);
else
if (!Gbl.Degs.DegTypes.Num)
/***** Help message *****/
Lay_ShowAlert (Lay_INFO,Txt_There_are_no_types_of_degree);
@ -2078,9 +2075,6 @@ void Deg_EditDegrees (void)
extern const char *Txt_There_is_no_list_of_types_of_degree;
extern const char *Txt_You_must_create_at_least_one_type_of_degree_before_creating_degrees;
/***** Put link (form) to view degrees *****/
Lay_PutFormToView (ActSeeDeg);
/***** Get list of degrees in the current centre *****/
Deg_GetListDegsOfCurrentCtr ();

View File

@ -238,10 +238,7 @@ void Dpt_EditDepartments (void)
/***** Get list of departments *****/
Dpt_GetListDepartments (Gbl.CurrentIns.Ins.InsCod);
if (Gbl.Dpts.Num)
/***** Put link (form) to view departments *****/
Lay_PutFormToView (ActSeeDpt);
else
if (!Gbl.Dpts.Num)
/***** Help message *****/
Lay_ShowAlert (Lay_INFO,Txt_There_are_no_departments);

View File

@ -218,10 +218,7 @@ void Hld_EditHolidays (void)
/***** Get list of holidays *****/
Hld_GetListHolidays ();
if (Gbl.Hlds.Num)
/***** Put link (form) to view degree types *****/
Lay_PutFormToView (ActSeeHld);
else
if (!Gbl.Hlds.Num)
/***** Help message *****/
Lay_ShowAlert (Lay_INFO,Txt_There_are_no_holidays);

View File

@ -766,10 +766,6 @@ void Ins_EditInstitutions (void)
/***** Get list of institutions *****/
Ins_GetListInstitutions (Gbl.CurrentCty.Cty.CtyCod,Ins_GET_EXTRA_DATA);
if (Gbl.Inss.Num)
/***** Put link (form) to view institutions *****/
Lay_PutFormToView (ActSeeIns);
/***** Put a form to create a new institution *****/
Ins_PutFormToCreateInstitution ();

View File

@ -978,20 +978,6 @@ static void Lay_ShowRightColumn (void)
// Lnk_WriteMenuWithInstitutionalLinks ();
}
/*****************************************************************************/
/************************* Put a link (form) to view *************************/
/*****************************************************************************/
void Lay_PutFormToView (Act_Action_t Action)
{
extern const char *Txt_View;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (Action,NULL,"eye-on64x64.png",
Txt_View,Txt_View);
fprintf (Gbl.F.Out,"</div>");
}
/*****************************************************************************/
/************************* Put a link (form) to edit *************************/
/*****************************************************************************/

View File

@ -71,7 +71,6 @@ typedef enum
void Lay_WriteStartOfPage (void);
void Lay_WriteTitle (const char *Title);
void Lay_PutFormToView (Act_Action_t Action);
void Lay_PutFormToEdit (Act_Action_t Action);
void Lay_PutContextualLink (Act_Action_t NextAction,
void (*FuncParams) (),

View File

@ -175,10 +175,7 @@ void Lnk_EditLinks (void)
/***** Get list of links *****/
Lnk_GetListLinks ();
if (Gbl.Links.Num)
/***** Put link (form) to view links *****/
Lay_PutFormToView (ActSeeLnk);
else
if (!Gbl.Links.Num)
/***** Help message *****/
Lay_ShowAlert (Lay_INFO,Txt_There_are_no_links);

View File

@ -192,10 +192,7 @@ void Mai_EditMailDomains (void)
/***** Get list of mail domains *****/
Mai_GetListMailDomainsAllowedForNotif ();
if (Gbl.Mails.Num)
/***** Put link (form) to view mail domains *****/
Lay_PutFormToView (ActSeeMai);
else
if (!Gbl.Mails.Num)
/***** Help message *****/
Lay_ShowAlert (Lay_INFO,Txt_There_are_no_mail_domains);

View File

@ -219,10 +219,7 @@ void Plc_EditPlaces (void)
/***** Get list of places *****/
Plc_GetListPlaces ();
if (Gbl.Plcs.Num)
/***** Put link (form) to view places *****/
Lay_PutFormToView (ActSeePlc);
else
if (!Gbl.Plcs.Num)
/***** Help message *****/
Lay_ShowAlert (Lay_INFO,Txt_There_are_no_places);

View File

@ -171,10 +171,7 @@ void Plg_EditPlugins (void)
/***** Get list of plugins *****/
Plg_GetListPlugins ();
if (Gbl.Plugins.Num)
/***** Put link (form) to view plugins *****/
Lay_PutFormToView (ActLstPlg);
else
if (!Gbl.Plugins.Num)
/***** Help message *****/
Lay_ShowAlert (Lay_INFO,Txt_There_are_no_plugins);