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 000000000..b82a26ff6 Binary files /dev/null and b/icon/swad112x32.png differ diff --git a/swad_RSS.c b/swad_RSS.c index 012c61a67..55447f95a 100644 --- a/swad_RSS.c +++ b/swad_RSS.c @@ -96,8 +96,8 @@ void RSS_UpdateRSSFileForACrs (struct Course *Crs) Cfg_PLATFORM_RESPONSIBLE_E_MAIL,Cfg_PLATFORM_RESPONSIBLE_NAME); fprintf (FileRSS,"\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); }