From bd48b11e4f76943bda378184532d10f212390559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Tue, 29 Dec 2015 10:38:46 +0100 Subject: [PATCH] Version 15.77.6 --- css/{swad15.77.5.css => swad15.77.6.css} | 7 +- swad_changelog.h | 5 +- swad_course.c | 2 +- swad_notification.h | 34 +-- swad_profile.c | 4 +- swad_social.c | 50 +++-- swad_social.h | 28 +-- swad_text.c | 265 ++++++++++++++++++++++- 8 files changed, 325 insertions(+), 70 deletions(-) rename css/{swad15.77.5.css => swad15.77.6.css} (99%) diff --git a/css/swad15.77.5.css b/css/swad15.77.6.css similarity index 99% rename from css/swad15.77.5.css rename to css/swad15.77.6.css index f59e9d52e..34478cea6 100644 --- a/css/swad15.77.5.css +++ b/css/swad15.77.6.css @@ -1533,6 +1533,7 @@ a:hover img.CENTRE_PHOTO_SHOW .DAT_NOBR {color:#707070; font-size:13pt; white-space:nowrap;} .DAT_N {color:black; font-size:13pt;} .DAT_NOBR_N {color:black; font-size:13pt; white-space:nowrap;} +.DAT_N_BOLD {color:black; font-size:13pt; font-weight:bold;} /*********************** Line in top part of a table row *********************/ .DAT_N_LINE_TOP @@ -1680,13 +1681,13 @@ a:hover img.CENTRE_PHOTO_SHOW display:inline-block; box-sizing:border-box; padding:0 0 10px 10px; - width:500px; + width:450px; } .SOCIAL_RIGHT_AUTHOR { display:inline-block; box-sizing:border-box; - width:300px; + width:270px; text-align:left; vertical-align:top; } @@ -1694,7 +1695,7 @@ a:hover img.CENTRE_PHOTO_SHOW { display:inline-block; box-sizing:border-box; - width:190px; + width:170px; text-align:right; vertical-align:top; } diff --git a/swad_changelog.h b/swad_changelog.h index 073ac8600..9aa24e5d1 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -115,12 +115,13 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.77.5 (2015-12-29)" -#define CSS_FILE "swad15.77.5.css" +#define Log_PLATFORM_VERSION "SWAD 15.77.6 (2015-12-29)" +#define CSS_FILE "swad15.77.6.css" // 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.77.6: Dec 29, 2015 Show type of event on social events (timeline). (188647 lines) Version 15.77.5: Dec 29, 2015 Insert social event when publishing an exam announcement. Changes in CSS related to social activity. (188392 lines) Version 15.77.4: Dec 29, 2015 Insert social event when publishing a new notice. diff --git a/swad_course.c b/swad_course.c index 234d3ad97..6c4f80804 100644 --- a/swad_course.c +++ b/swad_course.c @@ -3136,7 +3136,7 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA if (NumStds + NumTchs) { Style = "DAT_N"; - StyleNoBR = "DAT_NOBR_N"; + StyleNoBR = "DAT_N_NOBR"; } else { diff --git a/swad_notification.h b/swad_notification.h index 42adc63e3..e3bb89712 100644 --- a/swad_notification.h +++ b/swad_notification.h @@ -42,33 +42,33 @@ // it is necessary to change old numbers to new ones in database tables notif and sta_notif typedef enum { - Ntf_EVENT_UNKNOWN = 0, // old 0 + Ntf_EVENT_UNKNOWN = 0, /* Course tab */ - Ntf_EVENT_DOCUMENT_FILE = 1, // old 1 - Ntf_EVENT_SHARED_FILE = 2, // old 2 + Ntf_EVENT_DOCUMENT_FILE = 1, + Ntf_EVENT_SHARED_FILE = 2, /* Assessment tab */ - Ntf_EVENT_ASSIGNMENT = 3, // old 3 - Ntf_EVENT_EXAM_ANNOUNCEMENT = 4, // old 4 - Ntf_EVENT_MARKS_FILE = 5, // old 5 + Ntf_EVENT_ASSIGNMENT = 3, + Ntf_EVENT_EXAM_ANNOUNCEMENT = 4, + Ntf_EVENT_MARKS_FILE = 5, - /* Enrollment tab */ - Ntf_EVENT_ENROLLMENT_STUDENT = 6, // old 6 - Ntf_EVENT_ENROLLMENT_TEACHER = 7, - Ntf_EVENT_ENROLLMENT_REQUEST = 8, // old 7 + /* Users tab */ + Ntf_EVENT_ENROLLMENT_STUDENT = 6, + Ntf_EVENT_ENROLLMENT_TEACHER = 7, + Ntf_EVENT_ENROLLMENT_REQUEST = 8, /* Messages tab */ - Ntf_EVENT_NOTICE = 9, // old 8 - Ntf_EVENT_FORUM_POST_COURSE = 10, // old 9 - Ntf_EVENT_FORUM_REPLY = 11, // old 10 - Ntf_EVENT_MESSAGE = 12, // old 11 + Ntf_EVENT_NOTICE = 9, + Ntf_EVENT_FORUM_POST_COURSE = 10, + Ntf_EVENT_FORUM_REPLY = 11, + Ntf_EVENT_MESSAGE = 12, /* Statistics tab */ - Ntf_EVENT_SURVEY = 13, // old 12 + Ntf_EVENT_SURVEY = 13, - /* Profile tab */ - Ntf_EVENT_FOLLOWER = 14, // old 13 + /* Social tab */ + Ntf_EVENT_FOLLOWER = 14, // TODO: Move up, between users tab and messages tab } Ntf_NotifyEvent_t; diff --git a/swad_profile.c b/swad_profile.c index a3832990e..50b9e16d5 100644 --- a/swad_profile.c +++ b/swad_profile.c @@ -309,7 +309,7 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat) /***** Start left list *****/ fprintf (Gbl.F.Out,"
" - "