summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-09-14 04:11:03 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-09-14 04:11:03 (GMT)
commitbb26e3cfeb814dd55451e15ebbe7e2f9e9ac1137 (patch)
tree5d24e6288e73bca87b6e225c060d1e4e0ced7c4b
parentbde50e6db4b42905e708625aff7556dec4b2fec8 (diff)
downloadkolab-webadmin-bb26e3cfeb814dd55451e15ebbe7e2f9e9ac1137.tar.gz
Move the templates in the data directory in preparation of moving this to a PEAR based package.
-rw-r--r--Makefile.am68
-rwxr-xr-xdata/templates/addrdeleted.tpl (renamed from php/admin/templates/addrdeleted.tpl)0
-rwxr-xr-xdata/templates/addresslist.tpl (renamed from php/admin/templates/addresslist.tpl)0
-rwxr-xr-xdata/templates/addrlistall.tpl (renamed from php/admin/templates/addrlistall.tpl)0
-rwxr-xr-xdata/templates/admindeleted.tpl (renamed from php/admin/templates/admindeleted.tpl)0
-rwxr-xr-xdata/templates/adminlistall.tpl (renamed from php/admin/templates/adminlistall.tpl)0
-rwxr-xr-xdata/templates/codefusion.tpl (renamed from php/admin/templates/codefusion.tpl)0
-rw-r--r--data/templates/createuser.tpl (renamed from php/admin/templates/createuser.tpl)0
-rw-r--r--data/templates/deliver.tpl (renamed from php/admin/templates/deliver.tpl)0
-rwxr-xr-xdata/templates/distlistall.tpl (renamed from php/admin/templates/distlistall.tpl)0
-rw-r--r--data/templates/distlistdeleted.tpl (renamed from php/admin/templates/distlistdeleted.tpl)0
-rw-r--r--data/templates/domainmaintainerlistall.tpl (renamed from php/admin/templates/domainmaintainerlistall.tpl)0
-rwxr-xr-xdata/templates/erfrakon.tpl (renamed from php/admin/templates/erfrakon.tpl)0
-rwxr-xr-xdata/templates/formcontainer.tpl (renamed from php/admin/templates/formcontainer.tpl)0
-rwxr-xr-xdata/templates/forward.tpl (renamed from php/admin/templates/forward.tpl)0
-rwxr-xr-xdata/templates/intevation.tpl (renamed from php/admin/templates/intevation.tpl)0
-rwxr-xr-xdata/templates/kdab.tpl (renamed from php/admin/templates/kdab.tpl)0
-rwxr-xr-xdata/templates/kde.tpl (renamed from php/admin/templates/kde.tpl)0
-rwxr-xr-xdata/templates/kolab.tpl (renamed from php/admin/templates/kolab.tpl)0
-rwxr-xr-xdata/templates/login.tpl (renamed from php/admin/templates/login.tpl)0
-rwxr-xr-xdata/templates/maintainerdeleted.tpl (renamed from php/admin/templates/maintainerdeleted.tpl)0
-rwxr-xr-xdata/templates/maintainerlistall.tpl (renamed from php/admin/templates/maintainerlistall.tpl)0
-rwxr-xr-xdata/templates/page.tpl (renamed from php/admin/templates/page.tpl)0
-rwxr-xr-xdata/templates/settings.tpl (renamed from php/admin/templates/settings.tpl)0
-rw-r--r--data/templates/sfdeleted.tpl (renamed from php/admin/templates/sfdeleted.tpl)0
-rwxr-xr-xdata/templates/sflistall.tpl (renamed from php/admin/templates/sflistall.tpl)0
-rwxr-xr-xdata/templates/systemaliasnagscreen.tpl (renamed from php/admin/templates/systemaliasnagscreen.tpl)0
-rwxr-xr-xdata/templates/userdeleted.tpl (renamed from php/admin/templates/userdeleted.tpl)0
-rwxr-xr-xdata/templates/userlistall.tpl (renamed from php/admin/templates/userlistall.tpl)0
-rw-r--r--data/templates/userlisterror.tpl (renamed from php/admin/templates/userlisterror.tpl)0
-rwxr-xr-xdata/templates/vacation.tpl (renamed from php/admin/templates/vacation.tpl)0
-rwxr-xr-xdata/templates/versions.tpl (renamed from php/admin/templates/versions.tpl)0
-rwxr-xr-xdata/templates/welcome.tpl (renamed from php/admin/templates/welcome.tpl)0
-rw-r--r--lib/KolabAdmin/include/mysmarty.php4
34 files changed, 36 insertions, 36 deletions
diff --git a/Makefile.am b/Makefile.am
index c66e7dd..75f2fdb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -147,40 +147,40 @@ PEARKA_SIEVE_SEGMENT_FILES = lib/KolabAdmin/Sieve/Segment/Delivery.php \
pearkasievesegmentdir = $(phplibdir)/KolabAdmin/Sieve/Segment
dist_pearkasievesegment_DATA = $(PEARKA_SIEVE_SEGMENT_FILES)
-PHP_TEMPLATES = php/admin/templates/maintainerdeleted.tpl \
- php/admin/templates/kde.tpl \
- php/admin/templates/addrdeleted.tpl \
- php/admin/templates/userdeleted.tpl \
- php/admin/templates/sfdeleted.tpl \
- php/admin/templates/distlistdeleted.tpl \
- php/admin/templates/addresslist.tpl \
- php/admin/templates/sflistall.tpl \
- php/admin/templates/erfrakon.tpl \
- php/admin/templates/codefusion.tpl \
- php/admin/templates/adminlistall.tpl \
- php/admin/templates/login.tpl \
- php/admin/templates/maintainerlistall.tpl \
- php/admin/templates/domainmaintainerlistall.tpl \
- php/admin/templates/kolab.tpl \
- php/admin/templates/addrlistall.tpl \
- php/admin/templates/forward.tpl \
- php/admin/templates/deliver.tpl \
- php/admin/templates/distlistall.tpl \
- php/admin/templates/kdab.tpl \
- php/admin/templates/userlistall.tpl \
- php/admin/templates/userlisterror.tpl \
- php/admin/templates/settings.tpl \
- php/admin/templates/page.tpl \
- php/admin/templates/welcome.tpl \
- php/admin/templates/systemaliasnagscreen.tpl \
- php/admin/templates/intevation.tpl \
- php/admin/templates/vacation.tpl \
- php/admin/templates/createuser.tpl \
- php/admin/templates/formcontainer.tpl \
- php/admin/templates/admindeleted.tpl \
- php/admin/templates/versions.tpl
-
-phptemplatesdir = $(phpkolabdir)/templates
+PHP_TEMPLATES = data/templates/maintainerdeleted.tpl \
+ data/templates/kde.tpl \
+ data/templates/addrdeleted.tpl \
+ data/templates/userdeleted.tpl \
+ data/templates/sfdeleted.tpl \
+ data/templates/distlistdeleted.tpl \
+ data/templates/addresslist.tpl \
+ data/templates/sflistall.tpl \
+ data/templates/erfrakon.tpl \
+ data/templates/codefusion.tpl \
+ data/templates/adminlistall.tpl \
+ data/templates/login.tpl \
+ data/templates/maintainerlistall.tpl \
+ data/templates/domainmaintainerlistall.tpl \
+ data/templates/kolab.tpl \
+ data/templates/addrlistall.tpl \
+ data/templates/forward.tpl \
+ data/templates/deliver.tpl \
+ data/templates/distlistall.tpl \
+ data/templates/kdab.tpl \
+ data/templates/userlistall.tpl \
+ data/templates/userlisterror.tpl \
+ data/templates/settings.tpl \
+ data/templates/page.tpl \
+ data/templates/welcome.tpl \
+ data/templates/systemaliasnagscreen.tpl \
+ data/templates/intevation.tpl \
+ data/templates/vacation.tpl \
+ data/templates/createuser.tpl \
+ data/templates/formcontainer.tpl \
+ data/templates/admindeleted.tpl \
+ data/templates/versions.tpl
+
+phptemplatesdir = $(phplibdir)/data/KolabAdmin/templates
phptemplates_DATA = $(PHP_TEMPLATES)
EXTRA_DIST += $(PHP_TEMPLATES)
diff --git a/php/admin/templates/addrdeleted.tpl b/data/templates/addrdeleted.tpl
index 84a7806..84a7806 100755
--- a/php/admin/templates/addrdeleted.tpl
+++ b/data/templates/addrdeleted.tpl
diff --git a/php/admin/templates/addresslist.tpl b/data/templates/addresslist.tpl
index 4bf6904..4bf6904 100755
--- a/php/admin/templates/addresslist.tpl
+++ b/data/templates/addresslist.tpl
diff --git a/php/admin/templates/addrlistall.tpl b/data/templates/addrlistall.tpl
index 3b8717e..3b8717e 100755
--- a/php/admin/templates/addrlistall.tpl
+++ b/data/templates/addrlistall.tpl
diff --git a/php/admin/templates/admindeleted.tpl b/data/templates/admindeleted.tpl
index 31bb532..31bb532 100755
--- a/php/admin/templates/admindeleted.tpl
+++ b/data/templates/admindeleted.tpl
diff --git a/php/admin/templates/adminlistall.tpl b/data/templates/adminlistall.tpl
index 232120f..232120f 100755
--- a/php/admin/templates/adminlistall.tpl
+++ b/data/templates/adminlistall.tpl
diff --git a/php/admin/templates/codefusion.tpl b/data/templates/codefusion.tpl
index 1513511..1513511 100755
--- a/php/admin/templates/codefusion.tpl
+++ b/data/templates/codefusion.tpl
diff --git a/php/admin/templates/createuser.tpl b/data/templates/createuser.tpl
index 0433351..0433351 100644
--- a/php/admin/templates/createuser.tpl
+++ b/data/templates/createuser.tpl
diff --git a/php/admin/templates/deliver.tpl b/data/templates/deliver.tpl
index bb9155f..bb9155f 100644
--- a/php/admin/templates/deliver.tpl
+++ b/data/templates/deliver.tpl
diff --git a/php/admin/templates/distlistall.tpl b/data/templates/distlistall.tpl
index 9fad827..9fad827 100755
--- a/php/admin/templates/distlistall.tpl
+++ b/data/templates/distlistall.tpl
diff --git a/php/admin/templates/distlistdeleted.tpl b/data/templates/distlistdeleted.tpl
index 2f78033..2f78033 100644
--- a/php/admin/templates/distlistdeleted.tpl
+++ b/data/templates/distlistdeleted.tpl
diff --git a/php/admin/templates/domainmaintainerlistall.tpl b/data/templates/domainmaintainerlistall.tpl
index fb39a28..fb39a28 100644
--- a/php/admin/templates/domainmaintainerlistall.tpl
+++ b/data/templates/domainmaintainerlistall.tpl
diff --git a/php/admin/templates/erfrakon.tpl b/data/templates/erfrakon.tpl
index 3f3a432..3f3a432 100755
--- a/php/admin/templates/erfrakon.tpl
+++ b/data/templates/erfrakon.tpl
diff --git a/php/admin/templates/formcontainer.tpl b/data/templates/formcontainer.tpl
index cde0961..cde0961 100755
--- a/php/admin/templates/formcontainer.tpl
+++ b/data/templates/formcontainer.tpl
diff --git a/php/admin/templates/forward.tpl b/data/templates/forward.tpl
index 458e093..458e093 100755
--- a/php/admin/templates/forward.tpl
+++ b/data/templates/forward.tpl
diff --git a/php/admin/templates/intevation.tpl b/data/templates/intevation.tpl
index 7e0cefc..7e0cefc 100755
--- a/php/admin/templates/intevation.tpl
+++ b/data/templates/intevation.tpl
diff --git a/php/admin/templates/kdab.tpl b/data/templates/kdab.tpl
index 2fd745c..2fd745c 100755
--- a/php/admin/templates/kdab.tpl
+++ b/data/templates/kdab.tpl
diff --git a/php/admin/templates/kde.tpl b/data/templates/kde.tpl
index 94deaff..94deaff 100755
--- a/php/admin/templates/kde.tpl
+++ b/data/templates/kde.tpl
diff --git a/php/admin/templates/kolab.tpl b/data/templates/kolab.tpl
index d43db6c..d43db6c 100755
--- a/php/admin/templates/kolab.tpl
+++ b/data/templates/kolab.tpl
diff --git a/php/admin/templates/login.tpl b/data/templates/login.tpl
index 3c36775..3c36775 100755
--- a/php/admin/templates/login.tpl
+++ b/data/templates/login.tpl
diff --git a/php/admin/templates/maintainerdeleted.tpl b/data/templates/maintainerdeleted.tpl
index 4f1b312..4f1b312 100755
--- a/php/admin/templates/maintainerdeleted.tpl
+++ b/data/templates/maintainerdeleted.tpl
diff --git a/php/admin/templates/maintainerlistall.tpl b/data/templates/maintainerlistall.tpl
index 2c6a3ad..2c6a3ad 100755
--- a/php/admin/templates/maintainerlistall.tpl
+++ b/data/templates/maintainerlistall.tpl
diff --git a/php/admin/templates/page.tpl b/data/templates/page.tpl
index 4b71979..4b71979 100755
--- a/php/admin/templates/page.tpl
+++ b/data/templates/page.tpl
diff --git a/php/admin/templates/settings.tpl b/data/templates/settings.tpl
index 6d1dfcc..6d1dfcc 100755
--- a/php/admin/templates/settings.tpl
+++ b/data/templates/settings.tpl
diff --git a/php/admin/templates/sfdeleted.tpl b/data/templates/sfdeleted.tpl
index 03fa3ea..03fa3ea 100644
--- a/php/admin/templates/sfdeleted.tpl
+++ b/data/templates/sfdeleted.tpl
diff --git a/php/admin/templates/sflistall.tpl b/data/templates/sflistall.tpl
index 3958e18..3958e18 100755
--- a/php/admin/templates/sflistall.tpl
+++ b/data/templates/sflistall.tpl
diff --git a/php/admin/templates/systemaliasnagscreen.tpl b/data/templates/systemaliasnagscreen.tpl
index 5beb354..5beb354 100755
--- a/php/admin/templates/systemaliasnagscreen.tpl
+++ b/data/templates/systemaliasnagscreen.tpl
diff --git a/php/admin/templates/userdeleted.tpl b/data/templates/userdeleted.tpl
index 33977b3..33977b3 100755
--- a/php/admin/templates/userdeleted.tpl
+++ b/data/templates/userdeleted.tpl
diff --git a/php/admin/templates/userlistall.tpl b/data/templates/userlistall.tpl
index bca3843..bca3843 100755
--- a/php/admin/templates/userlistall.tpl
+++ b/data/templates/userlistall.tpl
diff --git a/php/admin/templates/userlisterror.tpl b/data/templates/userlisterror.tpl
index a1914ec..a1914ec 100644
--- a/php/admin/templates/userlisterror.tpl
+++ b/data/templates/userlisterror.tpl
diff --git a/php/admin/templates/vacation.tpl b/data/templates/vacation.tpl
index 01fe63c..01fe63c 100755
--- a/php/admin/templates/vacation.tpl
+++ b/data/templates/vacation.tpl
diff --git a/php/admin/templates/versions.tpl b/data/templates/versions.tpl
index aa1385f..aa1385f 100755
--- a/php/admin/templates/versions.tpl
+++ b/data/templates/versions.tpl
diff --git a/php/admin/templates/welcome.tpl b/data/templates/welcome.tpl
index 4b8fb5a..4b8fb5a 100755
--- a/php/admin/templates/welcome.tpl
+++ b/data/templates/welcome.tpl
diff --git a/lib/KolabAdmin/include/mysmarty.php b/lib/KolabAdmin/include/mysmarty.php
index a7dba5c..1106869 100644
--- a/lib/KolabAdmin/include/mysmarty.php
+++ b/lib/KolabAdmin/include/mysmarty.php
@@ -37,8 +37,8 @@ class MySmarty extends Smarty {
global $params;
$this->Smarty();
- $this->config_dir = $basedir.'configs/';
- $this->template_dir = $basedir.'templates/';
+ $this->config_dir = $basedir . 'configs/';
+ $this->template_dir = $php_dir . '/data/KolabAdmin/templates/';
$this->compile_dir = $smarty_compiledir;
//$this->cache_dir = $basedir.'cache/';