From 79376f4b44b95b01262e5be1f3d2b8c2397f1cd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Oudot?= <clement@oodo.net>
Date: Sat, 13 Mar 2010 16:21:55 +0000
Subject: [PATCH] Manager: * Change test for SAML attributes value * Remove
 unused Apply button * Use js to always display New Vhost or New Metadata on
 Vhost or IDP node

---
 modules/lemonldap-ng-manager/example/index.pl          |  6 ------
 .../example/skins/default/manager.js                   | 10 ++++++++++
 .../example/skins/default/manager.tpl                  |  4 ----
 .../lib/Lemonldap/NG/Manager/_Struct.pm                |  6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/modules/lemonldap-ng-manager/example/index.pl b/modules/lemonldap-ng-manager/example/index.pl
index 34f23679a..88b8a5068 100755
--- a/modules/lemonldap-ng-manager/example/index.pl
+++ b/modules/lemonldap-ng-manager/example/index.pl
@@ -6,12 +6,6 @@ use HTML::Template;
 
 my $manager = new Lemonldap::NG::Manager(
     {
-        # MANAGER CUSTOMIZATION
-        #managerSkin		=> 'default',
-        #managerCss		=> 'manager.css',
-        #managerTreeAutoClose	=> 'false',
-        #managerTreeJqueryCss	=> 'false',
-
         # ACCESS TO CONFIGURATION
 
         # By default, Lemonldap::NG uses the default storage.conf file to know
diff --git a/modules/lemonldap-ng-manager/example/skins/default/manager.js b/modules/lemonldap-ng-manager/example/skins/default/manager.js
index 7245d8a74..26dbf24ce 100644
--- a/modules/lemonldap-ng-manager/example/skins/default/manager.js
+++ b/modules/lemonldap-ng-manager/example/skins/default/manager.js
@@ -269,6 +269,16 @@ function hashRoot(id){
 	display('default','');
 	$('#newkbr').show();
 }
+function vhostRoot(id){
+	currentId=id;
+	display('default','');
+	$('#bnewvh').show();
+}
+function samlIdpRoot(id){
+	currentId=id;
+	display('default','');
+	$('#newsamlmetadatab').show();
+}
 function authParams(id) {
 	currentId=id;
 	$('#authText').attr('value',lmdata(id));
diff --git a/modules/lemonldap-ng-manager/example/skins/default/manager.tpl b/modules/lemonldap-ng-manager/example/skins/default/manager.tpl
index f0d3b5898..14e5a4ead 100644
--- a/modules/lemonldap-ng-manager/example/skins/default/manager.tpl
+++ b/modules/lemonldap-ng-manager/example/skins/default/manager.tpl
@@ -70,10 +70,6 @@
      <lang en="Save" fr="Sauver" />
     </button>
 
-    <button id="bapply" onclick="$.post(scriptname,{apply:1},function(data){return 1},'html');" class="ui-state-default ui-corner-all">
-     <lang en="Apply" fr="Appliquer" />
-    </button>
-
     <button id="bnewvh" style="display:none;" onclick="newVh();return false;" class="ui-state-default ui-corner-all">
      <lang en="New virtual host" fr="Nouvel hôte virtuel" />
     </button>
diff --git a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm
index 67fbb765e..9d8f184bd 100644
--- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm
+++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm
@@ -283,7 +283,7 @@ sub struct {
             _nodes  => ['nhash:/locationRules:virtualHosts:vhost'],
             _upload => ['/exportedHeaders'],
             _help   => 'default',
-            _call   => '$(\'#bnewvh\').show();',
+            _js     => 'vhostRoot',
         },
 
         ########
@@ -296,7 +296,7 @@ sub struct {
             ],
             _upload => [ '/samlIDPMetaDataXML', '/samlIDPMetaDataOptions' ],
             _help   => 'default',
-            _call => '$(\'#newsamlmetadatab\').show();',
+            _js     => 'samlIdpRoot',
         },
 
         samlServiceMetaData => {
@@ -713,7 +713,7 @@ sub testStruct {
             '*'        => {
                 keyTest    => qr/^\w([\w\-]*\w)?$/,
                 keyMsgFail => 'Bad attribute name',
-                test       => $perlExpr,
+                test       => sub { return 1; },
             },
         },
         samlIDPMetaDataXML => {