Private GIT

Skip to content
Snippets Groups Projects
Unverified Commit da2009a2 authored by miigotu's avatar miigotu
Browse files

Merge branch 'ajax-ep-search' into develop

parents afa8655b b3aa69d3
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
gui/slick/css/style.css
+ 0
− 27
View file @ da2009a2
......@@ -549,33 +549,6 @@ span.show-option {
top: 3px;
}
.queued-search {
background-image: url("../images/queued.png");
width: 16px;
height: 16px;
display: inline-block;
position: relative;
top: 3px;
}
.yes-image {
background-image: url("../images/yes16.png");
width: 16px;
height: 16px;
display: inline-block;
position: relative;
top: 3px;
}
.no-image {
background-image: url("../images/no16.png");
width: 16px;
height: 16px;
display: inline-block;
position: relative;
top: 3px;
}
.show-container {
margin: 4px;
background-color: #F3F3F3;
......
gui/slick/js/ajaxEpSearch.js
+ 4
− 4
View file @ da2009a2
......@@ -22,7 +22,7 @@ function updateImages(data) {
$.each(data.episodes, function (name, ep) {
// Get td element for current ep
var loadingClass = 'loading-spinner16';
var queuedClass = 'queued-search';
var queuedClass = 'displayshow-icon-clock';
var searchClass = 'displayshow-icon-search';
//Try to get the <a> Element
......@@ -192,9 +192,9 @@ $(document).ready(function () {
size: 16,
colorRow: false,
loadingClass: 'loading-spinner16',
queuedClass: 'queued-search',
noImage: 'no16-image',
yesImage: 'yes16-image'
queuedClass: 'displayshow-icon-clock',
noImage: 'displayshow-icon-disable',
yesImage: 'displayshow-icon-enable'
}
};
......
gui/slick/views/displayShow.mako
+ 9
− 9
View file @ da2009a2
......@@ -262,40 +262,40 @@
% if sickbeard.USE_SUBTITLES:
<tr>
<td class="showLegend">${_('Subtitles')}: </td>
<td><img src="${srRoot}/images/${("no16.png", "yes16.png")[bool(show.subtitles)]}" alt="${("N", "Y")[bool(show.subtitles)]}" width="16" height="16" /></td>
<td><span class="displayshow-icon-${("disable", "enable")[bool(show.subtitles)]}" title=${("N", "Y")[bool(show.subtitles)]}></span></td>
</tr>
% endif
<tr>
<td class="showLegend">${_('Subtitles SR Metadata')}: </td>
<td><img src="${srRoot}/images/${("no16.png", "yes16.png")[bool(show.subtitles_sr_metadata)]}" alt="${("N", "Y")[bool(show.subtitles_sr_metadata)]}" width="16" height="16" /></td>
<td><span class="displayshow-icon-${("disable", "enable")[bool(show.subtitles_sr_metadata)]}" title=${("N", "Y")[bool(show.subtitles_sr_metadata)]}></span></td>
</tr>
<tr>
<td class="showLegend">${_('Season Folders')}: </td>
<td><img src="${srRoot}/images/${("no16.png", "yes16.png")[bool(show.season_folders or sickbeard.NAMING_FORCE_FOLDERS)]}" alt=="${("N", "Y")[bool(show.season_folders or sickbeard.NAMING_FORCE_FOLDERS)]}" width="16" height="16" /></td>
<td><span class="displayshow-icon-${("disable", "enable")[bool(show.season_folders or sickbeard.NAMING_FORCE_FOLDERS)]}" title=${("N", "Y")[bool(show.season_folders or sickbeard.NAMING_FORCE_FOLDERS)]}></span></td>
</tr>
<tr>
<td class="showLegend">${_('Paused')}: </td>
<td><img src="${srRoot}/images/${("no16.png", "yes16.png")[bool(show.paused)]}" alt="${("N", "Y")[bool(show.paused)]}" width="16" height="16" /></td>
<td><span class="displayshow-icon-${("disable", "enable")[bool(show.paused)]}" title=${("N", "Y")[bool(show.paused)]}></span></td>
</tr>
<tr>
<td class="showLegend">${_('Air-by-Date')}: </td>
<td><img src="${srRoot}/images/${("no16.png", "yes16.png")[bool(show.air_by_date)]}" alt="${("N", "Y")[bool(show.air_by_date)]}" width="16" height="16" /></td>
<td><span class="displayshow-icon-${("disable", "enable")[bool(show.air_by_date)]}" title=${("N", "Y")[bool(show.air_by_date)]}></span></td>
</tr>
<tr>
<td class="showLegend">${_('Sports')}: </td>
<td><img src="${srRoot}/images/${("no16.png", "yes16.png")[bool(show.is_sports)]}" alt="${("N", "Y")[bool(show.is_sports)]}" width="16" height="16" /></td>
<td><span class="displayshow-icon-${("disable", "enable")[bool(show.is_sports)]}" title=${("N", "Y")[bool(show.is_sports)]}></span></td>
</tr>
<tr>
<td class="showLegend">${_('Anime')}: </td>
<td><img src="${srRoot}/images/${("no16.png", "yes16.png")[bool(show.is_anime)]}" alt="${("N", "Y")[bool(show.is_anime)]}" width="16" height="16" /></td>
<td><span class="displayshow-icon-${("disable", "enable")[bool(show.is_anime)]}" title=${("N", "Y")[bool(show.is_anime)]}></span></td>
</tr>
<tr>
<td class="showLegend">${_('DVD Order')}: </td>
<td><img src="${srRoot}/images/${("no16.png", "yes16.png")[bool(show.dvdorder)]}" alt="${("N", "Y")[bool(show.dvdorder)]}" width="16" height="16" /></td>
<td><span class="displayshow-icon-${("disable", "enable")[bool(show.dvdorder)]}" title=${("N", "Y")[bool(show.dvdorder)]}></span></td>
</tr>
<tr>
<td class="showLegend">${_('Scene Numbering')}: </td>
<td><img src="${srRoot}/images/${("no16.png", "yes16.png")[bool(show.scene)]}" alt="${("N", "Y")[bool(show.scene)]}" width="16" height="16" /></td>
<td><span class="displayshow-icon-${("disable", "enable")[bool(show.scene)]}" title=${("N", "Y")[bool(show.scene)]}></span></td>
</tr>
</table>
</div>
......
gui/slick/views/manage.mako
+ 6
− 6
View file @ da2009a2
......@@ -94,12 +94,12 @@
% endif
</td>
<td align="center">${renderQualityPill(curShow.quality, showTitle=True)}</td>
<td align="center"><img src="${srRoot}/images/${('no16.png" alt="N"', 'yes16.png" alt="Y"')[int(curShow.is_sports) == 1]} width="16" height="16" /></td>
<td align="center"><img src="${srRoot}/images/${('no16.png" alt="N"', 'yes16.png" alt="Y"')[int(curShow.is_scene) == 1]} width="16" height="16" /></td>
<td align="center"><img src="${srRoot}/images/${('no16.png" alt="N"', 'yes16.png" alt="Y"')[int(curShow.is_anime) == 1]} width="16" height="16" /></td>
<td align="center"><img src="${srRoot}/images/${('no16.png" alt="N"', 'yes16.png" alt="Y"')[int(curShow.season_folders) == 1]} width="16" height="16" /></td>
<td align="center"><img src="${srRoot}/images/${('no16.png" alt="N"', 'yes16.png" alt="Y"')[int(curShow.paused) == 1]} width="16" height="16" /></td>
<td align="center"><img src="${srRoot}/images/${('no16.png" alt="N"', 'yes16.png" alt="Y"')[int(curShow.subtitles) == 1]} width="16" height="16" /></td>
<td align="center"><span class="displayshow-icon-${("disable", "enable")[bool(curShow.is_sports)]}" title=${("N", "Y")[bool(curShow.is_sports)]}></span></td>
<td align="center"><span class="displayshow-icon-${("disable", "enable")[bool(curShow.is_scene)]}" title=${("N", "Y")[bool(curShow.is_scene)]}></span></td>
<td align="center"><span class="displayshow-icon-${("disable", "enable")[bool(curShow.is_anime)]}" title=${("N", "Y")[bool(curShow.is_anime)]}></span></td>
<td align="center"><span class="displayshow-icon-${("disable", "enable")[bool(curShow.season_folders)]}" title=${("N", "Y")[bool(curShow.season_folders)]}></span></td>
<td align="center"><span class="displayshow-icon-${("disable", "enable")[bool(curShow.paused)]}" title=${("N", "Y")[bool(curShow.paused)]}></span></td>
<td align="center"><span class="displayshow-icon-${("disable", "enable")[bool(curShow.subtitles)]}" title=${("N", "Y")[bool(curShow.subtitles)]}></span></td>
<td align="center">${statusStrings[curShow.default_ep_status]}</td>
<td align="center">${_(curShow.status)}</td>
<td align="center">${curUpdate}</td>
......
gui/slick/views/restart.mako
+ 6
− 8
View file @ da2009a2
......@@ -25,22 +25,20 @@
<div class="messages">
<div id="shut_down_message">
${_('Waiting for SickRage to shut down')}:
<img src="${srRoot}/images/loading16-${sickbeard.THEME_NAME}.gif" height="16" width="16"
id="shut_down_loading"/>
<img src="${srRoot}/images/yes16.png" height="16" width="16" id="shut_down_success"
style="display: none;"/>
<span class="loading-spinner16" id="shut_down_loading"></span>
<span class="displayshow-icon-enable" id="shut_down_success" style="display: none;"></span>
</div>
<div id="restart_message" style="display: none;">
${_('Waiting for SickRage to start again')}:
<img src="${srRoot}/images/loading16-${sickbeard.THEME_NAME}.gif" height="16" width="16" id="restart_loading"/>
<img src="${srRoot}/images/yes16.png" height="16" width="16" id="restart_success" style="display: none;"/>
<img src="${srRoot}/images/no16.png" height="16" width="16" id="restart_failure" style="display: none;"/>
<span class="loading-spinner16" id="restart_loading"></span>
<span class="displayshow-icon-enable" id="restart_success" style="display: none;"></span>
<span class="displayshow-icon-disable" id="restart_failure" style="display: none;"></span>
</div>
<div id="refresh_message" style="display: none;">
${_('Loading the default page')}:
<img src="${srRoot}/images/loading16-${sickbeard.THEME_NAME}.gif" height="16" width="16" id="refresh_loading"/>
<span class="loading-spinner16" id="refresh_loading"></span>
</div>
<div id="restart_fail_message" style="display: none;">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment

Another place to be (or not)