Merge branch 'master' of git://github.com/tobiasd/friendika

[friendica.git] / view / en / settings.tpl

diff --git a/view/en/settings.tpl b/view/en/settings.tpl
index f1926c004c45c25a12c985123c18d9f14e0abef1..5e1bfabf4c1876dc159df31fc6c73973c7170366 100644 (file)
--- a/view/en/settings.tpl
+++ b/view/en/settings.tpl
@@ -1,5 +1,7 @@
 <h1>Account Settings</h1>
 
+<div id="plugin-settings-link"><a href="settings/addon">Plugin Settings</a></div>
+
 $nickname_block
 
 
@@ -49,22 +51,34 @@ $theme
 </div>
 <div id="settings-theme-end"></div>
 
-<div id="settings-submit-wrapper" >
-<input type="submit" name="submit" id="settings-submit" value="Submit" />
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="Submit" />
 </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" class="fakelink" onClick="openClose('settings-default-perms-select');" >&#x21e9; $permissions</div>
        <div id="settings-default-perms-menu-end"></div>
 
        <div id="settings-default-perms-select" style="display: none;" >
@@ -75,8 +89,8 @@ $profile_in_net_dir
 </div>
 <div id="settings-default-perms-end"></div>
 
-<div id="settings-submit-wrapper" >
-<input type="submit" name="submit" id="settings-submit" value="Submit" />
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="Submit" />
 </div>
 
 
@@ -104,8 +118,8 @@ $profile_in_net_dir
 </div>
 <div id="settings=notify-end"></div>
 
-<div id="settings-submit-wrapper" >
-<input type="submit" name="submit" id="settings-submit" value="Submit" />
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="Submit" />
 </div>
 
 
@@ -128,14 +142,13 @@ Leave password fields blank unless changing
 <div id="settings-confirm-end" ></div>
 
 <div id="settings-openid-wrapper" >
-<label id="settings-openid-label" for="settings-openid" >(optional) OpenID: </label>
-<input type="text" id="settings-openid" class="openid" name="openid_url" value="$openid" />
+       $oidhtml
 </div>
 <div id="settings-openid-end" ></div>
 
 
-<div id="settings-submit-wrapper" >
-<input type="submit" name="submit" id="settings-submit" value="Submit" />
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="Submit" />
 </div>
 
 
@@ -143,12 +156,8 @@ Leave password fields blank unless changing
 
 $pagetype
 
-<div id="settings-submit-wrapper" >
-<input type="submit" name="submit" id="settings-submit" value="Submit" />
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="Submit" />
 </div>
 
 
-</form>
-
-
-