Private GIT

Skip to content
Snippets Groups Projects
Commit a21e1bf9 authored by Nic Wolfe's avatar Nic Wolfe
Browse files

Merge branch 'master' of github.com:midgetspy/Sick-Beard into windows_binaries

parents 95ccbc10 b5f5cd08
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 254 additions and 84 deletions
SickBeard.py
+ 4
− 1
View file @ a21e1bf9
......@@ -32,6 +32,9 @@ import sqlite3
import traceback
import getopt
# allow libraries to import each other
sys.path.append(os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])), 'lib'))
import sickbeard
from sickbeard import db
......@@ -95,7 +98,7 @@ def daemonize():
def main():
# do some preliminary stuff
sickbeard.MY_FULLNAME = os.path.normpath(os.path.abspath(sys.argv[0]))
sickbeard.MY_FULLNAME = os.path.normpath(os.path.abspath(__file__))
sickbeard.MY_NAME = os.path.basename(sickbeard.MY_FULLNAME)
sickbeard.PROG_DIR = os.path.dirname(sickbeard.MY_FULLNAME)
sickbeard.MY_ARGS = sys.argv[1:]
......
data/css/browser.css
+ 7
− 1
View file @ a21e1bf9
#fileBrowserDialog {
max-height: 480;
overflow-y: auto;
}
#fileBrowserDialog ul {
margin: 0;
padding: 0;
......@@ -19,6 +23,8 @@
margin: 0 4px;
float: left;
}
/*
.browserDialog.busy .ui-dialog-buttonpane {
background: url(../images/loading.gif) 10px 50% no-repeat;
background: url("/images/loading.gif") 10px 50% no-repeat;
}
*/
\ No newline at end of file
data/css/comingEpisodes.css
+ 1
− 4
View file @ a21e1bf9
......@@ -53,7 +53,6 @@ div#insideContent {
}
.posterThumb {
background-image: url("/images/poster.png");
/* display:table-cell; */
vertical-align: top;
height: 200px;
......@@ -62,8 +61,6 @@ div#insideContent {
border-right: 1px solid #ccc;
}
.bannerThumb {
background-image: url("/images/poster.png");
background-repeat: repeat-x;
/* display:table-cell; */
vertical-align: top;
height: 112px;
......@@ -125,7 +122,7 @@ h1.network {
}
.listing_default {
background-color: #e5e5e5;
background-color: #F5F1E4;
}
.listing_current {
......
data/css/default.css
+ 64
− 61
View file @ a21e1bf9
......@@ -30,11 +30,15 @@ legend {
color:#000;
font-weight:700;
}
div.EntryBlock,div.EntryBlock form {
display:inline;
}
/* --------------------------------------------- */
/* these are for incl_top.tmpl */
#header {
padding-top:3px;
z-index:2;
}
#header a:hover {
......@@ -67,43 +71,8 @@ text-transform:lowercase;
color:#57442B;
}
.MainMenu {
display:block;
background-color:#F5F1E4;
padding:5px;
}
.MainMenu a {
font-weight:700;
text-decoration:none;
color:#4e4e4e;
padding:3px 12px 7px;
}
.SubMenu {
display:block;
padding:5px;
}
.SubMenu a {
font-weight:700;
text-decoration:none;
color:#f5f5f5;
padding:3px 12px 7px;
}
/* --------------------------------------------- */
a.current {
border:none;
color:#ccc;
background-color:#000;
padding:3px 12px 7px;
}
a.current:hover {
border:none;
}
table {
font-size:9pt;
margin:0;
......@@ -154,6 +123,9 @@ font-weight:700;
margin-top:-32px;
margin-right:5px;
}
.h2footer span {
padding:2px;
}
.separator {
font-size:90%;
......@@ -198,7 +170,7 @@ color:#4e4e4e;
}
.sickbeardTable {
width:80%;
width:90%;
margin-left:auto;
margin-right:auto;
}
......@@ -216,6 +188,7 @@ clear:left;
.plotInfo {
cursor:help;
padding-left:5px;
float:right;
}
......@@ -242,6 +215,7 @@ z-index:3000;
border:1px solid #111;
background-color:#eee;
padding:5px;
margin-right:10px;
}
.progressbarText {
......@@ -272,6 +246,7 @@ text-decoration:none;
}
tr.seasonheader a:hover {
background-color: #fff;
color:#000;
}
tr.unaired,span.unaired {
......@@ -299,44 +274,72 @@ background-color:#FFB0B0;
padding:2px;
}
#progressBar {
background-color:#cdf;
border:1px solid blue;
}
#percentageBar {
background-color:#9bf;
}
.SubMenu,a.current {
background-color:#57442B;
color:#FFF;
a,a.remove {
color:#000;
}
a.current:hover,a:hover {
h1 a:hover, h2 a:hover, span a:hover, div.h2footer a:hover {
background-color:#000;
color:#FFF;
}
a.imgLink:hover {
background-color:transparent;
}
div.EntryBlock,div.EntryBlock form {
display:inline;
}
.message p,.message ul {
margin:0;
}
a,.queuelink,td > a,td > a,a.remove {
color:#000;
}
div#summary {
background-color:#efefef;
padding:10px;
border:1px solid #DFDEDE;
margin:10px;
}
#MainMenu {
background-color:#57442B;
color:#F5F5F5;
line-height:1;
/*margin-bottom:1em;*/
width:100%;
border-bottom: 1px solid #333;
}
#SubMenu {
background-color:#F5F1E4;
color:#333;
border-bottom: 1px solid #333;
padding-left:5px;
}
#SubMenu span {
padding:2px 6px 2px 8px;
}
#SubMenu span a {
line-height:24px;
text-decoration:none;
color:#333;
font-weight:700;
padding:2px 6px 2px;
}
#SubMenu span a.inner {
font-weight:400;
padding:2px;
}
#SubMenu span a:hover {
background-color:#000;
color:#fff;
}
#donate {
line-height:2px;
background: none;
float: right;
}
#donate a,#donate a:hover {
background-color:#57442B;
border:0;
padding:3px 15px 0px;
}
#content {
padding: 10px 15px 15px;
_text-align: center;
min-width:500px;
z-index:1;
clear:both;
}
\ No newline at end of file
data/css/jquery.autocomplete.css
+ 2
− 2
View file @ a21e1bf9
......@@ -33,11 +33,11 @@
line-height: 16px;
overflow: hidden;
}
/*
.ac_loading {
background: white url('../images/indicator.gif') right center no-repeat;
}
*/
.ac_odd {
background-color: #eee;
}
......
data/css/pepper-grinder/jquery-ui-1.8.7.custom.css
+ 11
− 6
View file @ a21e1bf9
......@@ -58,26 +58,26 @@
----------------------------------*/
.ui-widget .ui-widget { font-size: 1em; }
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1em; }
.ui-widget-content { border: 1px solid #d9d6c4; background: #eceadf url(images/ui-bg_fine-grain_10_eceadf_60x60.png) 50% 50% repeat; color: #1f1f1f; }
/*.ui-widget-content { border: 1px solid #d9d6c4; background: #eceadf url(images/ui-bg_fine-grain_10_eceadf_60x60.png) 50% 50% repeat; color: #1f1f1f; }*/
.ui-widget-content a { color: #1f1f1f; }
.ui-widget-header { border: 1px solid #d4d1bf; background: #ffffff; color: #453821; font-weight: bold; }
.ui-widget-header a { color: #453821; }
/* Interaction states
----------------------------------*/
.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cbc7bd; background: #f8f7f6 url(images/ui-bg_fine-grain_10_f8f7f6_60x60.png) 50% 50% repeat; font-weight: bold; color: #654b24; }
/*.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cbc7bd; background: #f8f7f6 url(images/ui-bg_fine-grain_10_f8f7f6_60x60.png) 50% 50% repeat; font-weight: bold; color: #654b24; }*/
.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #654b24; text-decoration: none; }
.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #654b24; background: #654b24; font-weight: bold; color: #ffffff; }
.ui-state-hover a, .ui-state-hover a:hover { color: #ffffff; text-decoration: none; }
.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #d9d6c4; background: #eceadf url(images/ui-bg_fine-grain_15_eceadf_60x60.png) 50% 50% repeat; font-weight: bold; color: #140f06; }
/*.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #d9d6c4; background: #eceadf url(images/ui-bg_fine-grain_15_eceadf_60x60.png) 50% 50% repeat; font-weight: bold; color: #140f06; }*/
.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #140f06; text-decoration: none; }
.ui-widget :active { outline: none; }
/* Interaction Cues
----------------------------------*/
.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #b2a266; background: #f7f3de url(images/ui-bg_fine-grain_15_f7f3de_60x60.png) 50% 50% repeat; color: #3a3427; }
/*.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #b2a266; background: #f7f3de url(images/ui-bg_fine-grain_15_f7f3de_60x60.png) 50% 50% repeat; color: #3a3427; }*/
.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #3a3427; }
.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #681818; background: #b83400 url(images/ui-bg_fine-grain_68_b83400_60x60.png) 50% 50% repeat; color: #ffffff; }
/*.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #681818; background: #b83400 url(images/ui-bg_fine-grain_68_b83400_60x60.png) 50% 50% repeat; color: #ffffff; }*/
.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #ffffff; }
.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #ffffff; }
.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
......@@ -88,6 +88,7 @@
----------------------------------*/
/* states and images */
/*
.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
.ui-widget-header .ui-icon {background-image: url(images/ui-icons_b83400_256x240.png); }
......@@ -96,6 +97,7 @@
.ui-state-active .ui-icon {background-image: url(images/ui-icons_8c291d_256x240.png); }
.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_3572ac_256x240.png); }
.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_fbdb93_256x240.png); }
*/
/* positioning */
.ui-icon-carat-1-n { background-position: 0 0; }
......@@ -290,8 +292,11 @@
.ui-corner-all { -moz-border-radius: 6px; -webkit-border-radius: 6px; border-radius: 6px; }
/* Overlays */
/*
.ui-widget-overlay { background: #6e4f1c url(images/ui-bg_diagonal-maze_20_6e4f1c_10x10.png) 50% 50% repeat; opacity: .60;filter:Alpha(Opacity=60); }
.ui-widget-shadow { margin: 0 0 0 -10px; padding: 5px; background: #000000 url(images/ui-bg_diagonal-maze_40_000000_10x10.png) 50% 50% repeat; opacity: .60;filter:Alpha(Opacity=60); -moz-border-radius: 18px; -webkit-border-radius: 18px; border-radius: 18px; }/*
.ui-widget-shadow { margin: 0 0 0 -10px; padding: 5px; background: #000000 url(images/ui-bg_diagonal-maze_40_000000_10x10.png) 50% 50% repeat; opacity: .60;filter:Alpha(Opacity=60); -moz-border-radius: 18px; -webkit-border-radius: 18px; border-radius: 18px; }
*/
/*
* jQuery UI Resizable 1.8.7
*
* Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
......
data/css/superfish.css 0 → 100644
+ 154
− 0
View file @ a21e1bf9
/*** ESSENTIAL STYLES ***/
.sf-menu, .sf-menu * {
margin: 0;
padding: 0;
list-style: none;
}
.sf-menu ul {
border: 1px solid #57442B;
position: absolute;
top: -999em;
width: 10em; /* left offset of submenus need to match (see below) */
}
.sf-menu ul li a {padding-left: 28px;}
.sf-menu ul li a img {position:absolute;margin-top:-2px;margin-left:-22px;z-index:99;}
.sf-menu ul li {
width: 100%;
}
.sf-menu li.spacer,.sf-menu li.spacer:hover {
background-color:#57442B;
width:15px;
}
.sf-menu li:hover {
visibility: inherit; /* fixes IE7 'sticky bug' */
}
.sf-menu li {
float: left;
position: relative;
}
.sf-menu a {
display: block;
position: relative;
}
.sf-menu li:hover ul,
.sf-menu li.sfHover ul {
left: 0;
top: 2.5em; /* match top ul list item height */
z-index: 99;
}
ul.sf-menu li:hover li ul,
ul.sf-menu li.sfHover li ul {
top: -999em;
}
ul.sf-menu li li:hover ul,
ul.sf-menu li li.sfHover ul {
left: 10em; /* match ul width */
top: 0;
}
ul.sf-menu li li:hover li ul,
ul.sf-menu li li.sfHover li ul {
top: -999em;
}
ul.sf-menu li li li:hover ul,
ul.sf-menu li li li.sfHover ul {
left: 10em; /* match ul width */
top: 0;
}
.sf-menu li.current {
background-color: #000;
}
.sf-menu {
float: left;
/*margin-bottom: 1em;*/
line-height: 1.0;
}
.sf-menu a {
border-right: 1px solid #fff;
padding: .75em 1em;
text-decoration:none;
}
.sf-menu a, .sf-menu a:visited { /* visited pseudo selector so IE6 applies text colour*/
color: #F5F5F5;
}
.sf-menu li { background: #57442B; /*brown*/ }
.sf-menu li li { background: #DFDACF; /* alt row light brown */ }
.sf-menu li li li { background: #F5F1E4; /* even row tan */ }
.sf-menu li li a,.sf-menu li li a:visited { color: #000; }
.sf-menu li li a:hover { color: #F5F5F5; }
.sf-menu li li a,.sf-menu li li a:visited,.sf-menu li li a:focus,.sf-menu li li a:active {
border-top: 1px solid #F5F1E4;
}
.sf-menu li li li a,.sf-menu li li li a:visited { color: #000; }
.sf-menu li li li a:hover { color: #F5F5F5; }
.sf-menu li li li a,.sf-menu li li li a:visited,.sf-menu li li li a:focus,.sf-menu li li li a:active {
border-top: 1px solid #DFDACF;
}
.sf-menu li:hover, .sf-menu li.sfHover,
.sf-menu a:focus, .sf-menu a:hover, .sf-menu a:active {
background: #333;
color:#F5F5F5;
outline: 0;
}
/*** arrows **/
.sf-menu a.sf-with-ul {
padding-right: 2.25em;
min-width: 1px; /* trigger IE7 hasLayout so spans position accurately */
}
.sf-sub-indicator {
position: absolute;
display: block;
right: .75em;
top: 1.05em; /* IE6 only */
width: 10px;
height: 10px;
text-indent: -999em;
overflow: hidden;
/*
background: url('/images/arrows.png') no-repeat -10px -100px; /* 8-bit indexed alpha png. IE6 gets solid image only */
*/
}
a > .sf-sub-indicator { /* give all except IE6 the correct values */
top: .8em;
background-position: 0 -100px; /* use translucent arrow for modern browsers*/
}
/* apply hovers to modern browsers */
a:focus > .sf-sub-indicator,
a:hover > .sf-sub-indicator,
a:active > .sf-sub-indicator,
li:hover > a > .sf-sub-indicator,
li.sfHover > a > .sf-sub-indicator {
background-position: -10px -100px; /* arrow hovers for modern browsers*/
}
/* point right for anchors in subs */
.sf-menu ul .sf-sub-indicator { background-position: -10px 0; }
.sf-menu ul a > .sf-sub-indicator { background-position: 0 0; }
/* apply hovers to modern browsers */
.sf-menu ul a:focus > .sf-sub-indicator,
.sf-menu ul a:hover > .sf-sub-indicator,
.sf-menu ul a:active > .sf-sub-indicator,
.sf-menu ul li:hover > a > .sf-sub-indicator,
.sf-menu ul li.sfHover > a > .sf-sub-indicator {
background-position: -10px 0; /* arrow hovers for modern browsers*/
}
/*** shadows for all but IE6 ***/
.sf-shadow ul {
/*
background: url('/images/shadow.png') no-repeat bottom right;
*/
padding: 0 8px 9px 0;
-moz-border-radius-bottomleft: 17px;
-moz-border-radius-topright: 17px;
-webkit-border-top-right-radius: 17px;
-webkit-border-bottom-left-radius: 17px;
}
.sf-shadow ul.sf-shadow-off {
background: transparent;
}
\ No newline at end of file
data/css/tablesorter.css
+ 11
− 9
View file @ a21e1bf9
/* tables */
table.tablesorter thead tr .header {
background-image: url(../images/tablesorter/bg.gif);
/* background-image: url(../images/tablesorter/bg.gif); */
cursor: pointer;
background-repeat: no-repeat;
background-position: center right;
......@@ -10,12 +10,14 @@ table.tablesorter thead tr th, table.tablesorter tfoot tr th {
border: 1px solid #241109;
padding: 2px;
}
/*
table.tablesorter thead tr .headerSortUp {
background-image: url(../images/tablesorter/asc.gif);
}
table.tablesorter thead tr .headerSortDown {
background-image: url(../images/tablesorter/desc.gif);
}
*/
table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp {
background-color: #57442B;
}
......
data/images/arrows.png 0 → 100644
+ 0
− 0
View file @ a21e1bf9
data/images/arrows.png

382 B

data/images/banner.png 0 → 100644
+ 0
− 0
View file @ a21e1bf9
data/images/banner.png

162 KiB

data/images/cancel32.png 0 → 100644
+ 0
− 0
View file @ a21e1bf9
data/images/cancel32.png

2.49 KiB

data/images/forceBacklog20.png 0 → 100644
+ 0
− 0
View file @ a21e1bf9
data/images/forceBacklog20.png

1.99 KiB

data/images/forceUpdate.png deleted 100644 → 0
+ 0
− 0
View file @ 95ccbc10
data/images/forceUpdate.png

4.37 KiB

data/images/forceUpdate32.png 0 → 100644
+ 0
− 0
View file @ a21e1bf9
data/images/forceUpdate32.png

1.78 KiB

data/images/hMids.gif deleted 100644 → 0
+ 0
− 0
View file @ 95ccbc10
data/images/hMids.gif

1.31 KiB

data/images/hellavcr.png deleted 100644 → 0
+ 0
− 0
View file @ 95ccbc10
data/images/hellavcr.png

7.76 KiB

data/images/menu/addshow16.png 0 → 100644
+ 0
− 0
View file @ a21e1bf9
data/images/menu/addshow16.png

303 B

data/images/menu/addshow16_over.png 0 → 100644
+ 0
− 0
View file @ a21e1bf9
data/images/menu/addshow16_over.png

313 B

data/images/menu/backlog16.png 0 → 100644
+ 0
− 0
View file @ a21e1bf9
data/images/menu/backlog16.png

228 B

data/images/menu/backlog16_over.png 0 → 100644
+ 0
− 0
View file @ a21e1bf9
data/images/menu/backlog16_over.png

250 B

0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Another place to be (or not)