From 2d2b5006397bb6ac90f7e33e6022000ec836e86e Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 7 Jul 2011 19:12:35 -0700
Subject: input the admin email address during install/setup.

---
 view/de/htconfig.tpl              | 2 +-
 view/en/htconfig.tpl              | 2 +-
 view/es/htconfig.tpl              | 2 +-
 view/fr/htconfig.tpl              | 2 +-
 view/install_db.tpl               | 4 ++++
 view/it/htconfig.tpl              | 2 +-
 view/sv/htconfig.tpl              | 2 +-
 view/theme/duepuntozero/style.css | 5 ++++-
 view/theme/loozah/style.css       | 5 ++++-
 9 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'view')

diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl
index 0ce28b4a0..6eb950130 100644
--- a/view/de/htconfig.tpl
+++ b/view/de/htconfig.tpl
@@ -33,7 +33,7 @@ $a->config['sitename'] = "My Friend Network";
 
 $a->config['register_policy'] = REGISTER_OPEN;
 $a->config['register_text'] = '';
-$a->config['admin_email'] = '';
+$a->config['admin_email'] = '$adminmail';
 
 // Maximum size of an imported message, 0 is unlimited
 
diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index 0ce28b4a0..6eb950130 100644
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
@@ -33,7 +33,7 @@ $a->config['sitename'] = "My Friend Network";
 
 $a->config['register_policy'] = REGISTER_OPEN;
 $a->config['register_text'] = '';
-$a->config['admin_email'] = '';
+$a->config['admin_email'] = '$adminmail';
 
 // Maximum size of an imported message, 0 is unlimited
 
diff --git a/view/es/htconfig.tpl b/view/es/htconfig.tpl
index 4de266112..ea8439ebb 100644
--- a/view/es/htconfig.tpl
+++ b/view/es/htconfig.tpl
@@ -33,7 +33,7 @@ $a->config['sitename'] = "La Mia Rete di Amici";
 
 $a->config['register_policy'] = REGISTER_OPEN;
 $a->config['register_text'] = '';
-$a->config['admin_email'] = '';
+$a->config['admin_email'] = '$adminmail';
 
 // Maximum size of an imported message, 0 is unlimited
 
diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl
index c65114a68..13ddab07f 100644
--- a/view/fr/htconfig.tpl
+++ b/view/fr/htconfig.tpl
@@ -33,7 +33,7 @@ $a->config['sitename'] = "My Friend Network";
 
 $a->config['register_policy'] = REGISTER_OPEN;
 $a->config['register_text'] = '';
-$a->config['admin_email'] = '';
+$a->config['admin_email'] = '$adminmail';
 
 // Maximum size of an imported message, 0 is unlimited
 
diff --git a/view/install_db.tpl b/view/install_db.tpl
index 1c59dbdb9..6a4d1e2a2 100644
--- a/view/install_db.tpl
+++ b/view/install_db.tpl
@@ -26,6 +26,10 @@ $lbl_03 $lbl_04 $lbl_05
 <input type="text" name="dbdata" id="install-dbdata"  value="$dbdata" />
 <div id="install-dbdata-end"></div>
 
+<label for="install-admin" id="install-admin-label">$lbl_11</label>
+<input type="text" name="adminemail" id="install-admin"  value="$adminemail" />
+<div id="install-admin-end"></div>
+
 <div id="install-tz-desc">
 $lbl_10
 </div>
diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl
index 4de266112..ea8439ebb 100644
--- a/view/it/htconfig.tpl
+++ b/view/it/htconfig.tpl
@@ -33,7 +33,7 @@ $a->config['sitename'] = "La Mia Rete di Amici";
 
 $a->config['register_policy'] = REGISTER_OPEN;
 $a->config['register_text'] = '';
-$a->config['admin_email'] = '';
+$a->config['admin_email'] = '$adminmail';
 
 // Maximum size of an imported message, 0 is unlimited
 
diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl
index 0ce28b4a0..6eb950130 100644
--- a/view/sv/htconfig.tpl
+++ b/view/sv/htconfig.tpl
@@ -33,7 +33,7 @@ $a->config['sitename'] = "My Friend Network";
 
 $a->config['register_policy'] = REGISTER_OPEN;
 $a->config['register_text'] = '';
-$a->config['admin_email'] = '';
+$a->config['admin_email'] = '$adminmail';
 
 // Maximum size of an imported message, 0 is unlimited
 
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index fccbe16d9..bbaa43b57 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -1943,6 +1943,7 @@ a.mail-list-link {
 #install-dbuser-label,
 #install-dbpass-label,
 #install-dbdata-label,
+#install-admin-label,
 #install-tz-desc {
        float: left;
        width: 250px;
@@ -1954,7 +1955,8 @@ a.mail-list-link {
 #install-dbhost,
 #install-dbuser,
 #install-dbpass,
-#install-dbdata {
+#install-dbdata,
+#install-admin {
        float: left;
        width: 200px;
        margin-left: 20px;
@@ -1964,6 +1966,7 @@ a.mail-list-link {
 #install-dbuser-end,
 #install-dbpass-end,
 #install-dbdata-end,
+#install-admin-end,
 #install-tz-end {
        clear: both;
 }
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index d905b988b..11ccab8ff 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -1979,6 +1979,7 @@ a.mail-list-link {
 #install-dbuser-label,
 #install-dbpass-label,
 #install-dbdata-label,
+#install-admin-label,
 #install-tz-desc {
        float: left;
        width: 250px;
@@ -1990,7 +1991,8 @@ a.mail-list-link {
 #install-dbhost,
 #install-dbuser,
 #install-dbpass,
-#install-dbdata {
+#install-dbdata,
+#install-admin {
        float: left;
        width: 200px;
        margin-left: 20px;
@@ -2000,6 +2002,7 @@ a.mail-list-link {
 #install-dbuser-end,
 #install-dbpass-end,
 #install-dbdata-end,
+#install-admin-end,
 #install-tz-end {
        clear: both;
 }
-- 
cgit v1.2.3