Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 15.11

This commit is contained in:
Antonio Cañas Vargas 2015-10-08 01:06:46 +02:00
parent 77efac0da2
commit 1cb24d5b19
4 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
css/swad_desktop.css
View File

@ -278,7 +278,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
font-size:20px;
font-weight:bold;
line-height:normal;
margin:10px;
margin:4px auto 12px auto;
padding:10px 20px;
border-radius:4px;
box-shadow:0 1px 0 rgba(255,255,255,0.15) inset;
@ -387,7 +387,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
/*********************************** Alerts **********************************/
.ALERT
{
margin:8px auto;
margin:2px auto 0 auto;
background-color:#FFF9E0;
background-repeat:no-repeat;
background-position:12px 12px;

4
css/swad_mobile.css
View File

@ -230,7 +230,7 @@ form {margin:0; display:inline;}
font-size:20px;
font-weight:bold;
line-height:normal;
margin:10px;
margin:4px auto 12px auto;
padding:10px 20px;
border-radius:4px;
box-shadow:0 1px 0 rgba(255,255,255,0.15) inset;
@ -354,7 +354,7 @@ form {margin:0; display:inline;}
/********************************** Alerts ***********************************/
.ALERT
{
margin:5px auto;
margin:2px auto 0 auto;
background-color:#FFF9E0;
background-repeat:no-repeat;
background-position:12px 12px;

3
swad_changelog.h
View File

@ -98,13 +98,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.10.5 (2015/10/07)"
#define Log_PLATFORM_VERSION "SWAD 15.11 (2015/10/08)"
// 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
/*
TODO: If photo zoom is out of the screen at left, put on right
Version 15.11: Oct 08, 2015 Changes in layout of sent / received messages. (185680 lines)
Version 15.10.5: Oct 07, 2015 Change in layout of removal of old users. (185669 lines)
Version 15.10.4: Oct 07, 2015 Change in layout of removal of old courses. (185665 lines)
Version 15.10.3: Oct 07, 2015 New contextual link in visits to last clicks. (185641 lines)

27
swad_message.c
View File

@ -764,7 +764,7 @@ void Msg_ReqDelAllRecMsgs (void)
Msg_GetParamFilterContent ();
Msg_GetParamOnlyUnreadMsgs ();
/***** Request confirmation to delete messages *****/
/***** Request confirmation to remove messages *****/
if (Gbl.Msg.FilterContent[0])
{
if (Gbl.Msg.ShowOnlyUnreadMsgs)
@ -793,10 +793,14 @@ void Msg_ReqDelAllRecMsgs (void)
}
Lay_ShowAlert (Lay_WARNING,Gbl.Message);
/***** Form to remove received messages *****/
Act_FormStart (ActDelAllRcvMsg);
Msg_PutHiddenParamsMsgsFilters ();
Lay_PutRemoveButton (Txt_Delete_messages_received);
Act_FormEnd ();
/***** Show messages again *****/
Msg_ShowRecMsgs ();
}
/*****************************************************************************/
@ -815,7 +819,7 @@ void Msg_ReqDelAllSntMsgs (void)
Msg_GetParamFilterFromTo ();
Msg_GetParamFilterContent ();
/***** Request confirmation to delete messages *****/
/***** Request confirmation to remove messages *****/
if (Gbl.Msg.FilterContent[0])
sprintf (Gbl.Message,Txt_Do_you_really_want_to_delete_all_messages_sent_to_USER_X_from_COURSE_Y_related_to_CONTENT_Z,
Gbl.Msg.FilterFromTo[0] ? Gbl.Msg.FilterFromTo :
@ -827,10 +831,15 @@ void Msg_ReqDelAllSntMsgs (void)
Txt_any_user,
Gbl.Msg.FilterCrsShortName);
Lay_ShowAlert (Lay_WARNING,Gbl.Message);
/***** Form to remove sent messages *****/
Act_FormStart (ActDelAllSntMsg);
Msg_PutHiddenParamsMsgsFilters ();
Lay_PutRemoveButton (Txt_Delete_messages_sent);
Act_FormEnd ();
/***** Show messages again *****/
Msg_ShowSntMsgs ();
}
/*****************************************************************************/
@ -1580,6 +1589,10 @@ static void Msg_ShowSentOrReceivedMessages (Msg_TypeOfMessages_t TypeOfMessages)
NumMsgs = (unsigned) NumRows;
/***** Start frame with messages *****/
Lay_StartRoundFrame ("97%",TypeOfMessages == Msg_MESSAGES_RECEIVED ? Txt_Messages_received :
Txt_Messages_sent);
/* Write number of messages and number of new messages */
fprintf (Gbl.F.Out,"<div class=\"TIT CENTER_MIDDLE\">");
Msg_WriteNumMsgs (NumMsgs,NumUnreadMsgs);
@ -1628,9 +1641,8 @@ static void Msg_ShowSentOrReceivedMessages (Msg_TypeOfMessages_t TypeOfMessages)
0,&Pagination);
/***** Show received / sent messages in this page *****/
Lay_StartRoundFrameTable ("95%",2,
TypeOfMessages == Msg_MESSAGES_RECEIVED ? Txt_Messages_received :
Txt_Messages_sent);
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\""
" style=\"width:100%%;\">");
mysql_data_seek (mysql_res,(my_ulonglong) (Pagination.FirstItemVisible-1));
for (NumRow = Pagination.FirstItemVisible;
@ -1645,7 +1657,7 @@ static void Msg_ShowSentOrReceivedMessages (Msg_TypeOfMessages_t TypeOfMessages)
Msg_ShowASentOrReceivedMessage (TypeOfMessages,NumMsg,MsgCod);
}
Lay_EndRoundFrameTable ();
fprintf (Gbl.F.Out,"</table>");
/***** Write again links to pages *****/
if (Pagination.MoreThanOnePage)
@ -1654,6 +1666,9 @@ static void Msg_ShowSentOrReceivedMessages (Msg_TypeOfMessages_t TypeOfMessages)
0,&Pagination);
}
/***** End frame *****/
Lay_EndRoundFrame ();
/***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res);
}