Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #489 from thezoggy/dev-cleanup

Dev cleanup
  • Loading branch information...
commit 44487fb900bf32f15f7f472f7897f4d82c271aff 2 parents aa938f8 + 2024339
@midgetspy authored
View
22 data/css/lib/jquery-ui-1.8.23.custom.css → data/css/lib/jquery-ui-1.8.24.custom.css
@@ -1,5 +1,5 @@
/*!
- * jQuery UI CSS Framework 1.8.23
+ * jQuery UI CSS Framework 1.8.24
*
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
@@ -39,7 +39,7 @@
/*!
- * jQuery UI CSS Framework 1.8.23
+ * jQuery UI CSS Framework 1.8.24
*
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
@@ -47,7 +47,7 @@
*
* http://docs.jquery.com/UI/Theming/API
*
- * To view and modify this theme, visit http://jqueryui.com/themeroller/?ctl=themeroller&ctl=themeroller&ctl=themeroller&ctl=themeroller&ctl=themeroller&ctl=themeroller&ctl=themeroller&ctl=themeroller&ctl=themeroller&ctl=themeroller&ctl=themeroller&ffDefault=Verdana,Arial,sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=ffffff&bgTextureHeader=01_flat.png&bgImgOpacityHeader=0&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=dcdcdc&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=efefef&bgTextureDefault=03_highlight_soft.png&bgImgOpacityDefault=75&borderColorDefault=aaaaaa&fcDefault=222222&iconColorDefault=8c291d&bgColorHover=dddddd&bgTextureHover=03_highlight_soft.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=222222&iconColorHover=222222&bgColorActive=dfdfdf&bgTextureActive=05_inset_soft.png&bgImgOpacityActive=75&borderColorActive=aaaaaa&fcActive=140f06&iconColorActive=8c291d&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=aaaaaa&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=aaaaaa&fcError=8c291d&iconColorError=cd0a0a&bgColorOverlay=6e4f1c&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=35&bgColorShadow=000000&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=35&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?ctl=themeroller&ffDefault=Verdana,Arial,sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=ffffff&bgTextureHeader=01_flat.png&bgImgOpacityHeader=0&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=dcdcdc&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=efefef&bgTextureDefault=03_highlight_soft.png&bgImgOpacityDefault=75&borderColorDefault=aaaaaa&fcDefault=222222&iconColorDefault=8c291d&bgColorHover=dddddd&bgTextureHover=03_highlight_soft.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=222222&iconColorHover=222222&bgColorActive=dfdfdf&bgTextureActive=05_inset_soft.png&bgImgOpacityActive=75&borderColorActive=aaaaaa&fcActive=140f06&iconColorActive=8c291d&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=aaaaaa&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=aaaaaa&fcError=8c291d&iconColorError=cd0a0a&bgColorOverlay=6e4f1c&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=35&bgColorShadow=000000&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=35&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
*/
@@ -290,7 +290,7 @@
.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #000000 url(images/ui-bg_flat_0_000000_40x100.png) 50% 50% repeat-x; opacity: .35;filter:Alpha(Opacity=35); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }
*/
/*!
- * jQuery UI Resizable 1.8.23
+ * jQuery UI Resizable 1.8.24
*
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
@@ -309,7 +309,7 @@
.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*!
- * jQuery UI Selectable 1.8.23
+ * jQuery UI Selectable 1.8.24
*
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
@@ -319,7 +319,7 @@
*/
.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
/*!
- * jQuery UI Autocomplete 1.8.23
+ * jQuery UI Autocomplete 1.8.24
*
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
@@ -333,7 +333,7 @@
* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
/*
- * jQuery UI Menu 1.8.23
+ * jQuery UI Menu 1.8.24
*
* Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
@@ -372,7 +372,7 @@
margin: -1px;
}
/*!
- * jQuery UI Button 1.8.23
+ * jQuery UI Button 1.8.24
*
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
@@ -410,7 +410,7 @@ input.ui-button { padding: .4em 1em; }
/* workarounds */
button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
/*!
- * jQuery UI Dialog 1.8.23
+ * jQuery UI Dialog 1.8.24
*
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
@@ -431,7 +431,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
.ui-draggable .ui-dialog-titlebar { cursor: move; }
/*!
- * jQuery UI Tabs 1.8.23
+ * jQuery UI Tabs 1.8.24
*
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
@@ -449,7 +449,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
.ui-tabs .ui-tabs-hide { display: none !important; }
/*!
- * jQuery UI Progressbar 1.8.23
+ * jQuery UI Progressbar 1.8.24
*
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
View
13 data/css/style.css
@@ -1198,16 +1198,6 @@ input[disabled], select[disabled], textarea[disabled], input[readonly], select[r
background-color: #57442b;
border-right: 1px solid #614e35;
}
-.dropdown-menu a {
- padding: 6px 15px;
- color: #333;
-}
-.dropdown-menu li {
- border-top: 1px solid #ccc;
-}
-.dropdown-menu li:first-child {
- border-top: none;
-}
.dropdown-menu li > a:hover,
.dropdown-menu .active > a,
.dropdown-menu .active > a:hover {
@@ -1215,6 +1205,9 @@ input[disabled], select[disabled], textarea[disabled], input[readonly], select[r
text-decoration: none;
background-color: #333;
}
+ul.nav .dropdown-menu .divider {
+ margin: 5px 1px;
+}
/*
.dropdown-menu li > a:hover > [class^="icon-"],
.dropdown-menu li > a:hover > [class*=" icon-"] {
View
78 data/interfaces/default/config_postProcessing.tmpl
@@ -7,7 +7,7 @@
#from sickbeard import naming
#set global $title = "Config - Post Processing"
-#set global $header = "Post Processing Configuration"
+#set global $header = "Post Processing"
#set global $sbPath="../.."
@@ -169,40 +169,40 @@
<td>Show_Name</td>
</tr>
<tr class="even">
- <td class="align-right"><b>Episode Name:</b></td>
- <td>%EN</td>
- <td>Episode Name</td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- <td>%E.N</td>
- <td>Episode.Name</td>
- </tr>
- <tr class="even">
- <td>&nbsp;</td>
- <td>%E_N</td>
- <td>Episode_Name</td>
- </tr>
- <tr>
<td class="align-right"><b>Season Number:</b></td>
<td>%S</td>
<td>2</td>
</tr>
- <tr class="even">
+ <tr>
<td>&nbsp;</td>
<td>%0S</td>
<td>02</td>
</tr>
- <tr>
+ <tr class="even">
<td class="align-right"><b>Episode Number:</b></td>
<td>%E</td>
<td>3</td>
</tr>
- <tr class="even">
+ <tr>
<td>&nbsp;</td>
<td>%0E</td>
<td>03</td>
</tr>
+ <tr class="even">
+ <td class="align-right"><b>Episode Name:</b></td>
+ <td>%EN</td>
+ <td>Episode Name</td>
+ </tr>
+ <tr>
+ <td>&nbsp;</td>
+ <td>%E.N</td>
+ <td>Episode.Name</td>
+ </tr>
+ <tr class="even">
+ <td>&nbsp;</td>
+ <td>%E_N</td>
+ <td>Episode_Name</td>
+ </tr>
<tr>
<td class="align-right"><b>Quality:</b></td>
<td>%QN</td>
@@ -335,6 +335,26 @@
<td>Show_Name</td>
</tr>
<tr class="even">
+ <td class="align-right"><b>Air-By-Date:</b></td>
+ <td>%AD</td>
+ <td>2010 03 09</td>
+ </tr>
+ <tr>
+ <td>&nbsp;</td>
+ <td>%A.D</td>
+ <td>2010.03.09</td>
+ </tr>
+ <tr class="even">
+ <td>&nbsp;</td>
+ <td>%A_D</td>
+ <td>2010_03_09</td>
+ </tr>
+ <tr>
+ <td>&nbsp;</td>
+ <td>%A-D</td>
+ <td>2010-03-09</td>
+ </tr>
+ <tr class="even">
<td class="align-right"><b>Episode Name:</b></td>
<td>%EN</td>
<td>Episode Name</td>
@@ -365,26 +385,6 @@
<td>720p_BluRay</td>
</tr>
<tr class="even">
- <td class="align-right"><b>Air-By-Date:</b></td>
- <td>%AD</td>
- <td>2010 03 09</td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- <td>%A.D</td>
- <td>2010.03.09</td>
- </tr>
- <tr class="even">
- <td>&nbsp;</td>
- <td>%A_D</td>
- <td>2010_03_09</td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- <td>%A-D</td>
- <td>2010-03-09</td>
- </tr>
- <tr class="even">
<td class="align-right"><b>Year:</b></td>
<td>%Y</td>
<td>2010</td>
View
4 data/interfaces/default/config_providers.tmpl
@@ -1,6 +1,6 @@
#import sickbeard
#from sickbeard.providers.generic import GenericProvider
-#set global $title="Config - Providers"
+#set global $title="Config - Search Providers"
#set global $header="Search Providers"
#set global $sbPath="../.."
@@ -205,7 +205,7 @@
<div class="providerDiv" id="btnDiv">
<div class="field-pair">
<label class="clearfix">
- <span class="component-title">BTN API KEY:</span>
+ <span class="component-title">BTN API Key:</span>
<input class="component-desc" type="text" name="btn_api_key" value="$sickbeard.BTN_API_KEY" size="40" />
</label>
</div>
View
4 data/interfaces/default/config_search.tmpl
@@ -1,6 +1,6 @@
#import sickbeard
-#set global $title="Config - Episode Search"
-#set global $header="Search Options"
+#set global $title="Config - Search Settings"
+#set global $header="Search Settings"
#set global $sbPath="../.."
View
17 data/interfaces/default/inc_top.tmpl
@@ -19,7 +19,7 @@
<link rel="stylesheet" type="text/css" href="$sbRoot/css/lib/bootstrap.css?$sbPID"/>
<link rel="stylesheet" type="text/css" href="$sbRoot/css/lib/jquery.pnotify.default.css?$sbPID" />
- <link rel="stylesheet" type="text/css" href="$sbRoot/css/lib/jquery-ui-1.8.23.custom.css?$sbPID" />
+ <link rel="stylesheet" type="text/css" href="$sbRoot/css/lib/jquery-ui-1.8.24.custom.css?$sbPID" />
<link rel="stylesheet" type="text/css" href="$sbRoot/css/lib/jquery.qtip.css?$sbPID"/>
<link rel="stylesheet" type="text/css" href="$sbRoot/css/style.css?$sbPID"/>
@@ -66,7 +66,7 @@
</style>
<script type="text/javascript" src="$sbRoot/js/lib/jquery-1.7.2.min.js?$sbPID"></script>
- <script type="text/javascript" src="$sbRoot/js/lib/jquery-ui-1.8.23.custom.min.js?$sbPID"></script>
+ <script type="text/javascript" src="$sbRoot/js/lib/jquery-ui-1.8.24.custom.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/bootstrap.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.cookie.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.cookiejar.js?$sbPID"></script>
@@ -143,7 +143,9 @@
<a data-toggle="dropdown" class="dropdown-toggle" href="#" onclick="return false;"><img src="$sbRoot/images/menu/system18.png" alt="" width="18" height="18" /> <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="$sbRoot/manage/manageSearches/forceVersionCheck"><i class="icon-check"></i> Force Version Check</a></li>
+ <li class="divider"></li>
<li><a href="$sbRoot/home/restart/?pid=$sbPID" class="confirm"><i class="icon-repeat"></i> Restart</a></li>
+ <li class="divider"></li>
<li><a href="$sbRoot/home/shutdown/?pid=$sbPID" class="confirm"><i class="icon-off"></i> Shutdown</a></li>
</ul>
</li>
@@ -152,7 +154,9 @@
<a data-toggle="dropdown" class="dropdown-toggle disabled" href="$sbRoot/home/">Home <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="$sbRoot/home/"><i class="icon-home"></i> Home</a></li>
+ <li class="divider"></li>
<li><a href="$sbRoot/home/addShows/"><i class="icon-plus-sign"></i> Add Shows</a></li>
+ <li class="divider"></li>
<li><a href="$sbRoot/home/postprocess/"><i class="icon-random"></i> Manual Post-Processing</a></li>
</ul>
</li>
@@ -169,8 +173,11 @@
<a data-toggle="dropdown" class="dropdown-toggle disabled" href="$sbRoot/manage/">Manage <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="$sbRoot/manage/"><i class="icon-tasks"></i> Mass Update</a></li>
+ <li class="divider"></li>
<li><a href="$sbRoot/manage/backlogOverview/"><i class="icon-retweet"></i> Backlog Overview</a></li>
+ <li class="divider"></li>
<li><a href="$sbRoot/manage/manageSearches/"><i class="icon-search"></i> Manage Searches</a></li>
+ <li class="divider"></li>
<li><a href="$sbRoot/manage/episodeStatuses/"><i class="icon-list-alt"></i> Episode Status Management</a></li>
</ul>
</li>
@@ -179,10 +186,15 @@
<a data-toggle="dropdown" class="dropdown-toggle disabled" href="$sbRoot/config/">Config <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="$sbRoot/config/"><i class="icon-question-sign"></i> Help &amp; Info</a></li>
+ <li class="divider"></li>
<li><a href="$sbRoot/config/general/"><i class="icon-cog"></i> General</a></li>
+ <li class="divider"></li>
<li><a href="$sbRoot/config/search/"><i class="icon-cog"></i> Search Settings</a></li>
+ <li class="divider"></li>
<li><a href="$sbRoot/config/providers/"><i class="icon-cog"></i> Search Providers</a></li>
+ <li class="divider"></li>
<li><a href="$sbRoot/config/postProcessing/"><i class="icon-cog"></i> Post Processing</a></li>
+ <li class="divider"></li>
<li><a href="$sbRoot/config/notifications/"><i class="icon-cog"></i> Notifications</a></li>
</ul>
</li>
@@ -191,6 +203,7 @@
<a data-toggle="dropdown" class="dropdown-toggle disabled" href="$sbRoot/errorlogs/">$logPageTitle <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="$sbRoot/errorlogs/"><i class="icon-file"></i> View Log (Errors)</a></li>
+ <li class="divider"></li>
<li><a href="$sbRoot/errorlogs/viewlog/"><i class="icon-file"></i> View Log</a></li>
</ul>
</li>
View
30 data/js/lib/jquery-ui-1.8.23.custom.min.js → data/js/lib/jquery-ui-1.8.24.custom.min.js
15 additions, 15 deletions not shown
Please sign in to comment.
Something went wrong with that request. Please try again.