From f60220c2b85ee9fc1ee090ba05f3fda9daad5493 Mon Sep 17 00:00:00 2001
From: Dominic Bosch <dominicsfakeaddress@server.fake>
Date: Tue, 10 Dec 2013 07:16:55 +0100
Subject: [PATCH] Demo preparations, getting towards a working example

---
 coffee/db_interface.coffee            |  3 ++-
 coffee/request_handler.coffee         |  3 +--
 coffee/server.coffee                  |  2 +-
 webpages/handlers/forge_modules.html  |  7 +++----
 webpages/handlers/forge_rules.html    | 21 +++++++++++----------
 webpages/public/rulesforge/index.html |  8 --------
 webpages/public/style.css             |  9 +++++++++
 7 files changed, 27 insertions(+), 26 deletions(-)
 delete mode 100644 webpages/public/rulesforge/index.html

diff --git a/coffee/db_interface.coffee b/coffee/db_interface.coffee
index da3e061..cab4a05 100644
--- a/coffee/db_interface.coffee
+++ b/coffee/db_interface.coffee
@@ -43,7 +43,8 @@ exports = module.exports = ( args ) =>
   config = require './config'
   config args
   @crypto_key = config.getCryptoKey()
-  @db = redis.createClient config.getDBPort(), 'localhost', { connect_timeout: 2000 }
+  @db = redis.createClient config.getDBPort(),
+    'localhost', { connect_timeout: 2000 }
   @db.on "error", ( err ) ->
     err.addInfo = 'message from DB'
     log.error 'DB', err
diff --git a/coffee/request_handler.coffee b/coffee/request_handler.coffee
index a9788ed..36955fe 100644
--- a/coffee/request_handler.coffee
+++ b/coffee/request_handler.coffee
@@ -92,8 +92,7 @@ exports.handleEvent = ( req, resp ) =>
       resp.send 'Thank you for the event: ' + obj.event + ' (' + obj.eventid + ')!'
       db.pushEvent obj
     else
-      resp.writeHead 400, { "Content-Type": "text/plain" }
-      resp.send 'Your event was missing important parameters!'
+      resp.send 400, 'Your event was missing important parameters!'
 
 
 ###
diff --git a/coffee/server.coffee b/coffee/server.coffee
index 2d41474..2bb23da 100644
--- a/coffee/server.coffee
+++ b/coffee/server.coffee
@@ -1,6 +1,6 @@
 ###
 
-Rules Server
+Server
 ============
 
 >This is the main module that is used to run the whole server:
diff --git a/webpages/handlers/forge_modules.html b/webpages/handlers/forge_modules.html
index 3a27674..6c89e9c 100644
--- a/webpages/handlers/forge_modules.html
+++ b/webpages/handlers/forge_modules.html
@@ -30,14 +30,14 @@ exports.myOwnEventFunction = function( callback ) {
 </script>
 
 <script type = "text/template" id="templ_params">
-[
+{
   username: {
     description: "The username for the Web API"
   },
   password: {
     description: "The password for the Web API"
   }
-]
+}
 </script>
 
   </head>
@@ -55,8 +55,7 @@ exports.myOwnEventFunction = function( callback ) {
         Module name: <input type="text" id="input_id" />
       </p>
       <p>
-        <textarea id="textarea_module" rows="20" cols="100">
-        </textarea>
+        <textarea id="textarea_module" rows="20" cols="100"> </textarea>
       </p>
       <p>
         Description of module:<br />
diff --git a/webpages/handlers/forge_rules.html b/webpages/handlers/forge_rules.html
index c6eab0d..15e5bc3 100644
--- a/webpages/handlers/forge_rules.html
+++ b/webpages/handlers/forge_rules.html
@@ -9,16 +9,17 @@
 		<div id="mainbody">
 	    <div id="pagetitle">Hi {{user.username}}, forge your own rules!</div>
 	    <p>
-        <input type="radio" name="radio_event" id="radio_input" checked />
-        <input type="text" id="input_event" /><br />
-        <input type="radio" name="radio_event" id="radio_select" />
-        <select id="select_event">
-        </select>
-        
+        <div id="div_left">
+          <textarea id="textarea_module" rows="20" cols="100"> </textarea>
+          <p>
+            <button id="but_submit">save</button>
+          </p>
+        </div>
+        <div id="div_right">
+          <p><b>Available Event Modules:</b></p>
+          <ul> </ul>
+        </div>
 	    </p>
-    	<p>
-    		<button id="but_submit">save</button>
-    	</p>
     </div>
     
     <script type="text/javascript">
@@ -49,7 +50,7 @@
           if(mthds) {
             var arr = mthds.split(',');
             for(var i = 0; i < arr.length; i++) {
-              $('#select_event').append($('<option>').text(mod + '->' + arr[i]));
+              $('#div_right ul').append($('<li>').text(mod + '->' + arr[i]));
             }
           }
         }
diff --git a/webpages/public/rulesforge/index.html b/webpages/public/rulesforge/index.html
deleted file mode 100644
index 5f50f37..0000000
--- a/webpages/public/rulesforge/index.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-  <head>
-    <title>Rules Forge</title>
-  </head>
-  <body>
-    <h1>Rules Forge</h1>
-  </body>
-</html>
\ No newline at end of file
diff --git a/webpages/public/style.css b/webpages/public/style.css
index 6d96582..781cf5c 100644
--- a/webpages/public/style.css
+++ b/webpages/public/style.css
@@ -46,3 +46,12 @@ textarea {
 	font-size: 1.5em;
 	font-weight: bold;
 }
+
+#div_left {
+  float: left;
+  padding-right: 10px;
+}
+
+#div_right li {
+  list-style-type: none;
+}