summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLV-426 <lv-426@taproot.org.il>2015-05-10 16:13:11 +0300
committerLV-426 <lv-426@taproot.org.il>2015-05-12 14:59:07 +0300
commit6a6b82e2e5dac73d7d05df173f90dec1a898d666 (patch)
treefe876c93eb32560877bce968b0bb5ed90e551e48
parent0fb3f8a889c8734ef9ba8630403aeb86a203fdd5 (diff)
img fragment layout: support both flask-mode, apache-mode
-rw-r--r--res/domain-fragment.d/default/template.d/index.html2
-rw-r--r--res/rz-mux/apache-conf-template.d/x.rhizi.net.conf3
2 files changed, 4 insertions, 1 deletions
diff --git a/res/domain-fragment.d/default/template.d/index.html b/res/domain-fragment.d/default/template.d/index.html
index 45fa0e58..772f89ed 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="/fragment.d/img/site-logo.png"></a></span>
+ <span class="site-logo"><a tabindex="-1"><img id="site-logo" src="/static/img/site-logo.png"></a></span>
</span>
</div>
<div id="intro-task" class="task-alert" style="display:none">
diff --git a/res/rz-mux/apache-conf-template.d/x.rhizi.net.conf b/res/rz-mux/apache-conf-template.d/x.rhizi.net.conf
index f6adf4c1..4ed9dbfd 100644
--- a/res/rz-mux/apache-conf-template.d/x.rhizi.net.conf
+++ b/res/rz-mux/apache-conf-template.d/x.rhizi.net.conf
@@ -20,7 +20,10 @@
# [!] proxy directives are order sensitive
#
# Temporary fix until #529 is implemented
+ ProxyPass /fragment.d !
ProxyPass /static/js/model/domain_types.js !
+ ProxyPass /static/img !
+ Alias /static/img ${rzi_fragment_d}/img
Alias /static/js/model/domain_types.js ${rzi_fragment_d}/js/domain_types.js
ProxyRequests Off