From af0442e2545a736de10f6afca8f91fa3bdd4fcc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Tue, 3 Nov 2015 22:13:01 +0100 Subject: [PATCH] Version 15.35.1 --- swad_action.c | 12 ++++++------ swad_changelog.h | 3 ++- swad_notice.c | 17 ++++++++++++++++- swad_notice.h | 3 ++- swad_text.c | 21 +++++++++++++++++++++ 5 files changed, 47 insertions(+), 9 deletions(-) diff --git a/swad_action.c b/swad_action.c index dc60c9cbb..2f19d4b65 100644 --- a/swad_action.c +++ b/swad_action.c @@ -2442,7 +2442,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = // Actions in menu: /* ActSeeNtf */{ 990, 0,TabMsg,ActSeeNtf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Ntf_ShowMyNotifications ,"bell" }, /* ActSeeAnn */{1235, 1,TabMsg,ActSeeAnn ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Ann_ShowAllAnnouncements ,"note" }, - /* ActSeeNot */{ 762, 2,TabMsg,ActSeeNot ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Not_ListNotices ,"note" }, + /* ActSeeNot */{ 762, 2,TabMsg,ActSeeNot ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Not_ListFullNotices ,"note" }, /* ActSeeFor */{ 95, 3,TabMsg,ActSeeFor ,0x1FC,0x1FC,0x1FC,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,For_ShowForumList ,"forum" }, /* ActSeeChtRms */{ 51, 4,TabMsg,ActSeeChtRms ,0x1FC,0x1FC,0x1FC,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Cht_ShowChatRooms ,"chat" }, /* ActReqMsgUsr */{ 26, 5,TabMsg,ActReqMsgUsr ,0x1FC,0x1FC,0x1FC,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Msg_FormMsgUsrs ,"editnewmsg" }, @@ -2457,13 +2457,13 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActRevAnn */{1471,-1,TabMsg,ActSeeAnn ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,Ann_RevealHiddenAnnouncement,Ann_ShowAllAnnouncements ,NULL}, /* ActRemAnn */{1236,-1,TabMsg,ActSeeAnn ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Ann_RemoveAnnouncement ,NULL}, - /* ActShoNot */{1164,-1,TabMsg,ActSeeNot ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,Not_GetNotToShowHighlighted ,Not_ListNotices ,NULL}, + /* ActShoNot */{1164,-1,TabMsg,ActSeeNot ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,Not_GetNotToShowHighlighted ,Not_ListFullNotices ,NULL}, /* ActWriNot */{ 59,-1,TabMsg,ActSeeNot ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Not_ShowFormNotice ,NULL}, - /* ActRcvNot */{ 60,-1,TabMsg,ActSeeNot ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,Not_ReceiveNotice ,Not_ListNotices ,NULL}, - /* ActHidNot */{ 763,-1,TabMsg,ActSeeNot ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,Not_HideActiveNotice ,Not_ListNotices ,NULL}, - /* ActRevNot */{ 764,-1,TabMsg,ActSeeNot ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,Not_RevealHiddenNotice ,Not_ListNotices ,NULL}, + /* ActRcvNot */{ 60,-1,TabMsg,ActSeeNot ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,Not_ReceiveNotice ,Not_ListFullNotices ,NULL}, + /* ActHidNot */{ 763,-1,TabMsg,ActSeeNot ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,Not_HideActiveNotice ,Not_ListFullNotices ,NULL}, + /* ActRevNot */{ 764,-1,TabMsg,ActSeeNot ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,Not_RevealHiddenNotice ,Not_ListFullNotices ,NULL}, /* ActReqRemNot */{1472,-1,TabMsg,ActSeeNot ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Not_RequestRemNotice ,NULL}, - /* ActRemNot */{ 73,-1,TabMsg,ActSeeNot ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,Not_RemoveNotice ,Not_ListNotices ,NULL}, + /* ActRemNot */{ 73,-1,TabMsg,ActSeeNot ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,Not_RemoveNotice ,Not_ListNoticesAfterRemoval ,NULL}, /* ActSeeNewNtf */{ 991,-1,TabMsg,ActSeeNtf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Ntf_ShowMyNotifications ,NULL}, /* ActMrkNtfSee */{1146,-1,TabMsg,ActSeeNtf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Ntf_MarkAllNotifAsSeen ,NULL}, diff --git a/swad_changelog.h b/swad_changelog.h index 0011605fc..6260f8ce5 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -108,11 +108,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.35 (2015/11/03)" +#define Log_PLATFORM_VERSION "SWAD 15.35.1 (2015/11/03)" // 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.35.1: Nov 03, 2015 Confirmation message after removing a notice. (186979 lines) Version 15.35: Nov 03, 2015 Request confirmation on notice removal. (186944 lines) 1 change necessary in database: INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1472','es','N','Solicitar elim. aviso'); diff --git a/swad_notice.c b/swad_notice.c index 90be2040f..80e89c391 100644 --- a/swad_notice.c +++ b/swad_notice.c @@ -185,11 +185,26 @@ static void Not_UpdateNumUsrsNotifiedByEMailAboutNotice (long NotCod,unsigned Nu DB_QueryUPDATE (Query,"can not update the number of notifications of a notice"); } +/*****************************************************************************/ +/******************* List notices after removing one of them *****************/ +/*****************************************************************************/ + +void Not_ListNoticesAfterRemoval (void) + { + extern const char *Txt_Notice_removed; + + /***** Message of success *****/ + Lay_ShowAlert (Lay_SUCCESS,Txt_Notice_removed); + + /***** List remaining notices *****/ + Not_ListFullNotices (); + } + /*****************************************************************************/ /******************************* List notices ********************************/ /*****************************************************************************/ -void Not_ListNotices (void) +void Not_ListFullNotices (void) { extern const char *Txt_New_notice; bool ICanEditNotices = (Gbl.Usrs.Me.LoggedRole == Rol_TEACHER || diff --git a/swad_notice.h b/swad_notice.h index 8e6cfaee5..f660d1ef6 100644 --- a/swad_notice.h +++ b/swad_notice.h @@ -57,7 +57,8 @@ typedef enum void Not_ShowFormNotice (void); void Not_ReceiveNotice (void); -void Not_ListNotices (void); +void Not_ListNoticesAfterRemoval (void); +void Not_ListFullNotices (void); void Not_HideActiveNotice (void); void Not_RevealHiddenNotice (void); diff --git a/swad_text.c b/swad_text.c index bbe5098b0..b33dd1a6f 100644 --- a/swad_text.c +++ b/swad_text.c @@ -24416,6 +24416,27 @@ const char *Txt_Notice_created = "Aviso criado."; #endif +const char *Txt_Notice_removed = +#if L==0 + "Avís eliminat."; +#elif L==1 + "Ankündigung entfernt."; +#elif L==2 + "Notice removed."; +#elif L==3 + "Aviso eliminado"; +#elif L==4 + "Avis supprimé."; +#elif L==5 + "Aviso eliminado."; // Okoteve traducción +#elif L==6 + "Avviso rimosso."; +#elif L==7 + "Informacja usuniete."; +#elif L==8 + "Aviso removido."; +#endif + const char *Txt_NOTIF_new_SINGULAR = #if L==0 "nueva"; // Necessita traduccio