directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject directory-fortress-commander git commit: FC-225 - make nav panel configurable
Date Fri, 14 Jul 2017 20:58:44 GMT
Repository: directory-fortress-commander
Updated Branches:
  refs/heads/master 849305a37 -> 07e5e0322


FC-225 - make nav panel configurable


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/commit/07e5e032
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/07e5e032
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/07e5e032

Branch: refs/heads/master
Commit: 07e5e03220a48a2843a1cbb39ed9153036c0d73c
Parents: 849305a
Author: Shawn McKinney <smckinney@apache.org>
Authored: Fri Jul 14 15:58:39 2017 -0500
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Fri Jul 14 15:58:39 2017 -0500

----------------------------------------------------------------------
 .../apache/directory/fortress/web/FourWaySplitter.java | 13 ++++++++++++-
 src/main/resources/fortress.properties.example         |  5 +++++
 2 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/07e5e032/src/main/java/org/apache/directory/fortress/web/FourWaySplitter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/FourWaySplitter.java b/src/main/java/org/apache/directory/fortress/web/FourWaySplitter.java
index d605b34..9a3122b 100644
--- a/src/main/java/org/apache/directory/fortress/web/FourWaySplitter.java
+++ b/src/main/java/org/apache/directory/fortress/web/FourWaySplitter.java
@@ -22,6 +22,7 @@ package org.apache.directory.fortress.web;
 import com.googlecode.wicket.kendo.ui.widget.splitter.IBorderLayout;
 import com.googlecode.wicket.kendo.ui.widget.splitter.SplitterAdapter;
 import com.googlecode.wicket.kendo.ui.widget.splitter.SplitterBehavior;
+import org.apache.directory.fortress.core.util.Config;
 import org.apache.wicket.MarkupContainer;
 
 /**
@@ -68,6 +69,16 @@ public class FourWaySplitter implements IBorderLayout
     @Override
     public String getHorizontalPanes()
     {
-        return "[ { collapsible: true, resizable: false, size: '85px', min: '85x', max: '85px'},
{ collapsible: true, size: '" + this.listPercentage + "%' }, { collapsible: true, size: '"
+ this.detailPercentage + "%'} ]";
+        // Define the layout for the horizontal panels in the splitter.  The default is for
Nav panell (left) to be collapsed.
+        String szValue = "[ { collapsible: true, resizable: false, size: '85px', min: '85x',
max: '85px', collapsed: " +
+            "true }, { collapsible: true, size: '" + this.listPercentage + "%' }, { collapsible:
true, size: '" +
+            this.detailPercentage + "%'} ]";
+
+        // The default of Nav panel collapsed can be overridden by setting fortress.properties
enable.nav.panel to 'true':
+        if( Config.getInstance().getProperty( "enable.nav.panel" ) != null && Config.getInstance().getProperty(
"enable.nav.panel" ).equalsIgnoreCase( "true" ))
+        {
+            szValue = "[ { collapsible: true, resizable: false, size: '85px', min: '85x',
max: '85px' }, { collapsible: true, size: '" + this.listPercentage + "%' }, { collapsible:
true, size: '" + this.detailPercentage + "%'} ]";
+        }
+        return szValue;
     }
 }

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/07e5e032/src/main/resources/fortress.properties.example
----------------------------------------------------------------------
diff --git a/src/main/resources/fortress.properties.example b/src/main/resources/fortress.properties.example
index 88338be..c5a75fe 100644
--- a/src/main/resources/fortress.properties.example
+++ b/src/main/resources/fortress.properties.example
@@ -46,6 +46,9 @@ max.admin.conn=10
 config.realm=DEFAULT
 config.root=ou=Config,dc=example,dc=com
 
+# ApacheDS stores its password policies objects here by default:
+apacheds.pwpolicy.root=ou=passwordPolicies,ads-interceptorId=authenticationInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
+
 # enable this to see trace statements when connection pool allocates new connections:
 debug.ldap.pool=true
 
@@ -64,3 +67,5 @@ http.pw=gX9JbCTxJW5RiH+otQEX0Ja0RIAoPBQf
 http.host=localhost
 http.port=8080
 
+# The default is 'false':
+#enable.nav.panel=true
\ No newline at end of file


Mime
View raw message