Private GIT

Skip to content
Snippets Groups Projects
Commit ad83bcdb authored by Vince Valenti's avatar Vince Valenti
Browse files

Enhance quality pills

- When the initial and preferred qualities are the same, show the
  quality instead of 'Custom'.
- Where it makes sense, show a title (mouse hover) for the pill showing
  the specific initial and preferred qualities.
parent a7ee3ce3
No related branches found
No related tags found
No related merge requests found
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
</td> </td>
<td align="center"> <td align="center">
${renderQualityPill(cur_result['quality'])} ${renderQualityPill(cur_result['quality'], showTitle=True)}
</td> </td>
<td align="center" style="vertical-align: middle;"> <td align="center" style="vertical-align: middle;">
...@@ -323,7 +323,7 @@ ...@@ -323,7 +323,7 @@
<div class="clearfix"> <div class="clearfix">
<span class="title">Quality:</span> <span class="title">Quality:</span>
${renderQualityPill(cur_result['quality'])} ${renderQualityPill(cur_result['quality'], showTitle=True)}
</div> </div>
</td> </td>
</tr> </tr>
......
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
</td> </td>
<td class="show-table"> <td class="show-table">
${renderQualityPill(curShow.quality, overrideClass="show-quality")} ${renderQualityPill(curShow.quality, showTitle=True, overrideClass="show-quality")}
</td> </td>
</tr> </tr>
</table> </table>
...@@ -437,7 +437,7 @@ ...@@ -437,7 +437,7 @@
</td> </td>
% endif % endif
<td align="center">${renderQualityPill(curShow.quality)}</td> <td align="center">${renderQualityPill(curShow.quality, showTitle=True)}</td>
<td align="center"> <td align="center">
## This first span is used for sorting and is never displayed to user ## This first span is used for sorting and is never displayed to user
......
<%! <%!
import cgi
from sickbeard.common import Quality, qualityPresets, qualityPresetStrings from sickbeard.common import Quality, qualityPresets, qualityPresetStrings
%> %>
<%def name="renderQualityPill(quality, overrideClass=None)"><% <%def name="renderQualityPill(quality, showTitle=False, overrideClass=None)"><%
iQuality = quality & 0xFFFF
pQuality = quality >> 16
# If initial and preferred qualities are the same, show pill as initial quality
if iQuality == pQuality:
quality = iQuality
# Build a string of quality names to use as title attribute
if showTitle:
iQuality, pQuality = Quality.splitQuality(quality)
title = 'Initial Quality:\n'
if iQuality:
for curQual in iQuality:
title += " " + Quality.qualityStrings[curQual] + "\n"
else:
title += " None\n"
title += "\nPreferred Quality:\n"
if pQuality:
for curQual in pQuality:
title += " " + Quality.qualityStrings[curQual] + "\n"
else:
title += " None\n"
title = ' title="' + cgi.escape(title.rstrip(), True) + '"'
else:
title = ""
if quality in qualityPresets: if quality in qualityPresets:
cssClass = qualityPresetStrings[quality] cssClass = qualityPresetStrings[quality]
qualityString = qualityPresetStrings[quality] qualityString = qualityPresetStrings[quality]
...@@ -20,4 +47,4 @@ ...@@ -20,4 +47,4 @@
else: else:
cssClass = overrideClass cssClass = overrideClass
%><span class="${cssClass}">${qualityString}</span></%def> %><span${title} class="${cssClass}">${qualityString}</span></%def>
...@@ -163,7 +163,7 @@ $(document).ready(function(){ ...@@ -163,7 +163,7 @@ $(document).ready(function(){
<tr> <tr>
<td align="center"><input type="checkbox" class="editCheck" id="edit-${curShow.indexerid}" /></td> <td align="center"><input type="checkbox" class="editCheck" id="edit-${curShow.indexerid}" /></td>
<td class="tvShow"><a href="${sbRoot}/home/displayShow?show=${curShow.indexerid}">${curShow.name}</a></td> <td class="tvShow"><a href="${sbRoot}/home/displayShow?show=${curShow.indexerid}">${curShow.name}</a></td>
<td align="center">${renderQualityPill(curShow.quality)}</td> <td align="center">${renderQualityPill(curShow.quality, showTitle=True)}</td>
<td align="center"><img src="${sbRoot}/images/${('no16.png" alt="N"', 'yes16.png" alt="Y"')[int(curShow.is_sports) == 1]} width="16" height="16" /></td> <td align="center"><img src="${sbRoot}/images/${('no16.png" alt="N"', 'yes16.png" alt="Y"')[int(curShow.is_sports) == 1]} width="16" height="16" /></td>
<td align="center"><img src="${sbRoot}/images/${('no16.png" alt="N"', 'yes16.png" alt="Y"')[int(curShow.is_scene) == 1]} width="16" height="16" /></td> <td align="center"><img src="${sbRoot}/images/${('no16.png" alt="N"', 'yes16.png" alt="Y"')[int(curShow.is_scene) == 1]} width="16" height="16" /></td>
<td align="center"><img src="${sbRoot}/images/${('no16.png" alt="N"', 'yes16.png" alt="Y"')[int(curShow.is_anime) == 1]} width="16" height="16" /></td> <td align="center"><img src="${sbRoot}/images/${('no16.png" alt="N"', 'yes16.png" alt="Y"')[int(curShow.is_anime) == 1]} width="16" height="16" /></td>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment