diff --git a/css/swad15.51.3.css b/css/swad15.52.css similarity index 97% rename from css/swad15.51.3.css rename to css/swad15.52.css index d95a63bf..77ac34c4 100644 --- a/css/swad15.51.3.css +++ b/css/swad15.52.css @@ -1560,14 +1560,27 @@ a:hover img.CENTRE_PHOTO_SHOW .TEST_EDI {color:#404040; font-size:12pt;} .TEST_EDI_LIGHT {color:#A0A0A0; font-size:12pt;} -.HOR {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#345C6C; font-size:10pt; line-height:110%; letter-spacing:0;} -.FREE0 {background-color:#F4F2EA; border:solid 1px; border-color:#F4F2EA #E0D9C2 #EEEADC #F4F2EA;} -.FREE1 {background-color:#F4F2EA; border:solid 1px; border-color:#F4F2EA #E0D9C2 #E0D9C2 #F4F2EA;} -.FREE2 {background-color:#FBFAF7; border:solid 1px; border-color:#FBFAF7 #E0D9C2 #F5F2E9 #FBFAF7;} -.FREE3 {background-color:#FBFAF7; border:solid 1px; border-color:#FBFAF7 #E0D9C2 #E0D9C2 #FBFAF7;} -.THEO {background-color:#C0DAE4; border:solid 2px; border-color:#C9E3ED #B5CFD9 #B5CFD9 #C9E3ED;} -.PRAC {background-color:#DBE5E9; border:solid 2px; border-color:#E4EEF2 #D0DADE #D0DADE #E4EEF2;} -.TUTO {background-color:#D6E9C3; border:solid 2px; border-color:#DFEEE0 #CAE3B1 #CAE3B1 #DFEEE0;} +/******************************* Time table **********************************/ +#timetable + { + width:100%; + margin:0 auto; + } +.TT_TXT + { + font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; + color:#345C6C; + font-size:10pt; + line-height:110%; + letter-spacing:0; + } +.FREE0 {height:20px; background-color:#F4F2EA; border:solid 1px; border-color:#F4F2EA #E0D9C2 #EEEADC #F4F2EA;} +.FREE1 {height:20px; background-color:#F4F2EA; border:solid 1px; border-color:#F4F2EA #E0D9C2 #E0D9C2 #F4F2EA;} +.FREE2 {height:20px; background-color:#FBFAF7; border:solid 1px; border-color:#FBFAF7 #E0D9C2 #F5F2E9 #FBFAF7;} +.FREE3 {height:20px; background-color:#FBFAF7; border:solid 1px; border-color:#FBFAF7 #E0D9C2 #E0D9C2 #FBFAF7;} +.THEO {height:20px; background-color:#C0DAE4; border:solid 2px; border-color:#C9E3ED #B5CFD9 #B5CFD9 #C9E3ED;} +.PRAC {height:20px; background-color:#DBE5E9; border:solid 2px; border-color:#E4EEF2 #D0DADE #D0DADE #E4EEF2;} +.TUTO {height:20px; background-color:#D6E9C3; border:solid 2px; border-color:#DFEEE0 #CAE3B1 #CAE3B1 #DFEEE0;} .PREF_OFF { @@ -1756,7 +1769,7 @@ a:hover img.CENTRE_PHOTO_SHOW box-sizing:border-box; min-width:312px; } - + /********************************** Page foot ********************************/ @media only screen and (max-width: 899px) { /* For mobile-phones */ diff --git a/sql/cambios.sql b/sql/cambios.sql index e90b25e9..78c33992 100644 --- a/sql/cambios.sql +++ b/sql/cambios.sql @@ -11166,3 +11166,17 @@ SELECT * FROM expanded_folders WHERE ClickTime"); + fprintf (Gbl.F.Out,""); /***** Top row used for column adjustement *****/ TT_TimeTableDrawAdjustRow (); /***** Row with day names *****/ fprintf (Gbl.F.Out,"" - "", TT_PERCENT_WIDTH_OF_AN_HOUR_COLUMN,TT_START_HOUR); TT_DrawCellAlignTimeTable (); TT_TimeTableDrawDaysCells (); TT_DrawCellAlignTimeTable (); - fprintf (Gbl.F.Out,"" "", @@ -785,8 +785,8 @@ static void TT_DrawTimeTable (void) /* Hour */ if (Hour % 2) - fprintf (Gbl.F.Out,"", TT_PERCENT_WIDTH_OF_AN_HOUR_COLUMN,TT_START_HOUR + (Hour+1)/2); @@ -843,8 +843,8 @@ static void TT_DrawTimeTable (void) /* Hour */ if (Hour % 2) - fprintf (Gbl.F.Out,"", TT_PERCENT_WIDTH_OF_AN_HOUR_COLUMN,TT_START_HOUR + (Hour+1)/2); @@ -880,8 +880,7 @@ static void TT_TimeTableDrawAdjustRow (void) unsigned Minicolumn; fprintf (Gbl.F.Out,"" - "", TT_PERCENT_WIDTH_OF_AN_HOUR_COLUMN); TT_DrawCellAlignTimeTable (); @@ -891,15 +890,13 @@ static void TT_TimeTableDrawAdjustRow (void) for (Minicolumn = 0; Minicolumn < TT_NUM_MINICOLUMNS_PER_DAY; Minicolumn++) - fprintf (Gbl.F.Out,"", TT_PERCENT_WIDTH_OF_A_MINICOLUMN); TT_DrawCellAlignTimeTable (); - fprintf (Gbl.F.Out,"" "", TT_PERCENT_WIDTH_OF_AN_HOUR_COLUMN); @@ -917,7 +914,7 @@ static void TT_TimeTableDrawDaysCells (void) for (Day = 0; Day < TT_DAYS; Day++) - fprintf (Gbl.F.Out,"", @@ -986,8 +983,7 @@ static unsigned TT_TimeTableCalculateColsToDraw (unsigned Day,unsigned Hour) static void TT_DrawCellAlignTimeTable (void) { - fprintf (Gbl.F.Out,"", TT_PERCENT_WIDTH_OF_A_SEPARATION_COLUMN); } @@ -1032,13 +1028,13 @@ static void TT_TimeTableDrawCell (unsigned Day,unsigned Hour,unsigned Column,uns /***** Compute row span and background color depending on hour type *****/ switch (HourType) { - case TT_FREE_HOUR: // Se escribe una casilla libre - RowSpan = 1; + case TT_FREE_HOUR: // Free cell written + RowSpan = 1; break; - case TT_FIRST_HOUR: // Se escribe una casilla normal + case TT_FIRST_HOUR: // Normal cell written RowSpan = Duration; break; - case TT_NEXT_HOUR: // No se escribe nada + case TT_NEXT_HOUR: // Nothing written break; } @@ -1093,14 +1089,9 @@ static void TT_TimeTableDrawCell (unsigned Day,unsigned Hour,unsigned Column,uns { case TT_CRS_SHOW: case TT_TUT_SHOW: - if (HourType == TT_FREE_HOUR) // If cell is empty... - fprintf (Gbl.F.Out,"\"\"", - Gbl.Prefs.IconsURL); - else + if (HourType != TT_FREE_HOUR) // If cell is not empty... { - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); if (Gbl.CurrentAct == ActSeeMyTimTbl || Gbl.CurrentAct == ActPrnMyTimTbl) {
" + "" "%u:00" "" + fprintf (Gbl.F.Out,"" "%u:00" "
" + fprintf (Gbl.F.Out,"" "%2u:00" "" + fprintf (Gbl.F.Out,"" "%2u:00" "
" - " " + "" "" - " " "" - " " "
" "%s" "" - " " + fprintf (Gbl.F.Out,"" "