streams now have individual settings

portertech · Aug 2, 2011 · ffb46ab · ffb46ab
1 parent 855d045
commit ffb46ab
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 13 deletions.
diff --git a/lib/public/scripts/main.js b/lib/public/scripts/main.js
@@ -3,16 +3,19 @@ function Stream() {
   this.s_id = null;
   this.s_name = null;
   this.s_terms = new Array();
+  this.s_logglytoken = null;
 
   // Getter Methods
   this.getId = function() { return s_id; };
   this.getName = function() { return s_name; };
   this.getTerms = function() { return s_terms; };
+  this.getLogglyToken = function() { return s_logglytoken; };
 
   // Setter Methods
   this.setId = function(id) { s_id = id; };
   this.setName = function(name) { s_name = name; };
   this.setTerms = function(terms) { s_terms = terms; };
+  this.setLogglyToken = function(logglytoken) { s_logglytoken = logglytoken; };
 
   // Other Methods
   this.addTerm = function(term) { s_terms.push(term); }
@@ -69,7 +72,6 @@ function switchToStream(stream) {
   stream.addClass('selected');
   $("div#logs_container").children("div:not(.logs_hidden)").addClass('logs_hidden');
   $("div#logs_container > div#"+stream.parent().attr('id')+"_logs").removeClass('logs_hidden');
-  $(".stream_settings[rel]").overlay({effect: 'apple'});
 }
 
 function setupTabs() {
@@ -125,11 +127,20 @@ function addStream(s) {
     $('div#streams').append(streamBlock);
   }
   $('div#streams li:last').fadeIn('normal');
+  var settings_div = '<div class="apple_overlay black" id="stream_settings_modal_'+s.ID+'" class="stream_settings_modal">'+
+  	'<div id="stream_settings_form_'+s.ID+'" class="stream_settings_form">'+
+  	'<div class="error"></div>'+
+  	'<h1>Stream Settings</h1>'+
+  	'<label for="loggly_token">Loggly Token:</label>'+
+  	'<input type="text" class="loggly_token"/>'+
+  	'<input type="button" value="Save" class="save_settings"/>'+
+  	'</div></div><div>';
+  $('div#settings_containers').append(settings_div);
   var div = $('<div/>',{
     'id': s.ID + '_logs',
     'class': 'logs_hidden'
   }).append('<div class="terms"></div>'+
-    '<div class="settings"><a href="#" rel="#stream_settings_modal" class="stream_settings"><img src="images/gear.png"/></a></div>'+
+    '<div class="settings"><a href="#" rel="#stream_settings_modal_'+s.ID+'" id="stream_settings_'+s.ID+'"><img src="images/gear.png"/></a></div>'+
     '<div class="term_adder"><input type="text" name="term_field"/><a href="#">+</a></div>'+
     '<div class="clear"></div>'+
     '<table><thead><tr>'+
@@ -141,6 +152,7 @@ function addStream(s) {
     '</tr></thead>'+
     '<tbody></tbody></table>');
   $('div#logs_container').append(div);
+  $("#stream_settings_"+s.ID+"[rel]").overlay({effect: 'apple'});
   var terms_container = div.find('div.terms');
   for (var t in s.Terms) {
     displayTerm(terms_container, s.Terms[t]);
@@ -156,6 +168,10 @@ function getStreams(pageLoad) {
         'ID': key,
         'Name': data[key].name,
         'Terms': data[key].terms,
+        'Forwarding': {
+          'Enabled': data[key].forwarding.enabled,
+          'Token': data[key].forwarding.token
+        }
       }
       streams[key] = stream;
       if (pageLoad) {

diff --git a/lib/public/stylesheets/style.css b/lib/public/stylesheets/style.css
@@ -243,7 +243,7 @@ div#new_stream_form
 	font-family: 'Helvetica Neue', Arial, sans-serif;
 }
 
-div#stream_settings_form
+div.stream_settings_form
 {
         margin: 0 auto;
         text-align: center;
@@ -256,7 +256,7 @@ div#new_stream_form h1
 	font-size: 1.6em;
 }
 
-div#stream_settings_form h1
+div.stream_settings_form h1
 {
         font-size: 1.6em;
 }
@@ -269,7 +269,7 @@ div#new_stream_form label
 	font-size: 1.0em;
 }
 
-div#stream_settings_form label
+div.stream_settings_form label
 {
         color: #ccc;
         font-weight: bold;
@@ -282,7 +282,7 @@ div#new_stream_form input[type="button"]
 	margin-left: 28px;
 }
 
-div#stream_settings_form input[type="button"]
+div.stream_settings_form input[type="button"]
 {
         margin-left: 28px;
 }

diff --git a/lib/views/application.haml b/lib/views/application.haml
@@ -23,10 +23,6 @@
     %label{ for: 'stream_name' } Stream name: 
     %input{ type: 'text', id: 'stream_name' }
     %input{ type: 'button', value: 'Create', id: 'create_stream' }
-%div.apple_overlay.black#stream_settings_modal
-  %div#stream_settings_form
-    %div.error
-    %h1 Stream Settings
-    %label{ for: 'loggly_token' } Loggly Token: 
-    %input{ type: 'text', id: 'loggly_token' }
-    %input{ type: 'button', value: 'Save', id: 'save_settings' }
+
+%div#settings_containers
+