From a0897b3a71a070ba79d0e442be1133adeb078546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 2 Jan 2015 13:19:13 +0100 Subject: [PATCH] Version 14.51.2 --- css/swad_desktop.css | 2 +- swad_changelog.h | 2 +- swad_message.c | 14 ++++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/css/swad_desktop.css b/css/swad_desktop.css index b316bd0fc..e68974b7d 100644 --- a/css/swad_desktop.css +++ b/css/swad_desktop.css @@ -598,7 +598,7 @@ a:hover img.CENTRE_PHOTO_SHOW list-style-type:none; border:0; margin:0 auto; - padding:0 0 20px 0; + padding:0 0 10px 0; } #horizontal_menu_container li { diff --git a/swad_changelog.h b/swad_changelog.h index 3e4cc56d1..225b63479 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -40,7 +40,7 @@ // 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 | tail -1 /* - Version 14.51.2 :Jan 02, 2014 Changes in layout and titles of some options. (? lines) + Version 14.51.2 :Jan 02, 2014 Changes in layout and titles of some options. (172987 lines) Version 14.51.1 :Jan 02, 2014 Changes in layout and titles of some options. (172963 lines) Version 14.51 :Jan 01, 2014 Users can select horizontal or vertical menu. (172958 lines) 1 change necessary in Makefile: diff --git a/swad_message.c b/swad_message.c index 7fda1e75e..617f3b5b0 100644 --- a/swad_message.c +++ b/swad_message.c @@ -142,8 +142,7 @@ void Msg_ListEMails (void) if (Usr_GetIfShowBigList (Gbl.Usrs.LstStds.NumUsrs)) { /***** Start of the frame used to list the e-mails *****/ - Lay_WriteTitle (Txt_Students_who_have_accepted_and_who_have_e_mail); - Lay_StartRoundFrameTable10 (NULL,0,NULL); + Lay_StartRoundFrameTable10 (NULL,0,Txt_Students_who_have_accepted_and_who_have_e_mail); fprintf (Gbl.F.Out,"" ""); @@ -1488,8 +1487,9 @@ void Msg_ShowRecMsgs (void) static void Msg_ShowSentOrReceivedMessages (Msg_TypeOfMessages_t TypeOfMessages) { - extern const char *Txt_any_course; extern const char *Txt_View_messages; + extern const char *Txt_Messages_received; + extern const char *Txt_Messages_sent; char FilterFromToSubquery[Msg_MAX_LENGTH_MESSAGES_QUERY+1]; char Query[Msg_MAX_LENGTH_MESSAGES_QUERY+1]; MYSQL_RES *mysql_res; @@ -1558,7 +1558,7 @@ static void Msg_ShowSentOrReceivedMessages (Msg_TypeOfMessages_t TypeOfMessages) if (MsgCod == Gbl.Msg.ExpandedMsgCod) // Expanded message found { - Gbl.Pag.CurrentPage = (unsigned) (NumRow/Pag_ITEMS_PER_PAGE)+ 1; + Gbl.Pag.CurrentPage = (unsigned) (NumRow / Pag_ITEMS_PER_PAGE) + 1; break; } } @@ -1581,8 +1581,10 @@ static void Msg_ShowSentOrReceivedMessages (Msg_TypeOfMessages_t TypeOfMessages) Pag_MESSAGES_SENT, 0,&Pagination); - /***** Show messages from this page, the author and the date of last reply *****/ - Lay_StartRoundFrameTable10 ("100%",0,NULL); + /***** Show received messages in this page *****/ + Lay_StartRoundFrameTable10 ("100%",0, + TypeOfMessages == Msg_MESSAGES_RECEIVED ? Txt_Messages_received : + Txt_Messages_sent); fprintf (Gbl.F.Out,"" "" "