Commit 4088edc3 authored by echel0n's avatar echel0n
Browse files

Added back table column selection for shows, show, and schedule views

Fixed sorting for all tables
Fixed filtering for all tables
parent 7020ea5e
# Changelog
- * 38565ca - 2018-07-28: Reverted text-nowrap class for schedule view table episode name column
- * 29b3e58 - 2018-07-28: Added back table column selection for shows, show, and schedule views Fixed sorting for all tables Fixed filtering for all tables
- * 7020ea5 - 2018-07-28: Reverted text-nowrap class for schedule view table episode name column
- * 764a9f1 - 2018-07-28: Fix for issue #244 - reverse proxy
- * e588aa6 - 2018-07-27: Pre-Release v9.3.56.dev8
- * 33a0a4b - 2018-07-27: Added tablesorter with bootstrap 4 compatibility Case-insensitive sorting fixed for shows view
......
......@@ -48,8 +48,8 @@
<div class="card-body">
<div class="table-responsive">
% if sickrage.app.config.history_layout == "detailed":
<table id="historyTable" class="table">
<thead>
<table id="historyTable" class="table ">
<thead class="thead-dark">
<tr>
<th>${_('Time')}</th>
<th>${_('Episode')}</th>
......@@ -59,12 +59,6 @@
</tr>
</thead>
<tfoot>
<tr>
<th class="text-nowrap" colspan="5">&nbsp;</th>
</tr>
</tfoot>
<tbody>
% for hItem in historyResults:
<% curStatus, curQuality = Quality.splitCompositeStatus(int(hItem["action"])) %>
......@@ -119,7 +113,7 @@
</table>
% else:
<table id="historyTable" class="table">
<thead>
<thead class="thead-dark">
<tr>
<th class="text-nowrap">${_('Time')}</th>
<th>${_('Episode')}</th>
......
......@@ -440,6 +440,9 @@
</div>
<div class="row">
<div class="col text-right">
<button class="btn mt-1 mb-1" id="popover" type="button">
${_('Select Columns')} <b class="fas fa-caret-down"></b>
</button>
<button class="btn mt-1 mb-1 seriesCheck">
${_('Select Filtered Episodes')}
</button>
......@@ -529,8 +532,8 @@
<div class="row">
<div class="col-md-12">
<div class="table-responsive">
<table id="${("showTable", "animeTable")[bool(show.is_anime)]}" class="table display_show" style="opacity: .80">
<thead>
<table id="${("showTable", "animeTable")[bool(show.is_anime)]}" class="table displayShowTable" style="opacity: .80">
<thead class="thead-dark">
<tr class="seasoncols">
<th data-sorter="false" data-priority="critical" class="col-checkbox">
<input type="checkbox" class="seasonCheck" id="${epResult["season"]}"/>
......
......@@ -57,6 +57,13 @@
</div>
<div class="col text-right">
<div class="form-inline d-inline-flex">
% if sickrage.app.config.home_layout != 'poster':
<div class="dropdown ml-4">
<button id="popover" type="button" class="btn bg-transparent dropdown-toggle" style="border: none;">
<i class="fas fa-2x fa-columns"></i>
</button>
</div>
% endif
% if sickrage.app.config.home_layout == 'poster':
<div style="width: 100px" id="posterSizeSlider"></div>
% endif
......@@ -271,7 +278,7 @@
</div>
% else:
<div class="table-responsive">
<table class="table tablesorter-bootstrap" id="showListTable${curListType}" data-sortlist="[[2,0]]">
<table class="table" id="showListTable${curListType}">
<thead class="thead-dark">
<tr>
<th>${_('Next Ep')}</th>
......
......@@ -5,7 +5,7 @@
%>
<table id="addRootDirTable" class="table">
<thead>
<thead class="thead-dark">
<tr>
<th class="col-checkbox"><input type="checkbox" id="checkAll" checked=checked></th>
<th>${_('Directory')}</th>
......
......@@ -35,7 +35,7 @@
<div class="card-body">
<div class="table-responsive">
<table id="schedulerStatusTable" class="table" width="100%">
<thead>
<thead class="thead-dark">
<tr>
<th>${_('Scheduled Job')}</th>
<th>${_('Enabled')}</th>
......@@ -111,7 +111,7 @@
</div>
<div class="card-body">
<table id="queueStatusTable" class="table" width="100%">
<thead>
<thead class="thead-dark">
<tr>
<th>${_('Show ID')}</th>
<th>${_('Show Name')}</th>
......
......@@ -14,20 +14,22 @@
<div class="col-lg-10 mx-auto">
<div class="card mt-3 mb-3">
<div class="card-header">
<h3 class="float-lg-left">${title}</h3>
<div class="float-lg-right">
<select name="limit" id="limit" class="form-control" title="${_('Limit')}">
<option value="100" ${('', 'selected')[limit == 100]}>100</option>
<option value="250" ${('', 'selected')[limit == 250]}>250</option>
<option value="500" ${('', 'selected')[limit == 500]}>500</option>
<option value="0" ${('', 'selected')[limit == 0 ]}>All</option>
</select>
<h3 class="float-left">${title}</h3>
<div class="float-right">
<div class="form-inline">
<select name="limit" id="limit" class="form-control" title="${_('Limit')}">
<option value="100" ${('', 'selected')[limit == 100]}>100</option>
<option value="250" ${('', 'selected')[limit == 250]}>250</option>
<option value="500" ${('', 'selected')[limit == 500]}>500</option>
<option value="0" ${('', 'selected')[limit == 0 ]}>All</option>
</select>
</div>
</div>
</div>
<div class="card-body">
<div class="table-responsive">
<table id="failedTable" class="table">
<thead>
<thead class="thead-dark">
<tr>
<th>${_('Release')}</th>
<th>${_('Size')}</th>
......@@ -68,7 +70,7 @@
</table>
</div>
<input type="button" class="btn" value="${_('Submit')}"
id="submitMassRemove">
id="submitMassRemove">
</div>
</div>
</div>
......
......@@ -36,7 +36,7 @@
<form name="massUpdateForm" method="post" action="massUpdate">
<div class="table-responsive">
<table id="massUpdateTable" class="table" cellspacing="1" border="0" cellpadding="0">
<thead>
<thead class="thead-dark">
<tr>
<th class="col-checkbox">
<input type="checkbox" class="bulkCheck" id="checkAll"/>
......
......@@ -18,7 +18,11 @@
<h3 class="float-left">${title}</h3>
<div class="float-right">
<div class="form-inline">
% if layout != 'list':
% if layout == 'list':
<button class="btn btn-dark mr-1" id="popover" type="button">
${_('Select Columns')} <b class="fas fa-caret-down"></b>
</button>
% else:
<select id="sortby" name="sort" class="form-control mr-1"
onchange="location = this.options[this.selectedIndex].value;">
<option value="${srWebRoot}/setScheduleSort/?sort=date" ${('', 'selected')[sickrage.app.config.coming_eps_sort == 'date']} >
......@@ -82,7 +86,7 @@
<div class="table-responsive">
<table class="table" id="showListTable">
<thead>
<thead class="thead-dark">
<tr>
<th>Airdate
(${('local', 'network')[sickrage.app.config.timezone_display == 'network']})
......
This diff is collapsed.
......@@ -343,6 +343,17 @@ span.snatched b {
}
}
#popover-target label {
margin: 0 5px;
display: block;
}
#popover-target input {
margin-right: 5px;
}
#popover-target .disabled {
color: #ddd;
}
.dropdown-menu {
@extend .bg-dark;
.dropdown-item {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment