Commit 6649edf9 authored by Clément OUDOT's avatar Clément OUDOT

Fix some portal items after jQuery migration (#604)

parent 60694bf8
......@@ -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();
......
......@@ -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 */
......
......@@ -30,7 +30,6 @@
<li title="<TMPL_VAR NAME="key">"><a href="#<TMPL_VAR NAME="key">"><TMPL_VAR NAME="name"></a></li>
</TMPL_LOOP>
</ul>
</div>
<!-- Forms -->
<TMPL_LOOP NAME="AUTH_LOOP">
......@@ -97,6 +96,7 @@
</div>
</TMPL_LOOP>
</div> <!-- end authloop -->
</div>
......
......@@ -33,8 +33,6 @@
</ul>
</TMPL_IF>
</div>
<div id="content-all-info2">
<TMPL_IF DISPLAY_MODULES>
......@@ -188,6 +186,7 @@
</TMPL_IF>
</div>
</div>
</div>
</div>
......
......@@ -209,7 +209,7 @@ color:#529214;
font-weight:bold;
}
li.ui-tabs-selected{
li.ui-tabs-active{
background-color:#E6EFC2;
}
......
......@@ -12,7 +12,7 @@ use Lemonldap::NG::Portal::_LibAccess;
use base qw(Lemonldap::NG::Portal::_LibAccess);
use Clone qw(clone);
our $VERSION = '1.1.0';
our $VERSION = '1.3.0';
our $catlevel = 0;
## @method void menuInit()
......@@ -48,7 +48,7 @@ sub menuInit {
# Default to appslist if invalid tab URL parameter
$self->{menuDisplayTab} = "appslist"
unless ( $self->{menuDisplayTab} =~ /^(password|logout)$/ );
unless ( $self->{menuDisplayTab} =~ /^(password|logout|loginHistory)$/ );
# Force password tab in case of password error
$self->{menuDisplayTab} = "password"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment