summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Levy <alon@pobox.com>2015-05-27 09:16:09 +0300
committerAlon Levy <alon@pobox.com>2015-05-27 09:16:09 +0300
commitb4e625edcd2f81ae2a57d158d3b6920ca5f46818 (patch)
tree3ce90ebad86d9460c4ccfe299425238d36679389
parent9a0c9324b712465048d8e1e07c1fa703877e65ba (diff)
remove all custom files, will be updated externally
-rw-r--r--build.ant18
-rw-r--r--res/domain-fragment.d/cri.rhizi.net/css/style.css7
-rw-r--r--res/domain-fragment.d/cri.rhizi.net/img/CRI-logo.pngbin14982 -> 0 bytes
-rw-r--r--res/domain-fragment.d/descartes.rhizi.net/js/domain_types.js51
-rw-r--r--res/domain-fragment.d/leap.rhizi.net/js/domain_types.js54
-rw-r--r--res/domain-fragment.d/ohalo.rhizi.net/js/domain_types.js61
-rw-r--r--res/domain-fragment.d/r2.tami.org.il/js/domain_types.js54
-rw-r--r--res/domain-fragment.d/rhizi.tami.org.il/js/domain_types.js50
-rw-r--r--res/local/css/style.css (renamed from res/domain-fragment.d/default/css/style.css)0
-rw-r--r--res/local/img/site-logo.png (renamed from res/domain-fragment.d/default/img/site-logo.png)bin180 -> 180 bytes
-rw-r--r--res/local/js/domain_types.js (renamed from res/domain-fragment.d/default/js/domain_types.js)0
-rw-r--r--res/local/template.d/base.html (renamed from res/domain-fragment.d/default/template.d/base.html)0
-rw-r--r--res/local/template.d/index.html (renamed from res/domain-fragment.d/default/template.d/index.html)0
-rw-r--r--res/local/template.d/login.html (renamed from res/domain-fragment.d/default/template.d/login.html)0
-rw-r--r--res/local/template.d/login__header.html (renamed from res/domain-fragment.d/default/template.d/login__header.html)0
-rw-r--r--res/local/template.d/pw_reset.html (renamed from res/domain-fragment.d/default/template.d/pw_reset.html)0
-rw-r--r--res/local/template.d/user_signup.html (renamed from res/domain-fragment.d/default/template.d/user_signup.html)0
-rw-r--r--res/local/template/fragment/by-domain/cri.rhizi.net/login__header.html5
-rw-r--r--res/local/template/fragment/by-domain/default.rhizi.net/login__header.html2
-rw-r--r--res/local/template/fragment/by-domain/descartes.rhizi.net/login__header.html4
-rw-r--r--res/local/template/fragment/by-domain/leap.rhizi.net/login__header.html6
-rw-r--r--res/local/template/fragment/by-domain/ohalo.rhizi.net/login__header.html6
-rw-r--r--res/local/template/fragment/by-domain/rhizi.tami.org.il/login__header.html7
23 files changed, 3 insertions, 322 deletions
diff --git a/build.ant b/build.ant
index 8e5d914b..95cc7a02 100644
--- a/build.ant
+++ b/build.ant
@@ -71,12 +71,7 @@
description="controls the source of domain fragments" />
<property name="doClientOptimize" value="false" />
<property name="localServerUseSymlink" value="true" />
- <property name="fragmentd_root_path" value="res/domain-fragment.d" />
- <property name="default_fragmentd_src_path"
- value="${fragmentd_root_path}/default"
- description="source path for default fragments" />
- <property name="domain_fragmentd_src_path"
- value="${fragmentd_root_path}/${targetDomain}" />
+ <property name="fragmentd_root_path" value="res/local" />
<tstamp>
<format property="versionQualifier" pattern="yyyyMMddHHmm" />
@@ -146,7 +141,7 @@
failonerror="false" />
<!-- default fragments: templates -->
- <rsync src="${default_fragmentd_src_path}/" dst="${fragment_d_path}" />
+ <rsync src="${fragmentd_root_path}/" dst="${fragment_d_path}" />
</parallel>
@@ -159,13 +154,6 @@
<!-- requires default fragment rsync to have finished -->
<generate_version_tag outputdir="${fragment_d_path}/template.d" />
- <!-- domain-specific fragments -->
- <copy todir="${fragment_d_path}" overwrite="true" failonerror="false">
- <fileset dir="${domain_fragmentd_src_path}"
- includes="**/*"
- excludes="template.d/" />
- </copy>
-
<replaceregexp file="${deploy_target_dir}/static/js/app.js">
<regexp pattern="\$\{fragment_d_path\}" />
<substitution expression="/static/fragment.d" />
@@ -257,7 +245,7 @@
</replaceregexp>
<!-- generate version fragment -->
- <generate_version_tag outputdir="${build_dir__deb_pkg}/${default_fragmentd_src_path}/template.d" />
+ <generate_version_tag outputdir="${build_dir__deb_pkg}/${fragmentd_root_path}/template.d" />
<delete verbose="true" includeemptydirs="true">
<fileset dir="${build_dir__deb_pkg}" includes="Makefile" />
diff --git a/res/domain-fragment.d/cri.rhizi.net/css/style.css b/res/domain-fragment.d/cri.rhizi.net/css/style.css
deleted file mode 100644
index 84b63e95..00000000
--- a/res/domain-fragment.d/cri.rhizi.net/css/style.css
+++ /dev/null
@@ -1,7 +0,0 @@
-#site-logo {
- background-color: white;
- border-radius: 3px;
- height: 25px;
- padding: 2px;
- vertical-align: middle;
-} \ No newline at end of file
diff --git a/res/domain-fragment.d/cri.rhizi.net/img/CRI-logo.png b/res/domain-fragment.d/cri.rhizi.net/img/CRI-logo.png
deleted file mode 100644
index 07a3f20e..00000000
--- a/res/domain-fragment.d/cri.rhizi.net/img/CRI-logo.png
+++ /dev/null
Binary files differ
diff --git a/res/domain-fragment.d/descartes.rhizi.net/js/domain_types.js b/res/domain-fragment.d/descartes.rhizi.net/js/domain_types.js
deleted file mode 100644
index d167fb2e..00000000
--- a/res/domain-fragment.d/descartes.rhizi.net/js/domain_types.js
+++ /dev/null
@@ -1,51 +0,0 @@
-define({
- type_attributes:[
- ['person', {
- 'title':'Personne',
- 'attributes': ['description',
- 'email',
- 'image-url',
- 'name',
- 'url'
- ],
- }],
- ['team', {
- 'title':'Équipe',
- 'attributes':['description', 'url', 'image-url'],
- }],
- ['resource', {
- 'title':'Organisation',
- 'attributes':['description', 'url', 'image-url', 'email'],
- }],
- ['project', {
- 'title':'Projet',
- 'attributes':['description', 'status', 'url', 'budget', 'total days','image-url'],
- }],
- ['skill', {
- 'title':'Compétence',
- 'attributes':['description', 'url', 'image-url'],
- }]
- ],
- attribute_titles:{
- 'description':'Description',
- 'email':'Email',
- 'name':'Nom',
- 'type':'Type',
- 'url':'URL',
- 'image-url':'Image URL',
- 'total days':'Jours travaillés',
- 'budget':'Budget en k€',
- 'status':'Statut'
- },
- attribute_ui:{
- 'description':'textarea',
- 'email':'input',
- 'name':'input',
- 'type':'type',
- 'image-url':'image',
- 'url':'url',
- 'total days':'total days',
- 'budget':'input',
- 'status':'input'
- },
- });
diff --git a/res/domain-fragment.d/leap.rhizi.net/js/domain_types.js b/res/domain-fragment.d/leap.rhizi.net/js/domain_types.js
deleted file mode 100644
index 92227728..00000000
--- a/res/domain-fragment.d/leap.rhizi.net/js/domain_types.js
+++ /dev/null
@@ -1,54 +0,0 @@
-define({
- type_attributes: [
- ['collaborator', {
- 'title': 'Collaborator',
- 'attributes': ['affiliation',
- 'description',
- 'email',
- 'image-url',
- 'name',
- 'url'
- ],
- }],
- ['keyword', {
- 'title': 'Keyword',
- 'attributes': ['description', 'url', 'image-url'],
- }],
- ['project', {
- 'title': 'Project',
- 'attributes': ['description', 'url', 'rhizi-url', 'image-url'],
- }],
- ['idea', {
- 'title': 'Idea',
- 'attributes': ['description', 'url', 'image-url'],
- }],
- ['skill', {
- 'title': 'Skill',
- 'attributes': ['description', 'url', 'image-url'],
- }],
- ['resource', {
- 'title': 'Resource',
- 'attributes': ['description', 'url', 'image-url'],
- }]
- ],
- attribute_titles: {
- 'affiliation': 'Affiliation',
- 'description': 'Description',
- 'email': 'Email',
- 'name': 'Name',
- 'type': 'Type',
- 'url': 'URL',
- 'image-url': 'Image URL',
- 'rhizi-url': 'Rhizi URL',
- },
- attribute_ui: {
- 'affiliation': 'textarea',
- 'description': 'textarea',
- 'email': 'input',
- 'name': 'input',
- 'type': 'type',
- 'image-url': 'image',
- 'url': 'url',
- 'rhizi-url': 'rhizi-url',
- },
-});
diff --git a/res/domain-fragment.d/ohalo.rhizi.net/js/domain_types.js b/res/domain-fragment.d/ohalo.rhizi.net/js/domain_types.js
deleted file mode 100644
index 4021fef2..00000000
--- a/res/domain-fragment.d/ohalo.rhizi.net/js/domain_types.js
+++ /dev/null
@@ -1,61 +0,0 @@
-define({
- type_attributes: [
- ['collaborator', {
- 'title': 'סטודנט',
- 'attributes': ['name',
- 'description',
- 'image-url',
- 'url'
- ],
- }],
- ['keyword', {
- 'title': 'מילת-מפתח',
- 'attributes': ['description', 'url', 'image-url'],
- }],
- ['project', {
- 'title': 'מאמר',
- 'attributes': ['description', 'url', 'image-url'],
- }],
- ['idea', {
- 'title': 'שאלת-ראיון',
- 'attributes': ['description', 'url', 'image-url'],
- }],
- ['skill', {
- 'title': 'מאפיין-מנהיגות',
- 'attributes': ['description', 'url', 'image-url'],
- }],
- ['resource', {
- 'title': 'מרואיין',
- 'attributes': ['description', 'url', 'image-url'],
- }],
- ['personality-trait', {
- 'title': 'פרופיל אישי',
- 'attributes': ['description', 'url', 'image-url'],
- }],
- ['accepting-changes', {
- 'title': 'קבלת שינויים',
- 'attributes': ['description', 'url', 'image-url'],
- }],
- ['decision-making', {
- 'title': 'קבלת החלטות',
- 'attributes': ['description', 'url', 'image-url'],
- }],
- ],
- attribute_titles: {
- 'description': 'תיאור',
- 'name': 'שם',
- 'type': 'סוג',
- 'url': 'לינק',
- 'image-url': 'לינק-תמונה',
- },
- attribute_ui: {
- 'description': 'textarea',
- 'name': 'input',
- 'type': 'type',
- 'image-url': 'image',
- 'url': 'url',
- },
- misc: {
- 'direction': 'rtl'
- }
-});
diff --git a/res/domain-fragment.d/r2.tami.org.il/js/domain_types.js b/res/domain-fragment.d/r2.tami.org.il/js/domain_types.js
deleted file mode 100644
index b9333b3e..00000000
--- a/res/domain-fragment.d/r2.tami.org.il/js/domain_types.js
+++ /dev/null
@@ -1,54 +0,0 @@
-define({
- type_attributes: [
- ['person', {
- 'title': 'Collaborator',
- 'attributes': ['affiliation',
- 'description',
- 'email',
- 'image-url',
- 'name',
- 'url'
- ],
- }],
- ['keyword', {
- 'title': 'Task',
- 'attributes': ['description', 'url', 'image-url'],
- }],
- ['project', {
- 'title': 'Feature',
- 'attributes': ['description', 'url', 'rhizi-url', 'image-url'],
- }],
- ['idea', {
- 'title': 'Idea',
- 'attributes': ['description', 'url', 'image-url'],
- }],
- ['skill', {
- 'title': 'Organisation',
- 'attributes': ['description', 'url', 'image-url'],
- }],
- ['resource', {
- 'title': 'Resource',
- 'attributes': ['description', 'url', 'image-url'],
- }]
- ],
- attribute_titles: {
- 'affiliation': 'Affiliation',
- 'description': 'Description',
- 'email': 'Email',
- 'name': 'Name',
- 'type': 'Type',
- 'url': 'URL',
- 'image-url': 'Image URL',
- 'rhizi-url': 'Rhizi URL',
- },
- attribute_ui: {
- 'affiliation': 'textarea',
- 'description': 'textarea',
- 'email': 'input',
- 'name': 'input',
- 'type': 'type',
- 'image-url': 'image',
- 'url': 'url',
- 'rhizi-url': 'rhizi-url',
- },
-});
diff --git a/res/domain-fragment.d/rhizi.tami.org.il/js/domain_types.js b/res/domain-fragment.d/rhizi.tami.org.il/js/domain_types.js
deleted file mode 100644
index 30adf121..00000000
--- a/res/domain-fragment.d/rhizi.tami.org.il/js/domain_types.js
+++ /dev/null
@@ -1,50 +0,0 @@
-define({
- type_attributes: [
- ['collaborator', {
- 'title': 'Human',
- 'attributes': ['affiliation',
- 'description',
- 'email',
- 'image-url',
- 'name',
- 'url'
- ],
- }],
- ['project', {
- 'title': 'Project',
- 'attributes': ['description', 'url', 'rhizi-url', 'image-url'],
- }],
- ['idea', {
- 'title': 'Idea',
- 'attributes': ['description', 'url', 'image-url'],
- }],
- ['skill', {
- 'title': 'Skill',
- 'attributes': ['description', 'url', 'image-url'],
- }],
- ['resource', {
- 'title': 'Technology',
- 'attributes': ['description', 'url', 'image-url'],
- }]
- ],
- attribute_titles: {
- 'affiliation': 'Affiliation',
- 'description': 'Description',
- 'email': 'Email',
- 'name': 'Name',
- 'type': 'Type',
- 'url': 'URL',
- 'image-url': 'Image URL',
- 'rhizi-url': 'Rhizi URL',
- },
- attribute_ui: {
- 'affiliation': 'textarea',
- 'description': 'textarea',
- 'email': 'input',
- 'name': 'input',
- 'type': 'type',
- 'image-url': 'image',
- 'url': 'url',
- 'rhizi-url': 'rhizi-url',
- },
-});
diff --git a/res/domain-fragment.d/default/css/style.css b/res/local/css/style.css
index e69de29b..e69de29b 100644
--- a/res/domain-fragment.d/default/css/style.css
+++ b/res/local/css/style.css
diff --git a/res/domain-fragment.d/default/img/site-logo.png b/res/local/img/site-logo.png
index 4b1c2ca2..4b1c2ca2 100644
--- a/res/domain-fragment.d/default/img/site-logo.png
+++ b/res/local/img/site-logo.png
Binary files differ
diff --git a/res/domain-fragment.d/default/js/domain_types.js b/res/local/js/domain_types.js
index f4ca18f2..f4ca18f2 100644
--- a/res/domain-fragment.d/default/js/domain_types.js
+++ b/res/local/js/domain_types.js
diff --git a/res/domain-fragment.d/default/template.d/base.html b/res/local/template.d/base.html
index 135189af..135189af 100644
--- a/res/domain-fragment.d/default/template.d/base.html
+++ b/res/local/template.d/base.html
diff --git a/res/domain-fragment.d/default/template.d/index.html b/res/local/template.d/index.html
index b1289c52..b1289c52 100644
--- a/res/domain-fragment.d/default/template.d/index.html
+++ b/res/local/template.d/index.html
diff --git a/res/domain-fragment.d/default/template.d/login.html b/res/local/template.d/login.html
index 73492ea2..73492ea2 100644
--- a/res/domain-fragment.d/default/template.d/login.html
+++ b/res/local/template.d/login.html
diff --git a/res/domain-fragment.d/default/template.d/login__header.html b/res/local/template.d/login__header.html
index 5f242e61..5f242e61 100644
--- a/res/domain-fragment.d/default/template.d/login__header.html
+++ b/res/local/template.d/login__header.html
diff --git a/res/domain-fragment.d/default/template.d/pw_reset.html b/res/local/template.d/pw_reset.html
index 908f5597..908f5597 100644
--- a/res/domain-fragment.d/default/template.d/pw_reset.html
+++ b/res/local/template.d/pw_reset.html
diff --git a/res/domain-fragment.d/default/template.d/user_signup.html b/res/local/template.d/user_signup.html
index 93589d86..93589d86 100644
--- a/res/domain-fragment.d/default/template.d/user_signup.html
+++ b/res/local/template.d/user_signup.html
diff --git a/res/local/template/fragment/by-domain/cri.rhizi.net/login__header.html b/res/local/template/fragment/by-domain/cri.rhizi.net/login__header.html
deleted file mode 100644
index 7e7e86fc..00000000
--- a/res/local/template/fragment/by-domain/cri.rhizi.net/login__header.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<p class="login-text"><em>Directly interact with knowledge graphs</em></p>
-<p class="login-text">Rhizi is a real-time collaboration tool for building networks together.
-</p>
-<br>
-<iframe width="420" height="315" src="https://www.youtube.com/embed/yRQtUPCzd3A" frameborder="0" allowfullscreen></iframe>
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
deleted file mode 100644
index 5f242e61..00000000
--- a/res/local/template/fragment/by-domain/default.rhizi.net/login__header.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<p class="login-text">Rhizi allows you and your peers to build a shared network of knowledge</p>
-<p class="login-text">Make yourself discoverable by sharing your skills, interests and projects</p>
diff --git a/res/local/template/fragment/by-domain/descartes.rhizi.net/login__header.html b/res/local/template/fragment/by-domain/descartes.rhizi.net/login__header.html
deleted file mode 100644
index e6b810c5..00000000
--- a/res/local/template/fragment/by-domain/descartes.rhizi.net/login__header.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<p class="login-text">Rhizi helps you discover the people in Descartes IT who can help you the most.</p>
-<p class="login-text">Make yourself discoverable by sharing your skills, interests and projects.</p>
-
-<iframe width="420" height="315" src="https://www.youtube.com/embed/yRQtUPCzd3A" frameborder="0" allowfullscreen></iframe> \ No newline at end of file
diff --git a/res/local/template/fragment/by-domain/leap.rhizi.net/login__header.html b/res/local/template/fragment/by-domain/leap.rhizi.net/login__header.html
deleted file mode 100644
index 087818c6..00000000
--- a/res/local/template/fragment/by-domain/leap.rhizi.net/login__header.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<p class="login-text"><em>Rhizi is a collaborative document for creating knowledge networks.</em></p>
-<p class="login-text">As we are currently in alpha, do expect a few bugs.
-</p>
-<a href="http://rhizinet.strikingly.com/#contact-form"> click here to receive updates </p></a>
-<br>
-<iframe width="420" height="315" src="https://www.youtube.com/embed/yRQtUPCzd3A" frameborder="0" allowfullscreen></iframe>
diff --git a/res/local/template/fragment/by-domain/ohalo.rhizi.net/login__header.html b/res/local/template/fragment/by-domain/ohalo.rhizi.net/login__header.html
deleted file mode 100644
index 54dbcd2b..00000000
--- a/res/local/template/fragment/by-domain/ohalo.rhizi.net/login__header.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<p class="login-text" style="direction: rtl;"><em>ברוכים הבאים לריזי, מערכת המאפשרת לסטודנטים של אוהלו לבנות ביחד רשת ידע משותפת!</em></p>
-<p class="login-text" style="direction: rtl;">זוהי גרסת אלפא, צפו לבאגים.
-</p>
-<a href="http://rhizinet.strikingly.com/#contact-form"> לקבלת עדכונים לגבי התוכנה </p></a>
-<br>
-<iframe width="420" height="315" src="https://www.youtube.com/embed/yRQtUPCzd3A" frameborder="0" allowfullscreen></iframe>
diff --git a/res/local/template/fragment/by-domain/rhizi.tami.org.il/login__header.html b/res/local/template/fragment/by-domain/rhizi.tami.org.il/login__header.html
deleted file mode 100644
index ff1fd770..00000000
--- a/res/local/template/fragment/by-domain/rhizi.tami.org.il/login__header.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<p class="login-text"><em>Rhizi is a collaborative document for creating knowledge networks.</em></p>
-<p class="login-text">By showing who works on what and who can help with tools/knowledge we can make tami better, stronger, faster!
-<p class="login-text">That said, we are currently in alpha, so do expect a few bugs.
-</p>
-<a href="http://rhizinet.strikingly.com/#contact-form"> click here to receive updates </p></a>
-<br>
-<iframe width="420" height="315" src="https://www.youtube.com/embed/yRQtUPCzd3A" frameborder="0" allowfullscreen></iframe>