From b547c93298829b3c1e71a387962e44c0d5553c14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sat, 3 Jun 2017 18:13:28 +0200 Subject: [PATCH] Version 16.232.7 --- icon/link64x64.gif | Bin 0 -> 470 bytes swad_action.c | 2 +- swad_banner.c | 16 ++++++++++++++++ swad_changelog.h | 5 +++-- swad_link.c | 33 ++++++++++++++++++++++++++------- swad_link.h | 1 + 6 files changed, 47 insertions(+), 10 deletions(-) create mode 100644 icon/link64x64.gif diff --git a/icon/link64x64.gif b/icon/link64x64.gif new file mode 100644 index 0000000000000000000000000000000000000000..e2f01180fbb67f157b68875bbdb0eb50e51f74b7 GIT binary patch literal 470 zcmV;{0V)1RNk%w1VL$*t0J8u9KtMoCOG{K#R9swKV`F1&ZEbUNb9{V!hK7ccl9HXB zouZM)j$~<` zXsWJgqbLn4I|E?fgd?NJ?ca!9sqiZT3_=mnSUe;@OJ))I+(dnXL_%P6Rx#I`S7PXX zE#)TKe3mrWYjvCZ8(+edZgiDG)VXyJwnlm~e&9CQuqxlO=uD_A<3)Py?{+E;H9rLu_5jurr~?pB zMuP>>E;RGEu9g%#?eJB3m1_Y*PF1)u8Bn2Jxi5t7d~ob&1dyNy$}Cza)acOzL;{Xo z`1S?U4QU;+P2vaQmkpdk=zZ`B0O$^N1vTjWLh;AP3^dR9d1_(bvNj$uSoMJnrIDl$ zw%$;QEb9cZdAbTSV$BmdwHMz3pb8f)6S{D{g2S8l!8sdb`&wwA(Z(*p8KCJv%($`R M$B-jSt`GqLJCnP}q5uE@ literal 0 HcmV?d00001 diff --git a/swad_action.c b/swad_action.c index 07a4f94a2..837ea7c14 100644 --- a/swad_action.c +++ b/swad_action.c @@ -1546,7 +1546,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActReqRemOldCrs */{1109,-1,TabUnk,ActSeePen , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Crs_AskRemoveOldCrss ,NULL}, /* ActRemOldCrs */{1110,-1,TabUnk,ActSeePen , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Crs_RemoveOldCrss ,NULL}, - /* ActSeeBan */{1137,-1,TabUnk,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Ban_SeeBanners ,NULL}, + /* ActSeeBan */{1137,-1,TabUnk,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x3FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Ban_SeeBanners ,NULL}, /* ActEdiBan */{1138,-1,TabUnk,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Ban_EditBanners ,NULL}, /* ActNewBan */{1139,-1,TabUnk,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Ban_RecFormNewBanner ,NULL}, /* ActRemBan */{1140,-1,TabUnk,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Ban_RemoveBanner ,NULL}, diff --git a/swad_banner.c b/swad_banner.c index a7592b6d2..02cae75c3 100644 --- a/swad_banner.c +++ b/swad_banner.c @@ -100,6 +100,14 @@ void Ban_SeeBanners (void) extern const char *Txt_No_banners; extern const char *Txt_New_banner; + /***** Put contextual links *****/ + fprintf (Gbl.F.Out,"
"); + + /* Put link to view links */ + Lnk_PutLinkToViewLinks (); + + fprintf (Gbl.F.Out,"
"); + /***** Get list of banners *****/ Ban_GetListBanners ("SELECT BanCod,Hidden,ShortName,FullName,Img,WWW" " FROM banners" @@ -184,6 +192,14 @@ void Ban_EditBanners (void) extern const char *Hlp_SYSTEM_Banners_edit; extern const char *Txt_Banners; + /***** Put contextual links *****/ + fprintf (Gbl.F.Out,"
"); + + /* Put link to view links */ + Lnk_PutLinkToViewLinks (); + + fprintf (Gbl.F.Out,"
"); + /***** Get list of banners *****/ Ban_GetListBanners ("SELECT BanCod,Hidden,ShortName,FullName,Img,WWW" " FROM banners ORDER BY ShortName"); diff --git a/swad_changelog.h b/swad_changelog.h index 8802e8343..df2e28365 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -233,15 +233,16 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.232.6 (2017-06-03)" +#define Log_PLATFORM_VERSION "SWAD 16.232.7 (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.7: Jun 03, 2017 Changed contextual links in institutional links and banners. (? lines) 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.5: Jun 03, 2017 Changed layout of edition of institutional 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) Version 16.232.2: May 31, 2017 Fixed bug in selection of user's centre and department. (221089 lines) diff --git a/swad_link.c b/swad_link.c index eb923c02d..55b7f4426 100644 --- a/swad_link.c +++ b/swad_link.c @@ -73,6 +73,20 @@ static void Lnk_PutFormToCreateLink (void); static void Lnk_PutHeadLinks (void); static void Lnk_CreateLink (struct Link *Lnk); +/*****************************************************************************/ +/************************** Put link to view links ***************************/ +/*****************************************************************************/ + +void Lnk_PutLinkToViewLinks (void) + { + extern const char *Txt_Links; + + Lay_PutContextualLink (ActSeeLnk,NULL,NULL, + "link64x64.gif", + Txt_Links,Txt_Links, + NULL); + } + /*****************************************************************************/ /*************************** List all the links ******************************/ /*****************************************************************************/ @@ -85,15 +99,12 @@ void Lnk_SeeLinks (void) extern const char *Txt_New_link; /***** Put contextual links *****/ - if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM) // Only for system admins - { - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); - /* Put link to view banners */ - Ban_PutLinkToViewBanners (); + /* Put link to view banners */ + Ban_PutLinkToViewBanners (); - fprintf (Gbl.F.Out,"
"); - } + fprintf (Gbl.F.Out,"
"); /***** Get list of links *****/ Lnk_GetListLinks (); @@ -204,6 +215,14 @@ void Lnk_EditLinks (void) extern const char *Hlp_SYSTEM_Links_edit; extern const char *Txt_Links; + /***** Put contextual links *****/ + fprintf (Gbl.F.Out,"
"); + + /* Put link to view banners */ + Ban_PutLinkToViewBanners (); + + fprintf (Gbl.F.Out,"
"); + /***** Get list of links *****/ Lnk_GetListLinks (); diff --git a/swad_link.h b/swad_link.h index b5a647370..744271848 100644 --- a/swad_link.h +++ b/swad_link.h @@ -49,6 +49,7 @@ struct Link /****************************** Public prototypes ****************************/ /*****************************************************************************/ +void Lnk_PutLinkToViewLinks (void); void Lnk_SeeLinks (void); void Lnk_WriteMenuWithInstitutionalLinks (void);