From ec2899a0df9eaf57af8281dd589a5fc26e0bbe6c Mon Sep 17 00:00:00 2001
From: LV-426 <lv-426@taproot.org.il>
Date: Sun, 10 May 2015 21:41:15 +0300
Subject: fragment_d_path: use as var within HTML templates

---
 res/domain-fragment.d/default/template.d/index.html |  2 +-
 src/server/rz_api.py                                | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/res/domain-fragment.d/default/template.d/index.html b/res/domain-fragment.d/default/template.d/index.html
index 772f89ed..3a2a9658 100644
--- a/res/domain-fragment.d/default/template.d/index.html
+++ b/res/domain-fragment.d/default/template.d/index.html
@@ -36,7 +36,7 @@ var RZ_VERSION = '{% include "version.txt" %}';
            <span id="profile-circle"></span>
            <span class="profile-username">Hello&nbsp;<span id="user_id">{{ rz_username }}</span>!<span id="btn-logout" class="button">Logout</span></span>
       </span>
-      <span class="site-logo"><a tabindex="-1"><img id="site-logo" src="/static/img/site-logo.png"></a></span>
+      <span class="site-logo"><a tabindex="-1"><img id="site-logo" src="{{ fragment_d_path }}/img/site-logo.png"></a></span>
     </span>
   </div>
   <div id="intro-task" class="task-alert" style="display:none">
diff --git a/src/server/rz_api.py b/src/server/rz_api.py
index fbd71e8c..38db7640 100644
--- a/src/server/rz_api.py
+++ b/src/server/rz_api.py
@@ -42,8 +42,9 @@ def rz_mainpage(rzdoc_name=None):
             role_set = u_account.role_set
             rz_username = escape(u_account.rz_username)
 
+    rz_config = current_app.rz_config
     if None == rzdoc_name:
-        s_rzdoc_name = current_app.rz_config.rzdoc__mainpage_name
+        s_rzdoc_name = rz_config.rzdoc__mainpage_name
     else:
         try:
             s_rzdoc_name = sanitize_input__rzdoc_name(rzdoc_name)
@@ -54,10 +55,12 @@ def rz_mainpage(rzdoc_name=None):
     # establish rz_config template values
     host_addr, host_port = request.host_sock_addr[0], request.host_sock_addr[1]
     rz_config = {'rz_config__rzdoc_cur__name': s_rzdoc_name,
-                 'rz_config__rzdoc__mainpage_name': current_app.rz_config.rzdoc__mainpage_name,
+                 'rz_config__rzdoc__mainpage_name': rz_config.rzdoc__mainpage_name,
                  'rz_config__hostname': host_addr,
                  'rz_config__port': host_port,
-                 'rz_config__optimized_main': 'true' if current_app.rz_config.optimized_main else 'false',
-                 'rz_config__role_set': role_set}
+                 'rz_config__optimized_main': 'true' if rz_config.optimized_main else 'false',
+                 'rz_config__role_set': role_set,
+                 'fragment_d_path': rz_config.fragment_d_path,
+                 }
     return render_template('index.html', rz_username=rz_username, **rz_config)
 
-- 
cgit v1.3.1