From f01538a54f68c172e09aabed90e2651ca2305675 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 15 Mar 2011 17:31:49 -0700
Subject: content expiration

---
 view/en/settings.tpl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'view/en/settings.tpl')

diff --git a/view/en/settings.tpl b/view/en/settings.tpl
index 97d67cbf6..39b18c126 100644
--- a/view/en/settings.tpl
+++ b/view/en/settings.tpl
@@ -76,9 +76,8 @@ $profile_in_dir
 $profile_in_net_dir
 
 
-
 <div id="settings-default-perms" class="settings-default-perms" >
-	<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >&#x21e9; $permissions</div>
+	<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions</div>
 	<div id="settings-default-perms-menu-end"></div>
 
 	<div id="settings-default-perms-select" style="display: none;" >
@@ -89,6 +88,10 @@ $profile_in_net_dir
 </div>
 <div id="settings-default-perms-end"></div>
 
+<div id="settings-expire-desc">Automatically expire (delete) posts older than <input type="text" size="3" name="expire" value="$expire" /> days</div>
+<div id="settings-expire-end"></div>
+
+
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="Submit" />
 </div>
-- 
cgit v1.2.3


From b7292bc673bc7983b1fd933070bc9d6a0a155dbb Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 20 Mar 2011 17:54:50 -0700
Subject: user pref -> block remote wall posting

---
 view/en/settings.tpl | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'view/en/settings.tpl')

diff --git a/view/en/settings.tpl b/view/en/settings.tpl
index 39b18c126..45060e1c4 100644
--- a/view/en/settings.tpl
+++ b/view/en/settings.tpl
@@ -88,6 +88,14 @@ $profile_in_net_dir
 </div>
 <div id="settings-default-perms-end"></div>
 
+<div id="settings-blockw-wrapper" >
+<label id="settings-blockw-label" for="settings-blockw" >Allow friends to post to your profile: </label>
+<input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
+</div>
+<div id="settings-blockw-end" ></div>
+
+
+
 <div id="settings-expire-desc">Automatically expire (delete) posts older than <input type="text" size="3" name="expire" value="$expire" /> days</div>
 <div id="settings-expire-end"></div>
 
-- 
cgit v1.2.3


From c4b292a4f103eb049c13dbe3c62f0438c18de816 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 22 Mar 2011 03:07:46 -0700
Subject: account/profile/contacts export

---
 view/en/settings.tpl | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'view/en/settings.tpl')

diff --git a/view/en/settings.tpl b/view/en/settings.tpl
index 45060e1c4..134fffaf9 100644
--- a/view/en/settings.tpl
+++ b/view/en/settings.tpl
@@ -2,6 +2,8 @@
 
 <div id="plugin-settings-link"><a href="settings/addon">Plugin Settings</a></div>
 
+$uexport
+
 $nickname_block
 
 
-- 
cgit v1.2.3


From 6a280c321daedaa8444a2a64e1a824ae60a9229b Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 28 Mar 2011 18:06:36 -0700
Subject: small wording change

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

(limited to 'view/en/settings.tpl')

diff --git a/view/en/settings.tpl b/view/en/settings.tpl
index 134fffaf9..9822291c1 100644
--- a/view/en/settings.tpl
+++ b/view/en/settings.tpl
@@ -91,7 +91,7 @@ $profile_in_net_dir
 <div id="settings-default-perms-end"></div>
 
 <div id="settings-blockw-wrapper" >
-<label id="settings-blockw-label" for="settings-blockw" >Allow friends to post to your profile: </label>
+<label id="settings-blockw-label" for="settings-blockw" >Allow friends to post to your profile page: </label>
 <input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
 </div>
 <div id="settings-blockw-end" ></div>
-- 
cgit v1.2.3


From e35a5bac55e0e259c7c587adfaf546484b032c92 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 7 Apr 2011 23:10:43 -0700
Subject: the rest of the english html templates except for htconfig

---
 view/en/settings.tpl | 176 ---------------------------------------------------
 1 file changed, 176 deletions(-)
 delete mode 100644 view/en/settings.tpl

(limited to 'view/en/settings.tpl')

diff --git a/view/en/settings.tpl b/view/en/settings.tpl
deleted file mode 100644
index 9822291c1..000000000
--- a/view/en/settings.tpl
+++ /dev/null
@@ -1,176 +0,0 @@
-<h1>Account Settings</h1>
-
-<div id="plugin-settings-link"><a href="settings/addon">Plugin Settings</a></div>
-
-$uexport
-
-$nickname_block
-
-
-<form action="settings" id="settings-form" method="post" autocomplete="off" >
-
-
-<h3 class="settings-heading">Basic Settings</h3>
-
-<div id="settings-username-wrapper" >
-<label id="settings-username-label" for="settings-username" >Full Name: </label>
-<input type="text" name="username" id="settings-username" value="$username" />
-</div>
-<div id="settings-username-end" ></div>
-
-<div id="settings-email-wrapper" >
-<label id="settings-email-label" for="settings-email" >Email Address: </label>
-<input type="text" name="email" id="settings-email" value="$email" />
-</div>
-<div id="settings-email-end" ></div>
-
-
-
-<div id="settings-timezone-wrapper" >
-<label id="settings-timezone-label" for="timezone_select" >Your Timezone: </label>
-$zoneselect
-</div>
-<div id="settings-timezone-end" ></div>
-
-<div id="settings-defloc-wrapper" >
-<label id="settings-defloc-label" for="settings-defloc" >Default Post Location: </label>
-<input type="text" name="defloc" id="settings-defloc" value="$defloc" />
-</div>
-<div id="settings-defloc-end" ></div>
-
-<div id="settings-allowloc-wrapper" >
-<label id="settings-allowloc-label" for="settings-allowloc" >Use Browser Location: </label>
-<input type="checkbox" name="allow_location" id="settings-allowloc" value="1" $loc_checked />
-</div>
-<div id="settings-allowloc-end" ></div>
-
-
-
-
-<div id="settings-theme-select">
-<label id="settings-theme-label" for="theme-select" >Display Theme: </label>
-$theme
-</div>
-<div id="settings-theme-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
-</div>
-
-
-<h3 class="settings-heading">Security and Privacy Settings</h3>
-
-
-<input type="hidden" name="visibility" value="$visibility" />
-
-<div id="settings-maxreq-wrapper">
-<label id="settings-maxreq-label" for="settings-maxreq" >Maximum Friend Requests/Day</label>
-<input id="settings-maxreq" name="maxreq" value="$maxreq" />
-<div id="settings-maxreq-desc">(to prevent spam abuse)</div>
-</div>
-<div id="settings-maxreq-end"></div>
-
-
-
-
-$profile_in_dir
-
-$profile_in_net_dir
-
-
-<div id="settings-default-perms" class="settings-default-perms" >
-	<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions</div>
-	<div id="settings-default-perms-menu-end"></div>
-
-	<div id="settings-default-perms-select" style="display: none;" >
-	
-		$aclselect
-
-	</div>
-</div>
-<div id="settings-default-perms-end"></div>
-
-<div id="settings-blockw-wrapper" >
-<label id="settings-blockw-label" for="settings-blockw" >Allow friends to post to your profile page: </label>
-<input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
-</div>
-<div id="settings-blockw-end" ></div>
-
-
-
-<div id="settings-expire-desc">Automatically expire (delete) posts older than <input type="text" size="3" name="expire" value="$expire" /> days</div>
-<div id="settings-expire-end"></div>
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
-</div>
-
-
-
-<h3 class="settings-heading">Notification Settings</h3>
-
-
-<div id="settings-notify-wrapper">
-<div id="settings-notify-desc">Send a notification email when: </div>
-<label for="notify1" id="settings-label-notify1">You receive an introduction</label>
-<input id="notify1" type="checkbox" $sel_notify1 name="notify1" value="1" />
-<div id="notify1-end"></div>
-<label for="notify2" id="settings-label-notify2">Your introductions are confirmed</label>
-<input id="notify2" type="checkbox" $sel_notify2 name="notify2" value="2" />
-<div id="notify2-end"></div>
-<label for="notify3" id="settings-label-notify3">Someone writes on your profile wall</label>
-<input id="notify3" type="checkbox" $sel_notify3 name="notify3" value="4" />
-<div id="notify3-end"></div>
-<label for="notify4" id="settings-label-notify4">Someone writes a followup comment</label>
-<input id="notify4" type="checkbox" $sel_notify4 name="notify4" value="8" />
-<div id="notify4-end"></div>
-<label for="notify5" id="settings-label-notify5">You receive a private message</label>
-<input id="notify5" type="checkbox" $sel_notify5 name="notify5" value="16" />
-<div id="notify5-end"></div>
-</div>
-<div id="settings=notify-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
-</div>
-
-
-<h3 class="settings-heading">Password Settings</h3>
-
-
-<div id="settings-password-wrapper" >
-<p id="settings-password-desc" >
-Leave password fields blank unless changing
-</p>
-<label id="settings-password-label" for="settings-password" >New Password: </label>
-<input type="password" id="settings-password" name="npassword" />
-</div>
-<div id="settings-password-end" ></div>
-
-<div id="settings-confirm-wrapper" >
-<label id="settings-confirm-label" for="settings-confirm" >Confirm: </label>
-<input type="password" id="settings-confirm" name="confirm" />
-</div>
-<div id="settings-confirm-end" ></div>
-
-<div id="settings-openid-wrapper" >
-	$oidhtml
-</div>
-<div id="settings-openid-end" ></div>
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
-</div>
-
-
-<h3 class="settings-heading">Advanced Page Settings</h3>
-
-$pagetype
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
-</div>
-
-
-- 
cgit v1.2.3