From b1537709281268927b4a988260c65b04eca5beeb Mon Sep 17 00:00:00 2001 From: lucas_nz Date: Sun, 3 Apr 2016 20:46:59 +1200 Subject: [PATCH] webui fixes and tidy ups. --- content/main.css | 60 +++++++++--- plugins/togo/templates/npl.tmpl | 136 +++++++++++++++++----------- plugins/video/templates/container_html.tmpl | 81 +++++++++++------ 3 files changed, 187 insertions(+), 90 deletions(-) diff --git a/content/main.css b/content/main.css index 71c65f2..6f7261b 100644 --- a/content/main.css +++ b/content/main.css @@ -64,12 +64,12 @@ td.progmain { td.progsize { white-space: nowrap; - text-align: right; + text-align: center; } td.progdate { white-space: nowrap; - text-align: left; + text-align: center; } img { @@ -84,31 +84,46 @@ div.button { margin: 12px; } -.icon { - width: 26px; +div.icon { + white-space: nowrap; text-align: left; - } + margin-right: 6px; +} + +div.flex { + display: flex; +} + +div.left { + float:left; +} + +div.right { + flex-grow: 1; + line-height: 26px; +} td.downarrow { background-repeat: no-repeat; background-position: center right; padding-right: 21px; background-image: url(data:image/gif;base64,R0lGODlhFQAEAIABAAAAAAAAACH/C1hNUCBEYXRhWE1QPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS4wLWMwNjAgNjEuMTM0Nzc3LCAyMDEwLzAyLzEyLTE3OjMyOjAwICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjAzODAxMTc0MDcyMDY4MTE4OEM2REYyN0ExMDhBNDJFIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjdCNTAyODc0MEY4NjExRTBBMzkyQzAyM0E1RDk3RDc3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjdCNTAyODczMEY4NjExRTBBMzkyQzAyM0E1RDk3RDc3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzUgTWFjaW50b3NoIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDM4MDExNzQwNzIwNjgxMTg4QzZERjI3QTEwOEE0MkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MDM4MDExNzQwNzIwNjgxMTg4QzZERjI3QTEwOEE0MkUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4B//79/Pv6+fj39vX08/Lx8O/u7ezr6uno5+bl5OPi4eDf3t3c29rZ2NfW1dTT0tHQz87NzMvKycjHxsXEw8LBwL++vby7urm4t7a1tLOysbCvrq2sq6qpqKempaSjoqGgn56dnJuamZiXlpWUk5KRkI+OjYyLiomIh4aFhIOCgYB/fn18e3p5eHd2dXRzcnFwb25tbGtqaWhnZmVkY2JhYF9eXVxbWllYV1ZVVFNSUVBPTk1MS0pJSEdGRURDQkFAPz49PDs6OTg3NjU0MzIxMC8uLSwrKikoJyYlJCMiISAfHh0cGxoZGBcWFRQTEhEQDw4NDAsKCQgHBgUEAwIBAAAh+QQBAAABACwAAAAAFQAEAAACDYwfoAvoz9qbZ9FrJC0AOw==); - cursor: pointer; } td.uparrow { background-repeat: no-repeat; background-position: center right; padding-right: 21px; background-image: url(data:image/gif;base64,R0lGODlhFQAEAIABAAAAAAAAACH/C1hNUCBEYXRhWE1QPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS4wLWMwNjAgNjEuMTM0Nzc3LCAyMDEwLzAyLzEyLTE3OjMyOjAwICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjAyODAxMTc0MDcyMDY4MTE4OEM2REYyN0ExMDhBNDJFIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhFNzNGQjI3MEY4NjExRTBBMzkyQzAyM0E1RDk3RDc3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhFNzNGQjI2MEY4NjExRTBBMzkyQzAyM0E1RDk3RDc3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzUgTWFjaW50b3NoIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDI4MDExNzQwNzIwNjgxMTg4QzZERjI3QTEwOEE0MkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MDI4MDExNzQwNzIwNjgxMTg4QzZERjI3QTEwOEE0MkUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4B//79/Pv6+fj39vX08/Lx8O/u7ezr6uno5+bl5OPi4eDf3t3c29rZ2NfW1dTT0tHQz87NzMvKycjHxsXEw8LBwL++vby7urm4t7a1tLOysbCvrq2sq6qpqKempaSjoqGgn56dnJuamZiXlpWUk5KRkI+OjYyLiomIh4aFhIOCgYB/fn18e3p5eHd2dXRzcnFwb25tbGtqaWhnZmVkY2JhYF9eXVxbWllYV1ZVVFNSUVBPTk1MS0pJSEdGRURDQkFAPz49PDs6OTg3NjU0MzIxMC8uLSwrKikoJyYlJCMiISAfHh0cGxoZGBcWFRQTEhEQDw4NDAsKCQgHBgUEAwIBAAAh+QQBAAABACwAAAAAFQAEAAACDYyPAcmtsJyDVDKKWQEAOw==); - cursor: pointer; } td.updownarrow { background-repeat: no-repeat; background-position: center right; padding-right: 21px; background-image: url(data:image/gif;base64,R0lGODlhFQAJAIABAAAAAAAAACH/C1hNUCBEYXRhWE1QPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS4wLWMwNjAgNjEuMTM0Nzc3LCAyMDEwLzAyLzEyLTE3OjMyOjAwICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjAxODAxMTc0MDcyMDY4MTE4OEM2REYyN0ExMDhBNDJFIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjdCNTAyODcwMEY4NjExRTBBMzkyQzAyM0E1RDk3RDc3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjdCNTAyODZGMEY4NjExRTBBMzkyQzAyM0E1RDk3RDc3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzUgTWFjaW50b3NoIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDE4MDExNzQwNzIwNjgxMTg4QzZERjI3QTEwOEE0MkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MDE4MDExNzQwNzIwNjgxMTg4QzZERjI3QTEwOEE0MkUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4B//79/Pv6+fj39vX08/Lx8O/u7ezr6uno5+bl5OPi4eDf3t3c29rZ2NfW1dTT0tHQz87NzMvKycjHxsXEw8LBwL++vby7urm4t7a1tLOysbCvrq2sq6qpqKempaSjoqGgn56dnJuamZiXlpWUk5KRkI+OjYyLiomIh4aFhIOCgYB/fn18e3p5eHd2dXRzcnFwb25tbGtqaWhnZmVkY2JhYF9eXVxbWllYV1ZVVFNSUVBPTk1MS0pJSEdGRURDQkFAPz49PDs6OTg3NjU0MzIxMC8uLSwrKikoJyYlJCMiISAfHh0cGxoZGBcWFRQTEhEQDw4NDAsKCQgHBgUEAwIBAAAh+QQBAAABACwAAAAAFQAJAAACF4yPgMsJ2mJ4VDKKrd4GVz5lYPeMiVUAADs=); - cursor: pointer; +} + +.mobileshow { + display: none; } /* Smartphones (portrait and landscape) ----------- */ @@ -125,13 +140,34 @@ and (max-width : 480px) { white-space: break-word; } table#main td.progsize { - display: none; - } - table#main td.progsizeheader { - display: none; + text-align: left; } table#main td.progdate { white-space: normal; + text-align: left; + } + table#main div.progdesc { + font-size: inherit; + margin-right: 6px + } + div.mobileinline { + display: inline; + } + .mobilehide { + display: none !important; + } + .mobileshow { + display: inherit; + } + div.mobileflex { + display: flex; + } + div.mobileleft { + float:left; + } + div.mobileright { + flex-grow: 1; + text-align: right; } } diff --git a/plugins/togo/templates/npl.tmpl b/plugins/togo/templates/npl.tmpl index 3ff7558..e94b8f1 100644 --- a/plugins/togo/templates/npl.tmpl +++ b/plugins/togo/templates/npl.tmpl @@ -52,61 +52,83 @@ Pull from $tname ## Header Row - - Title +
+
+
Title
+
- Size - Capture Date + Size + Capture Date #set $i = 0 ## i variable is used to alternate colors of row ## loop through passed data printing row for each show or folder #for $row in $data - #set $i += 1 - #set $j = $i%2 - #if $row['ContentType'].startswith('x-tivo-container') + #set $i += 1 + #set $j = $i%2 + #if $row['ContentType'].startswith('x-tivo-container') ## This is a folder - - $row['Title'] +
+
+
+ $row['Title'] +
+
+ + +
+
Items:
+
$row["TotalItems"]
+
+ + +
+
Capture Date:
+
$row["LastChangeDate"]
+
- $row["TotalItems"] Items - $row["LastChangeDate"] #else ## This is a show - #if 'Url' in $row and not ($row['Url'] in $status and ($status[$row['Url']]['running'] or $status[$row['Url']]['queued'])) and not ('CopyProtected' in $row and $row['CopyProtected'] == 'Yes') and not ('Icon' in $row and $row['Icon'] == 'urn:tivo:image:in-progress-recording') - - #end if - #if 'CopyProtected' in $row and $row['CopyProtected'] == 'Yes' - - #elif 'Icon' in $row - - #if $row['Icon'] == 'urn:tivo:image:expires-soon-recording' - - #else if $row['Icon'] == 'urn:tivo:image:expired-recording' - - #else if $row['Icon'] == 'urn:tivo:image:save-until-i-delete-recording' - - #else if $row['Icon'] == 'urn:tivo:image:in-progress-recording' - - #end if - #end if - #if 'episodeTitle' in $row - $row['title']: $row['episodeTitle']
- #else - $row['title']
- #end if - - #if 'description' in $row - $row['description'] - #end if - #if 'displayMajorNumber' in $row and 'callsign' in $row - $row['displayMajorNumber'] $row['callsign'] - #end if - +
+
+ #if 'Url' in $row and not ($row['Url'] in $status and ($status[$row['Url']]['running'] or $status[$row['Url']]['queued'])) and not ('CopyProtected' in $row and $row['CopyProtected'] == 'Yes') and not ('Icon' in $row and $row['Icon'] == 'urn:tivo:image:in-progress-recording') + + #end if + #if 'CopyProtected' in $row and $row['CopyProtected'] == 'Yes' + + #elif 'Icon' in $row + + #if $row['Icon'] == 'urn:tivo:image:expires-soon-recording' + + #else if $row['Icon'] == 'urn:tivo:image:expired-recording' + + #else if $row['Icon'] == 'urn:tivo:image:save-until-i-delete-recording' + + #else if $row['Icon'] == 'urn:tivo:image:in-progress-recording' + + #end if + #end if +
+
+ #if 'episodeTitle' in $row + $row['title']: $row['episodeTitle'] + #else + $row['title'] + #end if +
+
+
+ #if 'description' in $row + $row['description'] + #end if + #if 'displayMajorNumber' in $row and 'callsign' in $row + $row['displayMajorNumber'] $row['callsign'] + #end if +
#if 'Url' in $row and row['Url'] in $status #set $this_status = $status[$row['Url']] #if $this_status['running'] and $this_status['rate'] != "" @@ -137,19 +159,29 @@ Pull from $tname #end if - #if 'SourceSize' in $row - $row['SourceSize'] - #end if -
- #if 'Duration' in $row - $row['Duration'] - #end if + #if 'SourceSize' in $row +
+
+
Size:
+
$row['SourceSize']
+
+ #end if + #if 'Duration' in $row +
+
Duration:
+
$row['Duration']
+
+
+ #end if - #if 'CaptureDate' in $row - $row['CaptureDate'] - #end if - + #if 'CaptureDate' in $row +
+
Capture Date:
+
$row['CaptureDate']
+
+ #end if + #end if #end for diff --git a/plugins/video/templates/container_html.tmpl b/plugins/video/templates/container_html.tmpl index d2b05b7..79dc07f 100644 --- a/plugins/video/templates/container_html.tmpl +++ b/plugins/video/templates/container_html.tmpl @@ -50,11 +50,15 @@ Push from $folders[0] #set sortorder = '!Normal' #set $arrowicon = 'uparrow' #end if - - - Title + +
+
+
+ Title +
+
- Size + Size #set $arrowicon = 'updownarrow' #set sortorder = 'CaptureDate' #if $sortby == '!capturedate' @@ -65,7 +69,7 @@ Push from $folders[0] #set $arrowicon = 'uparrow' #end if - Capture Date +
Capture Date
#set $i = 0 @@ -78,33 +82,58 @@ Push from $folders[0] ## This is a folder - - $video.title +
+
+
+ $video.title +
+
+ + +
+
Items:
+
$video.total_items Items
+
+ + +
+
Capture Date:
+
$video.textDate
+
- $video.total_items Items - $video.textDate #else ## This is a show - - #if $video.episodeTitle - $video.title: $video.episodeTitle
- #else - $video.title
- #end if - - - #if $video.description - $video.description - #end if - #if $video.displayMajorNumber and $video.callsign - $video.displayMajorNumber $video.callsign - #end if - +
+
+ #if $video.episodeTitle +
$video.title: $video.episodeTitle
+ #else +
$video.title
+ #end if +
+
+ #if $video.description + $video.description + #end if + #if $video.displayMajorNumber and $video.callsign + $video.displayMajorNumber $video.callsign + #end if +
- $video.textSize - $video.textDate + +
+
Size:
+
$video.textSize
+
+ + +
+
Capture Date:
+
$video.textDate
+
+ #end if #end for -- 2.11.4.GIT