Merge branch 'friendika-master'

20 files changed, 46 insertions, 11 deletions

diff --git a/view/de/head.tpl b/view/de/head.tpl
index 50dd9cab6..c3ec3d2c9 100644
--- a/view/de/head.tpl
+++ b/view/de/head.tpl
@@ -1,7 +1,7 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <base href="$baseurl" />
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<link rel="shortcut icon" href="$baseurl/images/ff-32.jpg">
+<link rel="shortcut icon" href="$baseurl/images/ff-32.jpg" />
 
 <!--[if IE]>
 <script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl
index c7c19bf69..d3bb6b411 100644
--- a/view/de/htconfig.tpl
+++ b/view/de/htconfig.tpl
@@ -62,3 +62,13 @@ $a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
 
 $a->config['system']['rino_encrypt'] = true;
 
+// default system theme
+
+$a->config['system']['theme'] = 'duepuntozero';
+
+// Addons or plugins are configured here.
+// This is a comma seperated list of addons to enable. Example:
+// $a->config['system']['addon'] = 'js_upload,randplace,oembed';
+
+$a->config['system']['addon'] = 'js_upload';
+
diff --git a/view/en/head.tpl b/view/en/head.tpl
index 04dd39bdb..ce141b251 100644
--- a/view/en/head.tpl
+++ b/view/en/head.tpl
@@ -2,7 +2,7 @@
 <base href="$baseurl" />
 <meta name="generator" content="$generator" />
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<link rel="shortcut icon" href="$baseurl/images/ff-32.jpg">
+<link rel="shortcut icon" href="$baseurl/images/ff-32.jpg" />
 
 <!--[if IE]>
 <script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index 0182dbe5c..d3bb6b411 100644
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
@@ -62,6 +62,10 @@ $a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
 
 $a->config['system']['rino_encrypt'] = true;
 
+// default system theme
+
+$a->config['system']['theme'] = 'duepuntozero';
+
 // Addons or plugins are configured here.
 // This is a comma seperated list of addons to enable. Example:
 // $a->config['system']['addon'] = 'js_upload,randplace,oembed';
diff --git a/view/fr/head.tpl b/view/fr/head.tpl
index 81011f422..75da8a924 100644
--- a/view/fr/head.tpl
+++ b/view/fr/head.tpl
@@ -2,7 +2,7 @@
 <base href="$baseurl" />
 <meta name="generator" content="$generator" />
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<link rel="shortcut icon" href="$baseurl/images/ff-32.jpg">
+<link rel="shortcut icon" href="$baseurl/images/ff-32.jpg" />
 
 <!--[if IE]>
 <script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl
index c7c19bf69..d31d5a39f 100644
--- a/view/fr/htconfig.tpl
+++ b/view/fr/htconfig.tpl
@@ -62,3 +62,12 @@ $a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
 
 $a->config['system']['rino_encrypt'] = true;
 
+// default system theme
+
+$a->config['system']['theme'] = 'duepuntozero';
+
+// Addons or plugins are configured here.
+// This is a comma seperated list of addons to enable. Example:
+// $a->config['system']['addon'] = 'js_upload,randplace,oembed';
+
+$a->config['system']['addon'] = 'js_upload';
diff --git a/view/it/head.tpl b/view/it/head.tpl
index 38b2a50f6..071c8fa91 100644
--- a/view/it/head.tpl
+++ b/view/it/head.tpl
@@ -2,7 +2,7 @@
 <base href="$baseurl" />
 <meta name="generator" content="$generator" />
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<link rel="shortcut icon" href="$baseurl/images/ff-32.jpg">
+<link rel="shortcut icon" href="$baseurl/images/ff-32.jpg" />
 
 <!--[if IE]>
 <script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl
index 78e014cc1..180f7885c 100644
--- a/view/it/htconfig.tpl
+++ b/view/it/htconfig.tpl
@@ -62,3 +62,12 @@ $a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
 
 $a->config['system']['rino_encrypt'] = true;
 
+// default system theme
+
+$a->config['system']['theme'] = 'duepuntozero';
+
+// Addons or plugins are configured here.
+// This is a comma seperated list of addons to enable. Example:
+// $a->config['system']['addon'] = 'js_upload,randplace,oembed';
+
+$a->config['system']['addon'] = 'js_upload';
diff --git a/view/theme/clean/style.css b/view/theme/clean/style.css
index ea8f54ddf..4730b5c2f 100644
--- a/view/theme/clean/style.css
+++ b/view/theme/clean/style.css
@@ -1,4 +1,4 @@
-@import url('../default/style.css');
+@import url('../loozah/style.css');
 
 footer {
 	background: #CCC;
diff --git a/view/theme/darkness/style.css b/view/theme/darkness/style.css
index 3aff559d3..828fdd104 100644
--- a/view/theme/darkness/style.css
+++ b/view/theme/darkness/style.css
@@ -1,4 +1,4 @@
-@import url('../default/style.css');
+@import url('../loozah/style.css');
 
 nav {
 	background: #CCC;
diff --git a/view/theme/default/dfrn.gif b/view/theme/default/dfrn.gif
deleted file mode 100644
index 104f42e51..000000000
--- a/view/theme/default/dfrn.gif
+++ /dev/null
diff --git a/view/theme/default/friendika16.gif b/view/theme/default/friendika16.gif
deleted file mode 100644
index f5321b1e5..000000000
--- a/view/theme/default/friendika16.gif
+++ /dev/null
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index c7eb56fb1..50745ac15 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -1210,7 +1210,8 @@ input#dfrn-url {
 	margin-top: 30px;
 }
 #contact-edit-poll-text {
-	margin-bottom: 10px;
+	margin-top: 15px;
+	margin-bottom: 5px;
 }
 
 #contact-edit-update-now {
diff --git a/view/theme/goldenrod/style.css b/view/theme/goldenrod/style.css
index a9c04a08d..2a098e955 100644
--- a/view/theme/goldenrod/style.css
+++ b/view/theme/goldenrod/style.css
@@ -1,4 +1,4 @@
-@import url('../default/style.css');
+@import url('../loozah/style.css');
 
 footer {
 	background: #CCC;
diff --git a/view/theme/default/ff-16.jpg b/view/theme/loozah/ff-16.jpg
index 3621f5914..3621f5914 100644
--- a/view/theme/default/ff-16.jpg
+++ b/view/theme/loozah/ff-16.jpg
diff --git a/view/theme/default/lock.cur b/view/theme/loozah/lock.cur
index 892c5e851..892c5e851 100755
--- a/view/theme/default/lock.cur
+++ b/view/theme/loozah/lock.cur
diff --git a/view/theme/default/login-bg.gif b/view/theme/loozah/login-bg.gif
index cde836c89..cde836c89 100644
--- a/view/theme/default/login-bg.gif
+++ b/view/theme/loozah/login-bg.gif
diff --git a/view/theme/default/style.css b/view/theme/loozah/style.css
index 5dd0b8712..d7d735d6d 100644
--- a/view/theme/default/style.css
+++ b/view/theme/loozah/style.css
@@ -1335,8 +1335,10 @@ input#dfrn-url {
 	margin-top: 30px;
 }
 #contact-edit-poll-text {
-	margin-bottom: 10px;
+	margin-top: 15px;
+	margin-bottom: 5px;
 }
+
 #contact-edit-update-now {
 	margin-top: 15px;
 }
diff --git a/view/theme/shady/style.css b/view/theme/shady/style.css
index 071310541..1e3e6ec40 100644
--- a/view/theme/shady/style.css
+++ b/view/theme/shady/style.css
@@ -1,4 +1,4 @@
-@import url('../default/style.css');
+@import url('../loozah/style.css');
 
 body { 
 	background: #DDDDDD;
diff --git a/view/theme/three-d/style.css b/view/theme/three-d/style.css
index e885a70d3..56d36914e 100644
--- a/view/theme/three-d/style.css
+++ b/view/theme/three-d/style.css
@@ -1,4 +1,4 @@
-@import url('../default/style.css');
+@import url('../loozah/style.css');
 
 .error-message {
 	-moz-box-shadow: 5px 5px 5px #888888;