diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-03-08 09:39:46 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-03-08 09:39:46 +0100 |
| commit | bc2b948f1f6e62b1c277a4042200bb6678956f3f (patch) | |
| tree | 8586c30e495607eee23f16c0aad40974f0711275 /view/tpl/settings.tpl | |
| parent | 23e3e2c50499fab52769929a448e73012fd915af (diff) | |
| parent | ff9442474d07cce24c8f66db39ec34471c3874a2 (diff) | |
| download | volse-hubzilla-2.2.tar.gz volse-hubzilla-2.2.tar.bz2 volse-hubzilla-2.2.zip | |
Merge branch 2.2RC2.2
Diffstat (limited to 'view/tpl/settings.tpl')
| -rwxr-xr-x | view/tpl/settings.tpl | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 05e531ba7..19c2b42d5 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -25,7 +25,9 @@ {{include file="field_checkbox.tpl" field=$adult}} {{include file="field_input.tpl" field=$photo_path}} {{include file="field_input.tpl" field=$attach_path}} - + {{if $basic_addon}} + {{$basic_addon}} + {{/if}} <div class="settings-submit-wrapper" > <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> </div> @@ -82,6 +84,13 @@ {{include file="field_checkbox.tpl" field=$blocktags}} {{include file="field_input.tpl" field=$expire}} </div> + {{if $permcat_enable}} + {{include file="field_select.tpl" field=$defpermcat}} + {{/if}} + + {{if $sec_addon}} + {{$sec_addon}} + {{/if}} <div class="settings-submit-wrapper" > <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> </div> @@ -135,6 +144,9 @@ {{include file="field_input.tpl" field=$evdays}} </div> </div> + {{if $notify_addon}} + {{$notify_addon}} + {{/if}} <div class="settings-submit-wrapper" > <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> </div> @@ -152,9 +164,6 @@ </div> <div id="miscellaneous-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="miscellaneous-settings"> <div class="section-content-tools-wrapper"> - <div class="ffsapilink"> - <a type="button" class="btn btn-default" href="/ffsapi">{{$firefoxshare}}</a> - </div> {{if $menus}} <div class="form-group channel-menu"> <label for="channel_menu">{{$menu_desc}}</label> @@ -166,6 +175,11 @@ </div> {{/if}} {{include file="field_checkbox.tpl" field=$cal_first_day}} + + {{if $misc_addon}} + {{$misc_addon}} + {{/if}} + <div class="settings-submit-wrapper" > <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> </div> |