From 2fc7ce4f4cb369948604ba471113f0e24cd9e965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sun, 29 Nov 2015 18:32:57 +0100 Subject: [PATCH] Version 15.49.2 --- css/swad.css | 102 ++++++++++++++++++--------- swad_changelog.h | 5 +- swad_menu.c | 174 ++++++++++++++++++++++++----------------------- swad_menu.h | 2 +- 4 files changed, 163 insertions(+), 120 deletions(-) diff --git a/css/swad.css b/css/swad.css index dc8846ca3..2b6ac2e5a 100644 --- a/css/swad.css +++ b/css/swad.css @@ -285,6 +285,10 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} vertical-align:middle; overflow:hidden; } +.TAB_OFF a:hover + { + text-decoration:none; + } .TAB_ON { display:inline-block; @@ -300,6 +304,10 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} vertical-align:middle; overflow:hidden; } +.TAB_ON a:hover + { + text-decoration:none; + } .WHITE_TAB_OFF { color:#707070; @@ -461,7 +469,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} min-width:900px; min-height:900px; margin:-8px 0 0 0; - padding:10px 20px; + padding:16px 0; border-radius:6px; box-shadow:inset -2px -2px 1px 0 rgba(50,50,50,0.2); text-align:center; @@ -472,39 +480,43 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} { display:table; box-sizing:border-box; + width:100%; margin:0 auto; } #main_zone_menu_vertical { display:table-cell; box-sizing:border-box; - width:175px; + width:180px; + padding-left:8px; text-align:left; vertical-align:top; + overflow:hidden; } #main_zone_canvas /* Where content for each action is written */ { display:table-cell; box-sizing:border-box; + padding:0 16px; text-align:left; vertical-align:top; - // padding:0 12px 12px 12px; } /***************************** Horizontal menu *******************************/ -#horizontal_menu ul +#menu_horizontal ul { display:table; list-style-type:none; border:0; margin:0 auto; padding:0 0 4px 0; + // background:red; } -#horizontal_menu li +#menu_horizontal li { - display:table-cell; + display:inline-block; box-sizing:border-box; - width:138px; + width:100px; height:64px; border:0; margin:0; @@ -512,53 +524,74 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} text-align:center; vertical-align:middle; } -.MENU_OFF +#menu_horizontal a:hover { - display:inline-block; - box-sizing:border-box; - width:138px; - height:64px; - margin:0; - padding:0 2px; - text-align:center; - vertical-align:middle; + text-decoration:none; } -.MENU_ON +#menu_horizontal .OPTION + { + margin:0 auto; + background-size:32px 32px; + background-repeat:no-repeat; + background-position:center top; + padding:32px 2px 2px 2px; + overflow:hidden; + } +#menu_horizontal .OPTION_NOT_SELECTED + { + opacity:0.67; + display:inline-block; + } +#menu_horizontal .OPTION_NOT_SELECTED:hover + { + opacity:1; + transform:scale(1.15,1.15); + } +#menu_horizontal .OPTION_SELECTED { display:inline-block; - box-sizing:border-box; - width:138px; - height:64px; - margin:0; - padding:0; - text-align:center; - vertical-align:middle; + opacity:1; + transform:scale(1.15,1.15); } /******************************* Vertical menu *******************************/ -#vertical_menu +#menu_vertical ul { list-style-type:none; padding:0; margin:0; + // background:red; } -.MENU_OPTION +#menu_vertical a:hover { + text-decoration:none; + } +#menu_vertical .OPTION + { + display:table-cell; + vertical-align:middle; height:40px; clear:both; margin:0 auto; text-align:left; vertical-align:middle; + background-size:40px 40px; background-repeat:no-repeat; background-position:2px 2px; padding:2px 2px 2px 50px; overflow:hidden; } -.MENU_TEXT +#menu_vertical .OPTION_NOT_SELECTED { - display:table-cell; - height:40px; - vertical-align:middle; + opacity:0.67; + } +#menu_vertical .OPTION_NOT_SELECTED:hover + { + opacity:1; + } +#menu_vertical .OPTION_SELECTED + { + opacity:1; } /********************************* Menu fonts ********************************/ @@ -576,7 +609,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} #action_title { box-sizing:border-box; - width:375px; + width:480px; min-height:68px; clear:both; margin:0 auto; @@ -1179,6 +1212,7 @@ a:hover img.CENTRE_PHOTO_SHOW { opacity:1; } +/* .ICON_SCALING { display:inline-block; @@ -1186,15 +1220,15 @@ a:hover img.CENTRE_PHOTO_SHOW .ICON_SCALING:hover { opacity:1; - transform:scale(1.2,1.2); + transform:scale(1.15,1.15); } .ICON_SCALED { display:inline-block; opacity:1; - transform:scale(1.2,1.2); + transform:scale(1.15,1.15); } - +*/ /********************************* Form fonts ********************************/ .WHITE_FORM {color:#4D88A1; font-size:13pt;} .GREY_FORM {color:#4D88A1; font-size:13pt;} diff --git a/swad_changelog.h b/swad_changelog.h index a1ac41fdf..39b7d3c7d 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -110,16 +110,19 @@ // TODO: Edition of courses: Rename "Optativas/libre conf." to "Optativas varios cursos" // TODO: Edition of courses: Rename "Curso" to "Aņo / semestre / cuatrimestre" // TODO: Listing of courses: Put "Optativas" year at the end +// TODO: Timetable: Sunday can be the first day of the week +// TODO: Timetable: Day can start at 6 am /*****************************************************************************/ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.49.1 (2015/11/27)" +#define Log_PLATFORM_VERSION "SWAD 15.49.2 (2015/11/29)" // 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.49.2: Nov 29, 2015 Changes in layout of menus. (186501 lines) Version 15.49.1: Nov 27, 2015 Length of country names limited in listing. of countries. (186460 lines) Version 15.49: Nov 27, 2015 Fixed width in edition of institutional links. Lot of fixing in CSS related to sizes. (186455 lines) diff --git a/swad_menu.c b/swad_menu.c index ff40e7df1..0b7ed7bb7 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -66,6 +66,86 @@ const char *Mnu_MenuIcons[Mnu_NUM_MENUS] = "vertical", }; +/*****************************************************************************/ +/******************* Write horizontal menu of current tab ********************/ +/*****************************************************************************/ + +void Mnu_WriteHorizontalMenuThisTab (void) + { + extern const char *The_ClassMenuOn[The_NUM_THEMES]; + extern const char *The_ClassMenuOff[The_NUM_THEMES]; + extern const struct Act_Menu Act_Menu[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB]; + extern const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB]; + unsigned NumOptInMenu; + Act_Action_t NumAct; + const char *Title; + bool IsTheSelectedAction; + + /***** List start *****/ + fprintf (Gbl.F.Out,"
" + "" + "
"); + } + /*****************************************************************************/ /******************* Write vertical menu of current tab **********************/ /*****************************************************************************/ @@ -85,7 +165,8 @@ void Mnu_WriteVerticalMenuThisTab (void) bool PreviousVisibleOptions = false; /***** List start *****/ - fprintf (Gbl.F.Out,"