summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLV-426 <lv-426@taproot.org.il>2015-04-05 15:40:56 +0300
committerLV-426 <lv-426@taproot.org.il>2015-04-05 15:40:56 +0300
commit16c139887d50962798ae0b9422fbdf26f9230264 (patch)
tree7ecc7f466fd616f721880136615cbc876ac10ad5
parenta16dea8dd45f54240d44bdade242d278da5b7fa0 (diff)
introducing template fragments
-rw-r--r--build.ant9
-rw-r--r--res/local/template/fragment/by-domain/default.rhizi.net/login__header.html3
-rw-r--r--res/templates/login.html4
3 files changed, 10 insertions, 6 deletions
diff --git a/build.ant b/build.ant
index 5b8d46cd..6984c053 100644
--- a/build.ant
+++ b/build.ant
@@ -36,8 +36,8 @@
<property name="pkg_version" value="0.1.0" />
<property name="buildDir" value="build/${pkg_name}-${pkg_version}" />
<property name="targetDeploymentDir" value="deploy-local" />
- <property name="remoteDeployServer" value="rhizi.net" />
- <property name="targetDomain" value="rhizi.net" />
+ <property name="remoteDeployServer" value="rz-0.unige.ch" />
+ <property name="targetDomain" value="default.rhizi.net" />
<property name="doClientOptimize" value="false" />
<tstamp>
@@ -74,6 +74,8 @@
<property name="src_server" value="src/server" />
<mkdir dir="${targetDeploymentDir}/static" />
+ <mkdir dir="${targetDeploymentDir}/templates" />
+ <mkdir dir="${targetDeploymentDir}/templates/fragment" />
<!-- note: defaults to not overwriting, so rhizi-server.conf is safe -->
@@ -93,7 +95,8 @@
<copy file="res/etc/rhizi-server.conf"
tofile="${targetDeploymentDir}/etc/rhizi-server.conf" />
- <rsync src="res/templates/" dst="${targetDeploymentDir}/templates" />
+ <rsync src="res/templates/" dst="${targetDeploymentDir}/templates/" />
+ <rsync src="res/local/template/fragment/by-domain/${targetDomain}/" dst="${targetDeploymentDir}/templates/fragment/" />
<copy file="res/etc/user_db.db" tofile="${targetDeploymentDir}/user_db.db" failonerror="false" />
</parallel>
diff --git a/res/local/template/fragment/by-domain/default.rhizi.net/login__header.html b/res/local/template/fragment/by-domain/default.rhizi.net/login__header.html
new file mode 100644
index 00000000..446a701a
--- /dev/null
+++ b/res/local/template/fragment/by-domain/default.rhizi.net/login__header.html
@@ -0,0 +1,3 @@
+<p class="login-text">Lorem ipsum dolor sit amet</p>
+<p class="login-text">consectetur adipiscing elit</p>
+<p class="login-text">sed do eiusmod tempor incididunt ut labore et dolore magna aliqua</p>
diff --git a/res/templates/login.html b/res/templates/login.html
index 4c320cf9..14b6b759 100644
--- a/res/templates/login.html
+++ b/res/templates/login.html
@@ -28,9 +28,7 @@ body {
<h1 class="login-header">Welcome to Rhizi</h1>
</div>
<div class="login-view-section" id="login-view-section_intro-text">
- <p class="login-text"><em>Directly interact with knowledge graphs.</em></p>
- <p class="login-text">Use Rhizi to Share the skills, interests and project you participate in.</p>
- <p class="login-text">The resulting interactome allows the entire CRI to better collaborate with AIV students</p>
+ {% include "fragment/login__header.html" %}
</div>
<div class="login-view-section login-form">
<div id="login-form">