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 2016/01/08 20:30:25 UTC
[20/50] [abbrv] allura git commit: [#7919] anchored tools: remove
not-allowed cursor, add tooltip
[#7919] anchored tools: remove not-allowed cursor, add tooltip
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/3b7a1807
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/3b7a1807
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/3b7a1807
Branch: refs/heads/master
Commit: 3b7a18077c4416dc2b05a3041e01475d51924d56
Parents: 10b82c2
Author: Dave Brondsema <da...@brondsema.net>
Authored: Wed Dec 9 16:12:47 2015 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Jan 8 14:06:16 2016 -0500
----------------------------------------------------------------------
Allura/allura/public/nf/css/navbar.css | 7 +------
Allura/allura/public/nf/js/navbar.es6.js | 17 ++++++++++-------
2 files changed, 11 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/3b7a1807/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 a29bcaf..71e625b 100644
--- a/Allura/allura/public/nf/css/navbar.css
+++ b/Allura/allura/public/nf/css/navbar.css
@@ -71,14 +71,9 @@
cursor: move;
}
-#top_nav .anchored {
- cursor: not-allowed;
- color: gray;
-}
-
.anchored .draggable-handle,
.anchored .draggable-handle-sub {
- cursor: not-allowed;
+ cursor: default;
color: gray;
}
http://git-wip-us.apache.org/repos/asf/allura/blob/3b7a1807/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 0f35a0c..e7262d1 100644
--- a/Allura/allura/public/nf/js/navbar.es6.js
+++ b/Allura/allura/public/nf/js/navbar.es6.js
@@ -113,11 +113,8 @@ var NavBarItem = React.createClass({
url: React.PropTypes.string.isRequired,
currentOptionMenu: React.PropTypes.object,
onOptionClick: React.PropTypes.func.isRequired,
- options: React.PropTypes.array
- },
-
- isAnchored: function() {
- return this.props.is_anchored !== null;
+ options: React.PropTypes.array,
+ is_anchored: React.PropTypes.bool
},
render: function() {
@@ -127,17 +124,23 @@ var NavBarItem = React.createClass({
}
var spanClasses = this.props.handleType + " ordinal-item";
if (this.props.isGrouper) {
- spanClasses += " toolbar-grouper"
+ spanClasses += " toolbar-grouper";
}
return (
<div className={ divClasses }>
+ <ToolTip targetSelector=".anchored .draggable-handle" position="top"
+ theme="tooltipster-default" delay={250}/>
+ <ToolTip targetSelector=".anchored .draggable-handle-sub" position="right"
+ theme="tooltipster-default" delay={250}/>
<a>
{!_.isEmpty(this.props.options) && <i className='config-tool fa fa-cog'
onClick={this.handleOptionClick}> </i>}
<span
className={spanClasses}
- data-mount-point={this.props.mount_point}>
+ data-mount-point={this.props.mount_point}
+ title={this.props.is_anchored ? 'This item cannot be moved.' : ''}
+ >
{this.props.name}
</span>
</a>