From 46a6618cb653533a9776520b6b2428728223cc80 Mon Sep 17 00:00:00 2001
From: LV-426 <lv-426@taproot.org.il>
Date: Mon, 4 May 2015 03:16:25 +0300
Subject: build.ant: relayout fragments

---
 build.ant                 | 14 ++++++--------
 res/template.d/index.html |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/build.ant b/build.ant
index 30c21b87..264a7765 100644
--- a/build.ant
+++ b/build.ant
@@ -105,10 +105,9 @@
       <property name="src_server" value="src/server" />
 
       <mkdir dir="${targetDeploymentDir}/static" />
-      <mkdir dir="${targetDeploymentDir}/template.d" />
-      <mkdir dir="${targetDeploymentDir}/template.d/fragment.d" />
+      <mkdir dir="${targetDeploymentDir}/fragment.d/template.d" />
 
-      <generate_version_tag output="res/template.d/fragment.d" />
+      <generate_version_tag output="res/template.d" />
 
       <!-- note: defaults to not overwriting, so rhizi-server.conf is safe  -->
 
@@ -132,7 +131,7 @@
          <!-- res -->
          <rsync src="res/client/" dst="${targetDeploymentDir}/static" />
          <rsync src="res/template.d/"
-                dst="${targetDeploymentDir}/template.d/" />
+                dst="${targetDeploymentDir}/fragment.d/template.d" />
 
          <!-- auth-->
          <copy file="res/etc/user_db.db"
@@ -142,7 +141,7 @@
          <!-- domain specific defaults-->
          <copy file="res/etc/rhizi-server.conf.example"
                tofile="res/etc/rhizi-server.conf" />
-         <copy todir="${targetDeploymentDir}/template.d/fragment.d"
+         <copy todir="${targetDeploymentDir}/fragment.d/template.d"
                failonerror="false">
             <fileset dir="res/local/template/fragment/by-domain/${defaultDomain}"
                      includes="*" />
@@ -157,7 +156,7 @@
          <!-- domain specific overrides -->
          <copy file="src/local/domain/${targetDomain}/domain_types.js"
                tofile="${targetDeploymentDir}/static/js/model/domain_types.js" />
-         <copy todir="${targetDeploymentDir}/template.d/fragment.d"
+         <copy todir="${targetDeploymentDir}/fragment.d/template.d"
                overwrite="true"
                failonerror="false">
             <fileset dir="res/local/template/fragment/by-domain/${targetDomain}" />
@@ -244,8 +243,7 @@
       </replaceregexp>
 
       <!-- generate version fragment -->
-      <mkdir dir="${build_dir__deb_pkg}/res/template.d/fragment.d" />
-      <generate_version_tag output="${build_dir__deb_pkg}/res/template.d/fragment.d/" />
+      <generate_version_tag output="${build_dir__deb_pkg}/res/template.d" />
 
       <delete verbose="true" includeemptydirs="true">
          <fileset dir="${build_dir__deb_pkg}" includes="Makefile" />
diff --git a/res/template.d/index.html b/res/template.d/index.html
index 3a1d921e..9a10297d 100644
--- a/res/template.d/index.html
+++ b/res/template.d/index.html
@@ -17,7 +17,7 @@ var rz_config = { // set as a global variable
     'separator_string': '  ',
 };
 
-var RZ_VERSION = '{% include "fragment/version.txt" %}';
+var RZ_VERSION = '{% include "version.txt" %}';
 </script>
 <script data-main='/static/js/app.js' src="/static/lib/require.js"></script>
 <script src="/static/js/local_config.js"></script>
-- 
cgit v1.3.1