From 4fec192939635ad5fc14d80e73ec0f999681c623 Mon Sep 17 00:00:00 2001
From: Julien Lengrand-Lambert <julien@lengrand.fr>
Date: Tue, 5 Feb 2013 10:59:49 +0100
Subject: [PATCH] First working version of hashtag adding in html. To be merged

---
 twiderboard/flask_app.py                  |  8 +--
 twiderboard/templates/add_hash.html       | 31 +++++++++++
 twiderboard/templates/statistics.html     | 30 -----------
 twiderboard/templates/statistics_sav.html | 64 +++++++++++++++++++++++
 4 files changed, 99 insertions(+), 34 deletions(-)
 create mode 100644 twiderboard/templates/add_hash.html
 create mode 100644 twiderboard/templates/statistics_sav.html

diff --git a/twiderboard/flask_app.py b/twiderboard/flask_app.py
index 3e8ca9c..08cbd33 100644
--- a/twiderboard/flask_app.py
+++ b/twiderboard/flask_app.py
@@ -50,15 +50,15 @@ def nb_trendy():
 
 @app.route('/_add_hashtag')
 def add_hashtag():
-    new_hash = request.args.get('new_hash', 0)
-    print "Request to add %s !" % (new_hash)
-    return jsonify(result="Added %s" % (new_hash))
+    new_hash = request.args.get('new_hash')
+    return jsonify(hash="Adding %s !" % (new_hash))
 
 
 @app.route('/')
 def index():
     #return render_template('index_dyn.html')
-    return render_template('statistics.html')
+    #return render_template('statistics.html')
+    return render_template('add_hash.html')
 
 if __name__ == '__main__':
     app.run()
diff --git a/twiderboard/templates/add_hash.html b/twiderboard/templates/add_hash.html
new file mode 100644
index 0000000..bb35a80
--- /dev/null
+++ b/twiderboard/templates/add_hash.html
@@ -0,0 +1,31 @@
+{% extends "layout.html" %}
+{% block body %}
+<script type=text/javascript>
+  $(function() {
+    var submit_form = function(e) {
+      $.getJSON($SCRIPT_ROOT + '/_add_hashtag', {
+        new_hash: $('input[name="new_hash"]').val()
+      }, function(data) {
+        $('#hash').text(data.hash);
+        $('input[name=new_hash]').focus().select();
+      });
+      return false;
+    };
+
+    $('new_hash#calculate').bind('click', submit_form);
+
+    $('input[type=text]').bind('keydown', function(e) {
+      if (e.keyCode == 13) {
+        submit_form(e);
+      }
+    });
+
+    $('input[name=new_hash]').focus();
+  });
+</script>
+<h1>Hashtags</h1>
+<p>
+  <input type=text size=5 name='new_hash'>
+  <span id=hash></span>
+<p><a href=# id=calculate>calculate server side</a>
+{% endblock %}
\ No newline at end of file
diff --git a/twiderboard/templates/statistics.html b/twiderboard/templates/statistics.html
index 1a89219..82b9826 100644
--- a/twiderboard/templates/statistics.html
+++ b/twiderboard/templates/statistics.html
@@ -15,29 +15,6 @@
     });
   })();
 </script>
-<script type=text/javascript>
-  $(function() {
-    var submit_form = function(e) {
-      $.getJSON($SCRIPT_ROOT + '/_add_hashtag', {
-        a: $('input[name="new_hash"]').val()
-      }, function(data) {
-        $('#result').text(data.result);
-        $('input[name=new_hash').focus().select();
-      });
-      return false;
-    };
-
-    $('new_hash#add_hash').bind('click', submit_form);
-
-    $('input[type=text]').bind('keydown', function(e) {
-      if (e.keyCode == 13) {
-        submit_form(e);
-      }
-    });
-
-    $('input[name=new_hash]').focus();
-  });
-</script>
 <h1>Database information</h1>
 <p>
   Current number of active hastags in database :
@@ -51,11 +28,4 @@
   Current number of members in database :
   <span id='members'>?</span>
 </p>
-
-<h2>Hashtags</h2>
-<p> <input type=text size=10 name=new_hash>
-  <a href='#' id='add_hash'>Add new hashtag!</a>
-  <br/>
-  <span id='result'>?</span>
-</p>
 {% endblock %}
\ No newline at end of file
diff --git a/twiderboard/templates/statistics_sav.html b/twiderboard/templates/statistics_sav.html
new file mode 100644
index 0000000..ffc26aa
--- /dev/null
+++ b/twiderboard/templates/statistics_sav.html
@@ -0,0 +1,64 @@
+{% extends "layout.html" %}
+{% block body %}
+<script>
+(function worker() {
+  $.ajax({
+    url : $SCRIPT_ROOT + '/nb_trendy',
+    success: function(data) {
+      $('#hashs').text(data.hashs);
+      $('#tweets').text(data.tweets);
+      $('#members').text(data.members);
+    },
+    complete: function() {
+      setTimeout(worker, 1000);
+    }
+  });
+})();
+</script>
+<script type=text/javascript>
+$(function() {
+  $(".button").click(function() {
+    $(function() {
+  $('.error').hide();
+  $(".button").click(function() {
+    // validate and process form here
+    $('.error').hide();
+      var name = $("input#new_hash").val();
+        if (name == "") {
+      $("label#new_hash_error").show();
+      $("input#new_hash").focus();
+      return false;
+    }
+  });
+});
+  });
+});
+</script>
+<h1>Database information</h1>
+<p>
+  Current number of active hastags in database :
+  <span id='hashs'>?</span>
+</p>
+<p>
+  Current number of tweets in database :
+  <span id='tweets'>?</span>
+</p>
+<p>
+  Current number of members in database :
+  <span id='members'>?</span>
+</p>
+
+<h2>Hashtags</h2>
+<p>
+  <div id="add_hash">
+    <form name="add" action="">
+      <fieldset>
+        <input type="text" name="new_hash" id="new_hash" class="text-input" size=10 />
+        <label class="error" for="new_hash" id="new_hash_error">Hash not empty!</label>
+        <input type="submit" name="submit" class="button" id="add_hash" value="Add!" />
+      </fieldset>
+    </form>
+  </div>
+  <span id='result'></span>
+</p>
+{% endblock %}
\ No newline at end of file