From 47445452a7e339d54298bc2dc1baa3a15cb9d510 Mon Sep 17 00:00:00 2001
From: Roberto Pastor <wedge.hero@gmail.com>
Date: Wed, 14 Dec 2016 08:54:16 +0100
Subject: [PATCH] Added download link on story arc list when issue is
 downloaded. Changed some lines indent.

---
 data/interfaces/default/storyarc_detail.html | 150 ++++++++++---------
 1 file changed, 76 insertions(+), 74 deletions(-)

diff --git a/data/interfaces/default/storyarc_detail.html b/data/interfaces/default/storyarc_detail.html
index 18818d68..42e9f67a 100755
--- a/data/interfaces/default/storyarc_detail.html
+++ b/data/interfaces/default/storyarc_detail.html
@@ -14,19 +14,19 @@
 			<a id="menu_link_delete" href="#">Remove Read</a>
 			<a id="menu_link_delete" href="#">Clear File Cache</a>
                         <a id="menu_link_refresh" onclick="doAjaxCall('SearchArcIssues?StoryArcID=${storyarcid}',$(this),'table')" data-success="Now searching for Missing StoryArc Issues">Search for Missing</a>
-                        <a id="menu_link_refresh" onclick="doAjaxCall('ArcWatchlist?StoryArcID=${storyarcid}',$(this),'table')" data-success="Now searching for matches on Watchlist">Search for Watchlist matches</a> 
+                        <a id="menu_link_refresh" onclick="doAjaxCall('ArcWatchlist?StoryArcID=${storyarcid}',$(this),'table')" data-success="Now searching for matches on Watchlist">Search for Watchlist matches</a>
                         %if cvarcid:
-                            <a id="menu_link_refresh" onclick="doAjaxCall('addStoryArc_thread?arcid=${storyarcid}&cvarcid=${cvarcid}&storyarcname=${storyarcname}&arcrefresh=True',$(this),'table')" data-success="Refreshed Story Arc">Refresh Story Arc</a> 
+                            <a id="menu_link_refresh" onclick="doAjaxCall('addStoryArc_thread?arcid=${storyarcid}&cvarcid=${cvarcid}&storyarcname=${storyarcname}&arcrefresh=True',$(this),'table')" data-success="Refreshed Story Arc">Refresh Story Arc</a>
                         %endif
 		</div>
-	</div>	
+	</div>
 </%def>
 
 <%def name="body()">
 	<div id="paddingheader">
 		<h1 class="clearfix"><a href="storyarc_main"><img src="interfaces/default/images/ReadingList-icon.png" height="26" width="26" alt="Story Arc Management"/>Story Arc Management</a></h1>
 	</div>
-         <center><h1>${storyarcname}</h1></center>        
+         <center><h1>${storyarcname}</h1></center>
          <div id="tabs">
                 <ul>
                         <li><a href="#tabs-1">Options</a></li>
@@ -71,87 +71,89 @@
 	<table class="display" id="read_detail">
 		<thead>
 			<tr>
-                                <th id="readingorder"></th>
-                                <th id="comicname">ComicName</th>
-                                <th id="issue">Issue</th>
-                                <th id="issuedate">Pub Date</th>
+        <th id="readingorder"></th>
+        <th id="comicname">ComicName</th>
+        <th id="issue">Issue</th>
+        <th id="issuedate">Pub Date</th>
 				<th id="status">Status</th>
 				<th id="action">Options</th>
 			</tr>
 		</thead>
 		<tbody>
-                <%
-                     cids = listLibrary()
-                %>
+        <%
+             cids = listLibrary()
+        %>
 		%for item in readlist:
-                        <%
-                                if item['Status'] == 'Skipped':
-                                        grade = 'Z'
-                                elif item['Status'] == 'Wanted':
-                                        grade = 'X'
-                                elif item['Status'] == 'Snatched':
-                                        grade = 'C'
-                                elif item['Status'] == 'Downloaded':
-                                        grade = 'A'
-                                elif item['Status'] == 'Archived':
-                                        grade = 'A'
-                                elif item['Status'] == 'Ignored':
-                                        grade = 'A'
-                                elif item['Status'] == 'Failed':
-                                        grade = 'C'
-                                elif item['Status'] == 'Read':
-                                        grade = 'C'
-                                elif item['Status'] == 'Not Watched':
-                                        grade = 'X'
-                                else:
-                                        grade = 'Z'
+        <%
+                if item['Status'] == 'Skipped':
+                        grade = 'Z'
+                elif item['Status'] == 'Wanted':
+                        grade = 'X'
+                elif item['Status'] == 'Snatched':
+                        grade = 'C'
+                elif item['Status'] == 'Downloaded':
+                        grade = 'A'
+                elif item['Status'] == 'Archived':
+                        grade = 'A'
+                elif item['Status'] == 'Ignored':
+                        grade = 'A'
+                elif item['Status'] == 'Failed':
+                        grade = 'C'
+                elif item['Status'] == 'Read':
+                        grade = 'C'
+                elif item['Status'] == 'Not Watched':
+                        grade = 'X'
+                else:
+                        grade = 'Z'
 
-                                if item['ComicID'] in cids:
-                                        haveit = cids[item['ComicID']]
-                                else:
-                                        haveit = "No"
+                if item['ComicID'] in cids:
+                        haveit = cids[item['ComicID']]
+                else:
+                        haveit = "No"
 
-                        %>
+        %>
 
-                         <tr id="${item['ReadingOrder']}" class="grade${grade}">
-                                <td id="readingorder">${item['ReadingOrder']}</td>
-                                <td id="comicname" title="${item['IssueName']}">
-                                %if haveit == "No":
-                                     ${item['ComicName']} (${item['SeriesYear']})
-                                %else:
-                                    <a href="comicDetails?ComicID=${haveit}">${item['ComicName']} (${item['SeriesYear']})</a>
+         <tr id="${item['ReadingOrder']}" class="grade${grade}">
+                <td id="readingorder">${item['ReadingOrder']}</td>
+                <td id="comicname" title="${item['IssueName']}">
+                %if haveit == "No":
+                     ${item['ComicName']} (${item['SeriesYear']})
+                %else:
+                    <a href="comicDetails?ComicID=${haveit}">${item['ComicName']} (${item['SeriesYear']})</a>
 
-                                %endif
-                                </td>
+                %endif
+                </td>
 
-                                <td id="issue">${item['IssueNumber']}</td>
-                                <% 
-                                    try:
-                                        if item['IssueDate'] != '0000-00-00' and item['IssueDate'] is not None:
-                                            issuedate = item['IssueDate']
-                                        else:
-                                            if item['StoreDate'] != '0000-00-00' and item['StoreDate'] is not None:
-                                                issuedate = item['IssueDate']
-                                            else:
-                                                # this is needed for imported cbl's
-                                                try:
-                                                    issuedate = item['issueYEAR']
-                                                except:
-                                                    issuedate = '0000-00-00'
-                                    except:
-                                        issuedate = '0000-00-00'
-                                 %>
-                                <td id="issuedate">${issuedate}</td>
-                                <td id="status">${item['Status']}</td>
-                                <td id="action">
-                                 %if item['Status'] is None or item['Status'] == None:
-                                     <a href="#" onclick="doAjaxCall('queueit?ComicName=${item['ComicName'] | u}&ComicIssue=${item['IssueNumber']}&ComicYear=${issuedate}&mode=readlist&SARC=${item['StoryArc']}&IssueArcID=${item['IssueArcID']}&SeriesYear=${item['SeriesYear']}',$(this),'table')" data-success="Now searching for ${item['ComicName']} #${item['IssueNumber']}"><span class="ui-icon ui-icon-plus"></span>Grab it</a>
-                                     <a title="Remove Issue from Story Arc" onclick="doAjaxCall('removefromreadlist?IssueArcID=${item['IssueArcID']}',$(this),'table')" data-success='Successfully deleted ${item['IssueArcID']}'><span class="ui-icon ui-icon-minus"></span>Remove it</a>
-                                 %elif item['Status'] == 'Snatched':
-                                     <a href="#" onclick="doAjaxCall('queueissue?ComicName=${item['ComicName'] | u}&ComicIssue=${item['IssueNumber']}&ComicYear=${issuedate}&mode=readlist&SARC=${item['StoryArc']}&IssueArcID=${item['IssueArcID']}&SeriesYear=${item['SeriesYear']}',$(this),'table')" data-success="Trying to Retry"><span class="ui-icon ui-icon-plus"></span>Retry</a>
-                                 %endif
-                                </td>
-                         </tr>
+                <td id="issue">${item['IssueNumber']}</td>
+                <%
+                    try:
+                        if item['IssueDate'] != '0000-00-00' and item['IssueDate'] is not None:
+                            issuedate = item['IssueDate']
+                        else:
+                            if item['StoreDate'] != '0000-00-00' and item['StoreDate'] is not None:
+                                issuedate = item['IssueDate']
+                            else:
+                                # this is needed for imported cbl's
+                                try:
+                                    issuedate = item['issueYEAR']
+                                except:
+                                    issuedate = '0000-00-00'
+                    except:
+                        issuedate = '0000-00-00'
+                 %>
+                <td id="issuedate">${issuedate}</td>
+                <td id="status">${item['Status']}</td>
+                <td id="action">
+                 %if item['Status'] is None or item['Status'] == None:
+                     <a href="#" onclick="doAjaxCall('queueit?ComicName=${item['ComicName'] | u}&ComicIssue=${item['IssueNumber']}&ComicYear=${issuedate}&mode=readlist&SARC=${item['StoryArc']}&IssueArcID=${item['IssueArcID']}&SeriesYear=${item['SeriesYear']}',$(this),'table')" data-success="Now searching for ${item['ComicName']} #${item['IssueNumber']}"><span class="ui-icon ui-icon-plus"></span>Grab it</a>
+                     <a title="Remove Issue from Story Arc" onclick="doAjaxCall('removefromreadlist?IssueArcID=${item['IssueArcID']}',$(this),'table')" data-success='Successfully deleted ${item['IssueArcID']}'><span class="ui-icon ui-icon-minus"></span>Remove it</a>
+                 %elif item['Status'] == 'Snatched':
+                     <a href="#" onclick="doAjaxCall('queueissue?ComicName=${item['ComicName'] | u}&ComicIssue=${item['IssueNumber']}&ComicYear=${issuedate}&mode=readlist&SARC=${item['StoryArc']}&IssueArcID=${item['IssueArcID']}&SeriesYear=${item['SeriesYear']}',$(this),'table')" data-success="Trying to Retry"><span class="ui-icon ui-icon-plus"></span>Retry</a>
+                 %elif item['Status'] == 'Downloaded' and item['Location'] is not None:
+                     <a href="downloadthis?pathfile=${item['Location'] |u}"><img src="interfaces/default/images/download_icon.png" height="25" width="25" title="Download the Issue" class="highqual" /></a>
+                 %endif
+                </td>
+         </tr>
 		%endfor
 		</tbody>
 	</table>