mirror of https://github.com/evilhero/mylar
FIX:(#1583) Fixed sorting by have column so it is now percentage of completion, FIX: Adjusted the column lengths in order to accomodate everything on one line instead of overflowing rows
This commit is contained in:
evilhero
parent
cc7c4a790d
commit
145df6e9f5
|
|
@ -925,16 +925,18 @@ div#artistheader h2 a {
|
|||
text-align: left;
|
||||
}
|
||||
#read_detail th#comicname {
|
||||
min-width: 300px;
|
||||
min-width: 290px;
|
||||
text-align: left;
|
||||
}
|
||||
#read_detail th#issue {
|
||||
max-width: 25px;
|
||||
max-width: 20px;
|
||||
text-align: center;
|
||||
}
|
||||
#read_detail th#issuedate,
|
||||
#read_detail th#status,
|
||||
#read_detail th#statuschange {
|
||||
#read_detail th#status {
|
||||
max-width: 80px;
|
||||
text-align: center;
|
||||
}
|
||||
#read_detail th#issuedate {
|
||||
max-width: 50px;
|
||||
text-align: center;
|
||||
}
|
||||
|
|
@ -944,19 +946,22 @@ div#artistheader h2 a {
|
|||
vertical-align: middle;
|
||||
}
|
||||
#read_detail td#comicname {
|
||||
min-width: 300px;
|
||||
min-width: 290px;
|
||||
text-align: left;
|
||||
vertical-align: middle;
|
||||
font-size: 12px;
|
||||
}
|
||||
#read_detail td#issue {
|
||||
max-width: 25px;
|
||||
max-width: 20px;
|
||||
text-align: left;
|
||||
vertical-align: middle;
|
||||
}
|
||||
#read_detail td#issuedate,
|
||||
#read_detail td#status,
|
||||
#read_detail td#statuschange {
|
||||
#read_detail td#status {
|
||||
max-width: 80px;
|
||||
text-align: center;
|
||||
vertical-align: middle;
|
||||
}
|
||||
#read_detail td#issuedate {
|
||||
max-width: 50px;
|
||||
text-align: center;
|
||||
vertical-align: middle;
|
||||
|
|
@ -1238,27 +1243,38 @@ div#artistheader h2 a {
|
|||
text-align: left;
|
||||
}
|
||||
#series_table th#name {
|
||||
min-width: 275px;
|
||||
min-width: 300px;
|
||||
text-align: left;
|
||||
}
|
||||
#series_table th#year {
|
||||
max-width: 25px;
|
||||
text-align: left;
|
||||
}
|
||||
#series_table th#have_percent,
|
||||
#series_table th#active_status {
|
||||
max-width: 25px;
|
||||
#series_table th#havepercent,
|
||||
#series_table th#totalcount {
|
||||
max-width: 1px;
|
||||
text-align: left;
|
||||
display: none;
|
||||
}
|
||||
#series_table th#activestatus {
|
||||
max-width: 1px;
|
||||
text-align: left;
|
||||
display: none;
|
||||
}
|
||||
#series_table th#active {
|
||||
max-width: 40px;
|
||||
max-width: 25px;
|
||||
text-align: left;
|
||||
}
|
||||
#series_table th#issue{
|
||||
min-width: 30px;
|
||||
text-align: left;
|
||||
}
|
||||
#series_table th#status {
|
||||
max-width: 50px;
|
||||
text-align: left;
|
||||
}
|
||||
#series_table th#status,
|
||||
#series_table th#issue,
|
||||
#series_table th#published {
|
||||
min-width: 50px;
|
||||
max-width: 50px;
|
||||
text-align: left;
|
||||
}
|
||||
#series_table th#have {
|
||||
|
|
@ -1271,32 +1287,46 @@ div#artistheader h2 a {
|
|||
font-size: 12px;
|
||||
}
|
||||
#series_table td#name {
|
||||
min-width: 275px;
|
||||
min-width: 300px;
|
||||
text-align: left;
|
||||
vertical-align: middle;
|
||||
}
|
||||
#series_table td#year,
|
||||
#series_table td#year {
|
||||
max-width: 25px;
|
||||
text-align: left;
|
||||
vertical-align: middle;
|
||||
}
|
||||
#series_table td#have_percent,
|
||||
#series_table td#active_status {
|
||||
max-width: 25px;
|
||||
#series_table td#havepercent,
|
||||
#series_table td#totalcount {
|
||||
max-width: 1px;
|
||||
text-align: left;
|
||||
vertical-align: middle;
|
||||
display: none;
|
||||
}
|
||||
#series_table td#activestatus {
|
||||
max-width: 1px;
|
||||
text-align: left;
|
||||
vertical-align: middle;
|
||||
display: none;
|
||||
}
|
||||
#series_table td#active {
|
||||
max-width: 40px;
|
||||
max-width: 25px;
|
||||
text-align: center;
|
||||
vertical-align: middle;
|
||||
}
|
||||
#series_table td#issue {
|
||||
max-width: 30px;
|
||||
text-align: left;
|
||||
vertical-align: middle;
|
||||
}
|
||||
#series_table td#status,
|
||||
#series_table td#issue,
|
||||
#series_table td#status {
|
||||
max-width: 50px;
|
||||
text-align: center;
|
||||
vertical-align: middle;
|
||||
}
|
||||
#series_table td#published {
|
||||
max-width: 50px;
|
||||
text-align: left;
|
||||
text-align: center;
|
||||
vertical-align: middle;
|
||||
}
|
||||
#manageheader {
|
||||
|
|
|
|||
|
|
@ -16,11 +16,12 @@
|
|||
<th id="year">Year</th>
|
||||
<th id="issue">Last Issue</th>
|
||||
<th id="published">Published</th>
|
||||
<th class="hidden" id="have_percent">Have %</th>
|
||||
<th class="hidden" id="havepercent">Have %</th>
|
||||
<th id="have">Have</th>
|
||||
<th class="hidden" id="totalcount">Total</th>
|
||||
<th id="status">Status</th>
|
||||
<th id="active">Active</th>
|
||||
<th class="hidden" id="active_state">ActiveSt</th>
|
||||
<th class="hidden" id="activestatus">ActiveSt</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
|
@ -43,7 +44,7 @@
|
|||
else:
|
||||
tissues = comic['totalissues']
|
||||
|
||||
comic_percent = int(hissues) + decimal.Decimal(tissues) / decimal.Decimal('1000')
|
||||
comic_percent = comic['percent']
|
||||
|
||||
if comic['Status'] == 'Paused':
|
||||
grade = 'X'
|
||||
|
|
@ -54,15 +55,30 @@
|
|||
else:
|
||||
grade = 'A'
|
||||
|
||||
comicpub = comic['ComicPublisher']
|
||||
try:
|
||||
if len(comic['ComicPublisher']) > 15:
|
||||
comicpub = comic['ComicPublisher'][:15] + '...'
|
||||
except:
|
||||
pass
|
||||
|
||||
comicname = comic['ComicSortName']
|
||||
try:
|
||||
if len(comic['ComicSortName']) > 55:
|
||||
comicname = comic['ComicSortName'][:55] + '...'
|
||||
except:
|
||||
pass
|
||||
|
||||
%>
|
||||
<tr class="grade${grade}">
|
||||
<td id="publisher">${comic['ComicPublisher']}</td>
|
||||
<td id="name"><span title="${comic['ComicSortName']}"></span><a href="comicDetails?ComicID=${comic['ComicID']}">${comic['ComicName']}</a></td>
|
||||
<td id="publisher"><span title="${comicpub}"></span>${comicpub}</td>
|
||||
<td id="name"><span title="${comicname}"></span><a title="${comic['ComicName']}" href="comicDetails?ComicID=${comic['ComicID']}">${comicname}</a></td>
|
||||
<td id="year"><span title="${comic['ComicYear']}"></span>${comic['ComicYear']}</td>
|
||||
<td id="issue"><span title="${comic['LatestIssue']}"></span># ${comic['LatestIssue']}</td>
|
||||
<td id="published">${comic['LatestDate']}</td>
|
||||
<td class="hidden" id="have_percent">${comic_percent}</td>
|
||||
<td class="hidden" id="havepercent">${comic_percent}</td>
|
||||
<td id="have"><span title="${comic['percent']}"></span>${css}<div style="width:${comic['percent']}%"><span class="progressbar-front-text">${comic['haveissues']}/${comic['totalissues']}</span></div></td>
|
||||
<td class="hidden" id="totalcount">${comic['totalissues']}</td>
|
||||
<td id="status">${comic['recentstatus']}</td>
|
||||
<td id="active" align="center">
|
||||
%if comic['Status'] == "Active":
|
||||
|
|
@ -75,7 +91,7 @@
|
|||
<img src="interfaces/default/images/cross.png" alt="N" width="16" height="16" />
|
||||
%endif
|
||||
</td>
|
||||
<td class="hidden" id="active_state">${comic['Status']}</td>
|
||||
<td class="hidden" id="activestatus">${comic['Status']}</td>
|
||||
</tr>
|
||||
%endfor
|
||||
</tbody>
|
||||
|
|
@ -97,11 +113,12 @@
|
|||
{
|
||||
"destroy": true,
|
||||
"columnDefs": [
|
||||
{ "orderable": false, "targets": [5, 9] },
|
||||
{ "visible": false, "targets": [5, 9] },
|
||||
{ "orderable": false, "targets": [5, 7, 10] },
|
||||
{ "visible": false, "targets": [5, 7, 10] },
|
||||
{ "type": 'num', "targets": 5 },
|
||||
{ "orderData": 5, "targets": 6 },
|
||||
{ "orderData": 9, "targets": 8 },
|
||||
{ "type": 'num', "targets": 7 },
|
||||
{ "orderData": [ 5, 7 ], "targets": 6 },
|
||||
{ "orderData": 10, "targets": 9 },
|
||||
{ "order": [[7, 'asc'],[1, 'asc']] }
|
||||
],
|
||||
"lengthMenu": [[10, 15, 25, 50, -1], [10, 15, 25, 50, 'All' ]],
|
||||
|
|
@ -115,7 +132,6 @@
|
|||
"stateSave": true,
|
||||
"pageLength": 25,
|
||||
"pagingType": "full_numbers",
|
||||
|
||||
});
|
||||
|
||||
resetFilters("comic");
|
||||
|
|
|
|||
Loading…
Reference in New Issue