From d87ba2c5212aaabf9e9b81f76c858d6c9c3828e3 Mon Sep 17 00:00:00 2001 From: Julien Lengrand-Lambert Date: Mon, 18 Feb 2013 17:08:35 +0100 Subject: [PATCH] Adds real hashtags instead of dummy numbers --- twiderboard/flask_app.py | 2 +- twiderboard/templates/trendy.html | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/twiderboard/flask_app.py b/twiderboard/flask_app.py index eb9b09d..cb91e31 100644 --- a/twiderboard/flask_app.py +++ b/twiderboard/flask_app.py @@ -51,7 +51,7 @@ def trendy(): session.close() engine.dispose() - trendy = [[1, 2], [3, 4], [5, 6]] + #trendy = [[1, 2], [3, 4], [5, 6]] #trendy = 'plop' return jsonify(trendy=trendy) diff --git a/twiderboard/templates/trendy.html b/twiderboard/templates/trendy.html index 42cdee0..be3bfd3 100644 --- a/twiderboard/templates/trendy.html +++ b/twiderboard/templates/trendy.html @@ -3,20 +3,18 @@ $.ajax({ url : $SCRIPT_ROOT + '/trendy', success: function(data) { - console.log(data.trendy); var res = ""; - var link = "Remove"; + var link_1 = "Remove"; for (i=0;i"; res = res + ""; - res = res + ""; + res = res + ""; res = res + ""; } } res = res + "
" + data.trendy[i][0] + "" + link + "" + link_1 + data.trendy[i][0] + link_2 + "
"; - - console.log(res); $('#trendy').html(res); }, complete: function() {