moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2024-12-04 15:12:23 -05:00
Code Issues Releases Wiki Activity

Add an in progress spinner that is suitable for the dark theme.

Browse Source 
Add dark spinner to "Add New Show" (searching indexers), "Add existing shows" (Loading Folders), Coming Eps and all config pages (when saving).
This commit is contained in:
JackDandy 2014-10-24 14:16:46 +01:00
parent dbaf256d74
commit 0c765e552c
15 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.md
View File

@ -23,6 +23,9 @@
* Clean up text, correct quotations, use spaces for code lines, tabs for html
* Implement automatic saving of poster layout sorting options on show list
* Clarify description for backlog searches option on provider settings page
* Fix Layout "Poster" sort of Paused, Ended, and Continuing shows as they were random
* Fix Layout "Simple" sort of tvrage "New" and "Returning" series by changing status column text to "Continuing"
* Add dark spinner to "Add New Show" (searching indexers), "Add existing shows" (Loading Folders), Coming Eps and all config pages (when saving)
### 0.2.1 (2014-10-22 06:41:00 UTC)

6
gui/slick/css/browser.css
View File

@ -23,11 +23,7 @@
margin: 0 4px;
float: left;
}
/*
.browserDialog.busy .ui-dialog-buttonpane {
background: url("/images/loading.gif") 10px 50% no-repeat;
}
*/
/* jquery ui autocomplete overrides to make it look more like the old autocomplete */
.ui-autocomplete {

BIN
gui/slick/images/loading16-dark.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
gui/slick/images/loading32-dark.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

2
gui/slick/interfaces/default/comingEpisodes.tmpl
View File

@ -268,7 +268,7 @@
<script type="text/javascript" charset="utf-8">
<!--
\$(document).ready(function(){
\$('#sbRoot').ajaxEpSearch({'size': 16, 'loadingImage': 'loading16.gif'});
\$('#sbRoot').ajaxEpSearch({'size': 16, 'loadingImage': 'loading16' + themeSpinner + '.gif'});
\$(".ep_summary").hide();
\$(".ep_summaryTrigger").click(function() {
\$(this).next(".ep_summary").slideToggle('normal', function() {

1
gui/slick/interfaces/default/inc_top.tmpl
View File

@ -83,6 +83,7 @@
sbRoot = "$sbRoot"; // needed for browser.js & ajaxNotifications.js
//HTML for scrolltopcontrol, which is auto wrapped in DIV w/ ID="topcontrol"
top_image_html = '<img src="$sbRoot/images/top.gif" width="31" height="11" alt="Jump to top" />';
themeSpinner = <%= '\'\'' if 'dark' != sickbeard.THEME_NAME else '\'-dark\'' %>;
//-->
</script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.scrolltopcontrol-1.1.js"></script>

18
gui/slick/interfaces/default/restart_bare.tmpl
View File

@ -22,24 +22,36 @@ sbHost = "$curSBHost";
<script type="text/javascript" src="$sbRoot/js/lib/jquery-1.8.3.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/restart.js?$sbPID"></script>
#try:
#sickbeard
#except NameError:
#set themeSpinner = '';
#else:
#if 'dark' != sickbeard.THEME_NAME:
#set themeSpinner = ''
#else:
#set themeSpinner = '-dark'
#end if
#end try
<h2>Performing Restart</h2>
<br />
<div id="shut_down_message">
Waiting for SickRage to shut down:
<img src="$sbRoot/images/loading16.gif" height="16" width="16" id="shut_down_loading" />
<img src="$sbRoot/images/loading16${themeSpinner}.gif" height="16" width="16" id="shut_down_loading" />
<img src="$sbRoot/images/yes16.png" height="16" width="16" id="shut_down_success" style="display: none;" />
</div>
<div id="restart_message" style="display: none;">
Waiting for SickRage to start again:
<img src="$sbRoot/images/loading16.gif" height="16" width="16" id="restart_loading" />
<img src="$sbRoot/images/loading16${themeSpinner}.gif" height="16" width="16" id="restart_loading" />
<img src="$sbRoot/images/yes16.png" height="16" width="16" id="restart_success" style="display: none;" />
<img src="$sbRoot/images/no16.png" height="16" width="16" id="restart_failure" style="display: none;" />
</div>
<div id="refresh_message" style="display: none;">
Loading the home page:
<img src="$sbRoot/images/loading16.gif" height="16" width="16" id="refresh_loading" />
<img src="$sbRoot/images/loading16${themeSpinner}.gif" height="16" width="16" id="refresh_loading" />
</div>
<div id="restart_fail_message" style="display: none;">

2
gui/slick/js/addExistingShow.js
View File

@ -42,7 +42,7 @@ $(document).ready(function() {
}
});
$('#tableDiv').html('<img id="searchingAnim" src="' + sbRoot + '/images/loading32.gif" height="32" width="32" /> loading folders...');
$('#tableDiv').html('<img id="searchingAnim" src="' + sbRoot + '/images/loading32' + themeSpinner + '.gif" height="32" width="32" /> loading folders...');
$.get(sbRoot+'/home/addShows/massAddTable', url, function(data) {
$('#tableDiv').html(data);
$("#addRootDirTable").tablesorter({

4
gui/slick/js/ajaxEpSearch.js
View File

@ -40,7 +40,7 @@ function updateImages(data) {
$.each(data.episodes, function (name, ep) {
console.debug(ep.searchstatus);
// Get td element for current ep
var loadingImage = 'loading16_dddddd.gif';
var loadingImage = 'loading16.gif';
var queuedImage = 'queued.png';
var searchImage = 'search16.png';
var status = null;
@ -113,7 +113,7 @@ function disableLink(el) {
defaults: {
size: 16,
colorRow: false,
loadingImage: 'loading16_dddddd.gif',
loadingImage: 'loading16.gif',
queuedImage: 'queued.png',
noImage: 'no16.png',
yesImage: 'yes16.png'

4
gui/slick/js/ajaxEpSubtitles.js
View File

@ -5,7 +5,7 @@
var subtitles_search_link = $(this);
// fill with the ajax loading gif
subtitles_search_link.empty();
subtitles_search_link.append($("<img/>").attr({"src": sbRoot+"/images/loading16_dddddd.gif", "alt": "", "title": "loading"}));
subtitles_search_link.append($("<img/>").attr({"src": sbRoot+"/images/loading16.gif", "alt": "", "title": "loading"}));
$.getJSON($(this).attr('href'), function(data){
if (data.result != "failure" && data.result != "No subtitles downloaded") {
// clear and update the subtitles column with new informations
@ -37,7 +37,7 @@
var subtitles_merge_link = $(this);
// fill with the ajax loading gif
subtitles_merge_link.empty();
subtitles_merge_link.append($("<img/>").attr({"src": sbRoot+"/images/loading16_dddddd.gif", "alt": "", "title": "loading"}));
subtitles_merge_link.append($("<img/>").attr({"src": sbRoot+"/images/loading16.gif", "alt": "", "title": "loading"}));
$.getJSON($(this).attr('href'), function(data){
// don't allow other merges
subtitles_merge_link.remove();

2
gui/slick/js/config.js
View File

@ -47,7 +47,7 @@ $(document).ready(function(){
beforeSubmit: function(){
$('.config_submitter').each(function(){
$(this).attr("disabled", "disabled");
$(this).after('<span><img src="' + sbRoot + '/images/loading16.gif"> Saving...</span>');
$(this).after('<span><img src="' + sbRoot + '/images/loading16' + themeSpinner + '.gif"> Saving...</span>');
$(this).hide();
});
},

2
gui/slick/js/configBackupRestore.js
View File

@ -1,5 +1,5 @@
$(document).ready(function(){
var loading = '<img src="' + sbRoot + '/images/loading16.gif" height="16" width="16" />';
var loading = '<img src="' + sbRoot + '/images/loading16' + themeSpinner + '.gif" height="16" width="16" />';
$('#Backup').click(function() {
$("#Backup").attr("disabled", true);

2
gui/slick/js/configNotifications.js
View File

@ -1,5 +1,5 @@
$(document).ready(function(){
var loading = '<img src="' + sbRoot + '/images/loading16.gif" height="16" width="16" />';
var loading = '<img src="' + sbRoot + '/images/loading16' + themeSpinner + '.gif" height="16" width="16" />';
$('#testGrowl').click(function(){
$('#testGrowl-result').html(loading);

2
gui/slick/js/configSearch.js
View File

@ -1,5 +1,5 @@
$(document).ready(function(){
var loading = '<img src="'+sbRoot+'/images/loading16.gif" height="16" width="16" />';
var loading = '<img src="'+sbRoot+'/images/loading16' + themeSpinner + '.gif" height="16" width="16" />';
function toggle_torrent_title(){
if ($('#use_torrents').prop('checked'))

2
gui/slick/js/newShow.js
View File

@ -39,7 +39,7 @@ $(document).ready(function () {
if (searchRequestXhr) searchRequestXhr.abort();
var searchingFor = $('#nameToSearch').val() + ' on ' + $('#providedIndexer option:selected').text() + ' in ' + $('#indexerLangSelect').val();
$('#searchResults').empty().html('<img id="searchingAnim" src="' + sbRoot + '/images/loading32.gif" height="32" width="32" /> searching ' + searchingFor + '...');
$('#searchResults').empty().html('<img id="searchingAnim" src="' + sbRoot + '/images/loading32' + themeSpinner + '.gif" height="32" width="32" /> searching ' + searchingFor + '...');
searchRequestXhr = $.ajax({
url: sbRoot + '/home/addShows/searchIndexersForShowName',