Made rooms have tags and display names.

app/app.css

@@ -287,7 +287,7 @@ form {
     z-index: 2;
 }
 
-form input, #croom {
+form input, .croom {
     -webkit-appearance: none;
     -moz-appearance: none;
     appearance: none;
@@ -805,11 +805,11 @@ footer .fa {
     width: 304px !important;
 }
 
-#croom_label {
+.croom_label {
     color: white;
 }
 
-#croom {
+.croom {
     width: 304px !important;
 }
 

app/app.js

@@ -407,9 +407,9 @@ if (Meteor.isClient) {
 
     Template.room.helpers({
         type: function() {
-          var parts = location.href.split('/');
-          var id = parts.pop();
-          return id.toUpperCase();
+            var parts = location.href.split('/');
+            var id = parts.pop().toLowerCase();
+            return Rooms.findOne({type: id}).display;
         },
         title: function(){
           return Session.get("title");
@@ -551,11 +551,11 @@ if (Meteor.isClient) {
             }
         },
         "click #croom_create": function() {
-            Meteor.call("createRoom", $("#croom").val(), function (err, res) {
+            Meteor.call("createRoom", $("#croom_display").val(), $("#croom_tag").val(), function (err, res) {
                 if (err) {
                     alert("Error " + err.error + ": " + err.reason);
                 } else {
-                    window.location = "/" + $("#croom").val();
+                    window.location = "/" + $("#croom_tag").val();
                 }
             });
         },
@@ -889,9 +889,10 @@ if (Meteor.isServer) {
         });
     }
 
-    function createRoom(type) {
+    function createRoom(display, tag) {
+        var type = tag;
         if (Rooms.find({type: type}).count() === 0) {
-            Rooms.insert({type: type}, function(err) {
+            Rooms.insert({display: display, type: type}, function(err) {
                 if (err) {
                     throw err;
                 } else {
@@ -1347,10 +1348,10 @@ if (Meteor.isServer) {
                 throw new Meteor.error(403, "Invalid permissions.");
             }
         },
-        createRoom: function(type) {
+        createRoom: function(display, tag) {
             var userData = Meteor.users.find(Meteor.userId());
             if (Meteor.userId() && userData.count !== 0 && userData.fetch()[0].profile.rank === "admin") {
-                createRoom(type);
+                createRoom(display, tag);
             } else {
                 return false;
             }
@@ -1382,11 +1383,11 @@ Router.route("/", {
 
 Router.route("/login", {
   template: "login"
-})
+});
 
 Router.route("/signup", {
   template: "register"
-})
+});
 
 Router.route("/terms", {
     template: "terms"

app/templates/admin.html

@@ -87,9 +87,13 @@
 
             <div class="col-md-4 col-md-offset-4">
                 <div id="croom_container">
-                    <label for="croom" id="croom_label">Room Name:</label>
+                    <label for="croom_display" class="croom_label">Room Display Name (eg 'Edm'):</label>
                     <div class="input-group">
-                        <input type="text" id="croom" name="croom" required />
+                        <input type="text" class="croom" id="croom_display" name="croom" required />
+                    </div>
+                    <label for="croom_tag" class="croom_label">Room Tag Name (eg 'edm'):</label>
+                    <div class="input-group">
+                        <input type="text" class="croom" id="croom_tag" name="croom" required />
                     </div>
                     <button class="btn btn-warning btn-block" id="croom_create">Create</button>
                 </div>

app/templates/dashboard.html

@@ -3,10 +3,10 @@
        {{#each rooms}}
           <div class="col-md-4 col-sm-6 col-xs-12">
               <div class="station">
-                  <h3>{{type}}</h3>
+                  <h3>{{display}}</h3>
                   {{#with type=type}}
-                    <h5>{{currentSong.song.title}}</h5>
-                    <h6>{{currentSong.song.artist}}</h6>
+                      <h5>{{currentSong.song.title}}</h5>
+                      <h6>{{currentSong.song.artist}}</h6>
                   {{/with}}
                   <a href="/{{type}}" class="station_link"></a>
               </div>
@@ -15,12 +15,12 @@
     </div>
     
     <script type="text/javascript">
-      window.doorbellOptions = {
-          appKey: 'v2Gu14c8s9HgBsAFCXNWIm2vlk11N12Plt2Wu5k2MbQIkM1Ao6kOTCbfN95ElEVM',
-          hideEmail: true
-      };
-      (function(d, t) {
-          var g = d.createElement(t);g.id = 'doorbellScript';g.type = 'text/javascript';g.async = true;g.src = 'https://embed.doorbell.io/button/2408?t='+(new Date().getTime());(d.getElementsByTagName('head')[0]||d.getElementsByTagName('body')[0]).appendChild(g);
-      }(document, 'script'));
+        window.doorbellOptions = {
+            appKey: 'v2Gu14c8s9HgBsAFCXNWIm2vlk11N12Plt2Wu5k2MbQIkM1Ao6kOTCbfN95ElEVM',
+            hideEmail: true
+        };
+        (function(d, t) {
+            var g = d.createElement(t);g.id = 'doorbellScript';g.type = 'text/javascript';g.async = true;g.src = 'https://embed.doorbell.io/button/2408?t='+(new Date().getTime());(d.getElementsByTagName('head')[0]||d.getElementsByTagName('body')[0]).appendChild(g);
+        }(document, 'script'));
     </script>
 </template>