Sending mail as multipart/alternative (html and plain text) (very basic by now)

[friendica.git] / view / settings.tpl

diff --git a/view/settings.tpl b/view/settings.tpl
old mode 100644 (file)
new mode 100755 (executable)
index 52f989f..1172df8
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -29,6 +29,7 @@ $nickname_block
 {{inc field_input.tpl with $field=$defloc }}{{endinc}}
 {{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
 {{inc field_select.tpl with $field=$theme }}{{endinc}}
+{{inc field_input.tpl with $field=$ajaxint }}{{endinc}}
 
 
 <div class="settings-submit-wrapper" >
@@ -55,18 +56,38 @@ $blockwall
 
 $blocktags
 
-{{inc field_input.tpl with $field=$expire }}{{endinc}}
+$suggestme
+
+{{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">$expire.label</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}}
+                       {{ inc field_yesno.tpl with $field=$expire.starred }}{{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>
 
 
@@ -86,6 +107,8 @@ $blocktags
 {{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
 {{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
 {{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
 </div>