diff --git a/css/swad.css b/css/swad.css index 68700cae6..5e64b8b7c 100644 --- a/css/swad.css +++ b/css/swad.css @@ -21,7 +21,6 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not,see . */ - a:link {text-decoration:none;} a:visited {text-decoration:none;} a:active {text-decoration:none;} @@ -469,7 +468,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:16px 0; + padding:8px 0; border-radius:6px; box-shadow:inset -2px -2px 1px 0 rgba(50,50,50,0.2); text-align:center; @@ -482,41 +481,43 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} { box-sizing:border-box; width:100%; - margin:0 auto; } #menu_horizontal .MENU_BOX { box-sizing:border-box; width:100%; + height:64px; + padding:8px 16px; + margin:0 auto; } -#menu_vertical .CANVAS /* Where content for each action is written */ +#menu_horizontal .MAIN_ZONE_CANVAS /* Where content for each action is written */ { box-sizing:border-box; width:100%; - padding:0 16px; + padding:8px 16px; text-align:left; vertical-align:top; } -#menu_horizontal ul +#menu_horizontal .MENU_LIST { display:table; list-style-type:none; margin:0 auto; padding:0; } -#menu_horizontal a:hover +#menu_horizontal .MENU_LIST_ITEM + { + display:table-cell; + box-sizing:border-box; + width:138px; + } +.MENU_LIST_ITEM a:hover { text-decoration:none; } -#menu_horizontal li - { - display:inline-block; - } #menu_horizontal .OPTION { box-sizing:border-box; - width:100px; - height:64px; text-align:center; margin:0 auto; padding:32px 2px 2px 2px; @@ -543,6 +544,10 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} width:100%; margin:0 auto; } +a:hover #menu_vertical.MENU_LIST_ITEM + { + text-decoration:none; + } #menu_vertical .MENU_BOX { display:table-cell; @@ -553,26 +558,22 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} vertical-align:top; overflow:hidden; } -#menu_vertical .CANVAS /* Where content for each action is written */ +#menu_vertical .MAIN_ZONE_CANVAS /* Where content for each action is written */ { display:table-cell; box-sizing:border-box; - padding:0 16px; + padding:8px 16px; text-align:left; vertical-align:top; } -#menu_vertical ul +#menu_vertical .MENU_LIST { display:table; list-style-type:none; margin:0; padding:0; } -#menu_vertical a:hover - { - text-decoration:none; - } -#menu_vertical li +#menu_vertical MENU_LIST_ITEM { display:block; } @@ -615,14 +616,15 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} #action_title { box-sizing:border-box; - width:480px; - min-height:68px; + width:400px; + min-height:70px; clear:both; margin:0 auto; text-align:left; + background-size:64px 64px; + background-position:0 0; background-repeat:no-repeat; - background-position:12px 0; - padding:12px 12px 12px 105px; + padding:4px 12px 12px 70px; overflow:hidden; } @@ -1219,23 +1221,7 @@ a:hover img.CENTRE_PHOTO_SHOW { opacity:1; } -/* -.ICON_SCALING - { - display:inline-block; - } -.ICON_SCALING:hover - { - opacity:1; - transform:scale(1.15,1.15); - } -.ICON_SCALED - { - display:inline-block; - opacity:1; - transform:scale(1.15,1.15); - } -*/ + /********************************* Form fonts ********************************/ .WHITE_FORM {color:#4D88A1; font-size:13pt;} .GREY_FORM {color:#4D88A1; font-size:13pt;} @@ -1325,7 +1311,7 @@ a:hover img.CENTRE_PHOTO_SHOW { list-style-type:none; padding:0; - margin:0; + margin:0 auto; text-align:center; vertical-align:middle; } diff --git a/swad_changelog.h b/swad_changelog.h index ee78b471c..1af1641a8 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -117,11 +117,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.49.3 (2015/11/29)" +#define Log_PLATFORM_VERSION "SWAD 15.49.4 (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.4: Nov 29, 2015 Changes in layout of menus. (186481 lines) Version 15.49.3: Nov 29, 2015 Changes in layout of menus. (186502 lines) 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) diff --git a/swad_layout.c b/swad_layout.c index 5dba929dd..8b0ae91cf 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -298,28 +298,15 @@ void Lay_WriteStartOfPage (void) } fprintf (Gbl.F.Out,"
", The_TabOnBgColors[Gbl.Prefs.Theme]); + fprintf (Gbl.F.Out,"
", + Gbl.Prefs.Menu == Mnu_MENU_VERTICAL ? "menu_vertical" : + "menu_horizontal"); - if (Gbl.Prefs.Menu == Mnu_MENU_VERTICAL) - { - fprintf (Gbl.F.Out,"
"); - fprintf (Gbl.F.Out,"
" - "
    "); - Mnu_WriteVerticalMenuThisTab (); - fprintf (Gbl.F.Out,"
" - "
"); - } - else - { - fprintf (Gbl.F.Out,"
"); - fprintf (Gbl.F.Out,"
" - "
    "); - Mnu_WriteHorizontalMenuThisTab (); - fprintf (Gbl.F.Out,"
" - "
"); - } + /* Menu */ + Mnu_WriteMenuThisTab (); /* Start of main zone for actions output */ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /* Write warning when degree type does not allow direct login */ Usr_WarningWhenDegreeTypeDoesntAllowDirectLogin (); @@ -783,8 +770,7 @@ static void Lay_WriteTitleAction (void) /***** Container start *****/ fprintf (Gbl.F.Out,"
", + " style=\"background-image:url('%s/%s/%s64x64.gif');\">", Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION, Act_Actions[Act_Actions[Gbl.CurrentAct].SuperAction].Icon); diff --git a/swad_menu.c b/swad_menu.c index 3d59ad1e2..5fe759115 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -70,7 +70,7 @@ const char *Mnu_MenuIcons[Mnu_NUM_MENUS] = /******************* Write horizontal menu of current tab ********************/ /*****************************************************************************/ -void Mnu_WriteHorizontalMenuThisTab (void) +void Mnu_WriteMenuThisTab (void) { extern const char *The_ClassMenuOn[The_NUM_THEMES]; extern const char *The_ClassMenuOff[The_NUM_THEMES]; @@ -81,6 +81,10 @@ void Mnu_WriteHorizontalMenuThisTab (void) const char *Title; bool IsTheSelectedAction; + /***** Menu start *****/ + fprintf (Gbl.F.Out,"
" + "
    "); + /***** Loop to write all options in menu. Each row holds an option *****/ for (NumOptInMenu = 0; NumOptInMenu < Act_MAX_OPTIONS_IN_MENU_PER_TAB; @@ -96,7 +100,7 @@ void Mnu_WriteHorizontalMenuThisTab (void) Title = Act_GetSubtitleAction (NumAct); /***** Start of element *****/ - fprintf (Gbl.F.Out,"
  • "); + fprintf (Gbl.F.Out,"
  • "); /***** Start of container used to highlight this option *****/ fprintf (Gbl.F.Out,"
    ", @@ -133,6 +137,10 @@ void Mnu_WriteHorizontalMenuThisTab (void) fprintf (Gbl.F.Out,"
  • "); } } + + /***** Menu end *****/ + fprintf (Gbl.F.Out,"
" + "
"); } /*****************************************************************************/ diff --git a/swad_menu.h b/swad_menu.h index 049055ba3..d435ac47c 100644 --- a/swad_menu.h +++ b/swad_menu.h @@ -49,7 +49,7 @@ typedef enum /***************************** Public prototypes *****************************/ /*****************************************************************************/ -void Mnu_WriteHorizontalMenuThisTab (void); +void Mnu_WriteMenuThisTab (void); void Mnu_WriteVerticalMenuThisTab (void); void Mnu_PutIconsToSelectMenu (void); diff --git a/swad_syllabus.c b/swad_syllabus.c index 5a8a46dc2..83f52603b 100644 --- a/swad_syllabus.c +++ b/swad_syllabus.c @@ -137,7 +137,7 @@ void Syl_PutFormWhichSyllabus (void) /***** Form to select which forums I want to see (all my forums or only the forums of current institution/degree/course) *****/ Act_FormStart (ActSeeSyl); - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" "
    "); for (WhichSyllabus = (Syl_WhichSyllabus_t) 0;