Commit 1dc01715 authored by echel0n's avatar echel0n
Browse files

Added show directory column to mass update view

Fixed table sorting issues for mass update and main shows views
parent 479026cf
# Changelog
- * 838e5a5 - 2018-08-08: Fixed status text styling issues for episode rows in display show view
- * b59a282 - 2018-08-13: Added show directory column to mass update view Fixed table sorting issues for mass update and main shows views
- * 479026c - 2018-08-08: Fixed status text styling issues for episode rows in display show view
- * d6b5a4a - 2018-08-08: Pre-Release v9.3.56.dev18
- * c775a68 - 2018-08-08: Fixed issue with missing JS import for timeago module
- * 9b5ed21 - 2018-08-08: Fixed redirect issue when trying to login to a app thats already linked to another account
......
......@@ -59,7 +59,7 @@ class QuicksearchCache(object):
'_t': 'quicksearch',
'category': 'shows',
'showid': indexerid,
'seasons': len(set([e['season'] for e in sickrage.app.main_db.get_many('tv_episodes', indexerid)])),
'seasons': len(set([e['season'] for e in sickrage.app.main_db.get_many('tv_episodes', indexerid) if e['season'] != 0])),
'name': show_name,
'img': sickrage.app.config.web_root + showImage(indexerid, 'poster_thumb').url
}
......
......@@ -409,12 +409,13 @@
% endif
% if sickrage.app.config.home_layout == 'small':
<td class="table-fit tvShow">
<span class="d-none">${curShow.name}</span>
<a href="${srWebRoot}/home/displayShow?show=${curShow.indexerid}">
<td class="tvShow">
<a href="${srWebRoot}/home/displayShow?show=${curShow.indexerid}"
title="${curShow.name}">
<img src="${srWebRoot}${showImage(curShow.indexerid, 'poster_thumb').url}"
class="rounded shadow img-fluid"
class="img-smallposter rounded shadow"
alt="${curShow.indexerid}"/>
${curShow.name}
</a>
</td>
% elif sickrage.app.config.home_layout == 'banner':
......@@ -422,7 +423,7 @@
<span class="d-none">${curShow.name}</span>
<a href="${srWebRoot}/home/displayShow?show=${curShow.indexerid}">
<img src="${srWebRoot}${showImage(curShow.indexerid, 'banner').url}"
class="rounded shadow" alt="${curShow.indexerid}"
class="img-banner rounded shadow" alt="${curShow.indexerid}"
title="${curShow.name}"/>
</a>
</td>
......@@ -437,15 +438,13 @@
% if sickrage.app.config.home_layout != 'simple':
<td class="table-fit align-middle">
% if curShow.network:
<span>
<i class="sickrage-network sickrage-network-${network_class_name}"
title="${curShow.network}"></i>
<span title="${curShow.network}">
<i class="sickrage-network sickrage-network-${network_class_name}"></i>
</span>
<span class="d-none d-print-inline">${curShow.network}</span>
% else:
<span>
<i class="sickrage-network sickrage-network-unknown"
title="${_('No Network')}"></i>
<span title="${_('No Network')}">
<i class="sickrage-network sickrage-network-unknown"></i>
</span>
<span class="d-none d-print-inline">No Network</span>
% endif
......@@ -477,6 +476,7 @@
<td class="table-fit align-middle">
<% paused = int(curShow.paused) == 0 and curShow.status == 'Continuing' %>
<i class="fa ${("fa-times text-danger", "fa-check text-success")[bool(paused)]}"></i>
<span class="d-none d-print-inline">${bool(paused)}</span>
</td>
<td class="table-fit align-middle">
......
......@@ -64,6 +64,7 @@
<input type="checkbox" class="bulkCheck" id="checkAll"/>
</th>
<th>${_('Show Name')}</th>
<th>${_('Show Directory')}</th>
<th class="col-quality">${_('Quality')}</th>
<th class="col-legend">${_('Sports')}</th>
<th class="col-legend">${_('Scene')}</th>
......@@ -90,30 +91,46 @@
<td class="tvShow">
<a href="${srWebRoot}/home/displayShow?show=${curShow.indexerid}">${curShow.name}</a>
</td>
<td class="table-fit tvShow">
<div class="text-left">
${curShow.location}
</div>
</td>
<td class="table-fit">${renderQualityPill(curShow.quality, showTitle=True)}</td>
<td class="table-fit">
<i class="fa ${("fa-times text-danger", "fa-check text-success")[bool(curShow.is_sports)]}"></i>
<span class="d-none d-print-inline">${bool(curShow.is_sports)}</span>
</td>
<td class="table-fit">
<i class="fa ${("fa-times text-danger", "fa-check text-success")[bool(curShow.is_scene)]}"></i>
<span class="d-none d-print-inline">${bool(curShow.is_scene)}</span>
</td>
<td class="table-fit">
<i class="fa ${("fa-times text-danger", "fa-check text-success")[bool(curShow.is_anime)]}"></i>
<span class="d-none d-print-inline">${bool(curShow.is_anime)}</span>
</td>
<td class="table-fit">
<i class="fa ${("fa-times text-danger", "fa-check text-success")[not bool(curShow.flatten_folders)]}"></i>
<span class="d-none d-print-inline">${bool(curShow.flatten_folders)}</span>
</td>
<td class="table-fit">
<i class="fa ${("fa-times text-danger", "fa-check text-success")[bool(curShow.skip_downloaded)]}"></i>
<span class="d-none d-print-inline">${bool(curShow.skip_downloaded)}</span>
</td>
<td class="table-fit">
<i class="fa ${("fa-times text-danger", "fa-check text-success")[bool(curShow.paused)]}"></i>
<span class="d-none d-print-inline">${bool(curShow.paused)}</span>
</td>
<td class="table-fit">
<i class="fa ${("fa-times text-danger", "fa-check text-success")[bool(curShow.subtitles)]}"></i>
<span class="d-none d-print-inline">${bool(curShow.subtitles)}</span>
</td>
<td class="table-fit">
${statusStrings[curShow.default_ep_status]}
</td>
<td class="table-fit">
${curShow.status}
</td>
<td class="table-fit">${statusStrings[curShow.default_ep_status]}</td>
<td class="table-fit">${curShow.status}</td>
</tr>
% endfor
</tbody>
......
......@@ -1620,7 +1620,7 @@ $(document).ready(function ($) {
return $(node).find('time').attr('datetime');
},
3: function (node) {
return $(node).find("span").prop("title").toLowerCase();
return $(node).find("span").text().toLowerCase();
},
4: function (node) {
return $(node).find("span").text().toLowerCase();
......@@ -1632,7 +1632,7 @@ $(document).ready(function ($) {
return $(node).data('show-size');
},
7: function (node) {
return $(node).find("img").attr("alt");
return $(node).find("span").text().toLowerCase();
}
},
widgets: ['saveSort', 'stickyHeaders', 'filter', 'columnSelector'],
......@@ -5171,50 +5171,51 @@ $(document).ready(function ($) {
theme: 'bootstrap',
sortList: [[1, 0]],
textExtraction: {
2: function (node) {
return $(node).find("span").text().toLowerCase();
},
3: function (node) {
return $(node).find("img").attr("alt");
return $(node).find("span").text().toLowerCase();
},
4: function (node) {
return $(node).find("img").attr("alt");
return $(node).find("span").text().toLowerCase();
},
5: function (node) {
return $(node).find("img").attr("alt");
return $(node).find("span").text().toLowerCase();
},
6: function (node) {
return $(node).find("img").attr("alt");
return $(node).find("span").text().toLowerCase();
},
7: function (node) {
return $(node).find("img").attr("alt");
return $(node).find("span").text().toLowerCase();
},
8: function (node) {
return $(node).find("img").attr("alt");
return $(node).find("span").text().toLowerCase();
},
9: function (node) {
return $(node).find("img").attr("alt");
return $(node).find("span").text().toLowerCase();
},
10: function (node) {
return $(node).find("span").text().toLowerCase();
}
},
headers: {
0: {sorter: false},
1: {sorter: 'showNames'},
2: {sorter: 'quality'},
3: {sorter: 'sports'},
4: {sorter: 'scene'},
5: {sorter: 'anime'},
6: {sorter: 'flatten_folders'},
7: {sorter: 'skip_downloaded'},
8: {sorter: 'paused'},
9: {sorter: 'subtitle'},
10: {sorter: 'default_ep_status'},
11: {sorter: 'status'},
12: {sorter: false},
2: {sorter: 'showDirs'},
3: {sorter: 'quality'},
4: {sorter: 'sports'},
5: {sorter: 'scene'},
6: {sorter: 'anime'},
7: {sorter: 'flatten_folders'},
8: {sorter: 'skip_downloaded'},
9: {sorter: 'paused'},
10: {sorter: 'subtitle'},
11: {sorter: 'default_ep_status'},
12: {sorter: 'status'},
13: {sorter: false},
14: {sorter: false},
15: {sorter: false},
16: {sorter: false},
17: {sorter: false}
17: {sorter: false},
18: {sorter: false}
}
});
......
......@@ -221,6 +221,16 @@ span.snatched b {
font-weight: 800;
}
.img-banner {
width: 360px;
height: 66px;
}
.img-smallposter {
width: 45px;
height: 66px;
}
.back-to-top {
cursor: pointer;
position: fixed;
......@@ -235,22 +245,27 @@ span.snatched b {
margin-top: 0;
color: #666;
}
.stepwizard-row {
display: table-row;
}
.stepwizard {
display: table;
width: 100%;
position: relative;
}
.stepwizard-step button[disabled] {
/*opacity: 1 !important;
filter: alpha(opacity=100) !important;*/
}
.stepwizard .btn.disabled, .stepwizard .btn[disabled], .stepwizard fieldset[disabled] .btn {
opacity: 1 !important;
color: #bbb;
}
.stepwizard-row:before {
top: 14px;
bottom: 0;
......@@ -261,11 +276,13 @@ span.snatched b {
background-color: #ccc;
z-index: 0;
}
.stepwizard-step {
display: table-cell;
text-align: center;
position: relative;
}
.btn-circle {
width: 30px;
height: 30px;
......@@ -345,22 +362,24 @@ span.snatched b {
}
.ui-autocomplete {
max-height: 500px;
overflow-y: auto;
overflow-x: hidden;
max-height: 500px;
overflow-y: auto;
overflow-x: hidden;
}
* html .ui-autocomplete {
height: 500px;
height: 500px;
}
#popover-target label {
margin: 0 5px;
display: block;
}
#popover-target input {
margin-right: 5px;
}
#popover-target .disabled {
color: #ddd;
}
......
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