Merge pull request #106 from Supremicus/feature/FixTablesorting.

This commit is contained in:
JackDandy 2014-12-14 13:26:38 +00:00
commit 2d0579239e
2 changed files with 153 additions and 150 deletions

View file

@ -34,6 +34,7 @@
* Add highlight to current status text in header on Episode Overview page * Add highlight to current status text in header on Episode Overview page
* Fix table alignment on homepage * Fix table alignment on homepage
* Fix duplicate entries in cache database * Fix duplicate entries in cache database
* Fix network sorting on home page
[develop changelog] [develop changelog]
* Add TVRage network name standardization * Add TVRage network name standardization

View file

@ -88,6 +88,7 @@
sortList: [[5,1],[1,0]], sortList: [[5,1],[1,0]],
textExtraction: { textExtraction: {
0: function(node) { return \$(node).find("span").text().toLowerCase(); }, 0: function(node) { return \$(node).find("span").text().toLowerCase(); },
2: function(node) { return \$(node).find("span").text().toLowerCase(); },
3: function(node) { return \$(node).find("span").text().toLowerCase(); }, 3: function(node) { return \$(node).find("span").text().toLowerCase(); },
4: function(node) { return \$(node).find("span").text(); }, 4: function(node) { return \$(node).find("span").text(); },
5: function(node) { return \$(node).find("img").attr("alt"); } 5: function(node) { return \$(node).find("img").attr("alt"); }
@ -110,6 +111,7 @@
sortList: [[5,1],[1,0]], sortList: [[5,1],[1,0]],
textExtraction: { textExtraction: {
0: function(node) { return \$(node).find("span").text().toLowerCase(); }, 0: function(node) { return \$(node).find("span").text().toLowerCase(); },
2: function(node) { return \$(node).find("span").text().toLowerCase(); },
3: function(node) { return \$(node).find("span").text().toLowerCase(); }, 3: function(node) { return \$(node).find("span").text().toLowerCase(); },
4: function(node) { return \$(node).find("span").text(); }, 4: function(node) { return \$(node).find("span").text(); },
5: function(node) { return \$(node).find("img").attr("alt"); } 5: function(node) { return \$(node).find("img").attr("alt"); }
@ -430,7 +432,6 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name))
</div> </div>
#end for #end for
</div> </div>
</div> </div>
@ -468,7 +469,6 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name))
<tr> <tr>
<td align="center">(loading)</td> <td align="center">(loading)</td>
<td></td>
<td> <td>
#if $curLoadingShow.show == None: #if $curLoadingShow.show == None:
Loading... ($curLoadingShow.show_name) Loading... ($curLoadingShow.show_name)
@ -480,6 +480,7 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name))
<td></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
<td></td>
</tr> </tr>
#end for #end for
@ -566,6 +567,7 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name))
#if $layout != 'simple': #if $layout != 'simple':
<td align="center"> <td align="center">
#if $curShow.network: #if $curShow.network:
<span style="display: none;">$curShow.network</span>
<img id="network" width="54" height="27" src="$sbRoot/images/network/${curShow.network.replace(u"\u00C9",'e').lower()}.png" alt="$curShow.network" title="$curShow.network" /> <img id="network" width="54" height="27" src="$sbRoot/images/network/${curShow.network.replace(u"\u00C9",'e').lower()}.png" alt="$curShow.network" title="$curShow.network" />
#else: #else:
<img id="network" width="54" height="27" src="$sbRoot/images/network/nonetwork.png" alt="No Network" title="No Network" /> <img id="network" width="54" height="27" src="$sbRoot/images/network/nonetwork.png" alt="No Network" title="No Network" />
@ -573,7 +575,7 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name))
</td> </td>
#else: #else:
<td> <td>
$curShow.network <span>$curShow.network</span>
</td> </td>
#end if #end if