diff --git a/lemonldap-ng-portal/example/skins/common/portal.js b/lemonldap-ng-portal/example/skins/common/portal.js index f9d2df097..96343d9ef 100644 --- a/lemonldap-ng-portal/example/skins/common/portal.js +++ b/lemonldap-ng-portal/example/skins/common/portal.js @@ -48,15 +48,18 @@ $(document).ready(function(){ $("input[name=timezone]").val( -(new Date().getTimezoneOffset()/60) ); /* Menu tabs */ - $("#menu").tabs({active:0}); - // TODO: replace 0 here ^ by the number of the tab to display (displaytab) - // OLD : $("#menu").tabs("select",displaytab); + var menuTabs = $("#menu").tabs({active:0}); + var menuIndex = $('#menu a[href="#'+displaytab+'"]').parent().index(); + menuTabs.tabs("option","active",menuIndex); /* Authentication choice tabs */ - $("#authMenu").tabs({active:0}); - // TODO: same problem + cookie + var authMenuTabs = $("#authMenu").tabs({active:0}); + // TODO: cookie //$("#authMenu").tabs({cookie: {name: 'lemonldapauthchoice'}}); - //$("#authMenu").tabs("select",choicetab); + if(choicetab){ + var authMenuIndex = $('#authMenu a[href="#'+choicetab+'"]').parent().index(); + authMenuTabs.tabs("option","active",authMenuIndex); + } /* Focus on first visible input */ $("input[type!=hidden]:first").focus(); diff --git a/lemonldap-ng-portal/example/skins/dark/css/styles.css b/lemonldap-ng-portal/example/skins/dark/css/styles.css index 8a36456bc..cb332ce46 100644 --- a/lemonldap-ng-portal/example/skins/dark/css/styles.css +++ b/lemonldap-ng-portal/example/skins/dark/css/styles.css @@ -46,6 +46,7 @@ padding: 0 10px; opacity:1; font-size:12pt; border-left: orange solid 20px; +text-align: left; } /* Tables */ @@ -101,6 +102,7 @@ color:#000; #logincontent form { min-height:200px; height:auto; +margin: 20px; } #mailcontent form { @@ -135,7 +137,7 @@ border-radius:10px 10px 10px 10px; color:#CCC; } -#authMenu li.ui-tabs-selected a { +#authMenu li.ui-tabs-active a { color:#000; } @@ -218,7 +220,7 @@ width:600px; color:#CCC; } -#menucontent li.ui-tabs-selected a { +#menucontent li.ui-tabs-active a { color:#000; } @@ -268,7 +270,7 @@ margin-bottom:5px; .ui-tabs-nav li a{ } -li.ui-tabs-selected{ +li.ui-tabs-active{ } /* Applications list */ diff --git a/lemonldap-ng-portal/example/skins/impact/login.tpl b/lemonldap-ng-portal/example/skins/impact/login.tpl index 50cc21388..34509b4a7 100644 --- a/lemonldap-ng-portal/example/skins/impact/login.tpl +++ b/lemonldap-ng-portal/example/skins/impact/login.tpl @@ -30,7 +30,6 @@