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 16.185.3

This commit is contained in:
Antonio Cañas Vargas 2017-04-20 23:03:42 +02:00
parent 43710dda36
commit 320a19c520
4 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
css/swad16.184.css → css/swad16.185.3.css
View File

@ -2352,7 +2352,9 @@ a:hover img.CENTRE_PHOTO_SHOW
} }
.TT_CELL .TT_CELL
{ {
max-width:50px; box-sizing:border-box;
max-width:80px;
white-space:nowrap;
overflow:hidden; overflow:hidden;
text-overflow:ellipsis; text-overflow:ellipsis;
margin:0 auto; margin:0 auto;
@ -2379,13 +2381,14 @@ a:hover img.CENTRE_PHOTO_SHOW
font-size:10pt; font-size:10pt;
letter-spacing:0; letter-spacing:0;
} }
.FREE0 {height:20px; background-color:#F4F2EA; border:solid 1px; border-color:#F4F2EA #E0D9C2 #EEEADC #F4F2EA;} .TT_HOUR {height:40px;}
.FREE1 {height:20px; background-color:#F4F2EA; border:solid 1px; border-color:#F4F2EA #E0D9C2 #E0D9C2 #F4F2EA;} .TT_FREE0 {height:20px; background-color:#F4F2EA; border:solid 1px; border-color:#F4F2EA #E0D9C2 #EEEADC #F4F2EA;}
.FREE2 {height:20px; background-color:#FBFAF7; border:solid 1px; border-color:#FBFAF7 #E0D9C2 #F5F2E9 #FBFAF7;} .TT_FREE1 {height:20px; background-color:#F4F2EA; border:solid 1px; border-color:#F4F2EA #E0D9C2 #E0D9C2 #F4F2EA;}
.FREE3 {height:20px; background-color:#FBFAF7; border:solid 1px; border-color:#FBFAF7 #E0D9C2 #E0D9C2 #FBFAF7;} .TT_FREE2 {height:20px; background-color:#FBFAF7; border:solid 1px; border-color:#FBFAF7 #E0D9C2 #F5F2E9 #FBFAF7;}
.THEO {height:20px; background-color:#C0DAE4; border:solid 2px; border-color:#C9E3ED #B5CFD9 #B5CFD9 #C9E3ED;} .TT_FREE3 {height:20px; background-color:#FBFAF7; border:solid 1px; border-color:#FBFAF7 #E0D9C2 #E0D9C2 #FBFAF7;}
.PRAC {height:20px; background-color:#DBE5E9; border:solid 2px; border-color:#E4EEF2 #D0DADE #D0DADE #E4EEF2;} .TT_THEO {height:20px; background-color:#C0DAE4; border:solid 2px; border-color:#C9E3ED #B5CFD9 #B5CFD9 #C9E3ED;}
.TUTO {height:20px; background-color:#D6E9C3; border:solid 2px; border-color:#DFEEE0 #CAE3B1 #CAE3B1 #DFEEE0;} .TT_PRAC {height:20px; background-color:#DBE5E9; border:solid 2px; border-color:#E4EEF2 #D0DADE #D0DADE #E4EEF2;}
.TT_TUTO {height:20px; background-color:#D6E9C3; border:solid 2px; border-color:#DFEEE0 #CAE3B1 #CAE3B1 #DFEEE0;}
/********************************* Preference ********************************/ /********************************* Preference ********************************/
.PREF_CONTAINER .PREF_CONTAINER

5
swad_changelog.h
View File

@ -214,13 +214,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.185.2 (2017-04-19)" #define Log_PLATFORM_VERSION "SWAD 16.185.3 (2017-04-20)"
#define CSS_FILE "swad16.184.css" #define CSS_FILE "swad16.185.3.css"
#define JS_FILE "swad16.181.js" #define JS_FILE "swad16.181.js"
// Number of lines (includes comments but not blank lines) has been got with the following command: // 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 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
/* /*
Version 16.185.3: Apr 20, 2017 Timetables end at 24h, suggested by Sandra Daniela Tazzioli Barroso. (217797 lines)
Version 16.185.2: Apr 19, 2017 Changes in forums. (217793 lines) Version 16.185.2: Apr 19, 2017 Changes in forums. (217793 lines)
Version 16.185.1: Apr 19, 2017 Changes in forums. Version 16.185.1: Apr 19, 2017 Changes in forums.
New help URLs for forums. (217793 lines) New help URLs for forums. (217793 lines)

2
swad_enrolment.c
View File

@ -2207,7 +2207,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
/***** Selection of scope and roles *****/ /***** Selection of scope and roles *****/
/* Start form */ /* Start form */
Act_FormStart (ActUpdSignUpReq); Act_FormStart (ActUpdSignUpReq);
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_MARGIN CELLS_PAD_5\">"); fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE_MARGIN CELLS_PAD_5\">");
/* Scope (whole platform, current centre, current degree or current course) */ /* Scope (whole platform, current centre, current degree or current course) */
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"

18
swad_timetable.c
View File

@ -51,7 +51,7 @@ extern struct Globals Gbl;
/*****************************************************************************/ /*****************************************************************************/
#define TT_START_HOUR 6 // Day starts at 6:00 #define TT_START_HOUR 6 // Day starts at 6:00
#define TT_HOURS_PER_DAY 16 // From 6:00 to 22:00 #define TT_HOURS_PER_DAY 18 // From 6:00 to 24:00
#define TT_DAYS 7 // Seven days per week #define TT_DAYS 7 // Seven days per week
#define TT_MAX_COLUMNS_PER_CELL 3 // Maximum number of items (i.e. classes) in a timetable cell (1, 2, 3 or 4) #define TT_MAX_COLUMNS_PER_CELL 3 // Maximum number of items (i.e. classes) in a timetable cell (1, 2, 3 or 4)
#define TT_NUM_MINICOLUMNS_PER_DAY 6 // Least common multiple of 1,2,3,...,TT_MAX_COLUMNS_PER_CELL #define TT_NUM_MINICOLUMNS_PER_DAY 6 // Least common multiple of 1,2,3,...,TT_MAX_COLUMNS_PER_CELL
@ -891,8 +891,8 @@ static void TT_DrawTimeTable (void)
/* Hour */ /* Hour */
if (Hour % 2) if (Hour % 2)
fprintf (Gbl.F.Out,"<td rowspan=\"2\" class=\"TT_TXT RIGHT_MIDDLE\"" fprintf (Gbl.F.Out,"<td rowspan=\"2\" class=\"TT_HOUR TT_TXT RIGHT_MIDDLE\""
" style=\"width:%u%%; height:40px;\">" " style=\"width:%u%%;\">"
"%2u:00" "%2u:00"
"</td>", "</td>",
TT_PERCENT_WIDTH_OF_AN_HOUR_COLUMN, TT_PERCENT_WIDTH_OF_AN_HOUR_COLUMN,
@ -957,8 +957,8 @@ static void TT_DrawTimeTable (void)
/* Hour */ /* Hour */
if (Hour % 2) if (Hour % 2)
fprintf (Gbl.F.Out,"<td rowspan=\"2\" class=\"TT_TXT LEFT_MIDDLE\"" fprintf (Gbl.F.Out,"<td rowspan=\"2\" class=\"TT_HOUR TT_TXT LEFT_MIDDLE\""
" style=\"width:%u%%; height:40px;\">" " style=\"width:%u%%;\">"
"%2u:00" "%2u:00"
"</td>", "</td>",
TT_PERCENT_WIDTH_OF_AN_HOUR_COLUMN, TT_PERCENT_WIDTH_OF_AN_HOUR_COLUMN,
@ -1135,10 +1135,10 @@ static void TT_TimeTableDrawCell (unsigned Day,unsigned Hour,unsigned Column,uns
extern const char *Txt_Place; extern const char *Txt_Place;
static const char *TimeTableClasses[TT_NUM_CLASS_TYPES] = static const char *TimeTableClasses[TT_NUM_CLASS_TYPES] =
{ {
"FREE", // Free hour "TT_FREE", // Free hour
"THEO", // Theoretical class "TT_THEO", // Theoretical class
"PRAC", // Practical class "TT_PRAC", // Practical class
"TUTO" // Tutorials "TT_TUTO" // Tutorials
}; };
enum enum
{ {