summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLV-426 <lv-426@taproot.org.il>2015-04-29 19:46:38 +0300
committerLV-426 <lv-426@taproot.org.il>2015-04-29 19:50:01 +0300
commit13a846813a1cf192355485197fc144d37e34eb63 (patch)
tree3da93c49216c8c4c627136d7046d17e841b57503
parent86762454fdb782193ea59712dc8704f99c9c549b (diff)
revive static/js move
-rw-r--r--res/debian/install2
-rw-r--r--res/templates/index.html4
-rw-r--r--res/templates/login.html2
-rw-r--r--res/templates/user_signup.html2
4 files changed, 5 insertions, 5 deletions
diff --git a/res/debian/install b/res/debian/install
index a37207aa..8d6b927a 100644
--- a/res/debian/install
+++ b/res/debian/install
@@ -9,5 +9,5 @@ src/local/server-tools/* usr/lib/rhizi/tools/server-tools
src/local/rz-mux/* usr/lib/rhizi/tools/rz-mux
# Domain specific - install defaults
+src/local/domain/default.rhizi.net/domain_types.js usr/lib/rhizi/webapp/static/js/model/
res/local/template/fragment/by-domain/default.rhizi.net/* usr/share/rhizi/webapp/templates/fragment
-src/local/domain/default.rhizi.net/domain_types.js usr/share/rhizi/webapp/static/js/model/
diff --git a/res/templates/index.html b/res/templates/index.html
index c2d47381..87fc59ad 100644
--- a/res/templates/index.html
+++ b/res/templates/index.html
@@ -19,8 +19,8 @@ var rz_config = { // set as a global variable
var RZ_VERSION = '{% include "fragment/version.txt" %}';
</script>
-<script data-main='/static/app.js' src="/static/lib/require.js"></script>
-<script src="/static/local_config.js"></script>
+<script data-main='/static/js/app.js' src="/static/lib/require.js"></script>
+<script src="/static/js/local_config.js"></script>
{% endblock %}
{% block content %}
<div class="top-bar">
diff --git a/res/templates/login.html b/res/templates/login.html
index b4d7f978..b3e4cfd0 100644
--- a/res/templates/login.html
+++ b/res/templates/login.html
@@ -3,7 +3,7 @@
{% block head %}
{{ super() }}
<script src="/static/lib/jquery.js" type="text/javascript"></script>
-<script src="/static/user_login.js" type="text/javascript"></script>
+<script src="/static/js/user_login.js" type="text/javascript"></script>
<style type="text/css">
html {
diff --git a/res/templates/user_signup.html b/res/templates/user_signup.html
index 639d0be9..93589d86 100644
--- a/res/templates/user_signup.html
+++ b/res/templates/user_signup.html
@@ -1,7 +1,7 @@
{% extends "base.html" %} {% block title %}Rhizi - Sign up{% endblock %}
{% block head %} {{ super() }}
<script src="/static/lib/jquery.js" type="text/javascript"></script>
-<script src="/static/user_signup.js" type="text/javascript"></script>
+<script src="/static/js/user_signup.js" type="text/javascript"></script>
<style type="text/css">
html {