mirror/Lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/Lidarr synced 2025-01-30 19:02:06 +00:00
Code Issues Releases Wiki Activity

Tooltips should now be attached to a container close to the target element while avoiding button/input groups.

Browse source
This commit is contained in:
Taloth Saldono 2015-02-12 22:23:41 +01:00
parent d1df5ed7cd
commit 1b3993bf6a
6 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/UI/Activity/Queue/TimeleftCell.js
View file

@ -14,7 +14,6 @@ module.exports = NzbDroneCell.extend({
var time = '{0} at {1}'.format(FormatHelpers.relativeDate(ect), moment(ect).format(UiSettingsModel.time(true, false))); var time = '{0} at {1}'.format(FormatHelpers.relativeDate(ect), moment(ect).format(UiSettingsModel.time(true, false)));
this.$el.html('-'); this.$el.html('-');
this.$el.attr('title', 'Will be processed during the first RSS Sync after {0}'.format(time)); this.$el.attr('title', 'Will be processed during the first RSS Sync after {0}'.format(time));
this.$el.attr('data-container', 'body');
return this; return this;
} }
var timeleft = this.cellValue.get('timeleft'); var timeleft = this.cellValue.get('timeleft');

8
src/UI/AddSeries/SearchResultViewTemplate.hbs
View file

@ -80,12 +80,12 @@
<!--Uncomment if we need to add even more controls to add series--> <!--Uncomment if we need to add even more controls to add series-->
<!--<label style="visibility: hidden">Add</label>--> <!--<label style="visibility: hidden">Add</label>-->
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-success add x-add"> <button class="btn btn-success add x-add" title="Add">
<i class="icon-plus" title="Add"></i> <i class="icon-plus"></i>
</button> </button>
<button class="btn btn-success add x-add-search"> <button class="btn btn-success add x-add-search" title="Add and Search for missing episodes">
<i class="icon-search" title="Add and Search for missing episodes"></i> <i class="icon-search"></i>
</button> </button>
</div> </div>
</div> </div>

4
src/UI/Calendar/CalendarFeedViewTemplate.hbs
View file

@ -14,8 +14,8 @@
<div class="input-group ical-url"> <div class="input-group ical-url">
<input type="text" class="form-control x-ical-url" value="{{icalHttpUrl}}" readonly="readonly" /> <input type="text" class="form-control x-ical-url" value="{{icalHttpUrl}}" readonly="readonly" />
<div class="input-group-btn"> <div class="input-group-btn">
<button class="btn btn-icon-only x-ical-copy" title="Copy to clipboard"><i class="icon-copy"></i></button> <button class="btn btn-icon-only x-ical-copy"><i class="icon-copy"></i></button>
<button class="btn btn-icon-only no-router" title="Subscribe" href="{{icalWebCalUrl}}" target="_blank" data-container=".modal-body"><i class="icon-calendar-empty"></i></button> <button class="btn btn-icon-only no-router" title="Subscribe" href="{{icalWebCalUrl}}" target="_blank"><i class="icon-calendar-empty"></i></button>
</div> </div>
</div> </div>
</div> </div>

1
src/UI/Shared/Toolbar/Radio/RadioButtonView.js
View file

@ -19,7 +19,6 @@ module.exports = Marionette.ItemView.extend({
} }
if(this.model.get('tooltip')) { if(this.model.get('tooltip')) {
this.$el.attr('title', this.model.get('tooltip')); this.$el.attr('title', this.model.get('tooltip'));
this.$el.attr('data-container', 'body');
} }
}, },
onClick : function(){ onClick : function(){

23
src/UI/Shared/Tooltip.js
View file

@ -1,8 +1,29 @@
var $ = require('jquery'); var $ = require('jquery');
require('bootstrap');
var Tooltip = $.fn.tooltip.Constructor;
var origGetOptions = Tooltip.prototype.getOptions;
Tooltip.prototype.getOptions = function(options) {
var result = origGetOptions.call(this, options);
if (result.container === false) {
var container = this.$element.closest('.btn-group,.input-group').parent();
if (container.length) {
result.container = container;
}
}
return result;
};
module.exports = { module.exports = {
appInitializer : function(){ appInitializer : function() {
$('body').tooltip({selector : '[title]'}); $('body').tooltip({selector : '[title]'});
return this; return this;
} }
}; };

6
src/UI/System/SystemLayoutTemplate.hbs
View file

@ -6,15 +6,15 @@
<li><a href="#logs" class="x-logs-tab no-router">Logs</a></li> <li><a href="#logs" class="x-logs-tab no-router">Logs</a></li>
<li class="lifecycle-controls pull-right"> <li class="lifecycle-controls pull-right">
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-default btn-icon-only x-shutdown" title="Shutdown" data-container="body"> <button class="btn btn-default btn-icon-only x-shutdown" title="Shutdown">
<i class="icon-nd-shutdown"></i> <i class="icon-nd-shutdown"></i>
</button> </button>
<button class="btn btn-default btn-icon-only x-restart" title="Restart" data-container="body"> <button class="btn btn-default btn-icon-only x-restart" title="Restart">
<i class="icon-nd-restart"></i> <i class="icon-nd-restart"></i>
</button> </button>
{{#if_eq authentication compare="forms"}} {{#if_eq authentication compare="forms"}}
<a href="{{UrlBase}}/logout" class="btn btn-default btn-icon-only" title="Logout" data-container="body"> <a href="{{UrlBase}}/logout" class="btn btn-default btn-icon-only" title="Logout">
<i class="icon-lock"></i> <i class="icon-lock"></i>
</a> </a>
{{/if_eq}} {{/if_eq}}