Commit a39041ae authored by echel0n's avatar echel0n

Merge branch 'release/9.4.50'

parents 434ec1e5 8bfcd445
# Changelog
- * 2f70c45 - 2018-12-08: Release v9.4.49
- * c663c1f - 2018-12-09: Release v9.4.50
- * 30193ca - 2018-12-09: Added gradient effect to buttons.
- * 2d4e3dc - 2018-12-09: Refactored menu icons to be fixed-width
- * c97cce5 - 2018-12-09: Refactored quicksearch menu
- * b3b4d7a - 2018-12-08: Refactoed display show view
- * c1aed13 - 2018-12-08: Release v9.4.49
- * 854687c - 2018-12-08: Added GKTorrent provider.
- * 5592614 - 2018-12-08: Fixed login issues for Speed.cd torrent provider.
- * 60cabed - 2018-12-04: Refactored display show view header
- * 5663214 - 2018-12-04: Release v9.4.48
- * e0fd191 - 2018-12-04: Cleaned up mass edit view code. Fixed bug with comparing minseed and minleech values.
- * b55a806 - 2018-12-02: Pre-Release v9.4.48.dev9
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -22,7 +22,6 @@ import datetime
import io
import os
import re
import threading
import time
import traceback
import urllib
......@@ -1127,6 +1126,8 @@ class Home(WebHandler):
return self.redirect(self.previous_url())
def displayShow(self, show=None):
submenu = []
if show is None:
return self._genericMessage(_("Error"), _("Invalid show ID"))
else:
......@@ -1140,9 +1141,11 @@ class Home(WebHandler):
seasonResults = list({x['season'] for x in episodeResults})
submenu = [
{'title': _('Edit'), 'path': '/home/editShow?show=%d' % showObj.indexerid,
'icon': 'fas fa-edit'}]
submenu.append({
'title': _('Edit'),
'path': '/home/editShow?show=%d' % showObj.indexerid,
'icon': 'fas fa-edit'
})
showLoc = showObj.location
......@@ -1172,33 +1175,65 @@ class Home(WebHandler):
if not sickrage.app.show_queue.is_being_added(showObj):
if not sickrage.app.show_queue.is_being_updated(showObj):
if showObj.paused:
submenu.append({'title': _('Resume'), 'path': '/home/togglePause?show=%d' % showObj.indexerid,
'icon': 'fas fa-play'})
submenu.append({
'title': _('Resume'),
'path': '/home/togglePause?show=%d' % showObj.indexerid,
'icon': 'fas fa-play'
})
else:
submenu.append({'title': _('Pause'), 'path': '/home/togglePause?show=%d' % showObj.indexerid,
'icon': 'fas fa-pause'})
submenu.append({'title': _('Remove'), 'path': '/home/deleteShow?show=%d' % showObj.indexerid,
'class': 'removeshow', 'confirm': True, 'icon': 'fas fa-trash'})
submenu.append({'title': _('Re-scan files'), 'path': '/home/refreshShow?show=%d' % showObj.indexerid,
'icon': 'fas fa-compass'})
submenu.append({'title': _('Full Update'),
'path': '/home/updateShow?show=%d&force=1' % showObj.indexerid,
'icon': 'fas fa-sync'})
submenu.append(
{'title': _('Update show in KODI'), 'path': '/home/updateKODI?show=%d' % showObj.indexerid,
'requires': self.haveKODI(), 'icon': 'fas fa-tv'})
submenu.append(
{'title': _('Update show in Emby'), 'path': '/home/updateEMBY?show=%d' % showObj.indexerid,
'requires': self.haveEMBY(), 'icon': 'fas fa-tv'})
submenu.append({'title': _('Preview Rename'), 'path': '/home/testRename?show=%d' % showObj.indexerid,
'icon': 'fas fa-tag'})
if sickrage.app.config.use_subtitles and not sickrage.app.show_queue.is_being_subtitled(
showObj) and showObj.subtitles:
submenu.append(
{'title': _('Download Subtitles'), 'path': '/home/subtitleShow?show=%d' % showObj.indexerid,
'icon': 'fas fa-comment'})
submenu.append({
'title': _('Pause'),
'path': '/home/togglePause?show=%d' % showObj.indexerid,
'icon': 'fas fa-pause'
})
submenu.append({
'title': _('Remove'),
'path': '/home/deleteShow?show=%d' % showObj.indexerid,
'class': 'removeshow',
'confirm': True,
'icon': 'fas fa-trash'
})
submenu.append({
'title': _('Re-scan files'),
'path': '/home/refreshShow?show=%d' % showObj.indexerid,
'icon': 'fas fa-compass'
})
submenu.append({
'title': _('Full Update'),
'path': '/home/updateShow?show=%d&force=1' % showObj.indexerid,
'icon': 'fas fa-sync'
})
submenu.append({
'title': _('Update show in KODI'),
'path': '/home/updateKODI?show=%d' % showObj.indexerid,
'requires': self.haveKODI(),
'icon': 'fas fa-tv'
})
submenu.append({
'title': _('Update show in Emby'),
'path': '/home/updateEMBY?show=%d' % showObj.indexerid,
'requires': self.haveEMBY(),
'icon': 'fas fa-tv'
})
submenu.append({
'title': _('Preview Rename'),
'path': '/home/testRename?show=%d' % showObj.indexerid,
'icon': 'fas fa-tag'
})
if sickrage.app.config.use_subtitles and showObj.subtitles:
if not sickrage.app.show_queue.is_being_subtitled(showObj):
submenu.append({
'title': _('Download Subtitles'),
'path': '/home/subtitleShow?show=%d' % showObj.indexerid,
'icon': 'fas fa-comment'
})
epCats = {}
epCounts = {
......
......@@ -44,7 +44,7 @@
cssClass = "Custom"
qualityString = "Custom"
cssClass = "badge text-white " + cssClass
cssClass = "badge p-1 align-middle text-white " + cssClass
if overrideClass:
cssClass = overrideClass
%>
......
This diff is collapsed.
9.4.49
\ No newline at end of file
9.4.50
\ No newline at end of file
......@@ -227,20 +227,17 @@ $(document).ready(function ($) {
return false;
},
open: function () {
//$("#quicksearch-icon").removeClass('fas fa-spinner fa-spin');
$("#quicksearch-icon").addClass('fas fa-times');
$(".quicksearch-input-container").append('<button type="button" class="quicksearch-input-btn"><i class="fas fa-1x fa-times-circle text-white m-2" aria-hidden="true"></i></button>');
$("ul.ui-menu").width($(this).innerWidth());
$("ul.ui-menu").css('border', 'none');
$("ul.ui-menu").css('outline', 'none');
$("ul.ui-menu").addClass('bg-dark shadow rounded');
$(".quicksearch-input-btn").click(function () {
$('#quicksearch').catcomplete('close').val('');
$(this).remove();
});
}
});
$("#quicksearch-icon").click(function () {
$('#quicksearch').catcomplete('close').val('');
$("#quicksearch-icon").removeClass();
});
},
common: {
......
@import "~bootstrap/scss/functions";
@import "~bootstrap/scss/variables";
/* set the overriding variables */
$grid-breakpoints: (
xxxs: 0,
xxs: 320px,
xs: 568px,
sm: 667px,
md: 768px,
lg: 992px,
xl: 1200px,
xxl: 1440px,
xxxl: 1600px
);
$container-max-widths: (
xxxs: 0,
xxs: 320px,
xs: 568px,
sm: 667px,
md: 768px,
lg: 992px,
xl: 1200px,
xxl: 1440px,
xxxl: 1600px
);
@import "~bootstrap/scss/bootstrap";
@import "~tablesorter/dist/css/theme.bootstrap_4.min.css";
@import "~tokenfield/dist/tokenfield.css";
......@@ -308,7 +336,9 @@ input[type=checkbox].toggle {
.btn {
@extend .btn-primary;
@extend .shadow;
@extend .shadow-lg;
background-image: linear-gradient(to bottom, rgba(255,255,255,0.5), rgba(255,255,255,0.2) 49%, rgba(0,0,0,0.15) 51%, rgba(0,0,0,0.05));
background-repeat: repeat-x;
}
.input-group-append, .input-group-prepend {
......@@ -392,9 +422,11 @@ input[type=checkbox].toggle {
.dropdown-menu {
@extend .bg-dark;
.dropdown-item {
@extend .text-white;
}
.dropdown-item:hover {
@extend .bg-dark;
}
......@@ -410,4 +442,72 @@ input[type=checkbox].toggle {
@extend .mt-1;
@extend .mb-1;
}
}
.show-legend {
@extend .pr-5;
}
.quicksearch-container {
position: relative;
display: inline-block;
margin-left: 10px;
width: 360px;
height: 40px;
vertical-align: super;
}
.quicksearch-input-container {
font-size: 13px;
font-family: Open Sans Semibold, Helvetica Neue, Helvetica, Arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-webkit-flex-flow: row nowrap;
flex-flow: row nowrap;
padding: 4px;
height: 40px;
border-radius: 4px;
background: hsla(0, 0%, 100%, .08);
color: #eee;
-webkit-transition: background-color .2s, color .2s;
transition: background-color .2s, color .2s;
}
.quicksearch-input {
-webkit-box-flex: 1;
-webkit-flex-grow: 1;
flex-grow: 1;
height: 100%;
outline: 0;
border: none;
background: transparent;
color: #eee;
}
.quicksearch-input-btn {
margin: 0;
padding: 0;
outline: none;
border: 0;
border-radius: 0;
background: none;
text-align: inherit;
text-decoration: none;
cursor: pointer;
-webkit-transition: color .2s;
transition: color .2s;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
touch-action: manipulation;
-webkit-tap-highlight-color: transparent;
}
\ No newline at end of file
Markdown is supported
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