From b6fe837a643c9c7bb63a5196d4d14c508f3fce55 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 29 May 2012 18:43:56 -0700
Subject: hide private group if desired

---
 view/dfrn_req_confirm.tpl | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'view')

diff --git a/view/dfrn_req_confirm.tpl b/view/dfrn_req_confirm.tpl
index 58e9233aa..6c916323c 100644
--- a/view/dfrn_req_confirm.tpl
+++ b/view/dfrn_req_confirm.tpl
@@ -11,6 +11,10 @@ $please
 <input type="hidden" name="localconfirm" value="1" />
 $aes_allow
 
+<label id="dfrn-request-homecoming-hide-label" for="dfrn-request-homecoming-hide">$hidethem</label>
+<input type="checkbox" name="hidden-contact" value="1" {{ if $hidechecked }}checked="checked" {{ endif }} />
+
+
 <div id="dfrn-request-homecoming-submit-wrapper" >
 <input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="$submit" />
 </div>
-- 
cgit v1.2.3


From 88a0d6a1d53a93fa0d43591f85b72a8a72c13d53 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 29 May 2012 22:57:15 -0700
Subject: private group tests, cont.

---
 view/theme/duepuntozero/style.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'view')

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 07eba1edb..2f792977b 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -80,6 +80,7 @@ blockquote {
 .heart {
 	color: #FF0000;
 	font-size: 100%;
+	margin-right: 5px;
 }
 
 
-- 
cgit v1.2.3


From bdcb8d27dd23b389016268f281211af11db490b5 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 30 May 2012 15:52:17 -0700
Subject: transition to beta for private forums

---
 view/pagetypes.tpl | 2 --
 1 file changed, 2 deletions(-)

(limited to 'view')

diff --git a/view/pagetypes.tpl b/view/pagetypes.tpl
index 924fc47ac..796abf0ee 100644
--- a/view/pagetypes.tpl
+++ b/view/pagetypes.tpl
@@ -2,6 +2,4 @@
 	{{inc field_radio.tpl with $field=$page_soapbox }}{{endinc}}
 	{{inc field_radio.tpl with $field=$page_community }}{{endinc}}
 	{{inc field_radio.tpl with $field=$page_freelove }}{{endinc}}
-	{{ if $experimental }}
 	{{inc field_radio.tpl with $field=$page_prvgroup }}{{endinc}}
-	{{ endif }}
\ No newline at end of file
-- 
cgit v1.2.3


From 1180919c898155126b098d0a44de6d96feb9aef6 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 30 May 2012 16:30:51 -0700
Subject: some zero theming on settings page

---
 view/pagetypes.tpl                |  4 ++--
 view/settings.tpl                 |  7 +++++--
 view/theme/duepuntozero/style.css | 12 +++++++++++-
 3 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'view')

diff --git a/view/pagetypes.tpl b/view/pagetypes.tpl
index 796abf0ee..c9022a1c1 100644
--- a/view/pagetypes.tpl
+++ b/view/pagetypes.tpl
@@ -1,5 +1,5 @@
 	{{inc field_radio.tpl with $field=$page_normal }}{{endinc}}
-	{{inc field_radio.tpl with $field=$page_soapbox }}{{endinc}}
 	{{inc field_radio.tpl with $field=$page_community }}{{endinc}}
-	{{inc field_radio.tpl with $field=$page_freelove }}{{endinc}}
 	{{inc field_radio.tpl with $field=$page_prvgroup }}{{endinc}}
+	{{inc field_radio.tpl with $field=$page_soapbox }}{{endinc}}
+	{{inc field_radio.tpl with $field=$page_freelove }}{{endinc}}
diff --git a/view/settings.tpl b/view/settings.tpl
index d61af072f..d7ef21210 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -104,15 +104,16 @@ $group_select
 
 
 <h3 class="settings-heading">$h_not</h3>
+<div id="settings-notifications">
 
-<strong>$activity_options</strong>
+<div id="settings-activity-desc">$activity_options</div>
 
 {{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
 {{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
 {{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
 
 
-<div id="settings-notify-desc"><strong>$lbl_not </strong></div>
+<div id="settings-notify-desc">$lbl_not</div>
 
 <div class="group">
 {{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
@@ -124,6 +125,7 @@ $group_select
 {{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
 </div>
 
+</div>
 
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="$submit" />
@@ -131,6 +133,7 @@ $group_select
 
 
 <h3 class="settings-heading">$h_advn</h3>
+<div id="settings-pagetype-desc">$h_descadvn</div>
 
 $pagetype
 
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 2f792977b..5854ccc02 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -717,7 +717,17 @@ input#dfrn-url {
 #settings-community {
 	float: left;
 }
-
+#settings-notifications label {
+	margin-left: 20px;
+}
+#settings-notify-desc, #settings-activity-desc {
+	font-weight: bold;
+	margin-bottom: 15px;
+}
+#settings-pagetype-desc {
+	color: #666666;
+	margin-bottom: 15px;
+}
 
 #profile-in-dir-yes-label,
 #profile-in-dir-no-label,
-- 
cgit v1.2.3