Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 21.66.3: Dec 02, 2021 Fixed issue in CSS for background.

This commit is contained in:
acanas 2021-12-02 19:07:51 +01:00
parent 05cb596913
commit 996415a97f
7 changed files with 44 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
css/swad21.65.1.css → css/swad21.66.3.css
View File

@ -567,28 +567,28 @@ a:hover /* Default ==> underlined */
} }
.HEAD_ROW_3_GREY .HEAD_ROW_3_GREY
{ {
background-image:-webkit-linear-gradient(#404040 0,#404040 52px,white 52px,white 100%); /* Safari */ background-image:-webkit-linear-gradient(#404040 0,#404040 54px,white 54px,white 100%); /* Safari */
background-image:linear-gradient(#404040 0,#404040 52px,white 52px,white 100%); background-image:linear-gradient(#404040 0,#404040 54px,white 54px,white 100%);
} }
.HEAD_ROW_3_PURPLE .HEAD_ROW_3_PURPLE
{ {
background-image:-webkit-linear-gradient(#a070a1 0,#a070a1 52px,white 52px,white 100%); /* Safari */ background-image:-webkit-linear-gradient(#a070a1 0,#a070a1 54px,white 54px,white 100%); /* Safari */
background-image:linear-gradient(#a070a1 0,#a070a1 52px,white 52px,white 100%); background-image:linear-gradient(#a070a1 0,#a070a1 54px,white 54px,white 100%);
} }
.HEAD_ROW_3_BLUE .HEAD_ROW_3_BLUE
{ {
background-image:-webkit-linear-gradient(#4f90c8 0,#4f90c8 52px,white 52px,white 100%); /* Safari */ background-image:-webkit-linear-gradient(#4f90c8 0,#4f90c8 54px,white 54px,white 100%); /* Safari */
background-image:linear-gradient(#4f90c8 0,#4f90c8 52px,white 52px,white 100%); background-image:linear-gradient(#4f90c8 0,#4f90c8 54px,white 54px,white 100%);
} }
.HEAD_ROW_3_YELLOW .HEAD_ROW_3_YELLOW
{ {
background-image:-webkit-linear-gradient(#302830 0,#302830 52px,white 52px,white 100%); /* Safari */ background-image:-webkit-linear-gradient(#302830 0,#302830 54px,white 54px,white 100%); /* Safari */
background-image:linear-gradient(#302830 0,#302830 52px,white 52px,white 100%); background-image:linear-gradient(#302830 0,#302830 54px,white 54px,white 100%);
} }
.HEAD_ROW_3_PINK .HEAD_ROW_3_PINK
{ {
background-image:-webkit-linear-gradient(#c86b85 0,#c86b85 52px,white 52px,white 100%); /* Safari */ background-image:-webkit-linear-gradient(#c86b85 0,#c86b85 54px,white 54px,white 100%); /* Safari */
background-image:linear-gradient(#c86b85 0,#c86b85 52px,white 52px,white 100%); background-image:linear-gradient(#c86b85 0,#c86b85 54px,white 54px,white 100%);
} }
@ -866,12 +866,11 @@ a:hover /* Default ==> underlined */
#main_zone_central_container #main_zone_central_container
{ {
box-sizing:border-box; box-sizing:border-box;
margin:-6px 0 0 0; margin:-4px 0 0 0;
padding:4px 0; padding:4px 0;
border-radius:2px; border-radius:2px;
box-shadow:inset 0 -1px 1px 0 rgba(50,50,50,0.2); box-shadow:inset 0 -1px 1px 0 rgba(50,50,50,0.2);
text-align:center; text-align:center;
vertical-align:top;
position:relative; position:relative;
} }
} }
@ -881,12 +880,11 @@ a:hover /* Default ==> underlined */
{ {
box-sizing:border-box; box-sizing:border-box;
min-height:900px; min-height:900px;
margin:-6px 0 0 0; margin:-4px 0 0 0;
padding:4px 0; padding:4px 0;
border-radius:2px; border-radius:2px;
box-shadow:inset 0 -1px 1px 0 rgba(50,50,50,0.2); box-shadow:inset 0 -1px 1px 0 rgba(50,50,50,0.2);
text-align:center; text-align:center;
vertical-align:top;
position:relative; position:relative;
} }
} }

5
swad_changelog.h
View File

@ -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. 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 Log_PLATFORM_VERSION "SWAD 21.66.3 (2021-12-02)"
#define CSS_FILE "swad21.65.1.css" #define CSS_FILE "swad21.66.3.css"
#define JS_FILE "swad21.59.js" #define JS_FILE "swad21.59.js"
/* /*
TODO: Rename CENTRE to CENTER in help wiki. TODO: Rename CENTRE to CENTER in help wiki.
TODO: Rename ASSESSMENT.Announcements to ASSESSMENT.Calls_for_exams 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.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) Version 21.65.1: Dec 01, 2021 New shape of user photos. (320833 lines)
2 changes necessary in database: 2 changes necessary in database:

10
swad_cookie.c
View File

@ -72,14 +72,14 @@ void Coo_EditMyPrefsOnCookies (void)
/* Begin container */ /* Begin container */
HTM_DIV_Begin ("class=\"%s\"", HTM_DIV_Begin ("class=\"%s\"",
(Gbl.Usrs.Me.UsrDat.Prefs.AcceptThirdPartyCookies) ? "DAT_N LIGHT_BLUE" : (Gbl.Usrs.Me.UsrDat.Prefs.AcceptCookies) ? "DAT_N LIGHT_BLUE" :
"DAT"); "DAT");
/* Check box */ /* Check box */
HTM_LABEL_Begin (NULL); HTM_LABEL_Begin (NULL);
HTM_INPUT_CHECKBOX ("cookies",HTM_SUBMIT_ON_CHANGE, HTM_INPUT_CHECKBOX ("cookies",HTM_SUBMIT_ON_CHANGE,
"value=\"Y\"%s", "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_Txt (Txt_Accept_third_party_cookies_to_view_multimedia_content_from_other_websites);
HTM_LABEL_End (); HTM_LABEL_End ();
@ -113,7 +113,7 @@ static void Coo_PutIconsCookies (__attribute__((unused)) void *Args)
void Coo_ChangeMyPrefsCookies (void) void Coo_ChangeMyPrefsCookies (void)
{ {
/***** Get param with preference about third party cookies *****/ /***** 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 *****/ /***** Store preference in database *****/
if (Gbl.Usrs.Me.Logged) if (Gbl.Usrs.Me.Logged)

4
swad_cookie_database.c
View File

@ -48,7 +48,7 @@ void Coo_DB_UpdateMyPrefsCookies (void)
"UPDATE usr_data" "UPDATE usr_data"
" SET ThirdPartyCookies='%c'" " SET ThirdPartyCookies='%c'"
" WHERE UsrCod=%ld", " WHERE UsrCod=%ld",
Gbl.Usrs.Me.UsrDat.Prefs.AcceptThirdPartyCookies ? 'Y' : Gbl.Usrs.Me.UsrDat.Prefs.AcceptCookies ? 'Y' :
'N', 'N',
Gbl.Usrs.Me.UsrDat.UsrCod); Gbl.Usrs.Me.UsrDat.UsrCod);
} }

4
swad_media.c
View File

@ -1724,7 +1724,7 @@ static void Med_ShowYoutube (const struct Med_Media *Media,const char *ClassMedi
/***** Check if YouTube code exists *****/ /***** Check if YouTube code exists *****/
if (Media->Name[0]) // YouTube code if (Media->Name[0]) // YouTube code
{ {
if (Gbl.Usrs.Me.UsrDat.Prefs.AcceptThirdPartyCookies) if (Gbl.Usrs.Me.UsrDat.Prefs.AcceptCookies)
{ {
/***** Show linked external media *****/ /***** Show linked external media *****/
// Example of code given by YouTube: // 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 *****/ /***** Check if embed URL exists *****/
if (Media->URL[0]) // Embed URL if (Media->URL[0]) // Embed URL
{ {
if (Gbl.Usrs.Me.UsrDat.Prefs.AcceptThirdPartyCookies) if (Gbl.Usrs.Me.UsrDat.Prefs.AcceptCookies)
{ {
/***** Show linked external media *****/ /***** Show linked external media *****/
// Example of code given by Slideshare: // Example of code given by Slideshare:

47
swad_user.c
View File

@ -341,8 +341,8 @@ void Usr_ResetUsrDataExceptUsrCodAndIDs (struct UsrData *UsrDat)
UsrDat->Prefs.Menu = Mnu_MENU_DEFAULT; UsrDat->Prefs.Menu = Mnu_MENU_DEFAULT;
UsrDat->Prefs.SideCols = Cfg_DEFAULT_COLUMNS; UsrDat->Prefs.SideCols = Cfg_DEFAULT_COLUMNS;
UsrDat->Prefs.PhotoShape = Pho_SHAPE_DEFAULT; UsrDat->Prefs.PhotoShape = Pho_SHAPE_DEFAULT;
UsrDat->Prefs.AcceptThirdPartyCookies = false; // By default, don't accept third party cookies UsrDat->Prefs.AcceptCookies = false; // By default, don't accept third party cookies
UsrDat->NtfEvents.SendEmail = 0; // By default, don't notify anything 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_RES *mysql_res;
MYSQL_ROW row; MYSQL_ROW row;
Lan_Language_t Lan;
/***** Get user's data from database *****/ /***** Get user's data from database *****/
if (Usr_DB_GetUsrDataFromUsrCod (&mysql_res,UsrDat->UsrCod,GetPrefs)) if (Usr_DB_GetUsrDataFromUsrCod (&mysql_res,UsrDat->UsrCod,GetPrefs))
@ -537,32 +536,24 @@ void Usr_GetUsrDataFromUsrCod (struct UsrData *UsrDat,
/***** Get user's settings *****/ /***** Get user's settings *****/
if (GetPrefs == Usr_GET_PREFS) if (GetPrefs == Usr_GET_PREFS)
{ {
/* Get language (row[23]) */ /* Get language (row[23]),
UsrDat->Prefs.Language = Lan_GetLanguageFromStr (row[23]); first day of week (row[24]),
date format (row[25]),
/* Get first day of week (row[24]) */ 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]); UsrDat->Prefs.FirstDayOfWeek = Cal_GetFirstDayOfWeekFromStr (row[24]);
UsrDat->Prefs.DateFormat = Dat_GetDateFormatFromStr (row[25]);
/* Get date format (row[25]) */ UsrDat->Prefs.Theme = The_GetThemeFromStr (row[26]);
UsrDat->Prefs.DateFormat = Dat_GetDateFormatFromStr (row[25]); UsrDat->Prefs.IconSet = Ico_GetIconSetFromStr (row[27]);
UsrDat->Prefs.Menu = Mnu_GetMenuFromStr (row[28]);
/* Get theme (row[26]) */ UsrDat->Prefs.SideCols = Set_GetSideColsFromStr (row[29]);
UsrDat->Prefs.Theme = The_GetThemeFromStr (row[26]); UsrDat->Prefs.PhotoShape = Pho_GetShapeFromStr (row[30]);
UsrDat->Prefs.AcceptCookies = (row[31][0] == 'Y');
/* 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');
} }
} }
else else

2
swad_user.h
View File

@ -216,7 +216,7 @@ struct UsrData
Mnu_Menu_t Menu; Mnu_Menu_t Menu;
unsigned SideCols; unsigned SideCols;
Pho_Shape_t PhotoShape; Pho_Shape_t PhotoShape;
bool AcceptThirdPartyCookies; // User has accepted third party cookies bool AcceptCookies; // User has accepted third party cookies
} Prefs; } Prefs;
}; };