allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [35/50] [abbrv] allura git commit: Add Tool button should only be after top-level tools, not in submenus
Date Fri, 08 Jan 2016 19:30:40 GMT
Add Tool button should only be after top-level tools, not in submenus


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/0f5bb4dd
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/0f5bb4dd
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/0f5bb4dd

Branch: refs/heads/master
Commit: 0f5bb4dde5b6e5b235fdc31a094d4ecdfd4970d4
Parents: c796d53
Author: Dave Brondsema <dave@brondsema.net>
Authored: Fri Dec 11 16:08:09 2015 -0500
Committer: Dave Brondsema <dave@brondsema.net>
Committed: Fri Jan 8 14:06:17 2016 -0500

----------------------------------------------------------------------
 Allura/allura/public/nf/js/navbar.es6.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/0f5bb4dd/Allura/allura/public/nf/js/navbar.es6.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/navbar.es6.js b/Allura/allura/public/nf/js/navbar.es6.js
index 63d303e..32b1fb5 100644
--- a/Allura/allura/public/nf/js/navbar.es6.js
+++ b/Allura/allura/public/nf/js/navbar.es6.js
@@ -339,9 +339,9 @@ var AdminNav = React.createClass({
                     { tools }
                 </ReactReorderable>
                 { end_tools }
-                <div id="add-tool-container">
+                { !isSubMenu && <div id="add-tool-container">
                     <ToggleAddNewTool installableTools={this.props.installableTools}/>
-                </div>
+                </div>}
             </div>
         );
     },


Mime
View raw message