diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-16 06:52:33 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-16 06:52:33 +0100 |
| commit | c43f647049c78b594c90e95d06d12f29f300d5d3 (patch) | |
| tree | a6b02ad763a5d539158721edbe8ca73e158d8ca4 /view/de | |
| parent | a2ee5ebe427522228dc03dc81da11f348a399c4d (diff) | |
| parent | e2ea341094c53e78ae7473a83d2b6c85b1cde4eb (diff) | |
| download | volse-hubzilla-c43f647049c78b594c90e95d06d12f29f300d5d3.tar.gz volse-hubzilla-c43f647049c78b594c90e95d06d12f29f300d5d3.tar.bz2 volse-hubzilla-c43f647049c78b594c90e95d06d12f29f300d5d3.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'view/de')
| -rw-r--r-- | view/de/profile_edit.tpl | 16 | ||||
| -rw-r--r-- | view/de/settings.tpl | 6 |
2 files changed, 16 insertions, 6 deletions
diff --git a/view/de/profile_edit.tpl b/view/de/profile_edit.tpl index 09a761023..840597ddc 100644 --- a/view/de/profile_edit.tpl +++ b/view/de/profile_edit.tpl @@ -134,11 +134,17 @@ $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 id="profile-edit-pubkeywords-wrapper" > +<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >Public Keywords: </label> +<input type="text" size="32" name="pubkeywords" id="profile-edit-pubkeywords" title="Example: fishing photography software" value="$pub_keywords" /> +</div><div id="profile-edit-pubkeywords-desc">(Used for suggesting potential friends, can be seen by others)</div> +<div id="profile-edit-pubkeywords-end"></div> + +<div id="profile-edit-prvkeywords-wrapper" > +<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Private Keywords: </label> +<input type="text" size="32" name="prvkeywords" id="profile-edit-prvkeywords" title="Example: fishing photography software" value="$prv_keywords" /> +</div><div id="profile-edit-prvkeywords-desc">(Used for searching profiles, never shown to others)</div> +<div id="profile-edit-prvkeywords-end"></div> <div class="profile-edit-submit-wrapper" > diff --git a/view/de/settings.tpl b/view/de/settings.tpl index 0ef50546f..675ef675f 100644 --- a/view/de/settings.tpl +++ b/view/de/settings.tpl @@ -78,7 +78,7 @@ $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');" >$permissions</div> <div id="settings-default-perms-menu-end"></div> <div id="settings-default-perms-select" style="display: none;" > @@ -89,6 +89,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> |