1
0
mirror of https://github.com/moparisthebest/SickRage synced 2024-12-13 11:32:20 -05:00

Merge pull request #838 from Supremicus/dev

fix for date clipping on poster view
This commit is contained in:
adam111316 2014-10-02 08:25:40 +08:00
commit 1682258866
2 changed files with 54 additions and 62 deletions

View File

@ -83,18 +83,6 @@
border-radius: 0px; border-radius: 0px;
} }
.show-details {
width: 180px;
padding-left: 4px;
padding-top: 4px;
cursor: default;
}
.show-airby {
float: left;
width: 33%;
}
.show-add { .show-add {
text-shadow: 1px 1px #000; text-shadow: 1px 1px #000;
font-size: 11px; font-size: 11px;
@ -118,25 +106,11 @@
line-height: 34px; line-height: 34px;
} }
.show-network {
float: left;
width: 33%;
text-shadow: 1px 1px #000;
font-size: 11px;
text-align: center;
}
.show-network-image { .show-network-image {
margin-top: 5px;
width: 50px; width: 50px;
height: auto; height: auto;
} }
.show-quality {
float: left;
width: 33%;
}
.show-dlstats { .show-dlstats {
text-shadow: 1px 1px #000; text-shadow: 1px 1px #000;
font-size: 11px; font-size: 11px;

View File

@ -334,7 +334,7 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name))
#set $download_stat = str($cur_downloaded) #set $download_stat = str($cur_downloaded)
#set $download_stat_tip = "Downloaded: " + str($cur_downloaded) #set $download_stat_tip = "Downloaded: " + str($cur_downloaded)
#if $cur_snatched > 0: #if $cur_snatched > 0:
#set $download_stat = download_stat + "+" + str($cur_snatched) #set $download_stat = download_stat
#set $download_stat_tip = download_stat_tip + "
" + "Snatched: " + str($cur_snatched) #set $download_stat_tip = download_stat_tip + "
" + "Snatched: " + str($cur_snatched)
#end if #end if
#set $download_stat = download_stat + " / " + str($cur_total) #set $download_stat = download_stat + " / " + str($cur_total)
@ -352,7 +352,21 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name))
#set $progressbar_percent = $nom * 100 / $den #set $progressbar_percent = $nom * 100 / $den
<div class="show" id="show$curShow.indexerid" data-name="$curShow.name" data-date="#if $cur_airs_next then $time.mktime($network_timezones.parse_date_time($cur_airs_next,$curShow.airs,$curShow.network).timetuple()) else ""#" data-network="$curShow.network" data-progress="$progressbar_percent"> #if "a" in sickbeard.DATE_PRESET:
#set $showheight = "344px"
#set $tableheight = "62px"
#else if "B" in sickbeard.DATE_PRESET:
#set $showheight = "374px"
#set $tableheight = "92px"
#else if "A" in sickbeard.DATE_PRESET:
#set $showheight = "344px"
#set $tableheight = "62px"
#else
#set $showheight = "323px"
#set $tableheight = "42px"
#end if
<div class="show" style="height: $showheight" id="show$curShow.indexerid" data-name="$curShow.name" data-date="#if $cur_airs_next then $time.mktime($network_timezones.parse_date_time($cur_airs_next,$curShow.airs,$curShow.network).timetuple()) else ""#" data-network="$curShow.network" data-progress="$progressbar_percent">
<div class="show-image"> <div class="show-image">
<a href="$sbRoot/home/displayShow?show=$curShow.indexerid"><img alt="" class="show-image" src="$sbRoot/showPoster/?show=$curShow.indexerid&amp;which=poster_thumb" /></a> <a href="$sbRoot/home/displayShow?show=$curShow.indexerid"><img alt="" class="show-image" src="$sbRoot/showPoster/?show=$curShow.indexerid&amp;which=poster_thumb" /></a>
<div class="show-image-slide"> <div class="show-image-slide">
@ -383,40 +397,44 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name))
//--> //-->
</script> </script>
<div class="show-details"> <table width="184px" height="$tableheight" cellspacing="1" border="0" cellpadding="0" style="padding-left: 2px; cursor: default;">
<div class="show-airby"> <col width="60px" />
#if $cur_airs_next <col width="59px" />
#set $ldatetime = $network_timezones.parse_date_time($cur_airs_next,$curShow.airs,$curShow.network) <col width="60px" />
<div class="show-date">Next Ep: $sbdatetime.sbdatetime.sbfdate($ldatetime)</div>
#else if $curShow.status != "Ended" and int($curShow.paused) == 1:
<div class="show-status">Paused</div>
#else if $curShow.status:
<div class="show-status">$curShow.status</div>
#else
<div class="show-status">?</div>
#end if
</div>
<div class="show-network"> <tr>
#if $curShow.network: <td style="text-align:center; vertical-align:middle;">
<img class="show-network-image" src="$sbRoot/images/network/${curShow.network.lower()}.png" alt="$curShow.network" title="$curShow.network" /> #if $cur_airs_next
#else: #set $ldatetime = $network_timezones.parse_date_time($cur_airs_next,$curShow.airs,$curShow.network)
$curShow.network <div class="show-date">Next Ep: $sbdatetime.sbdatetime.sbfdate($ldatetime)</div>
#end if #else if $curShow.status != "Ended" and int($curShow.paused) == 1:
</div> <div class="show-status">Paused</div>
#else if $curShow.status:
<div class="show-status">$curShow.status</div>
#else
<div class="show-status">?</div>
#end if
</td>
<div class="show-quality"> <td style="text-align:center; vertical-align:middle;">
<span class="show-dlstats" title="$download_stat_tip">$download_stat</span> #if $curShow.network:
<div class="float-right"> <img class="show-network-image" src="$sbRoot/images/network/${curShow.network.lower()}.png" alt="$curShow.network" title="$curShow.network" />
#if $curShow.quality in $qualityPresets: #else:
<span class="show-dlstats">$qualityPresetStrings[$curShow.quality]</span> $curShow.network
#else: #end if
<span class="show-dlstats">Custom</span> </td>
#end if
</div>
</div>
</div> <td style="text-align:center; vertical-align:middle;">
<span class="show-dlstats" title="$download_stat_tip">$download_stat</span>
<div class="float-right">
#if $curShow.quality in $qualityPresets:
<span class="show-dlstats">$qualityPresetStrings[$curShow.quality]</span>
#else:
<span class="show-dlstats">Custom</span>
#end if
</td>
</tr>
</table>
</div> </div>