You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2015/10/30 22:41:44 UTC
allura git commit: [#7919] Add New display improvements
Repository: allura
Updated Branches:
refs/heads/db/7919 64141915f -> 16ae8d1f3
[#7919] Add New display improvements
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/16ae8d1f
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/16ae8d1f
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/16ae8d1f
Branch: refs/heads/db/7919
Commit: 16ae8d1f34034b7291bcac842733f25a67ba5dd3
Parents: 6414191
Author: Dave Brondsema <da...@brondsema.net>
Authored: Fri Oct 30 17:41:37 2015 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Oct 30 17:41:37 2015 -0400
----------------------------------------------------------------------
Allura/allura/public/nf/css/navbar.css | 15 +++++++----
Allura/allura/public/nf/js/add-new-tool.es6.js | 27 +++++---------------
.../allura/templates/jinja_master/top_nav.html | 2 +-
3 files changed, 17 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/16ae8d1f/Allura/allura/public/nf/css/navbar.css
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/css/navbar.css b/Allura/allura/public/nf/css/navbar.css
index db2ae4e..b755a59 100644
--- a/Allura/allura/public/nf/css/navbar.css
+++ b/Allura/allura/public/nf/css/navbar.css
@@ -340,13 +340,14 @@
background: #333;
}
-.add-tool-toggle {
- border: 1px dashed #B3B3B3;
- padding: 1px;
+#top_nav .add-tool-toggle {
+ border: 1px dashed #B9B9B9;
+ color: #0077aa;
+ padding: 3px 7px;
+ margin-top: -3px;
height: 100%;
- width: 5.1rem;
float: right;
- border-radius: 4px;
+ border-radius: 2px;
cursor: pointer;
-webkit-user-select: none;
-moz-user-select: none;
@@ -354,6 +355,10 @@
-o-user-select: none;
user-select: none;
}
+#top_nav .add-tool-toggle:hover {
+ color: #0099cc;
+ text-decoration: underline;
+}
/*.react-drag{*/
/*display: block;*/
http://git-wip-us.apache.org/repos/asf/allura/blob/16ae8d1f/Allura/allura/public/nf/js/add-new-tool.es6.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/add-new-tool.es6.js b/Allura/allura/public/nf/js/add-new-tool.es6.js
index 89017f4..bcaba6a 100644
--- a/Allura/allura/public/nf/js/add-new-tool.es6.js
+++ b/Allura/allura/public/nf/js/add-new-tool.es6.js
@@ -10,27 +10,12 @@
*/
var AddNewToolButton = React.createClass({
render: function() {
- let _this = this;
-
- var content = (() => {
- if (_this.props.showAddToolMenu) {
- return (
- <div>
- <span onClick={ _this.props.handleToggleAddNewTool }
- className='add-tool-toggle'> + Add new...</span>
- <NewToolMain />
- </div>
- );
- } else {
- return (
- <span onClick={ _this.props.handleToggleAddNewTool }
- className='add-tool-toggle'> + Add new...</span>
- );
- }
- })();
-
- return (<li>
- {content}
+ return (
+ <li>
+ <a onClick={ this.props.handleToggleAddNewTool } className='add-tool-toggle'>
+ Add New...
+ </a>
+ { this.props.showAddToolMenu && <NewToolMain />}
</li>
);
}
http://git-wip-us.apache.org/repos/asf/allura/blob/16ae8d1f/Allura/allura/templates/jinja_master/top_nav.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/top_nav.html b/Allura/allura/templates/jinja_master/top_nav.html
index 9df413c..91b7194 100644
--- a/Allura/allura/templates/jinja_master/top_nav.html
+++ b/Allura/allura/templates/jinja_master/top_nav.html
@@ -35,7 +35,7 @@
</li>
{% endfor %}
{% if h.has_access(c.project, 'admin')() %}
- <div id="add-tool-container"></div>
+ <li id="add-tool-container"><a class="add-tool-toggle">Add New...</a></li>
<button id="toggle-admin-btn"><i class="fa fa-lock"></i></button>
{% endif %}
</ul>