Edited progressbars

This commit is contained in:
Brinken
2012-03-15 09:43:50 +01:00
parent c9ec401798
commit 81dc309d49
12 changed files with 229 additions and 55 deletions

View File

@@ -23,7 +23,7 @@
<%def name="body()">
<div class="table_wrapper">
<h2><a href="artistPage?ArtistID=${album['ArtistID']}"><- Back to ${album['ArtistName']}</a></h2>
<h2><a class="btnBack" href="artistPage?ArtistID=${album['ArtistID']}">< Back to ${album['ArtistName']}</a></h2>
<div id="albumheader">
<div class="album-art-big">
<img src="http://ec1.images-amazon.com/images/P/${album['AlbumASIN']}.01.LZZZZZZZ.jpg" alt="albumart" class="albumArt" title="${album['ArtistName']} - ${album['AlbumTitle']}">
@@ -41,11 +41,14 @@
albumduration = 'n/a'
%>
Duration: ${albumduration}
<br />
%if description:
<h3>Description:</h3>
${description['Summary']}
%endif
<br />
<br />
Playtime: ${albumduration}
</div>
</div>
<div id="track_wrapper">

View File

@@ -90,28 +90,27 @@
<td id="albumart">
<div class="album-art-small">
<a href="albumPage?AlbumID=${album['AlbumID']}">
<img src="http://ec1.images-amazon.com/images/P/${album['AlbumASIN']}.01.MZZZZZZZ.jpg" title="${album['AlbumTitle']}">
<img src="http://ec1.images-amazon.com/images/P/${album['AlbumASIN']}.01.MZZZZZZZ.jpg" title="${artist['ArtistName']} - ${album['AlbumTitle']}">
</a>
</div>
</td>
<td id="albumname"><a href="albumPage?AlbumID=${album['AlbumID']}">${album['AlbumTitle']}</a></td>
<td id="reldate">${album['ReleaseDate']}</td>
<td id="type">${album['Type']}</td>
<td id="status"><img src="../images/${album['Status']}.png" title="${album['Status']}" />
<td id="status"><span class="btn${album['Status']} btnStatus" title="${album['Status']}">${album['Status']}</span>
%if album['Status'] == 'Skipped':
<a href="queueAlbum?AlbumID=${album['AlbumID']}&ArtistID=${album['ArtistID']}"><img src="../images/get.png" title="Download this album" style="margin-left: 5px;"/></a>
<a class="btnGet btnStatus" href="queueAlbum?AlbumID=${album['AlbumID']}&ArtistID=${album['ArtistID']}" title="Get this album">Get</a>
%elif album['Status'] == 'Wanted':
<a href="unqueueAlbum?AlbumID=${album['AlbumID']}&ArtistID=${album['ArtistID']}"><img src="../images/cancel.png" title="Cancel" style="margin-left: 5px;"/></a>
<a class="btnAbort btnStatus" href="unqueueAlbum?AlbumID=${album['AlbumID']}&ArtistID=${album['ArtistID']}" title="Abort current status, and set to skipped">Abort</a>
%else:
<a href="queueAlbum?AlbumID=${album['AlbumID']}&ArtistID=${album['ArtistID']}" title="Retry the same download again"><img src="../images/retry.png" style="margin-left: 5px;" /></a><a href="queueAlbum?AlbumID=${album['AlbumID']}&ArtistID=${album['ArtistID']}&new=True" title="Try a new download, skipping all previously tried nzbs"><img src="../images/new.png" alt="New" style="margin-left: 5px;" /></a>
<a class="btnRetry btnStatus" href="queueAlbum?AlbumID=${album['AlbumID']}&ArtistID=${album['ArtistID']}" title="Retry the same nbz">Retry</a>
<a class="btnNew btnStatus" href="queueAlbum?AlbumID=${album['AlbumID']}&ArtistID=${album['ArtistID']}&new=True" title="Try a new download, skipping all previously tried nzbs">New</a>
%endif
</td>
<td id="have"><span title="${percent}"><span>
<div class="progress-container" title="You have ${havetracks} of a total ${totaltracks}">
<div style="width:${percent}%">
<div class="havetracks">
${havetracks}/${totaltracks}
</div>
</div>
</div>
</td>

View File

@@ -41,12 +41,10 @@
<script type="text/javascript" src="js/jquery.mousewheel.min.js" ></script>
<!-- Add to Scrollbars #main -->
<script>
$(function()
{
$(function(){
$('.main').jScrollPane();
});
</script>
${next.headIncludes()}

View File

@@ -52,7 +52,13 @@
<td id="name"><span title="${artist['ArtistSortName']}"></span><a href="artistPage?ArtistID=${artist['ArtistID']}">${artist['ArtistName']}</a></td>
<td id="status">${artist['Status']}</td>
<td id="album"><span title="${releasedate}"></span><a href="albumPage?AlbumID=${artist['AlbumID']}">${albumdisplay}</a></td>
<td id="have"><span title="${percent}"></span><div class="progress-container"><div style="width:${percent}%"><div class="havetracks">${havetracks}/${totaltracks}</div></div></div></td>
<td id="have"><span title="${percent}"></span>
<div class="progress-container">
<div style="width:${percent}%">
<div class="havetracks">${havetracks}/${totaltracks}</div>
</div>
</div>
</td>
</tr>
%endfor
</tbody>

View File

@@ -32,11 +32,10 @@
<td id="artistname"><a href="${result['url']}">${result['uniquename']}</a></td>
<td id="score">
<div class="searchscore" title="The match result is: ${result['score']}%">
${result['score']}%
<div class="progress-container">
<div style="width: ${result['score']}%">
</div>
</div>
</div>