From 642ce4070e35d2fb71ee955d0145765766cbb149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Tue, 15 Mar 2016 23:11:14 +0100 Subject: [PATCH] Version 15.145.4 --- css/swad15.145.3.css | 4 ++-- icon/swad112x32.png | Bin 0 -> 3666 bytes swad_RSS.c | 6 ++--- swad_changelog.h | 5 +++- swad_config.h | 3 +-- swad_notice.c | 53 +++++++++++++++++++++++-------------------- swad_record.c | 2 +- 7 files changed, 39 insertions(+), 34 deletions(-) create mode 100644 icon/swad112x32.png diff --git a/css/swad15.145.3.css b/css/swad15.145.3.css index 8aa21bb59..eafd4913a 100644 --- a/css/swad15.145.3.css +++ b/css/swad15.145.3.css @@ -1107,7 +1107,7 @@ a:hover /* Default ==> underlined */ .NOTICE_CONTAINER_ACTIVE { box-sizing:border-box; - margin:10px auto; + margin:0 auto 10px auto; padding:10px; background-image:linear-gradient(rgba(238,216,108,0.8) 0%,rgba(248,237,149,0.8) 15%,rgba(250,240,152,0.8) 100%); box-shadow:0 8px 10px -5px rgba(125,113,0,0.8); @@ -1117,7 +1117,7 @@ a:hover /* Default ==> underlined */ .NOTICE_CONTAINER_OBSOLETE { box-sizing:border-box; - margin:10px auto; + margin:0 auto 10px auto; padding:10px; background-image:linear-gradient(rgba(238,216,108,0.4) 0%,rgba(248,237,149,0.4) 15%,rgba(250,240,152,0.4) 100%); box-shadow:0 8px 10px -5px rgba(125,113,0,0.4); diff --git a/icon/swad112x32.png b/icon/swad112x32.png new file mode 100644 index 0000000000000000000000000000000000000000..b82a26ff6f75627b2c3ad72940c847d6c1a3e4bd GIT binary patch literal 3666 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\n"); - fprintf (FileRSS,"%s/%s/swad112x32.png\n", - Cfg_HTTP_URL_SWAD_PUBLIC,Cfg_FOLDER_PUBLIC_LOGO); + fprintf (FileRSS,"%s/swad112x32.png\n", + Gbl.Prefs.IconsURL); fprintf (FileRSS,"%s: %s\n", Cfg_PLATFORM_SHORT_NAME,Crs->ShortName); fprintf (FileRSS,"%s/?crs=%ld\n", @@ -332,5 +332,5 @@ static void RSS_WriteExamAnnouncements (FILE *FileRSS,struct Course *Crs) void RSS_WriteRSSLink (FILE *FileTgt,long CrsCod) { fprintf (FileTgt,"%s/%s/%ld/%s/%s", - Cfg_HTTP_URL_SWAD_PUBLIC,Cfg_FOLDER_CRS,CrsCod,Cfg_RSS_FOLDER,Cfg_RSS_FILE); + Cfg_HTTPS_URL_SWAD_PUBLIC,Cfg_FOLDER_CRS,CrsCod,Cfg_RSS_FOLDER,Cfg_RSS_FILE); } diff --git a/swad_changelog.h b/swad_changelog.h index 4ca3cb0c1..7d517950d 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -129,13 +129,16 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.145.3 (2016-03-15)" +#define Log_PLATFORM_VERSION "SWAD 15.145.4 (2016-03-15)" #define CSS_FILE "swad15.145.3.css" #define JS_FILE "swad15.131.3.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.145.4: Mar 15, 2016 Link to RSS file is moved to the end of notices in left column. (195751 lines) +Copy file swad112x32.png to icon directory + Version 15.145.3: Mar 15, 2016 Changes in layout of connected users. (195746 lines) Version 15.145.2: Mar 15, 2016 Changes in layout of frequent actions. (195762 lines) Version 15.145.1: Mar 15, 2016 Changes in layout of frequent actions. (195751 lines) diff --git a/swad_config.h b/swad_config.h index 1907cf9d4..5c9db6d22 100644 --- a/swad_config.h +++ b/swad_config.h @@ -66,7 +66,7 @@ #define Cfg_PLATFORM_LOGO_BIG_WIDTH 140 #define Cfg_PLATFORM_LOGO_BIG_HEIGHT 40 -#define Cfg_PLATFORM_RESPONSIBLE_NAME "Antonio Cañas Vargas" // Main responsible for the platform +#define Cfg_PLATFORM_RESPONSIBLE_NAME "Antonio Caņas Vargas" // Main responsible for the platform #define Cfg_PLATFORM_RESPONSIBLE_E_MAIL "webmaster@openswad.org" // Main responsible for the platform #define Cfg_HELP_WEB "http://cevug.ugr.es/contactar/contactar_multilang_simple_.php?amb=tic" // Web to solve questions and problems #define Cfg_AUTOMATIC_EMAIL_SMTP_SERVER "openswad.org" // SMTP server for sending automatic e-mails @@ -411,7 +411,6 @@ #define Cfg_FOLDER_DEGREE_PHOTO_AVERAGE "avg_all" /* Folders with icons. They should be created with icons during installation */ -#define Cfg_FOLDER_PUBLIC_LOGO "logo" #define Cfg_FOLDER_PUBLIC_ICON "icon" #define Cfg_ICON_FOLDER_THEMES "theme" // Directory with all the images for each theme #define Cfg_ICON_FOLDER_ICON_SETS "iconset" // Directory with all the icons for each icon set diff --git a/swad_notice.c b/swad_notice.c index c9782e66f..1ab71d7bb 100644 --- a/swad_notice.c +++ b/swad_notice.c @@ -409,28 +409,6 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing,bool ICanEditNotices) Lay_ShowAlert (Lay_INFO,Txt_No_notices); } - /***** Link to RSS file *****/ - if (TypeNoticesListing == Not_LIST_BRIEF_NOTICES) - { - /* Create RSS file if not exists */ - sprintf (PathRelRSSFile,"%s/%s/%ld/%s/%s", - Cfg_PATH_SWAD_PUBLIC,Cfg_FOLDER_CRS,Gbl.CurrentCrs.Crs.CrsCod,Cfg_RSS_FOLDER,Cfg_RSS_FILE); - if (!Fil_CheckIfPathExists (PathRelRSSFile)) - RSS_UpdateRSSFileForACrs (&Gbl.CurrentCrs.Crs); - - /* Put a link to the RSS file */ - fprintf (Gbl.F.Out,"
" - "" - "\"RSS\"" - "" - "
", - Gbl.Prefs.IconsURL); - } - /***** Show the notices *****/ for (NumNot = 0; NumNot < NumNotices; @@ -468,9 +446,34 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing,bool ICanEditNotices) ICanEditNotices); } - if (TypeNoticesListing == Not_LIST_FULL_NOTICES && NumNotices) - /***** End frame *****/ - Lay_EndRoundFrame (); + switch (TypeNoticesListing) + { + case Not_LIST_BRIEF_NOTICES: + /***** Link to RSS file *****/ + /* Create RSS file if not exists */ + sprintf (PathRelRSSFile,"%s/%s/%ld/%s/%s", + Cfg_PATH_SWAD_PUBLIC,Cfg_FOLDER_CRS,Gbl.CurrentCrs.Crs.CrsCod,Cfg_RSS_FOLDER,Cfg_RSS_FILE); + if (!Fil_CheckIfPathExists (PathRelRSSFile)) + RSS_UpdateRSSFileForACrs (&Gbl.CurrentCrs.Crs); + + /* Put a link to the RSS file */ + fprintf (Gbl.F.Out,"
" + "" + "\"RSS\"" + "" + "
", + Gbl.Prefs.IconsURL); + break; + case Not_LIST_FULL_NOTICES: + if (NumNotices) + /***** End frame *****/ + Lay_EndRoundFrame (); + break; + } /***** Free structure that stores the query result *****/ DB_FreeMySQLResult (&mysql_res); diff --git a/swad_record.c b/swad_record.c index 9e09a1c09..6eaca2f06 100644 --- a/swad_record.c +++ b/swad_record.c @@ -3157,7 +3157,7 @@ static void Rec_WriteLinkToDataProtectionClause (void) sprintf (Title,"
" "%s" "
", - Cfg_HTTP_URL_SWAD_PUBLIC,Cfg_DATA_PROTECTION_FOLDER, + Cfg_HTTPS_URL_SWAD_PUBLIC,Cfg_DATA_PROTECTION_FOLDER, Txt_DATA_PROTECTION_CLAUSE); Lay_WriteTitle (Title); }