From ccc1bc4a83434e507523ec87a3030fa0274a116f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sat, 3 Jun 2017 17:53:51 +0200 Subject: [PATCH] Version 16.232.6 --- swad_banner.c | 28 ++++++++++++++++++++++++---- swad_changelog.h | 5 ++--- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/swad_banner.c b/swad_banner.c index ebe925204..a7592b6d2 100644 --- a/swad_banner.c +++ b/swad_banner.c @@ -62,6 +62,7 @@ extern struct Globals Gbl; static void Ban_WriteListOfBanners (void); static void Ban_PutFormToEditBanners (void); static void Ban_GetListBanners (const char *Query); +static void Ban_PutIconToViewBanners (void); static void Ban_ListBannersForEdition (void); static void Ban_PutParamBanCod (long BanCod); static void Ban_ShowOrHideBanner (bool Hide); @@ -180,10 +181,17 @@ static void Ban_PutFormToEditBanners (void) void Ban_EditBanners (void) { + extern const char *Hlp_SYSTEM_Banners_edit; + extern const char *Txt_Banners; + /***** Get list of banners *****/ Ban_GetListBanners ("SELECT BanCod,Hidden,ShortName,FullName,Img,WWW" " FROM banners ORDER BY ShortName"); + /***** Start frame *****/ + Lay_StartRoundFrame (NULL,Txt_Banners,Ban_PutIconToViewBanners, + Hlp_SYSTEM_Banners_edit); + /***** Put a form to create a new banner *****/ Ban_PutFormToCreateBanner (); @@ -191,6 +199,9 @@ void Ban_EditBanners (void) if (Gbl.Banners.Num) Ban_ListBannersForEdition (); + /***** End frame *****/ + Lay_EndRoundFrame (); + /***** Free list of banners *****/ Ban_FreeListBanners (); } @@ -331,20 +342,28 @@ void Ban_FreeListBanners (void) } } +/*****************************************************************************/ +/**************** Put contextual icons in edition of banners *****************/ +/*****************************************************************************/ + +static void Ban_PutIconToViewBanners (void) + { + Lay_PutContextualIconToView (ActSeeBan,NULL); + } + /*****************************************************************************/ /*************************** List all the banners ****************************/ /*****************************************************************************/ static void Ban_ListBannersForEdition (void) { - extern const char *Hlp_SYSTEM_Banners_edit; - extern const char *Txt_Banners; extern const char *Txt_Show; extern const char *Txt_Hide; unsigned NumBan; struct Banner *Ban; - Lay_StartRoundFrameTable (NULL,Txt_Banners,NULL,Hlp_SYSTEM_Banners_edit,2); + /***** Start table *****/ + Lay_StartTableWide (2); /***** Table head *****/ Ban_PutHeadBanners (); @@ -439,7 +458,8 @@ static void Ban_ListBannersForEdition (void) ""); } - Lay_EndRoundFrameTable (); + /***** End table *****/ + Lay_EndTable (); } /*****************************************************************************/ diff --git a/swad_changelog.h b/swad_changelog.h index da32911be..8802e8343 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -229,19 +229,18 @@ // TODO: Limit lenght of very big institution name in record card -// TODO: Change edition of banners, integrating box and putting icon to view. - /*****************************************************************************/ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.232.5 (2017-06-03)" +#define Log_PLATFORM_VERSION "SWAD 16.232.6 (2017-06-03)" #define CSS_FILE "swad16.226.css" #define JS_FILE "swad16.206.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 16.232.6: Jun 03, 2017 Changed layout of edition of banners. (221123 lines) Version 16.232.5: Jun 03, 2017 Changed layout of edition of links. (221108 lines) Version 16.232.4: Jun 01, 2017 Changed alert when session expired. (221092 lines) Version 16.232.3: Jun 01, 2017 Fixed bug in permission of deletion of forum threads. (221091 lines)