aboutsummaryrefslogtreecommitdiffstats
path: root/view/settings.tpl
diff options
context:
space:
mode:
authorfabrixxm <fabrix.xm@gmail.com>2011-11-21 04:57:56 -0800
committerfabrixxm <fabrix.xm@gmail.com>2011-11-21 04:57:56 -0800
commitea04263f52dc30ca21e2bfb61ff41cf4428f69f2 (patch)
tree9234db8ab0c946ed65123181acba0df71524a8eb /view/settings.tpl
parentaaedac8f574278fba89cd11d3d8f1adaeb6b030e (diff)
parentcb05e677a96e1312263c0a1c63ee10cea62268b1 (diff)
downloadvolse-hubzilla-ea04263f52dc30ca21e2bfb61ff41cf4428f69f2.tar.gz
volse-hubzilla-ea04263f52dc30ca21e2bfb61ff41cf4428f69f2.tar.bz2
volse-hubzilla-ea04263f52dc30ca21e2bfb61ff41cf4428f69f2.zip
Merge pull request #8 from fabrixxm/master
expire settings, clean html from php, more work on quattro
Diffstat (limited to 'view/settings.tpl')
-rw-r--r--view/settings.tpl23
1 files changed, 20 insertions, 3 deletions
diff --git a/view/settings.tpl b/view/settings.tpl
index 52f989f99..cd9d53963 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -55,18 +55,35 @@ $blockwall
$blocktags
-{{inc field_input.tpl with $field=$expire }}{{endinc}}
+{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
+<div class="field input">
+ <span class="field_help"><a href="#advaced-expire-popup" id="advenced-expire" class='popupbox' title="$expire.advanced">Advanced</a></span>
+ <div style="display: none;">
+ <div id="advaced-expire-popup" style="width:auto;height:auto;overflow:auto;">
+ <h3>$expire.advanced</h3>
+ {{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
+ {{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
+ </div>
+ </div>
+
+</div>
+
<div id="settings-default-perms" class="settings-default-perms" >
- <div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions $permdesc</div>
+ <a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>$permissions $permdesc</a>
<div id="settings-default-perms-menu-end"></div>
<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >
- $aclselect
+ <div style="display: none;">
+ <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+ $aclselect
+ </div>
+ </div>
</div>
</div>
+<br/>
<div id="settings-default-perms-end"></div>