Skip to content

Commit

Permalink
Merge branch 'python3-dev'
Browse files Browse the repository at this point in the history 
IMP:(mylar3#1285) Change StoryArc base folder location via config.ini (storyarc_location)
IMP: Set default docker paths for Comic Location (/comics) and SABnzbd Download directory (/downloads) (if not set)
IMP: (API getWanted results empty  mylar3#1266) getWanted API endpoint will now return issues and annuals (and story_arcs when queried for)
FIX:(mylar3#1277) invalid issue numbering with Alpha & Omega during rename
FIX:(mylar3#1295) Make sure to reset the sort counter if no series are present after removing from watchlist
FIX:(mylar3#1284) trailing slash in url if not present
FIX:(mylar3#1297) Fypo correction
FIX: Adding series with legacy numbering (issue number in brackets)
FIX: imprint field being used within Folder Format string causing extra spaces
FIX: DBUpdater would traceback and kill scheduled job on CV entries with no comicid
FIX: (DC 2022 Annual not downloading from GetComics mylar3#1059) 2022 Annuals not being searched / detected properly
FIX: Resuming DDL would cause progress bars to display incorrect % and elongated bar
FIX: DDL Manage page could have duplicates listed (one with a Volume, one without)
FIX: Changing series directory location and then changing booktype would reset the directory location to the default instead of previously set one
FIX: Storyarc would not rename existing files within arc directory with updated reading order number
FIX: Post-processing an issue that belongs to multiple arcs would only post-process against one arc and then cause an error
FIX: Manual post-processing of story arc issues that are not on watchlist would result in a volume-related error in some cases
FIX: (Missing issue count in Have column on main page mylar3#1270) issue count missing on main page (default theme)
FIX: Storyarc issue count not showing on detail page
FIX: Unable to properly load resizeimage function on storyarc detail page when image present
FIX: Manage DDL showing duplicate buttons
FIX: Secondary watermark on series detail page was not aligned within column
FIX:(mylar3#1278) Editing series location path via Edit Settings would not take initial value (had to repeat steps)
FIX: Variable error on startup (docker)
FIX: CDH category removal if not present when querying SABnzbd history
FIX: Remove eta variable from sabnzbd response as no longer supported (and wasn't really used)
FIX: Manage page would not show full annual titles but just the series it was attached to (ie. Series as opposed to Series Annual)
  • Loading branch information
@evilhero
evilhero committed Dec 9, 2022
2 parents bbccef9 + 000fb43 commit 5c1b5e2
Show file tree
Hide file tree
Showing 21 changed files with 619 additions and 310 deletions.
9 changes: 7 additions & 2 deletions data/interfaces/default/comicdetails_update.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1574,7 +1574,11 @@ <h3><i><span id="series_status" style="margin-bottom:0px;margin-top:10px;positio
"targets": [1],
"visible": true,
"render": function (data,type,full){
return full[0];
if (full[12]){
return '<span title="Legacy numbering #' + full[12] + '">' + full[0] + '*</span>';
} else {
return full[0];
}
}
},
{
Expand Down Expand Up @@ -1625,7 +1629,7 @@ <h3><i><span id="series_status" style="margin-bottom:0px;margin-top:10px;positio
if (full[5] !== null){
response = '<center>' + full[3] + '<a href="#" title="' + full[5] + ' (' + full[6] + ')"><img src="images/info32.png" height="16" alt="" class="highqual" /></a></center>';
if (full[11] == 'secondary'){
response += '<div style="position:relative;"><span class="watermark"><center>SECONDARY</center></span></div>';
response += '<div style="position:relative;left:-60px;"><span class="watermark"><center>SECONDARY</center></span></div>';
}
} else {
response = '<center>'+full[3]+'</center>';
Expand Down Expand Up @@ -1744,6 +1748,7 @@ <h3><i><span id="series_status" style="margin-bottom:0px;margin-top:10px;positio
//[9] = digitaldate;
//[10] = storedate;
//[11] = secondary;
//[12] = alt_issuenumber;
return nRow;
},
"drawCallback": function (settings) {
Expand Down
11 changes: 9 additions & 2 deletions data/interfaces/default/css/data_table.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,24 +109,31 @@ table.display thead th {
background-color: white;
font-weight: bold;
font-size: 14px;
border-bottom: 1px solid #white;
border-bottom-width: 3px;
text-align: center;
}

table.display tfoot th {
padding: 3px 18px 3px 10px;
border-top: 1px solid black;
border-top: 1px solid white;
font-weight: bold;
}

table.display tr.heading2 td {
border-bottom: 1px solid #aaa;
text-align: center;
vertical-align:middle;
}

table.display td {
border-bottom: 1px solid #white;
border-right: 1px solid #white;
vertical-align: middle;
padding: 4px 5px;
font-size: 12px;
text-align: center;
}
table
table.display td.center {
text-align: center;
}
Expand Down
7 changes: 3 additions & 4 deletions data/interfaces/default/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1788,8 +1788,7 @@ DIV.progress-container
/*width: 100px;*/
height: 18px;
/*margin: 2px 5px 2px 0;*/
float: left;
border:1px solid #ccc;
-border:1px solid #ccc;
background-color: #F7F7F7;
background-image: -moz-linear-gradient(top, whiteSmoke, #F9F9F9);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(whiteSmoke), to(#F9F9F9));
Expand Down Expand Up @@ -1900,7 +1899,7 @@ DIV.series-progress-container > DIV
.progressbar-back-text
{
font-size: 12px;
vertical-align: middle;
vertical-align: text-bottom;
background-color: transparent;
position: absolute;
text-align: center;
Expand All @@ -1911,7 +1910,7 @@ DIV.series-progress-container > DIV
.progressbar-front-text
{
font-size: 12px;
vertical-align: text-top;
vertical-align: text-bottom;
background-color: transparent;
display: block;
width: 100%;
Expand Down
27 changes: 21 additions & 6 deletions data/interfaces/default/queue_management.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@ <h2><center><bold>ACTIVE</bold></center></h2>
</div>
<div style="display: flex; justify-content: flex-end">
<div id="btn_container"><div id="btn_menu" style="display:none;">
<a id="arestartddl" name="restartddl" href="#" title="Restart stalled download" data-success="Restarted Download">Restart Download</a></br>
<span id="aresume_ddl"><a id="aresumeddl" name="resumeddl" href="#" title="Resume download" data-success="Resumed Download">Resume Download</a></br></span>
<a id="aabortddl" name="abortddl" href="#" title="Abort download" data-success="Aborted Download">Abort Download</a></br>
<a style="display:none;" id="arestartddl" name="restartddl" href="#" title="Restart stalled download" data-success="Restarted Download">Restart Download</a></br>
<span id="aresume_ddl"><a style="display:none;" id="aresumeddl" name="resumeddl" href="#" title="Resume download" data-success="Resumed Download">Resume Download</a></br></span>
<a style="display:none;" id="aabortddl" name="abortddl" href="#" title="Abort download" data-success="Aborted Download">Abort Download</a></br>
</div></div>
</div>
<div id="active_queue" style="display:none;">
<table width="100%" cellpadding="5" cellspacing="5">
<tbody>
<div style="display: flex; justify-content: flex-end">
<div id="btn_container"><div id="btn_menu">
<a id="qrestartddl" name="restartddl" href="#" title="Restart stalled download" data-success="Restarted Download">Restart Download</a></br>
<a id="qresumeddl" name="resumeddl" href="#" title="Resume download" data-success="Resumed Download">Resume Download</a></br>
<a id="qabortddl" name="abortddl" href="#" title="Abort download" data-success="Aborted Download">Abort Download</a>
<a id="qrestartddl" style="display:none;" name="restartddl" href="#" title="Restart stalled download" data-success="Restarted Download">Restart Download</a></br>
<a id="qresumeddl" style="display:none;" name="resumeddl" href="#" title="Resume download" data-success="Resumed Download">Resume Download</a></br>
<a id="qabortddl" style="display:none;" name="abortddl" href="#" title="Abort download" data-success="Aborted Download">Abort Download</a>
</div></div>
</div>
<tr><td id="series" align="center" style="text-align:center"></td></tr>
Expand Down Expand Up @@ -109,7 +109,15 @@ <h2><center><bold>HISTORY</bold></center></h2>
document.getElementById("size").innerHTML = obj['a_size'];
document.getElementById("status").innerHTML = status;
qmm = document.getElementById("btn_menu");
if (qmm.style.display == "inline-block"){
document.getElementById("arestartddl").style.display = "none";
document.getElementById("aresume_ddl").style.display = "none";
document.getElementById("aabortddl").style.display = "none";
}
qmm.style.display = "inline-block";
document.getElementById("qrestartddl").style.display = "block";
document.getElementById("qresumeddl").style.display = "block";
document.getElementById("qabortddl").style.display = "block";
$("#qrestartddl").attr('onClick', "ajaxcallit('restart', '"+aid+"')");
$("#qresumeddl").attr('onClick', "ajaxcallit('resume', '"+aid+"')");
$("#qabortddl").attr('onClick', "ajaxcallit('abort', '"+aid+"')");
Expand All @@ -120,7 +128,14 @@ <h2><center><bold>HISTORY</bold></center></h2>
acq.style.display = "none";
document.getElementById("amessage").innerHTML = status;
qmm = document.getElementById("btn_menu");
if (qmm.style.display == "inline-block"){
document.getElementById("qresumeddl").style.display = "none";
document.getElementById("qresumeddl").style.display = "none";
document.getElementById("qresumeddl").style.display = "none";
}
qmm.style.display = "inline-block";
document.getElementById("arestartddl").style.display = "block";
document.getElementById("aabortddl").style.display = "block";
$("#arestartddl").attr('onClick', "ajaxcallit('restart', '"+aid+"')");
//$("#aresumeddl").attr('onClick', "ajaxcallit('resume', '"+aid+"')");
document.getElementById("aresume_ddl").style.display = "none";
Expand Down
2 changes: 1 addition & 1 deletion data/interfaces/default/storyarc.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ <h1 class="clearfix"><img src="${icons['ReadingList-icon']}" height="26" width="
<legend>Global StoryArc Options</legend>
<div class="row checkbox left clearfix">
<%
storyarcdest = os.path.join(mylar.CONFIG.DESTINATION_DIR, 'StoryArcs')
storyarcdest = mylar.CONFIG.STORYARC_LOCATION
%>
<input type="checkbox" style="vertical-align: middle; margin: 3px; margin-top: -1px;" onclick="getOption(this)" name="storyarcdir" id="storyarcdir" value="1" ${checked(mylar.CONFIG.STORYARCDIR)} /><label>Arcs in StoryArc Directory </br><small>(${storyarcdest})</small></label>
</div>
Expand Down
31 changes: 14 additions & 17 deletions data/interfaces/default/storyarc_detail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,19 @@
</div>
</%def>

<script>
$('#banner').load(
function (height) {
var myImg = document.getElementById("banner");
var bannerh = "${bannerheight}";
myImg.style.height = bannerh + "px";
});
</script>
<%def name="body()">
<input type="hidden" id="page_name" value="storyarc_detail" />
<h1 class="clearfix"><a href="storyarc_main"><img src="${icons['ReadingList-icon']}" height="26" width="26" align="left" alt="Story Arc Management"/></a></h1>
%if storyarcbanner is not None:
<img src="${storyarcbanner}" onload="resizeimage('${bannerheight}')" width="960" height="${bannerheight}" id="banner" style="text-decoration: none; position: relative; top: 40px;"/>
<img src="${storyarcbanner}" width="960" height="${bannerheight}" id="banner" style="text-decoration: none; position: relative; top: 40px;"/>
%else:
</br>
%endif
Expand All @@ -43,11 +51,11 @@ <h1 class="clearfix"><a href="storyarc_main"><img src="${icons['ReadingList-icon
<form action="arcOptions" id="chkoptions" method="GET">
<%
if arcdetail['percent'] == 101:
css = '<div class=\"progress-container warning\">'
css = '<div class=\"series-progress-container warning\">'
if arcdetail['percent'] == 100:
css = '<div class=\"progress-container complete\">'
css = '<div class=\"series-progress-container complete\">'
if arcdetail['percent'] < 100:
css = '<div class=\"progress-container missing\">'
css = '<div class=\"series-progress-container missing\">'

%>
<fieldset>
Expand Down Expand Up @@ -83,13 +91,13 @@ <h1 class="clearfix"><a href="storyarc_main"><img src="${icons['ReadingList-icon
</div>
<div style="display:block;float:right;position:relative;text-color:black;top:-130px;">
<h1><p style="display:inline;float:right;">${storyarcname}</h1>
<div style="display:inline;float:right;"><span title="${arcdetail['percent']}"></span>${css}<div style="width:${arcdetail['percent']}%"><span class="progressbar-front-text">${arcdetail['Have']}/${arcdetail['Total']}</span></div></div></div>
<div style="display:inline;position:relative;float:right;top:7px;"><span title="${arcdetail['percent']}"></span>${css}<div style="width:${arcdetail['percent']}%"><span class="progressbar-front-text">${arcdetail['Have']}/${arcdetail['Total']}</span></div></div></div>
</div>
<%
if storyarcbanner is None:
optpos = '<div style=\"display:block;float:right;position:absolute;right:20px;top:120px;\">'
else:
optpos = '<div style=\"display:block;float:right;position:absolute;right:20px;top:100px;\">'
optpos = '</br><div style=\"display:block;float:right;position:absolute;right:20px;top:120px;\">'
%>
${optpos}
<form action="downloadBanner" method="GET">
Expand Down Expand Up @@ -259,14 +267,10 @@ <h1><p style="display:inline;float:right;">${storyarcname}</h1>
}
});
});
</script>
<script type="text/javascript">
$("#menu_link_scan").click(function() {
$('#chkoptions').submit();
return true;
});
</script>
<script type="text/javascript">
function zoomin(){
var myImg = document.getElementById("banner");
var currHeight = myImg.clientHeight;
Expand All @@ -285,10 +289,6 @@ <h1><p style="display:inline;float:right;">${storyarcname}</h1>
myImg.style.height = (currHeight - 50) + "px";
}
}
function resizeimage(height) {
var myImg = document.getElementById("banner");
myImg.style.height = height + "px";
}
function getHeight(comicid, action) {
var myImg = document.getElementById("banner");
var curHeight = myImg.clientHeight;
Expand All @@ -310,8 +310,6 @@ <h1><p style="display:inline;float:right;">${storyarcname}</h1>
},
});
}
</script>
<script>
function initThisPage() {
$(function() {
$( "#tabs" ).tabs();
Expand All @@ -334,7 +332,6 @@ <h1><p style="display:inline;float:right;">${storyarcname}</h1>
})
resetFilters("item");
}

$(document).ready(function() {
initThisPage();
initActions();
Expand Down
31 changes: 14 additions & 17 deletions data/interfaces/default/storyarc_detail.poster.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@ <h1 class="clearfix"><a href="storyarc_main"><img src="${icons['ReadingList-icon
</div>
</%def>

<script>
$('#banner').load(
function () {
var myImg = document.getElementById("banner");
var bannerw = "${bannerwidth}";
myImg.style.width = bannerw + "px";
});
</script>

<%def name="body()">
<input type="hidden" id="page_name" value="storyarc_detail" />
</br></br>
Expand All @@ -37,17 +46,17 @@ <h1 class="clearfix"><a href="storyarc_main"><img src="${icons['ReadingList-icon
<fieldset>
<div id="aristImg">
%if storyarcbanner is not None:
<img src="${storyarcbanner}" onload="resizeimage('${bannerwidth}')" height="400" width="${bannerwidth}" id="banner" style="text-decoration: none;position: relative;top:0px;right:0px;left:0px;"/>
<img src="${storyarcbanner}" height="400" width="${bannerwidth}" id="banner" style="text-decoration: none;position: relative;top:0px;right:0px;left:0px;"/>
%else:
</br>
%endif
<%
if arcdetail['percent'] == 101:
css = '<div class=\"progress-container warning\">'
css = '<div class=\"series-progress-container warning\">'
if arcdetail['percent'] == 100:
css = '<div class=\"progress-container complete\">'
css = '<div class=\"series-progress-container complete\">'
if arcdetail['percent'] < 100:
css = '<div class=\"progress-container missing\">'
css = '<div class=\"series-progress-container missing\">'

%>
<div style="display:table;margin:auto;position:relative;top:0px;"><span title="${arcdetail['percent']}"></span>${css}<div style="width:${arcdetail['percent']}%"><span class="progressbar-front-text">${arcdetail['Have']}/${arcdetail['Total']}</span></div></div></div>
Expand Down Expand Up @@ -89,7 +98,7 @@ <h1 class="clearfix"><a href="storyarc_main"><img src="${icons['ReadingList-icon
</form>
</div>
<%
optpos = '<div style=\"display:block;float:right;position:relative;right:20px;top:-10px;\">'
optpos = '<div style=\"display:block;float:right;position:relative;right:20px;top:50px;\">'
%>
${optpos}
<form action="downloadBanner" method="GET">
Expand All @@ -101,8 +110,6 @@ <h1 class="clearfix"><a href="storyarc_main"><img src="${icons['ReadingList-icon
%if storyarcbanner is not None:
<p style="display:inline;float:right;">
<input type="hidden" name="height" id="height" value="" />
<button type="button" onclick="zoomin()">Zoom In</button>
<button type="button" onclick="zoomout()">Zoom Out</button>
<button type="button" onclick="getWidth('${storyarcid}', 'delete')" data-success="Successfully deleted banner image">Clear</button>
<button type="button" onclick="getWidth('${storyarcid}', 'save')" data-success="Saved new height dimensions for banner">Save</button>
</p>
Expand Down Expand Up @@ -262,14 +269,10 @@ <h1 class="clearfix"><a href="storyarc_main"><img src="${icons['ReadingList-icon
}
});
});
</script>
<script type="text/javascript">
$("#menu_link_scan").click(function() {
$('#chkoptions').submit();
return true;
});
</script>
<script type="text/javascript">
function zoomin(){
var myImg = document.getElementById("banner");
var currWidth = myImg.clientWidth;
Expand All @@ -288,10 +291,6 @@ <h1 class="clearfix"><a href="storyarc_main"><img src="${icons['ReadingList-icon
myImg.style.width = (currWidth - 50) + "px";
}
}
function resizeimage(width) {
var myImg = document.getElementById("banner");
myImg.style.width = width + "px";
}
function getWidth(comicid, action) {
var myImg = document.getElementById("banner");
var curWidth = myImg.clientWidth;
Expand All @@ -313,8 +312,6 @@ <h1 class="clearfix"><a href="storyarc_main"><img src="${icons['ReadingList-icon
},
});
}
</script>
<script>
function initThisPage() {
$(function() {
$( "#tabs" ).tabs();
Expand Down
Loading

0 comments on commit 5c1b5e2

Please sign in to comment.