From 996415a97f6e163ec4b8b1cf92095184f9ffc7af Mon Sep 17 00:00:00 2001 From: acanas Date: Thu, 2 Dec 2021 19:07:51 +0100 Subject: [PATCH] Version 21.66.3: Dec 02, 2021 Fixed issue in CSS for background. --- css/{swad21.65.1.css => swad21.66.3.css} | 26 ++++++------- swad_changelog.h | 5 ++- swad_cookie.c | 10 ++--- swad_cookie_database.c | 4 +- swad_media.c | 4 +- swad_user.c | 47 ++++++++++-------------- swad_user.h | 2 +- 7 files changed, 44 insertions(+), 54 deletions(-) rename css/{swad21.65.1.css => swad21.66.3.css} (98%) diff --git a/css/swad21.65.1.css b/css/swad21.66.3.css similarity index 98% rename from css/swad21.65.1.css rename to css/swad21.66.3.css index 37d76659..097295c7 100644 --- a/css/swad21.65.1.css +++ b/css/swad21.66.3.css @@ -567,28 +567,28 @@ a:hover /* Default ==> underlined */ } .HEAD_ROW_3_GREY { - background-image:-webkit-linear-gradient(#404040 0,#404040 52px,white 52px,white 100%); /* Safari */ - background-image:linear-gradient(#404040 0,#404040 52px,white 52px,white 100%); + background-image:-webkit-linear-gradient(#404040 0,#404040 54px,white 54px,white 100%); /* Safari */ + background-image:linear-gradient(#404040 0,#404040 54px,white 54px,white 100%); } .HEAD_ROW_3_PURPLE { - background-image:-webkit-linear-gradient(#a070a1 0,#a070a1 52px,white 52px,white 100%); /* Safari */ - background-image:linear-gradient(#a070a1 0,#a070a1 52px,white 52px,white 100%); + background-image:-webkit-linear-gradient(#a070a1 0,#a070a1 54px,white 54px,white 100%); /* Safari */ + background-image:linear-gradient(#a070a1 0,#a070a1 54px,white 54px,white 100%); } .HEAD_ROW_3_BLUE { - background-image:-webkit-linear-gradient(#4f90c8 0,#4f90c8 52px,white 52px,white 100%); /* Safari */ - background-image:linear-gradient(#4f90c8 0,#4f90c8 52px,white 52px,white 100%); + background-image:-webkit-linear-gradient(#4f90c8 0,#4f90c8 54px,white 54px,white 100%); /* Safari */ + background-image:linear-gradient(#4f90c8 0,#4f90c8 54px,white 54px,white 100%); } .HEAD_ROW_3_YELLOW { - background-image:-webkit-linear-gradient(#302830 0,#302830 52px,white 52px,white 100%); /* Safari */ - background-image:linear-gradient(#302830 0,#302830 52px,white 52px,white 100%); + background-image:-webkit-linear-gradient(#302830 0,#302830 54px,white 54px,white 100%); /* Safari */ + background-image:linear-gradient(#302830 0,#302830 54px,white 54px,white 100%); } .HEAD_ROW_3_PINK { - background-image:-webkit-linear-gradient(#c86b85 0,#c86b85 52px,white 52px,white 100%); /* Safari */ - background-image:linear-gradient(#c86b85 0,#c86b85 52px,white 52px,white 100%); + background-image:-webkit-linear-gradient(#c86b85 0,#c86b85 54px,white 54px,white 100%); /* Safari */ + background-image:linear-gradient(#c86b85 0,#c86b85 54px,white 54px,white 100%); } @@ -866,12 +866,11 @@ a:hover /* Default ==> underlined */ #main_zone_central_container { box-sizing:border-box; - margin:-6px 0 0 0; + margin:-4px 0 0 0; padding:4px 0; border-radius:2px; box-shadow:inset 0 -1px 1px 0 rgba(50,50,50,0.2); text-align:center; - vertical-align:top; position:relative; } } @@ -881,12 +880,11 @@ a:hover /* Default ==> underlined */ { box-sizing:border-box; min-height:900px; - margin:-6px 0 0 0; + margin:-4px 0 0 0; padding:4px 0; border-radius:2px; box-shadow:inset 0 -1px 1px 0 rgba(50,50,50,0.2); text-align:center; - vertical-align:top; position:relative; } } diff --git a/swad_changelog.h b/swad_changelog.h index 63abf2be..ab0a0cd1 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -602,13 +602,14 @@ TODO: FIX BUG, URGENT! En las fechas como par TODO: En las encuestas, que los estudiantes no puedan ver los resultados hasta que no finalice el plazo. */ -#define Log_PLATFORM_VERSION "SWAD 21.66 (2021-12-02)" -#define CSS_FILE "swad21.65.1.css" +#define Log_PLATFORM_VERSION "SWAD 21.66.3 (2021-12-02)" +#define CSS_FILE "swad21.66.3.css" #define JS_FILE "swad21.59.js" /* TODO: Rename CENTRE to CENTER in help wiki. TODO: Rename ASSESSMENT.Announcements to ASSESSMENT.Calls_for_exams + Version 21.66.3: Dec 02, 2021 Fixed issue in CSS for background. (320874 lines) Version 21.66: Dec 02, 2021 New module swad_photo_shape for user photo shapes. (320876 lines) Version 21.65.1: Dec 01, 2021 New shape of user photos. (320833 lines) 2 changes necessary in database: diff --git a/swad_cookie.c b/swad_cookie.c index 236e6c51..3577a050 100644 --- a/swad_cookie.c +++ b/swad_cookie.c @@ -72,14 +72,14 @@ void Coo_EditMyPrefsOnCookies (void) /* Begin container */ HTM_DIV_Begin ("class=\"%s\"", - (Gbl.Usrs.Me.UsrDat.Prefs.AcceptThirdPartyCookies) ? "DAT_N LIGHT_BLUE" : - "DAT"); + (Gbl.Usrs.Me.UsrDat.Prefs.AcceptCookies) ? "DAT_N LIGHT_BLUE" : + "DAT"); /* Check box */ HTM_LABEL_Begin (NULL); HTM_INPUT_CHECKBOX ("cookies",HTM_SUBMIT_ON_CHANGE, "value=\"Y\"%s", - Gbl.Usrs.Me.UsrDat.Prefs.AcceptThirdPartyCookies ? " checked=\"checked\"" : - ""); + Gbl.Usrs.Me.UsrDat.Prefs.AcceptCookies ? " checked=\"checked\"" : + ""); HTM_Txt (Txt_Accept_third_party_cookies_to_view_multimedia_content_from_other_websites); HTM_LABEL_End (); @@ -113,7 +113,7 @@ static void Coo_PutIconsCookies (__attribute__((unused)) void *Args) void Coo_ChangeMyPrefsCookies (void) { /***** Get param with preference about third party cookies *****/ - Gbl.Usrs.Me.UsrDat.Prefs.AcceptThirdPartyCookies = Par_GetParToBool ("cookies"); + Gbl.Usrs.Me.UsrDat.Prefs.AcceptCookies = Par_GetParToBool ("cookies"); /***** Store preference in database *****/ if (Gbl.Usrs.Me.Logged) diff --git a/swad_cookie_database.c b/swad_cookie_database.c index 19c653dd..bd26fc10 100644 --- a/swad_cookie_database.c +++ b/swad_cookie_database.c @@ -48,7 +48,7 @@ void Coo_DB_UpdateMyPrefsCookies (void) "UPDATE usr_data" " SET ThirdPartyCookies='%c'" " WHERE UsrCod=%ld", - Gbl.Usrs.Me.UsrDat.Prefs.AcceptThirdPartyCookies ? 'Y' : - 'N', + Gbl.Usrs.Me.UsrDat.Prefs.AcceptCookies ? 'Y' : + 'N', Gbl.Usrs.Me.UsrDat.UsrCod); } diff --git a/swad_media.c b/swad_media.c index 2e121768..a071312f 100644 --- a/swad_media.c +++ b/swad_media.c @@ -1724,7 +1724,7 @@ static void Med_ShowYoutube (const struct Med_Media *Media,const char *ClassMedi /***** Check if YouTube code exists *****/ if (Media->Name[0]) // YouTube code { - if (Gbl.Usrs.Me.UsrDat.Prefs.AcceptThirdPartyCookies) + if (Gbl.Usrs.Me.UsrDat.Prefs.AcceptCookies) { /***** Show linked external media *****/ // Example of code given by YouTube: @@ -1769,7 +1769,7 @@ static void Med_ShowEmbed (const struct Med_Media *Media,const char *ClassMedia) /***** Check if embed URL exists *****/ if (Media->URL[0]) // Embed URL { - if (Gbl.Usrs.Me.UsrDat.Prefs.AcceptThirdPartyCookies) + if (Gbl.Usrs.Me.UsrDat.Prefs.AcceptCookies) { /***** Show linked external media *****/ // Example of code given by Slideshare: diff --git a/swad_user.c b/swad_user.c index 93ba3da5..e15edb14 100644 --- a/swad_user.c +++ b/swad_user.c @@ -341,8 +341,8 @@ void Usr_ResetUsrDataExceptUsrCodAndIDs (struct UsrData *UsrDat) UsrDat->Prefs.Menu = Mnu_MENU_DEFAULT; UsrDat->Prefs.SideCols = Cfg_DEFAULT_COLUMNS; UsrDat->Prefs.PhotoShape = Pho_SHAPE_DEFAULT; - UsrDat->Prefs.AcceptThirdPartyCookies = false; // By default, don't accept third party cookies - UsrDat->NtfEvents.SendEmail = 0; // By default, don't notify anything + UsrDat->Prefs.AcceptCookies = false; // By default, don't accept third party cookies + UsrDat->NtfEvents.SendEmail = 0; // By default, don't notify anything } /*****************************************************************************/ @@ -450,7 +450,6 @@ void Usr_GetUsrDataFromUsrCod (struct UsrData *UsrDat, { MYSQL_RES *mysql_res; MYSQL_ROW row; - Lan_Language_t Lan; /***** Get user's data from database *****/ if (Usr_DB_GetUsrDataFromUsrCod (&mysql_res,UsrDat->UsrCod,GetPrefs)) @@ -537,32 +536,24 @@ void Usr_GetUsrDataFromUsrCod (struct UsrData *UsrDat, /***** Get user's settings *****/ if (GetPrefs == Usr_GET_PREFS) { - /* Get language (row[23]) */ - UsrDat->Prefs.Language = Lan_GetLanguageFromStr (row[23]); - - /* Get first day of week (row[24]) */ + /* Get language (row[23]), + first day of week (row[24]), + date format (row[25]), + theme (row[26]), + icon set (row[27]), + menu (row[28]), + if user wants to show side columns (row[29]), + user settings on user photo shape (row[30]), + and if user accepts third party cookies (row[31]) */ + UsrDat->Prefs.Language = Lan_GetLanguageFromStr (row[23]); UsrDat->Prefs.FirstDayOfWeek = Cal_GetFirstDayOfWeekFromStr (row[24]); - - /* Get date format (row[25]) */ - UsrDat->Prefs.DateFormat = Dat_GetDateFormatFromStr (row[25]); - - /* Get theme (row[26]) */ - UsrDat->Prefs.Theme = The_GetThemeFromStr (row[26]); - - /* Get icon set (row[27]) */ - UsrDat->Prefs.IconSet = Ico_GetIconSetFromStr (row[27]); - - /* Get menu (row[28]) */ - UsrDat->Prefs.Menu = Mnu_GetMenuFromStr (row[28]); - - /* Get if user wants to show side columns (row[29]) */ - UsrDat->Prefs.SideCols = Set_GetSideColsFromStr (row[29]); - - /* Get user settings on user photo shape (row[30]) */ - UsrDat->Prefs.PhotoShape = Pho_GetShapeFromStr (row[30]); - - /* Get if user accepts third party cookies (row[31]) */ - UsrDat->Prefs.AcceptThirdPartyCookies = (row[31][0] == 'Y'); + UsrDat->Prefs.DateFormat = Dat_GetDateFormatFromStr (row[25]); + UsrDat->Prefs.Theme = The_GetThemeFromStr (row[26]); + UsrDat->Prefs.IconSet = Ico_GetIconSetFromStr (row[27]); + UsrDat->Prefs.Menu = Mnu_GetMenuFromStr (row[28]); + UsrDat->Prefs.SideCols = Set_GetSideColsFromStr (row[29]); + UsrDat->Prefs.PhotoShape = Pho_GetShapeFromStr (row[30]); + UsrDat->Prefs.AcceptCookies = (row[31][0] == 'Y'); } } else diff --git a/swad_user.h b/swad_user.h index 9f86e267..e621a4b0 100644 --- a/swad_user.h +++ b/swad_user.h @@ -216,7 +216,7 @@ struct UsrData Mnu_Menu_t Menu; unsigned SideCols; Pho_Shape_t PhotoShape; - bool AcceptThirdPartyCookies; // User has accepted third party cookies + bool AcceptCookies; // User has accepted third party cookies } Prefs; };