From d9ed6655405fe1fe081672189a9bc63b39101643 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Sun, 12 May 2013 11:46:19 -0400
Subject: [PATCH] Show page title in channel list

---
 api.js               | 1 +
 package.json         | 2 +-
 server.js            | 2 +-
 www/channellist.html | 3 +++
 www/index.html       | 2 ++
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/api.js b/api.js
index d7cedf8d..d58515aa 100644
--- a/api.js
+++ b/api.js
@@ -117,6 +117,7 @@ function handleChannelData(params, req, res) {
 
         if(d.loaded) {
             var chan = Server.channels[cname];
+            d.pagetitle = chan.opts.pagetitle;
             d.media = chan.media ? chan.media.pack() : {};
             d.usercount = chan.users.length;
             d.users = [];
diff --git a/package.json b/package.json
index e4009515..42dcb622 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "author": "Calvin Montgomery",
     "name": "CyTube",
     "description": "Online media synchronizer and chat",
-    "version": "1.6.4",
+    "version": "1.6.5",
     "repository": {
         "url": "http://github.com/calzoneman/sync"
     },
diff --git a/server.js b/server.js
index 85c65ea1..c9538967 100644
--- a/server.js
+++ b/server.js
@@ -9,7 +9,7 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-const VERSION = "1.6.4";
+const VERSION = "1.6.5";
 
 var fs = require("fs");
 var Logger = require("./logger.js");
diff --git a/www/channellist.html b/www/channellist.html
index 683075a5..8f9154bf 100644
--- a/www/channellist.html
+++ b/www/channellist.html
@@ -35,6 +35,7 @@
             <thead>
                 <tr>
                     <th>Channel</th>
+                    <th>Title</th>
                     <th>Connected</th>
                     <th>Playing</th>
                 </tr>
@@ -135,6 +136,7 @@
                         $("<a/>").attr("href", host + "/r/" + d.name)
                             .text(d.name)
                             .appendTo(name);
+                        $("<td/>").text(d.pagetitle).appendTo(tr);
                         $("<td/>").text(d.usercount || 0).appendTo(tr);
                         var title = $("<td/>").appendTo(tr);
                         if(d.media.id) {
@@ -153,6 +155,7 @@
                     $("<td/>").text("Total").appendTo(tr);
                     $("<td/>").text(total).appendTo(tr);
                     $("<td/>").appendTo(tr);
+                    $("<td/>").appendTo(tr);
 
                 });
             }
diff --git a/www/index.html b/www/index.html
index 584ca91d..48b2cc78 100644
--- a/www/index.html
+++ b/www/index.html
@@ -52,6 +52,7 @@
                     <thead>
                         <tr>
                             <th>Channel</th>
+                            <th>Title</th>
                             <th>Connected</th>
                             <th>Playing</th>
                         </tr>
@@ -144,6 +145,7 @@
                     $("<a/>").attr("href", host + "/r/" + d.name)
                         .text(d.name)
                         .appendTo(name);
+                    $("<td/>").text(d.pagetitle).appendTo(tr);
                     $("<td/>").text(d.usercount || 0).appendTo(tr);
                     var title = $("<td/>").appendTo(tr);
                     if(d.media.id) {