webui: replace 'Play' text with the play image for channels / services / DVR, cleanups

diff --git a/src/webui/static/app/chconf.js b/src/webui/static/app/chconf.js
index 6c9aae0c2e7e6c38c919dbc51b678c1e058373ab..34ab1d80f7ed7e73e0bcac897ec48f26bf2b86b3 100644 (file)
--- a/src/webui/static/app/chconf.js
+++ b/src/webui/static/app/chconf.js
@@ -234,8 +234,7 @@ tvheadend.channel_tab = function(panel, index)
                     if (r.data['number'])
                       title += r.data['number'] + ' : ';
                     title += r.data['name'];
-                    return "<a href='play/stream/channel/" + r.id +
-                           "?title=" + encodeURIComponent(title) + "'>" + _('Play') + "</a>";
+                    return tvheadend.playLink('play/stream/channel/' + r.id, title);
                 }
             }
         ],

diff --git a/src/webui/static/app/dvr.js b/src/webui/static/app/dvr.js
index 633161c864b0ecf6312abff1117818f8a05c54c2..1da74d23fefdc897b922f7de808a54f38701c094 100644 (file)
--- a/src/webui/static/app/dvr.js
+++ b/src/webui/static/app/dvr.js
@@ -451,8 +451,7 @@ tvheadend.dvr_finished = function(panel, index) {
                     var title = r.data['disp_title'];
                     if (r.data['episode'])
                         title += ' / ' + r.data['episode'];
-                    return '<a href="play/dvrfile/' + r.id +
-                           '?title=' + encodeURIComponent(title) + '">' + _('Play') + '</a>';
+                    return tvheadend.playLink('play/dvrfile/' + r.id, title);
                 }
             }],
         tbar: [downloadButton, rerecordButton, moveButton],
@@ -589,8 +588,7 @@ tvheadend.dvr_failed = function(panel, index) {
                     var title = r.data['disp_title'];
                     if (r.data['episode'])
                         title += ' / ' + r.data['episode'];
-                    return '<a href="play/dvrfile/' + r.id +
-                           '?title=' + encodeURIComponent(title) + '">' + _('Play') + '</a>';
+                    return tvheadend.playLink('play/dvrfile/' + r.id, title);
                 }
             }],
         tbar: [downloadButton, rerecordButton, moveButton],

diff --git a/src/webui/static/app/ext.css b/src/webui/static/app/ext.css
index 86a9069c11b7dfb8015b643c2b913b2a8b271c4a..b1a5b6ad435e5402ff417acd391f8be1512e3953 100644 (file)
--- a/src/webui/static/app/ext.css
+++ b/src/webui/static/app/ext.css
@@ -984,6 +984,13 @@
     font-weight: bold;
 }
 
+.playlink {
+    margin: -1px;
+    width: 14px;
+    height: 14px;
+    cursor: pointer;
+}
+
 /** vim: ts=4:sw=4:nu:fdc=4:nospell 
  *
  * Ext.ux.grid.RowActions.css 

diff --git a/src/webui/static/app/mpegts.js b/src/webui/static/app/mpegts.js
index cc6664092af31a7a550b8d0f9e738fda13e5f7df..18bab39ff837bbb5d250734243e51109669d5ab5 100644 (file)
--- a/src/webui/static/app/mpegts.js
+++ b/src/webui/static/app/mpegts.js
@@ -121,9 +121,12 @@ tvheadend.muxes = function(panel, index)
                 header: _('Play'),
                 tooltip: _('Play'),
                 renderer: function(v, o, r) {
-                    var title = r.data['name'] + ' / ' + r.data['network'];
-                    return "<a href='play/stream/mux/" + r.id +
-                           "?title=" + encodeURIComponent(title) + "'>" + _("Play") + "</a>";
+                    var title = r.data['name'];
+                    if (r.data['network']) {
+                        if (title) title += ' / ';
+                        title += r.data['network'];
+                    }
+                    return tvheadend.playLink('play/stream/mux/' + r.id, title);
                 }
             }
         ],
@@ -317,9 +320,12 @@ tvheadend.services = function(panel, index)
                 header: _('Play'),
                 tooltip: _('Play'),
                 renderer: function(v, o, r) {
-                    var title = r.data['svcname'] + ' / ' + r.data['provider'];
-                    return "<a href='play/stream/service/" + r.id +
-                           "?title=" + encodeURIComponent(title) + "'>" + _('Play') + "</a>";
+                    var title = r.data['svcname'];
+                    if (r.data['provider']) {
+                        if (title) title += ' / ';
+                        title += r.data['provider'];
+                    }
+                    return tvheadend.playLink('play/stream/service/' + r.id, title);
                 }
             },
             {

diff --git a/src/webui/static/app/tvheadend.js b/src/webui/static/app/tvheadend.js
index bb73a61e41c6163799e8a06c16ce108e0a1f3790..988827924a8076b197a81284ab95bfbfa4ed1d0f 100644 (file)
--- a/src/webui/static/app/tvheadend.js
+++ b/src/webui/static/app/tvheadend.js
@@ -417,6 +417,16 @@ tvheadend.niceDate = function(dt) {
            '<div class="x-nice-time">' + d.toLocaleTimeString() + '</div>';
 }
 
+/*
+ *
+ */
+tvheadend.playLink = function(link, title) {
+    if (title) title = '?title=' + encodeURIComponent(title);
+    return '<a href="' + link + title + '">' +
+           '<img src="static/icons/control_play.png" class="playlink" title="' +
+           _('Play this stream') + '" alt="' + _('Play') + '"/></a>';
+}
+
 /**
  * Displays a mediaplayer using the html5 video element
  */