3 files changed, 38 insertions, 3 deletions
diff --git a/view/en/profile_edit.tpl b/view/en/profile_edit.tpl
index c5b24a88a..50227b7f3 100644
--- a/view/en/profile_edit.tpl
+++ b/view/en/profile_edit.tpl
@@ -40,6 +40,7 @@ $gender
 <div id="profile-edit-dob" >
 $dob $age
 </div>
+</div>
 <div id="profile-edit-dob-end"></div>
 
 $hide_friends
@@ -93,7 +94,7 @@ $hide_friends
 <div class="profile-edit-submit-end"></div>
 
 <div id="profile-edit-marital-wrapper" >
-<label id="profile-edit-marital-label" for="profile-edit-marital" >Marital Status: </label>
+<label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart">&hearts;</span> (Marital) Status: </label>
 $marital
 </div>
 <label id="profile-edit-with-label" for="profile-edit-with" > Who: (if applicable) </label>
@@ -126,6 +127,13 @@ $sexual
 </div>
 <div id="profile-edit-religion-end"></div>
 
+<div id="profile-edit-keywords-wrapper" >
+<label id="profile-edit-keywords-label" for="profile-edit-keywords" >Keywords: </label>
+<input type="text" size="32" name="keywords" id="profile-edit-keywords" title="Example: fishing photography software" value="$keywords" />
+</div><div id="profile-edit-keywords-desc">(Used for searching public profiles, never shown to others)</div>
+<div id="profile-edit-keywords-end"></div>
+
+
 <div class="profile-edit-submit-wrapper" >
 <input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
 </div>
diff --git a/view/en/settings.tpl b/view/en/settings.tpl
index 095dd70a4..85587afbf 100644
--- a/view/en/settings.tpl
+++ b/view/en/settings.tpl
@@ -54,15 +54,27 @@ $theme
 </div>
 
 
-<h3 class="settings-heading">Privacy Settings</h3>
+<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>
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index 491486794..8ad6ee593 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -496,6 +496,7 @@ input#dfrn-url {
 #settings-password-end,
 #settings-confirm-end,
 #settings-openid-end,
+#settings-maxreq-end,
 #notify1-end,
 #notify2-end,
 #notify3-end,
@@ -515,6 +516,7 @@ input#dfrn-url {
 #settings-password-label,
 #settings-confirm-label,
 #settings-openid-label,
+#settings-maxreq-label,
 #settings-label-notify1,
 #settings-label-notify2,
 #settings-label-notify3,
@@ -533,6 +535,7 @@ input#dfrn-url {
 #theme-select,
 #settings-password,
 #settings-confirm,
+#settings-maxreq,
 #notify1,
 #notify2,
 #notify3,
@@ -548,7 +551,10 @@ input#dfrn-url {
 	width: 127px;
 }
 	
-
+#settings-maxreq-desc {
+	float: left;
+	margin-left: 20px;
+}
 
 #settings-theme-label,
 #settings-defloc-label {
@@ -720,6 +726,7 @@ input#dfrn-url {
 #profile-edit-sexual-label,
 #profile-edit-politic-label,
 #profile-edit-religion-label,
+#profile-edit-keywords-label,
 #profile-edit-homepage-label {
 	float: left;
 	width: 175px;
@@ -738,6 +745,7 @@ input#dfrn-url {
 #sexual-select,
 #profile-edit-politic,
 #profile-edit-religion,
+#profile-edit-keywords,
 #profile-in-dir-yes,
 #profile-in-dir-no,
 #profile-in-netdir-yes,
@@ -768,6 +776,12 @@ input#dfrn-url {
 	margin-left: 20px;
 }
 
+#profile-edit-keywords-desc {
+	float: left;
+	margin-left: 20px;
+}
+
+
 #profile-edit-homepage {
 	float: left;
 	margin-bottom: 35px;
@@ -800,6 +814,7 @@ input#dfrn-url {
 #profile-edit-sexual-end,
 #profile-edit-politic-end,
 #profile-edit-religion-end,
+#profile-edit-keywords-end,
 #profile-edit-homepage-end,
 #profile-in-dir-break,
 #profile-in-dir-end,