Merge branch 'dev'

REGOVAR · Jun 6, 2018 · 786d16f · 786d16f
2 parents 71f7f96 + b56c8cf
commit 786d16f
Show file tree

Hide file tree

Showing 3 changed files with 92 additions and 3,310 deletions.
diff --git a/regovar/api_rest/handlers/web_handler.py b/regovar/api_rest/handlers/web_handler.py
@@ -44,10 +44,17 @@ def __init__(self):
     #@user_role('Authenticated')
     @aiohttp_jinja2.template('web_home.html')
     def home(self, request):
+        # Get message
+        sql = "SELECT value FROM parameter WHERE key = 'message'"
+        message = None
+        for res in execute(sql):
+            message = json.loads(res.value)
+
         return {
             "hostname" : HOST_P,
             "error": None,
-            "path": []
+            "path": [],
+            "message": message
         }
 
 

diff --git a/regovar/api_rest/templates/web_home.html b/regovar/api_rest/templates/web_home.html
@@ -86,6 +86,42 @@
             margin-bottom: 12px;
             margin-top: 50px;
         }
+
+        .box-info
+        {
+            background-color: #d9edf7;
+            border: 1px solid #6887ff;
+            color: #6887ff;
+            width: 100%;
+            font-size: 16px;
+            padding: 12px 20px 12px 42px;
+            border: 1px solid #6887ff;
+            margin-bottom: 12px;
+            margin-top: 50px;
+        }
+        .box-warning
+        {
+            background-color: #fcf8e3;
+            border: 1px solid #ff9b28;
+            color: #ff9b28;
+            width: 100%;
+            font-size: 16px;
+            padding: 12px 20px 12px 42px;
+            margin-bottom: 12px;
+            margin-top: 50px;
+        }
+        .box-danger
+        {
+            background-color: #f2dede;
+            border: 1px solid #f44455;
+            color: #f44455;
+
+            width: 100%;
+            font-size: 16px;
+            padding: 12px 20px 12px 42px;
+            margin-bottom: 12px;
+            margin-top: 50px;
+        }
 
 
     </style>
@@ -112,11 +148,19 @@
 
     <div class="container" role="main">
         <div style="margin-top:70px; text-align: center;">
+            {% if message %}
+                <div class="box-{{ message["type"] }}">
+                    <span>{{ message["message"]}}</span>
+                </div>
+            {% endif %}
+
+
             <img src="https://raw.githubusercontent.com/REGOVAR/Regovar/master/logo/logotitle.color.png" height="150px" style="margin-top: 50px;"/>
 
-            <input type="text" id="searchbar" onkeypress="startsearch(event)" placeholder="Search for analyses, subjects, files, panels, phenotypes, diseases, genes or variants">
+            <!-- <input type="text" id="searchbar" onkeypress="startsearch(event)" placeholder="Search for analyses, subjects, files, panels, phenotypes, diseases, genes or variants"> -->
+
         </div>
-        
+
         <p style="margin-top:100px; text-align: center;">
             <a href="http://regovar.org" target="_blanck">Regovar.org</a> - 
             <a href="http://regovar.readthedocs.io/fr/latest/" target="_blanck">Documentation</a>