diff options
| author | Habeas Codice <habeascodice@federated.social> | 2014-11-13 13:06:31 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2014-11-13 13:06:31 -0800 |
| commit | ac27db22c18ee7a82a52cbadb3efe2760b910499 (patch) | |
| tree | aa7002d73dbcd4136033589f1cb135184f4126c1 /view/tpl/settings.tpl | |
| parent | 1a5a5c7edb8697c93f8bababbafa80245378dd7e (diff) | |
| parent | 109cb936632c693d3f24afb9e2ce533797ad1a7f (diff) | |
| download | volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.tar.gz volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.tar.bz2 volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
boot.php
include/dba/dba_driver.php
include/diaspora.php
include/follow.php
include/session.php
include/zot.php
mod/photos.php
mod/ping.php
Diffstat (limited to 'view/tpl/settings.tpl')
| -rwxr-xr-x | view/tpl/settings.tpl | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 4c1b8eb8f..7fa52677b 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -100,6 +100,27 @@ {{include file="field_intcheckbox.tpl" field=$notify8}} </div> +<div id="settings-vnotify-desc">{{$lbl_vnot}}</div> + +<div class="group"> +{{include file="field_intcheckbox.tpl" field=$vnotify1}} +{{include file="field_intcheckbox.tpl" field=$vnotify2}} +{{include file="field_intcheckbox.tpl" field=$vnotify3}} +{{include file="field_intcheckbox.tpl" field=$vnotify4}} +{{include file="field_intcheckbox.tpl" field=$vnotify5}} +{{include file="field_intcheckbox.tpl" field=$vnotify6}} +{{include file="field_intcheckbox.tpl" field=$vnotify10}} +{{include file="field_intcheckbox.tpl" field=$vnotify7}} +{{include file="field_intcheckbox.tpl" field=$vnotify8}} +{{include file="field_intcheckbox.tpl" field=$vnotify9}} + +{{*include file="field_intcheckbox.tpl" field=$vnotify11*}} +</div> + +{{include file="field_input.tpl" field=$evdays}} + + + </div> <div class="settings-submit-wrapper" > @@ -110,6 +131,8 @@ {{if $menus}} <h3 class="settings-heading">{{$lbl_misc}}</h3> + + <div id="settings-menu-desc">{{$menu_desc}}</div> <div class="settings-channel-menu-div"> <select name="channel_menu" class="settings-channel-menu-sel"> |