diff --git a/css/swad15.51.3.css b/css/swad15.51.3.css index 98d512985..d95a63bfd 100644 --- a/css/swad15.51.3.css +++ b/css/swad15.51.3.css @@ -140,12 +140,17 @@ a:hover {text-decoration:underline;} background-color:#201420; } +#head_row_1_left + { + display:table-cell; + text-align:left; + vertical-align:middle; + } @media only screen and (max-width: 899px) { /* For mobile-phones */ #head_row_1_logo_small { - display:table-cell; - vertical-align:middle; + display:inline-block; } #head_row_1_logo_big { @@ -160,15 +165,13 @@ a:hover {text-decoration:underline;} } #head_row_1_logo_big { - display:table-cell; - vertical-align:middle; + display:inline-block; } } #head_row_1_search { - display:table-cell; - text-align:left; - vertical-align:middle; + display:inline-block; + padding:0 20px; } @media only screen and (max-width: 1279px) { /* For mobile phones and tablets */ @@ -355,7 +358,7 @@ a:hover {text-decoration:underline;} display:table; box-sizing:border-box; width:492px; /* 82 px * 6 visible tabs */ - height:68px; + height:70px; margin:0 auto; border-spacing:1px; } @@ -364,7 +367,7 @@ a:hover {text-decoration:underline;} display:table-cell; box-sizing:border-box; width:80px; - height:66px; + height:68px; margin:0; padding:0; border-radius:6px 6px 0 0; @@ -378,7 +381,7 @@ a:hover {text-decoration:underline;} display:table-cell; box-sizing:border-box; width:80px; - height:66px; + height:68px; margin:0; padding:0; border-radius:6px 6px 0 0; @@ -399,7 +402,7 @@ a:hover {text-decoration:underline;} display:table; box-sizing:border-box; width:660px; /* 110 px * 6 visible tabs */ - height:68px; + height:70px; margin:0 auto; border-spacing:1px; } @@ -408,7 +411,7 @@ a:hover {text-decoration:underline;} display:table-cell; box-sizing:border-box; width:108px; - height:66px; + height:68px; margin:0; padding:0; border-radius:6px 6px 0 0; @@ -422,7 +425,7 @@ a:hover {text-decoration:underline;} display:table-cell; box-sizing:border-box; width:108px; - height:66px; + height:68px; margin:0; padding:0; border-radius:6px 6px 0 0; @@ -570,7 +573,7 @@ a:hover {text-decoration:underline;} box-sizing:border-box; min-width:900px; min-height:900px; - margin:-6px 0 0 0; + margin:-8px 0 0 0; padding:8px 0; border-radius:6px; box-shadow:inset -2px -2px 1px 0 rgba(50,50,50,0.2); @@ -594,9 +597,9 @@ a:hover {text-decoration:underline;} { display:table; box-sizing:border-box; - height:76px; + height:60px; margin:0 auto; - padding:8px 16px; + padding:0 8px; list-style-type:none; } #main_horizontal .MENU_LIST_ITEM @@ -653,9 +656,9 @@ a:hover {text-decoration:underline;} { display:table; box-sizing:border-box; - height:76px; + height:60px; margin:0 auto; - padding:8px 16px; + padding:0 8px; list-style-type:none; } #main_vertical .MENU_LIST_ITEM @@ -869,55 +872,55 @@ a:hover {text-decoration:underline;} .MONTH { color:#4D88A1; - font-size:10pt; + font-size:9pt; white-space:nowrap; } .DAY_WRK_HEAD { color:#4D88A1; - font-size:10pt; + font-size:9pt; text-align:center; } .DAY_NO_WRK_HEAD { color:#FF0000; - font-size:10pt; + font-size:9pt; text-align:center; } .DAY_WRK { color:#202020; - font-size:10pt; + font-size:9pt; text-align:center; } .DAY_NO_WORK { color:#C04080; - font-size:10pt; + font-size:9pt; text-align:center; } .DAY_HLD { color:#FF0000; - font-size:10pt; + font-size:9pt; text-align:center; } .DAY_WRK_LIGHT { color:#E0E0E0; - font-size:10pt; + font-size:9pt; text-align:center; } .DAY_NO_WORK_LIGHT { color:#FFE0FF; - font-size:10pt; + font-size:9pt; text-align:center; } .DAY_HLD_LIGHT { color:#FFE0E0; - font-size:10pt; + font-size:9pt; text-align:center; } .DAY diff --git a/icon/openswad220x40.png b/icon/openswad220x40.png new file mode 100644 index 000000000..4483969aa Binary files /dev/null and b/icon/openswad220x40.png differ diff --git a/icon/swad140x40.png b/icon/swad140x40.png new file mode 100644 index 000000000..840006b59 Binary files /dev/null and b/icon/swad140x40.png differ diff --git a/js/swad.js b/js/swad.js index c11f48828..6fca33cff 100644 --- a/js/swad.js +++ b/js/swad.js @@ -626,18 +626,18 @@ function disableDetailedClicks() { function Cal_DrawCalendar (id,FirstDayOfWeek,TimeUTC,CurrentPlcCod,PrintView, CGI,FormGoToCalendarParams,FormEventParams) { var StartingMonth = [ // Calendar starts one row before current month - 9, // January --> September - 9, // February --> September - 9, // Mars --> September - 9, // April --> September - 1, // May --> January - 1, // June --> January - 1, // July --> January - 1, // August --> January - 5, // September --> May - 5, // October --> May - 5, // November --> May - 5 // December --> May + 10, // January --> October + 10, // February --> October + 10, // Mars --> October + 1, // April --> January + 1, // May --> January + 1, // June --> January + 4, // July --> April + 4, // August --> April + 4, // September --> April + 7, // October --> July + 7, // November --> July + 7 // December --> July ]; var d = new Date; d.setTime(TimeUTC * 1000); @@ -656,11 +656,11 @@ function Cal_DrawCalendar (id,FirstDayOfWeek,TimeUTC,CurrentPlcCod,PrintView, Gbl_HTMLContent += ''; for (Row = 0; - Row < 4; + Row < 5; Row++) { Gbl_HTMLContent += ''; for (Col = 0; - Col < 4; + Col < 3; Col++) { MonthIdNum++; MonthId = id + '_month_' + MonthIdNum; diff --git a/swad_calendar.c b/swad_calendar.c index c78d2764f..45d0f72af 100644 --- a/swad_calendar.c +++ b/swad_calendar.c @@ -213,20 +213,21 @@ void Cal_DrawCurrentMonth (void) /*****************************************************************************/ /* Current Starting month month - 1 -> 9 - 2 -> 9 - 3 -> 9 - 4 -> 9 + 1 -> 10 + 2 -> 10 + 3 -> 10 + 4 -> 1 5 -> 1 6 -> 1 - 7 -> 1 - 8 -> 1 - 9 -> 5 - 10 -> 5 - 11 -> 5 - 12 -> 5 + 7 -> 4 + 8 -> 4 + 9 -> 4 + + 10 -> 7 + 11 -> 7 + 12 -> 7 */ void Cal_DrawCalendar (void) { diff --git a/swad_changelog.h b/swad_changelog.h index 1470bb7ce..fee2ed2b1 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -117,12 +117,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.51.3 (2015/11/30)" -#define CSS_FILE "swad15.51.3.css" +#define Log_PLATFORM_VERSION "SWAD 15.51.4 (2015/11/30)" +#define CSS_FILE "swad15.51.4.css" // 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.51.4: Nov 30, 2015 Calendar is now distributed in rows with 3 months instead of 4. + Changes in layout. (186644 lines) Version 15.51.3: Nov 30, 2015 Responsive design in login-logout. (186641 lines) Version 15.51.2: Nov 30, 2015 Responsive design in tabs. (186688 lines) Version 15.51.1: Nov 30, 2015 Responsive design in logo. diff --git a/swad_config.h b/swad_config.h index 74b37a577..fe79392d3 100644 --- a/swad_config.h +++ b/swad_config.h @@ -62,8 +62,8 @@ #define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad40x40.png" // Logo displayed in the top of the page #define Cfg_PLATFORM_LOGO_SMALL_WIDTH 40 #define Cfg_PLATFORM_LOGO_SMALL_HEIGHT 40 -#define Cfg_PLATFORM_LOGO_BIG_FILENAME "openswad240x40.png" -#define Cfg_PLATFORM_LOGO_BIG_WIDTH 240 +#define Cfg_PLATFORM_LOGO_BIG_FILENAME "swad140x40.png" +#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 @@ -115,8 +115,8 @@ #define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad40x40.png" // Logo displayed in the top of the page #define Cfg_PLATFORM_LOGO_SMALL_WIDTH 40 #define Cfg_PLATFORM_LOGO_SMALL_HEIGHT 40 -#define Cfg_PLATFORM_LOGO_BIG_FILENAME "openswad240x40.png" -#define Cfg_PLATFORM_LOGO_BIG_WIDTH 240 +#define Cfg_PLATFORM_LOGO_BIG_FILENAME "openswad220x40.png" +#define Cfg_PLATFORM_LOGO_BIG_WIDTH 220 #define Cfg_PLATFORM_LOGO_BIG_HEIGHT 40 #define Cfg_PLATFORM_RESPONSIBLE_NAME "Antonio Caņas Vargas" // Main responsible for the platform @@ -185,8 +185,8 @@ #define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad40x40.png" // Logo displayed in the top of the page #define Cfg_PLATFORM_LOGO_SMALL_WIDTH 40 #define Cfg_PLATFORM_LOGO_SMALL_HEIGHT 40 -#define Cfg_PLATFORM_LOGO_BIG_FILENAME "swad160x40.png" -#define Cfg_PLATFORM_LOGO_BIG_WIDTH 160 +#define Cfg_PLATFORM_LOGO_BIG_FILENAME "swad140x40.png" +#define Cfg_PLATFORM_LOGO_BIG_WIDTH 140 #define Cfg_PLATFORM_LOGO_BIG_HEIGHT 40 #define Cfg_PLATFORM_RESPONSIBLE_NAME "CEVUG" // Main responsible for the platform @@ -245,8 +245,8 @@ #define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad40x40.png" // Logo displayed in the top of the page #define Cfg_PLATFORM_LOGO_SMALL_WIDTH 40 #define Cfg_PLATFORM_LOGO_SMALL_HEIGHT 40 -#define Cfg_PLATFORM_LOGO_BIG_FILENAME "swad160x40.png" -#define Cfg_PLATFORM_LOGO_BIG_WIDTH 160 +#define Cfg_PLATFORM_LOGO_BIG_FILENAME "swad140x40.png" +#define Cfg_PLATFORM_LOGO_BIG_WIDTH 140 #define Cfg_PLATFORM_LOGO_BIG_HEIGHT 40 #define Cfg_PLATFORM_RESPONSIBLE_NAME "Carmen Varela Báez" // Main responsible for the platform diff --git a/swad_layout.c b/swad_layout.c index 0bf899156..01b072b1c 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -683,33 +683,32 @@ static void Lay_WritePageTopHeading (void) fprintf (Gbl.F.Out,"
", ClassHeadRow1[Gbl.Prefs.Theme]); - /* 1st. row, 1st. column: logo */ - fprintf (Gbl.F.Out,"
" + /* 1st. row, 1st. column: logo and search */ + fprintf (Gbl.F.Out,"
"); + + fprintf (Gbl.F.Out,"
" "" "\"%s\"" "" - "
", - Cfg_PLATFORM_LOGO_SMALL_WIDTH, + "
", // head_row_1_logo_small Cfg_HTTPS_URL_SWAD_CGI, Gbl.Prefs.IconsURL,Cfg_PLATFORM_LOGO_SMALL_FILENAME, Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME, Cfg_PLATFORM_LOGO_SMALL_WIDTH,Cfg_PLATFORM_LOGO_SMALL_HEIGHT); - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" "" "\"%s\"" "" - "
", - Cfg_PLATFORM_LOGO_BIG_WIDTH, + "
", // head_row_1_logo_big Cfg_HTTPS_URL_SWAD_CGI, Gbl.Prefs.IconsURL,Cfg_PLATFORM_LOGO_BIG_FILENAME, Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME, Cfg_PLATFORM_LOGO_BIG_WIDTH,Cfg_PLATFORM_LOGO_BIG_HEIGHT); - /* 1st. row, 2nd. column: search */ fprintf (Gbl.F.Out,"
"); Act_FormStart ( Gbl.CurrentCrs.Crs.CrsCod > 0 ? ActCrsSch : (Gbl.CurrentDeg.Deg.DegCod > 0 ? ActDegSch : @@ -720,7 +719,9 @@ static void Lay_WritePageTopHeading (void) Sco_PutParamScope (Sco_SCOPE_SYS); Sch_PutFormToSearch (Gbl.Prefs.PathTheme,"head_search_text"); Act_FormEnd (); - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); // head_row_1_search + + fprintf (Gbl.F.Out,"
"); // head_row_1_left /* 1st. row, 3rd. column: logged user or language selection, and link to open/close session */ @@ -1427,8 +1428,6 @@ void Lay_WriteHeaderClassPhoto (unsigned NumColumns,bool PrintView,bool DrawingC struct Institution Ins; struct Degree Deg; struct Course Crs; - unsigned Size = (PrintView ? 64 : - 32); /***** Get data of institution *****/ Ins.InsCod = InsCod; @@ -1456,7 +1455,7 @@ void Lay_WriteHeaderClassPhoto (unsigned NumColumns,bool PrintView,bool DrawingC if (!PrintView) fprintf (Gbl.F.Out,"",Ins.WWW); Log_DrawLogo (Sco_SCOPE_INS,Ins.InsCod,Ins.ShortName, - Size,NULL,true); + 32,NULL,true); if (!PrintView) fprintf (Gbl.F.Out,""); } @@ -1504,7 +1503,8 @@ void Lay_WriteHeaderClassPhoto (unsigned NumColumns,bool PrintView,bool DrawingC fprintf (Gbl.F.Out,"", Deg.WWW); - Log_DrawLogo (Sco_SCOPE_DEG,Deg.DegCod,Deg.ShortName,Size,NULL,true); + Log_DrawLogo (Sco_SCOPE_DEG,Deg.DegCod,Deg.ShortName, + 32,NULL,true); if (!PrintView) fprintf (Gbl.F.Out,""); }