diff --git a/Mylar.py b/Mylar.py index b03cb915..a5fb0496 100644 --- a/Mylar.py +++ b/Mylar.py @@ -102,7 +102,6 @@ def main(): print "Daemonize not supported under Windows, starting normally" else: mylar.DAEMON = True - mylar.VERBOSE = 0 if args.pidfile: mylar.PIDFILE = str(args.pidfile) diff --git a/data/css/style.css b/data/css/style.css index 9b67255a..c009c90b 100755 --- a/data/css/style.css +++ b/data/css/style.css @@ -171,41 +171,41 @@ table#series_table td#active { vertical-align: middle; text-align: left; max-wid div#paddingheader { padding-top: 48px; font-size: 24px; font-weight: bold; text-align: center; } div#paddingheadertitle { padding-top: 24px; font-size: 24px; font-weight: bold; text-align: center; } div#nopaddingheader { font-size: 24px; font-weight: bold; text-align: center; } -table#issue_table { background-color: grey; width: 100%; padding: 10px; } +table#issue_table { background-color: white; width: 100%; padding: 10px; } -table#issue_table th#select { vertical-align: middle; text-align: left; min-width: 5px; } -table#issue_table th#int_issuenumber { text-align: left; min-width: 1px } -table#issue_table th#issuenumber { text-align: left; min-width: 10px; } +table#issue_table th#select { vertical-align: middle; text-align: left; max-width: 10px; } +table#issue_table th#int_issuenumber { text-align: left; max-width: 50px } +table#issue_table th#issuenumber { text-align: left; max-width: 50px; } table#issue_table th#issuename { text-align: center; min-width: 200px; } -table#issue_table th#reldate { text-align: center; min-width: 10px; } -table#issue_table th#status { text-align: center; min-width: 10px; } -table#issue_table th#options { text-align: center; min-width: 30px; } +table#issue_table th#reldate { text-align: center; max-width: 75px; } +table#issue_table th#status { text-align: center; max-width: 75px; } +table#issue_table th#options { text-align: center; min-width: 50px; } -table#issue_table td#select { vertical-align: middle; text-align: left; min-width: 5px; } -table#issue_table td#int_issuenumber { vertical-align: middle; text-align: left; } -table#issue_table td#issuenumber { vertical-align: middle; text-align: left; max-width: 10px; } -table#issue_table td#issuename { vertical-align: middle; text-align: center; font-size: 9px; } -table#issue_table td#reldate { vertical-align: middle; text-align: center; } -table#issue_table td#status { vertical-align: middle; text-align: center; font-size: 13px; } -table#issue_table td#options { vertical-align: middle; text-align: center; } +table#issue_table td#select { vertical-align: middle; text-align: left; max-width: 10px; } +table#issue_table td#int_issuenumber { vertical-align: middle; text-align: left; max-width: 50px; } +table#issue_table td#issuenumber { vertical-align: middle; text-align: left; max-width: 50px; } +table#issue_table td#issuename { vertical-align: middle; text-align: center; min-width: 200px; font-size: 9px; } +table#issue_table td#reldate { vertical-align: middle; text-align: center; max-width: 75px; } +table#issue_table td#status { vertical-align: middle; text-align: center; max-width: 75px; font-size: 13px; } +table#issue_table td#options { vertical-align: middle; text-align: center; min-width: 50px; } table#annual_table { background-color: white; width: 100%; padding: 10px; } -table#annual_table th#aselect { vertical-align: middle; text-align: left; min-width: 10px; } -table#annual_table th#aint_issuenumber { text-align: left; min-width: 0px } -table#annual_table th#aissuenumber { text-align: left; min-width: 20px; } +table#annual_table th#select { vertical-align: middle; text-align: left; max-width: 10px; } +table#annual_table th#aint_issuenumber { text-align: left; max-width: 1px } +table#annual_table th#aissuenumber { text-align: left; max-width: 50px; } table#annual_table th#aissuename { text-align: center; min-width: 200px; } -table#annual_table th#areldate { text-align: center; min-width: 10px; } -table#annual_table th#astatus { text-align: center; min-width: 10px; } -table#annual_table th#aoptions { text-align: center; min-width: 20px; } +table#annual_table th#areldate { text-align: center; max-width: 75px; } +table#annual_table th#astatus { text-align: center; max-width: 75px; } +table#annual_table th#aoptions { text-align: center; min-width: 50px; } -table#annual_table td#aselect { vertical-align: middle; text-align: left; } -table#annual_table td#aint_issuenumber { vertical-align: middle; text-align: left; } -table#annual_table td#aissuenumber { vertical-align: middle; text-align: left; } -table#annual_table td#aissuename { vertical-align: middle; text-align: center; font-size: 9px; } -table#annual_table td#areldate { vertical-align: middle; text-align: center; } -table#annual_table td#astatus { vertical-align: middle; text-align: center; font-size: 13px; } -table#annual_table td#aoptions { vertical-align: middle; text-align: center; } +table#annual_table td#select { vertical-align: middle; text-align: left; max-width: 10px; } +table#annual_table td#aint_issuenumber { vertical-align: middle; text-align: left; max-width: 1 px; } +table#annual_table td#aissuenumber { vertical-align: middle; text-align: left; max-width: 50px; } +table#annual_table td#aissuename { vertical-align: middle; text-align: center; font-size: 9px; min-width: 200px; } +table#annual_table td#areldate { vertical-align: middle; text-align: center; max-width: 75px; } +table#annual_table td#astatus { vertical-align: middle; text-align: center; max-width: 75px; font-size: 13px; } +table#annual_table td#aoptions { vertical-align: middle; text-align: center; min-width: 50px; } table#history_table { background-color: white; width: 100%; font-size: 13px; } diff --git a/data/interfaces/default/comicdetails.html b/data/interfaces/default/comicdetails.html index be742c80..740ed7e6 100644 --- a/data/interfaces/default/comicdetails.html +++ b/data/interfaces/default/comicdetails.html @@ -490,7 +490,7 @@
Mark selected annuals as - @@ -498,22 +498,13 @@ + selected annuals
- - diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html index 12fdc305..9ef92e41 100755 --- a/data/interfaces/default/config.html +++ b/data/interfaces/default/config.html @@ -214,10 +214,6 @@ mins - -
- - mins
Comic Location
@@ -461,6 +457,9 @@ NZB.SU
+
+ +
@@ -478,6 +477,9 @@ DOGNZB
+
+ +
@@ -485,22 +487,6 @@
-
-
- OMGWTFNZBS -
-
-
- - -
-
- - -
-
-
-
Use Experimental Search @@ -596,10 +582,15 @@ %> %for newznab in config['extra_newznabs']: <% - if newznab[4] == '1' or newznab[4] == 1: + if newznab[5] == '1' or newznab[5] == 1: newznab_enabled = "checked" else: newznab_enabled = "" + + if newznab[2] == '1' or newznab[2] == 1: + newznab_verify = "checked" + else: + newznab_verify = "" %>
@@ -610,13 +601,16 @@
+
+ +
- +
- + ( only needed for RSS feed )
@@ -1339,7 +1333,7 @@ $("#add_newznab").click(function() { var intId = $("#newznab_providers > div").size() + deletedNewznabs + 1; - var formfields = $("
"); + var formfields = $("
"); var removeButton = $("
"); removeButton.click(function() { $(this).parent().remove(); @@ -1355,31 +1349,31 @@ }; $('#nma_test').click(function () { - $.get("/testNMA", + $.get("testNMA", function (data) { $('#ajaxMsg').html("
"+data+"
"); }); $('#ajaxMsg').addClass('success').fadeIn().delay(3000).fadeOut(); }); $('#prowl_test').click(function () { - $.get("/testprowl", + $.get("testprowl", function (data) { $('#ajaxMsg').html("
"+data+"
"); }); $('#ajaxMsg').addClass('success').fadeIn().delay(3000).fadeOut(); }); $('#pushover_test').click(function () { - $.get("/testpushover", + $.get("testpushover", function (data) { $('#ajaxMsg').html("
"+data+"
"); }); $('#ajaxMsg').addClass('success').fadeIn().delay(3000).fadeOut(); }); $('#boxcar_test').click(function () { - $.get("/testboxcar", + $.get("testboxcar", function (data) { $('#ajaxMsg').html("
"+data+"
"); }); $('#ajaxMsg').addClass('success').fadeIn().delay(3000).fadeOut(); }); $('#pushbullet_test').click(function () { - $.get("/testpushbullet", + $.get("testpushbullet", function (data) { $('#ajaxMsg').html("
"+data+"
"); }); $('#ajaxMsg').addClass('success').fadeIn().delay(3000).fadeOut(); }); @@ -1396,7 +1390,6 @@ initConfigCheckbox("#enable_torznab"); initConfigCheckbox("#usenzbsu"); initConfigCheckbox("#usedognzb"); - initConfigCheckbox("#useomgwtfnzbs"); initConfigCheckbox("#enable_torrents"); initConfigCheckbox("#torrent_local"); initConfigCheckbox("#torrent_seedbox"); diff --git a/data/interfaces/default/css/data_table.css b/data/interfaces/default/css/data_table.css index ee6eeab3..d8245f53 100755 --- a/data/interfaces/default/css/data_table.css +++ b/data/interfaces/default/css/data_table.css @@ -351,6 +351,92 @@ table.display tr:last-child td { table.display tr td#add .ui-icon { display: inline-block; } +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * DataTables row classes + */ +table.display_no_select tr.odd.gradeA { + background-color: #ddffdd; +} + +table.display_no_select tr.even.gradeA { + background-color: #ddffdd; +} + +table.display_no_select tr.odd.gradeC { + background-color: #ebf5ff; +} + +table.display_no_select tr.even.gradeC { + background-color: #ebf5ff; +} + +table.display_no_select tr.even.gradeH{ + background-color: #FFF5CC; +} + +table.display_no_select tr.odd.gradeH { + background-color: #FFF5CC; +} + +table.display_no_select tr.even.gradeL { + background-color: #ebf5ff; +} + +table.display_no_select tr.odd.gradeL { + background-color: #ebf5ff; +} + +table.display_no_select tr.odd.gradeX { + background-color: #ffdddd; +} + +table.display_no_select tr.even.gradeX { + background-color: #ffdddd; +} + +table.display_no_select tr.odd.gradeU { + background-color: #ddd; +} + +table.display_no_select tr.even.gradeU { + background-color: #eee; +} + +table.display_no_select tr.odd.gradeP { + background-color: #68FC68; +} + +table.display_no_select tr.even.gradeP { + background-color: #68FC68; +} + +table.display_no_select tr.odd.gradeD { + background-color: #C7EFC7; +} + +table.display_no_select tr.odd.gradeZ { + background-color: #FAFAFA; +} + +table.display_no_select tr.even.gradeZ { + background-color: white; +} +table.display_no_select tr.gradeL #status { + background: url("../images/loader_black.gif") no-repeat scroll 15px center transparent; + font-size: 11px; + text-indent: -3000px; +} +table.display_no_select tr.gradeA td, +table.display_no_select tr.gradeC td, +table.display_no_select tr.gradeX td, +table.display_no_select tr.gradeU td, +table.display_no_select tr.gradeP td, +table.display_no_select tr.gradeD td, +table.display_no_select tr.gradeZ td {border-bottom: 1px solid #FFF;} +table.display_no_select tr:last-child td { + border-bottom: 1px solid #eee; +} +table.display_no_select tr td#add .ui-icon { display: inline-block; } /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Misc diff --git a/data/interfaces/default/css/style.css b/data/interfaces/default/css/style.css index 56b89d02..93b87c24 100755 --- a/data/interfaces/default/css/style.css +++ b/data/interfaces/default/css/style.css @@ -286,8 +286,7 @@ input, select, form .checkbox input, .configtable td#middle, -#series_table td#have, -#album_table td#have { +#series_table td#have { vertical-align: middle; } input[type="radio"] { @@ -1228,7 +1227,8 @@ div#artistheader h2 a { min-width: 275px; text-align: left; } -#series_table th#year { +#series_table th#year, +#series_table th#have_percent { max-width: 25px; text-align: left; } @@ -1256,7 +1256,8 @@ div#artistheader h2 a { text-align: left; vertical-align: middle; } -#series_table td#year { +#series_table td#year, +#series_table td#have_percent { max-width: 25px; text-align: left; vertical-align: middle; diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html index 01f09096..e4fb4f77 100755 --- a/data/interfaces/default/index.html +++ b/data/interfaces/default/index.html @@ -15,6 +15,7 @@
+ @@ -46,6 +47,7 @@ +
Year Last Issue PublishedHave % Have Status Active${comic['ComicYear']} # ${comic['LatestIssue']} ${comic['LatestDate']}${comic['percent']} ${css}
${comic['haveissues']}/${comic['totalissues']}
 ${comic['recentstatus']} @@ -74,6 +76,12 @@ $('#series_table').dataTable( { "bDestroy": true, + "aoColumnDefs": [ + { 'bSortable': false, 'aTargets': [5] }, + { 'bVisible': false, 'aTargets': [5] }, + { 'sType': 'numeric', 'aTargets': [5] }, + { 'iDataSort': [5], 'aTargets': [6] } + ], "aLengthMenu": [[10, 25, 50, -1], [10, 25, 50, 'All' ]], "oLanguage": { "sLengthMenu":"Show _MENU_ results per page", diff --git a/data/interfaces/default/manage.html b/data/interfaces/default/manage.html index 050928fe..6d7c5742 100755 --- a/data/interfaces/default/manage.html +++ b/data/interfaces/default/manage.html @@ -44,10 +44,6 @@ (this.value==this.defaultValue) this.value='';" name="path" size="70" /> %endif -
diff --git a/data/interfaces/default/storyarc_detail.html b/data/interfaces/default/storyarc_detail.html index 70501e0a..34ee8fc1 100755 --- a/data/interfaces/default/storyarc_detail.html +++ b/data/interfaces/default/storyarc_detail.html @@ -136,8 +136,6 @@ <%def name="javascriptIncludes()"> - -