Merge branch 'feature/ChangeSwapColumns' into develop

CHANGES.md

@@ -88,7 +88,8 @@
 * Add return paused "Only" to API
 * Change Add shows/Search results first aired dates to UI date format setting
 * Change improve the search progress text
-* Add "Size" filter '=0' in history view to filter already deleted media
+* Add "Size" filter '<0' in history view to filter already deleted media
+* Change swap `Episode` and `Label` columns in history view
 
 
 [develop changelog]

gui/slick/interfaces/default/history.tmpl

@@ -284,8 +284,8 @@
 			<tr>
 				<th><span class="date">Event Date</span><span class="age">Event Age</span></th>
 				<th width="8%">Played</th>
-				<th class="text-nowrap">Episode</th>
 				<th class="text-nowrap" width="15%">Label (Profile)</th>
+				<th class="text-nowrap">Episode</th>
 				<th class="text-nowrap" width="10%">Quality</th>
 				<th class="text-nowrap" width="10%">Size</th>
 				<th width="10%">Delete</th>
@@ -339,11 +339,6 @@
             #set $value = ($float_played, int($float_played))[int($float_played) == $float_played]
 					<span#if not $bool($int($value))# class="add-qtip" title="Marked Unwatched"#end if#>$value</span>
 				</td>
-				<td class="tvShow text-nowrap">
-					<span class="add-qtip#if not $hItem.get('deleted')#"#else# strike-deleted" title="file no longer exists"#end if#>
-						<a href="$sbRoot/home/view-show?tvid_prodid=$hItem['tvid_prodid']#season-$hItem.get('season')">$display_name</a>
-					</span>
-				</td>
 				<td>
             #set $label = re.sub(r'\{[^}]+\}$', '', $hItem.get('label'))
             #set $client = ''
@@ -356,6 +351,11 @@
                 #pass
             #end try
 				</td>
+				<td class="tvShow text-nowrap">
+					<span class="add-qtip#if not $hItem.get('deleted')#"#else# strike-deleted" title="file no longer exists"#end if#>
+						<a href="$sbRoot/home/view-show?tvid_prodid=$hItem['tvid_prodid']#season-$hItem.get('season')">$display_name</a>
+					</span>
+				</td>
 				<td quality="$hItem.get('quality')" class="text-nowrap">
 					<span class="quality $Quality.get_quality_css($hItem.get('quality')) add-qtip" title="#if $hItem.get('deleted')#file no longer exists#else#$hItem['location']#end if#">$Quality.qualityStrings[$hItem.get('quality')].replace('SD DVD', 'SD DVD/BR/BD')</span>
 				</td>

gui/slick/js/history.js

@@ -64,7 +64,7 @@ $(document).ready(function() {
 	} else if (-1 !== layoutName.indexOf('watched')) {
 
 		jQuery.extend(extraction, {
-			3: function(node) {
+			2: function(node) {
 				return $(node).find('span[data-sort]').attr('data-sort');
 			},
 			5: function(node) {