From e992e296851fd049af045d8851f3b46d0fe73a3f Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Thu, 12 Apr 2012 08:38:55 +0200
Subject: settings: move tabs to aside. add a new template
 "generic_links_widget.tpl"

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

(limited to 'view/settings.tpl')

diff --git a/view/settings.tpl b/view/settings.tpl
index 8753474af..ebca4875f 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -1,5 +1,3 @@
-$tabs
-
 <h1>$ptitle</h1>
 
 $nickname_block
-- 
cgit v1.2.3


From 32cd62ff0a69cbce29617ac943dbcb580e395b67 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 12 Apr 2012 18:15:46 -0700
Subject: allow setting default new friend notify

---
 view/settings.tpl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'view/settings.tpl')

diff --git a/view/settings.tpl b/view/settings.tpl
index ebca4875f..081f56306 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -99,7 +99,12 @@ $unkmail
 
 <h3 class="settings-heading">$h_not</h3>
 
-<div id="settings-notify-desc">$lbl_not </div>
+<strong>$activity_options</strong>
+
+{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
+
+
+<div id="settings-notify-desc"><strong>$lbl_not </strong></div>
 
 <div class="group">
 {{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
-- 
cgit v1.2.3


From 972c01edb3009e835d7a5a0861867cea8c06283f Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 12 Apr 2012 21:10:32 -0700
Subject: profile change activities

---
 view/settings.tpl | 1 +
 1 file changed, 1 insertion(+)

(limited to 'view/settings.tpl')

diff --git a/view/settings.tpl b/view/settings.tpl
index 081f56306..59c669a87 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -102,6 +102,7 @@ $unkmail
 <strong>$activity_options</strong>
 
 {{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
 
 
 <div id="settings-notify-desc"><strong>$lbl_not </strong></div>
-- 
cgit v1.2.3