From b6c9bc0268ec3a39a7080c95e5d78a572563a6f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 4 Jan 2016 16:10:27 +0100 Subject: [PATCH] Version 15.97.1 --- css/swad15.97.css | 4 ++-- swad_changelog.h | 5 +++-- swad_profile.c | 2 +- swad_social.c | 16 ++++++++-------- swad_text.c | 6 +++--- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/css/swad15.97.css b/css/swad15.97.css index 4e0683802..e4ca4af99 100644 --- a/css/swad15.97.css +++ b/css/swad15.97.css @@ -1527,10 +1527,10 @@ a:hover img.CENTRE_PHOTO_SHOW .USR_ID {color:#404040; font-size:18pt; font-weight:bold;} -.DAT {color:#707070; font-size:13pt;} +.DAT {color:#404040; font-size:13pt;} .DAT_GREEN {color:#008000; font-size:13pt;} .DAT_LIGHT {color:#A0A0A0; font-size:13pt;} -.DAT_NOBR {color:#707070; font-size:13pt; white-space:nowrap;} +.DAT_NOBR {color:#404040; 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;} diff --git a/swad_changelog.h b/swad_changelog.h index 51c724ef8..dba96fc95 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -110,20 +110,21 @@ // TODO: Fix bug at the end of ranking (number too low) when a course is selected // TODO: Reply to all // TODO: Hour in exam announcement should start at six a.m. -// TODO: Change "Actividad pública" to "Actividad de Antonio" in user's profile // TODO: Forums For_FORUM_GLOBAL_USRS and For_FORUM_SWAD_USRS should be available for guests for coherence with social timeline? +// TODO: Actividad pública: (*) Visible por cualquier usuario identificado /*****************************************************************************/ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.97 (2016-01-04)" +#define Log_PLATFORM_VERSION "SWAD 15.97.1 (2016-01-04)" #define CSS_FILE "swad15.97.css" #define JS_FILE "swad15.77.7.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 15.97.1: Jan 04, 2016 User's timeline below user's profile visible only by logged users. (190719 lines) Version 15.97: Jan 04, 2016 Show list of some users who has shared a social note. (190718 lines) 3 changes necessary in database: CREATE TABLE IF NOT EXISTS social_timeline_new (PubCod BIGINT NOT NULL AUTO_INCREMENT, NotCod BIGINT NOT NULL, PublisherCod INT NOT NULL, AuthorCod INT NOT NULL, TimePublish DATETIME NOT NULL, UNIQUE INDEX(PubCod), UNIQUE INDEX(NotCod,PublisherCod), INDEX(PublisherCod), INDEX(AuthorCod), INDEX(TimePublish)) SELECT PubCod,NotCod,PublisherCod,AuthorCod,TimePublish FROM social_timeline ORDER BY PubCod; diff --git a/swad_profile.c b/swad_profile.c index c75f96212..5aa707a88 100644 --- a/swad_profile.c +++ b/swad_profile.c @@ -207,7 +207,7 @@ static void Prf_GetUsrDatAndShowUserProfile (void) /***** Request nickname again *****/ Prf_RequestUserProfileWithDefaultNickname (""); } - else + else if (Gbl.Usrs.Me.Logged) // Timeline visible only by logged users { /***** Start section *****/ fprintf (Gbl.F.Out,"
"); diff --git a/swad_social.c b/swad_social.c index e3ce3fed1..11cae2e70 100644 --- a/swad_social.c +++ b/swad_social.c @@ -114,7 +114,7 @@ struct SocialNote long Cod; // Code of file, forum post, notice,... bool Unavailable; // File, forum post, notice,... unavailable (removed) time_t DateTimeUTC; - unsigned NumShared; // Number of times this note has been shared + unsigned NumShared; // Number of times (users) this note has been shared }; /*****************************************************************************/ @@ -1817,13 +1817,13 @@ static void Soc_GetDataOfSocialNoteByCod (struct SocialNote *SocNot) else { /***** Reset fields of social note *****/ - SocNot->NoteType = Soc_NOTE_UNKNOWN; - SocNot->UsrCod = -1L; - SocNot->HieCod = -1L; - SocNot->Cod = -1L; - SocNot->Unavailable = false; - SocNot->DateTimeUTC = (time_t) 0; - SocNot->NumShared = 0; + SocNot->NoteType = Soc_NOTE_UNKNOWN; + SocNot->UsrCod = -1L; + SocNot->HieCod = -1L; + SocNot->Cod = -1L; + SocNot->Unavailable = false; + SocNot->DateTimeUTC = (time_t) 0; + SocNot->NumShared = 0; } } diff --git a/swad_text.c b/swad_text.c index e8c3f763d..2e73943f4 100644 --- a/swad_text.c +++ b/swad_text.c @@ -23858,17 +23858,17 @@ const char *Txt_No_of_users_who_will_be_notified_by_e_mail = const char *Txt_No_public_activity = #if L==1 - "No hi ha activitat pública"; + "Cap activitat pública"; #elif L==2 "Keine öffentliche Aktivität"; #elif L==3 "No public activity"; #elif L==4 - "No hay actividad pública"; + "Ninguna actividad pública"; #elif L==5 "Aucune activité public"; #elif L==6 - "No hay actividad pública"; // Okoteve traducción + "Ninguna actividad pública"; // Okoteve traducción #elif L==7 "Nessuna attività pubblica"; #elif L==8