diff --git a/modules/lemonldap-ng-manager/example/skins/default/manager.css b/modules/lemonldap-ng-manager/example/skins/default/manager.css index 951d51144..5bc5df014 100644 --- a/modules/lemonldap-ng-manager/example/skins/default/manager.css +++ b/modules/lemonldap-ng-manager/example/skins/default/manager.css @@ -241,7 +241,7 @@ option #content_filearea table tr td { text-align:left; - vertical-align:center; + vertical-align:middle; } #content_filearea table { diff --git a/modules/lemonldap-ng-manager/example/skins/default/manager.js b/modules/lemonldap-ng-manager/example/skins/default/manager.js index 06c37b922..523d71d61 100644 --- a/modules/lemonldap-ng-manager/example/skins/default/manager.js +++ b/modules/lemonldap-ng-manager/example/skins/default/manager.js @@ -2,6 +2,13 @@ * Lemonldap::NG Manager jQuery scripts */ +/* Help chapters */ +var helpCh={ + rules:'/pages/documentation/1.0/writingrulesand_headers.html#rules', + headers:'/pages/documentation/1.0/writingrulesand_headers.html#headers', + default:'/' +}; + /* Init simpleTreeCollection */ var simpleTreeCollection; @@ -58,9 +65,6 @@ $(document).ready(function(){ return false; }); - /* Load default help */ - $('#help_content').load(scriptname+'?help=default'); - /* Display configuration datas */ getCfgAttributes(); display('cfgDatas',''); @@ -72,7 +76,7 @@ $(document).ready(function(){ drag:false, afterClick:function(node){ var span=$('span:first',node); - $('#help_content').load(scriptname+'?help='+span.attr('help')); + loadHelp(span.attr('help')); simpleTreeDefaultJqueryClasses(); simpleTreeToggleJqueryClasses(); }, @@ -112,6 +116,10 @@ $(document).ready(function(){ simpleTreeSetMenuStyle(style); return false; }); + + /* Load default help */ + loadHelp('default'); + }); function simpleTreeSetMenuStyle(style){ if(style=="tree"){ @@ -347,12 +355,13 @@ function display(div,title) { $('#newapplicationr,#delapplication').hide(); $('#newpostr,#delpost').hide(); $('#newpostdatar,#delpostdata').hide(); - var height_cur=$('#buttons').height()+$('#edition').height()+$('#help').height(); + /* TODO: conflict with loadAndScroll */ + /*var height_cur=$('#buttons').height()+$('#edition').height()+$('#help').height(); var height_max=$('#menu').height(); if(height_cur > height_max || $('#help_content').is(':visible')==false){ $('#help h1 img').toggle(); $('#help_content').toggle(); - } + }*/ } function none(id) { currentId=id; @@ -700,7 +709,7 @@ function vhost(id){ } function cfgDatas(id){ var span=$('#'+id+' span'); - $('#help_content').load(scriptname+'?help='+span.attr('help')); + loadHelp(span.attr('help')); display('cfgDatas',''); getCfgAttributes(); } @@ -1272,11 +1281,39 @@ function networkPb(){ popup('