From 3642a641c57621f2cbf87bed4657d58527d7b76f Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Fri, 7 Oct 2016 10:49:03 +0000
Subject: Tweets on main page are working

---
 wqflask/wqflask/templates/index_page_orig.html | 23 ++++++++++++++++++++++-
 wqflask/wqflask/views.py                       |  4 ++++
 2 files changed, 26 insertions(+), 1 deletion(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/templates/index_page_orig.html b/wqflask/wqflask/templates/index_page_orig.html
index 73d3e718..bc811ef6 100755
--- a/wqflask/wqflask/templates/index_page_orig.html
+++ b/wqflask/wqflask/templates/index_page_orig.html
@@ -221,7 +221,11 @@
                         <li><a href="http://genenetwork.helmholtz-hzi.de/">Germany at the HZI</a></li>
                         <li><a href="http://gn2.genenetwork.org/">Memphis at the U of M</a></li>
                     </ul>
-                </section>
+
+                 <div id="tweets"></div>
+
+
+               </section>
 
                 <!--<section id="getting-started">
                     <div class="page-header">
@@ -282,4 +286,21 @@
         }
     </script>
 
+    <script type="text/javascript" src="/twitter/js/twitterFetcher_min.js"></script>
+
+    <script type="text/javascript">
+      var configProfile = {
+      "profile": {"screenName": 'GeneNetwork2'},
+      "domId": 'tweets',
+      "maxTweets": 5,
+      "enableLinks": true,
+      "showUser": true,
+      "showTime": true,
+      "showImages": true,
+      "lang": 'en'
+      };
+      twitterFetcher.fetch(configProfile);
+    </script>
+
+
 {% endblock %}
diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py
index 33fab84d..a5b2870d 100644
--- a/wqflask/wqflask/views.py
+++ b/wqflask/wqflask/views.py
@@ -143,6 +143,10 @@ def tmp_page(img_path):
     return render_template("show_image.html",
                             img_base64 = bytesarray )
 
+@app.route("/twitter/<path:filename>")
+def bd_files(filename):
+    bd_path = app.config['TWITTER_POST_FETCHER_JS_PATH']
+    return send_from_directory(bd_path, filename)
 
 #@app.route("/data_sharing")
 #def data_sharing_page():
-- 
cgit v1.2.3


From 2b1df54a13f0fa53c91ce23a4e9b7b9262983946 Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Fri, 7 Oct 2016 11:14:52 +0000
Subject: Twitter: added news list to search page

---
 wqflask/wqflask/templates/index_page_orig.html | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/templates/index_page_orig.html b/wqflask/wqflask/templates/index_page_orig.html
index bc811ef6..8844609f 100755
--- a/wqflask/wqflask/templates/index_page_orig.html
+++ b/wqflask/wqflask/templates/index_page_orig.html
@@ -1,5 +1,10 @@
 {% extends "base.html" %}
 {% block title %}GeneNetwork{% endblock %}
+{% block css %}
+<style TYPE="text/css">
+  p.interact { display: none; }
+</style>
+{% endblock %}
 {% block content %}
 <!-- Start of body -->
 
@@ -166,8 +171,17 @@
                       </ul>
                 </section>
             </div>
+
             <div style="padding-left:120px" class="col-xs-4" style="width: 600px !important;">
-                <!--
+                <section id="news-section">
+                    <div class="page-header">
+                        <h1>News</h1>
+                    </div>
+                    <div id="tweets"></div>
+                    <div align="right">
+                      <a href="https://twitter.com/GeneNetwork2">more news items...</a>
+                    </div>
+              <!--
                 <section id="tour-info">
                     <div class="page-header">
                         <h1>Tour and more info</h1>
@@ -194,6 +208,7 @@
 
                 </section>
                 -->
+                </section>
 
                 <section id="websites">
                     <div class="page-header">
@@ -222,7 +237,6 @@
                         <li><a href="http://gn2.genenetwork.org/">Memphis at the U of M</a></li>
                     </ul>
 
-                 <div id="tweets"></div>
 
 
                </section>
@@ -294,9 +308,9 @@
       "domId": 'tweets',
       "maxTweets": 5,
       "enableLinks": true,
-      "showUser": true,
+      "showUser": false,
       "showTime": true,
-      "showImages": true,
+      "showImages": false,
       "lang": 'en'
       };
       twitterFetcher.fetch(configProfile);
-- 
cgit v1.2.3


From d300e9183900962cafbac47b0cbbdb43a49e2019 Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Fri, 7 Oct 2016 11:37:09 +0000
Subject: Make sure JS path exists

---
 wqflask/utility/tools.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'wqflask')

diff --git a/wqflask/utility/tools.py b/wqflask/utility/tools.py
index c6d8f7d2..31f838b3 100644
--- a/wqflask/utility/tools.py
+++ b/wqflask/utility/tools.py
@@ -231,3 +231,5 @@ if os.environ.get('WQFLASK_OVERRIDES'):
             else:
                 OVERRIDES[k] = cmd
             logger.debug(OVERRIDES)
+
+assert_dir(get_setting("TWITTER_POST_FETCHER_JS_PATH"))
-- 
cgit v1.2.3