diff options
| author | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-12-22 14:31:27 +0100 |
|---|---|---|
| committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-12-22 14:31:27 +0100 |
| commit | 870df76463a1cc9823b364db0bfb387f3f46664f (patch) | |
| tree | a8c7391bfe799703aa0a8f26b9ee788f1204e8be /view/tpl/settings.tpl | |
| parent | 25a533bd72c34e9775af71c010a39db6caf7b633 (diff) | |
| parent | 7e7b5bfa4930493a8feae10b0550e29797956c70 (diff) | |
| download | volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.tar.gz volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.tar.bz2 volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.zip | |
Merge remote-tracking branch 'upstream/master' into bootstrap
Conflicts:
view/php/theme_init.php
Diffstat (limited to 'view/tpl/settings.tpl')
| -rwxr-xr-x | view/tpl/settings.tpl | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 10378e599..7b6add231 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -4,7 +4,7 @@ {{$nickname_block}} <form action="settings" id="settings-form" method="post" autocomplete="off" > -<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> +<input type='hidden' name='form_security_token' value='{{$form_security_token}}' /> <h3 class="settings-heading">{{$h_basic}}</h3> @@ -52,28 +52,8 @@ {{include file="field_input.tpl" field=$cntunkmail}} - -{{if $expireisfixed}} -{{* Remove above line when expire is working *}} -{{include file="field_input.tpl" field=$expire.days}} - - -<div class="field input"> - <span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="{{$expire.advanced}}">{{$expire.label}}</a></span> - <div style="display: none;"> - <div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;"> - <h3>{{$expire.advanced}}</h3> - {{include file="field_yesno.tpl" field=$expire.items}} - {{include file="field_yesno.tpl" field=$expire.starred}} - {{include file="field_yesno.tpl" field=$expire.network_only}} - </div> - </div> - -</div> -{{/if}} - <div id="settings-default-perms" class="settings-default-perms" > - <a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>{{$permissions}} {{$permdesc}}</a> + <a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" >{{$permissions}} {{$permdesc}}</a> <div id="settings-default-perms-menu-end"></div> <div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" > |