dockeruser
/
sabnzbd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Moving sort button to top of queue

pull/322/head
Safihre 10 years ago
parent
355ae2d60d
commit
dd4fe01036
3 changed files with 56 additions and 61 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 47
      interfaces/Glitter/templates/main.tmpl
  2. 55
      interfaces/Glitter/templates/static/stylesheets/glitter.css
  3. 15
      interfaces/Glitter/templates/static/stylesheets/glitter.mobile.css

47
interfaces/Glitter/templates/main.tmpl
View File

@ -59,7 +59,7 @@
<button type="button" class="btn btn-default navbar-btn dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<ul class="dropdown-menu">
<li><a href="#" data-time="5" data-bind="click: pauseTime">$T('Glitter-pause5m')</a></li>
<li><a href="#" data-time="15" data-bind="click: pauseTime">$T('Glitter-pause15m')</a></li>
<li><a href="#" data-time="30" data-bind="click: pauseTime">$T('Glitter-pause30m')</a></li>
@ -113,7 +113,7 @@
</li>
<li class="dropdown">
<a href="#" data-toggle="dropdown" data-bind="css: { 'active-on-queue-finish-menu': onQueueFinish()}" onclick="keepOpen(this)"><span class="glyphicon glyphicon-off"></span></a>
<ul class="dropdown-menu menu-options" role="menu">
<ul class="dropdown-menu menu-options">
<li><a href="#modal_help" data-toggle="modal">$T('menu-help') <span class="glyphicon glyphicon-question-sign"></span></a></li>
<!--#if $have_quota or $have_rss_defined or $have_watched_dir or $pp_pause_event#--><li class="divider"></li><!--#end if#-->
<!--#if $have_quota#--><li><a href="#" data-bind="click: doQueueAction" data-mode="reset_quota">$T('link-resetQuota')</a></li><!--#end if#-->
@ -190,9 +190,22 @@
</span>
</div>
<!-- /ko -->
<a href="#" data-bind="click: queue.showMultiEdit, visible: hasQueue()" data-toggle="tooltip" data-placement="left" title="$T('Glitter-multiOperations') &amp; $T('cmenu-sorting')">
<span class="glyphicon glyphicon-tasks"></span>
</a>
<div class="info-container-box-sorting dropdown" data-bind="visible: hasQueue()">
<a href="#" data-toggle="dropdown">
<span class="glyphicon glyphicon-sort-by-alphabet" data-toggle="tooltip" data-placement="left" title="$T('cmenu-sorting')"></span>
</a>
<a href="#" data-bind="click: queue.showMultiEdit">
<span class="glyphicon glyphicon-tasks" data-toggle="tooltip" data-placement="left" data-container="body" title="$T('Glitter-multiOperations')"></span>
</a>
<ul class="dropdown-menu">
<li><a href="#" data-action="sortAgeAsc" data-bind="click: queue.queueSorting">$T('Glitter-sortAgeAsc')</a></li>
<li><a href="#" data-action="sortAgeDesc" data-bind="click: queue.queueSorting">$T('Glitter-sortAgeDesc')</a></li>
<li><a href="#" data-action="sortNameAsc" data-bind="click: queue.queueSorting">$T('Glitter-sortNameAsc')</a></li>
<li><a href="#" data-action="sortNameDesc" data-bind="click: queue.queueSorting">$T('Glitter-sortNameDesc')</a></li>
<li><a href="#" data-action="sortSizeAsc" data-bind="click: queue.queueSorting">$T('Glitter-sortSizeAsc')</a></li>
<li><a href="#" data-action="sortSizeDesc" data-bind="click: queue.queueSorting">$T('Glitter-sortSizeDesc')</a></li>
</ul>
</div>
</div>
<div class="clearfix"></div>
@ -256,7 +269,7 @@
<input type="checkbox" name="multiedit" title="$T('Glitter-multiSelect')" data-bind="click: parent.addMultiEdit" />
</label>
<div class="dropdown" data-bind="visible: !isGrabbing() && !parent.isMultiEditing()">
<a role="button" href="#" data-toggle="dropdown" onclick="keepOpen(this)">
<a href="#" data-toggle="dropdown" onclick="keepOpen(this)">
<span class="caret"></span>
</a>
<ul class="dropdown-menu queueitem-settings">
@ -288,11 +301,13 @@
</table>
<form class="multioperations-selector" data-bind="visible: (hasQueue() && queue.isMultiEditing())" style="display: none;">
<div class="add-nzb-inputbox add-nzb-inputbox-small">
<div class="add-nzb-inputbox add-nzb-inputbox-small add-nzb-inputbox-options">
<label for="multiedit-checkall">
<input type="checkbox" name="multieditCheckAll" id="multiedit-checkall" onclick="checkAllFiles(this)" title="$T('Glitter-checkAll')" data-toggle="tooltip" data-placement="top" />
</label>
<a href="#" class="hoverbutton" data-bind="click: queue.doMultiDelete"><span class="glyphicon glyphicon-trash"></span></a>
<a href="#" class="hoverbutton" data-bind="click: queue.doMultiDelete">
<span class="glyphicon glyphicon-trash"></span>
</a>
</div>
<div class="add-nzb-inputbox add-nzb-inputbox-small">
<label for="multiedit-play">
@ -304,19 +319,7 @@
<span class="glyphicon glyphicon-pause" title="$T('link-pause')" data-toggle="tooltip" data-placement="top"></span>
</label>
</div>
<div class="add-nzb-inputbox add-nzb-inputbox-small add-nzb-inputbox-tiny dropdown">
<a role="button" href="#" data-toggle="dropdown" class="hoverbutton">
<span data-toggle="tooltip" data-placement="top" title="$T('cmenu-sorting')" class="glyphicon glyphicon-sort-by-alphabet"></span>
</a>
<ul class="dropdown-menu">
<li><a href="#" data-action="sortAgeAsc" data-bind="click: queue.queueSorting">$T('Glitter-sortAgeAsc')</a></li>
<li><a href="#" data-action="sortAgeDesc" data-bind="click: queue.queueSorting">$T('Glitter-sortAgeDesc')</a></li>
<li><a href="#" data-action="sortNameAsc" data-bind="click: queue.queueSorting">$T('Glitter-sortNameAsc')</a></li>
<li><a href="#" data-action="sortNameDesc" data-bind="click: queue.queueSorting">$T('Glitter-sortNameDesc')</a></li>
<li><a href="#" data-action="sortSizeAsc" data-bind="click: queue.queueSorting">$T('Glitter-sortSizeAsc')</a></li>
<li><a href="#" data-action="sortSizeDesc" data-bind="click: queue.queueSorting">$T('Glitter-sortSizeDesc')</a></li>
</ul>
</div>
<div class="add-nzb-inputbox-clear"></div>
<div class="add-nzb-inputbox" data-toggle="tooltip" data-placement="top" title="$T('category')">
<span class="glyphicon glyphicon-tag"></span>
<select name="Category" class="form-control" data-bind="options: queue.categoriesList, optionsCaption: '', event: { change: queue.doMultiEditUpdate }"></select>
@ -527,7 +530,7 @@
<td class="history-completedon" data-bind="text: completedOn()"></td>
<td class="delete">
<div class="dropdown">
<a role="button" href="#" data-toggle="dropdown" data-bind="click: updateAllHistoryInfo">
<a href="#" data-toggle="dropdown" data-bind="click: updateAllHistoryInfo">
<span class="caret"></span>
</a>
<div class="dropdown-menu">

55
interfaces/Glitter/templates/static/stylesheets/glitter.css
View File

@ -341,8 +341,23 @@ tbody>tr>td:last-child {
margin-right: 2px;
}
.info-container a {
margin-left: 8px;
.info-container .info-container-box-sorting {
float: right;
}
.info-container .info-container-box-sorting a {
padding-left: 12px;
}
.info-container .info-container-box-sorting .dropdown-menu {
left: auto;
right: 0;
padding-left: 10px;
padding-right: 10px;
}
.info-container .info-container-box-sorting .dropdown-menu small {
color: #AAA;
}
.queue-table td.name,
@ -441,8 +456,11 @@ td.delete .dropdown>a {
padding: 0px 10px;
}
td.delete input[type="checkbox"] {
td.delete input[type="checkbox"],
.add-nzb-inputbox-options input[type="checkbox"]{
margin: 0;
margin-bottom: -2px;
display: block;
}
td.delete label,
@ -540,7 +558,7 @@ td.delete label,
}
.multioperations-selector .add-nzb-inputbox-small {
width: 50px;
width: 60px;
float: right;
padding-left: 0;
padding-top: 2px;
@ -562,32 +580,15 @@ td.delete label,
opacity: 1;
}
.multioperations-selector .add-nzb-inputbox-small label[for="multiedit-pause"],
.multioperations-selector .add-nzb-inputbox-small label[for="multiedit-play"] {
padding-left: 6px;
.multioperations-selector .add-nzb-inputbox-options {
width: auto;
padding-right: 6px;
}
.multioperations-selector .add-nzb-inputbox-tiny {
width: 20px;
}
.multioperations-selector .add-nzb-inputbox-tiny>a {
margin-left: -4px;
margin-top: 1px;
display: inline-block;
}
.multioperations-selector .add-nzb-inputbox-tiny .dropdown-menu {
margin-left: -110px;
}
.multioperations-selector .add-nzb-inputbox-tiny.open a {
opacity: 1;
}
.multioperations-selector .add-nzb-inputbox-tiny small {
color: #AAA;
.multioperations-selector .add-nzb-inputbox-small label[for="multiedit-pause"],
.multioperations-selector .add-nzb-inputbox-small label[for="multiedit-play"] {
padding-left: 6px;
padding-right: 6px;
}
/* WARNINGS */

15
interfaces/Glitter/templates/static/stylesheets/glitter.mobile.css
View File

@ -82,7 +82,7 @@ h2 {
white-space: pre;
}
.info-container a {
.info-container .info-container-box-sorting {
position: absolute;
right: 10px;
top: 0px;
@ -142,17 +142,8 @@ h2 {
width: 52px;
}
.multioperations-selector .add-nzb-inputbox-tiny {
width: 50%;
}
.multioperations-selector .add-nzb-inputbox-tiny>a {
float: right;
margin-right: 20px;
}
.multioperations-selector .add-nzb-inputbox-tiny .dropdown-menu {
margin-left: 0px;
.multioperations-selector .add-nzb-inputbox-clear {
clear: both;
}
.table-messages .table-messages-header-label {

Write Preview
Loading…
Cancel
Save