Merge remote-tracking branch 'upstream/develop' into develop
This commit is contained in:
commit
4f25396fae
|
@ -6,7 +6,12 @@
|
|||
|
||||
{{include file="field_themeselect.tpl" field=$theme}}
|
||||
{{include file="field_input.tpl" field=$itemspage_network}}
|
||||
|
||||
{{* Show the mobile theme selection only if mobile themes are available *}}
|
||||
{{if count($mobile_theme.4) > 1}}
|
||||
{{include file="field_themeselect.tpl" field=$mobile_theme}}
|
||||
{{/if}}
|
||||
|
||||
{{include file="field_input.tpl" field=$itemspage_mobile_network}}
|
||||
{{include file="field_input.tpl" field=$ajaxint}}
|
||||
{{include file="field_checkbox.tpl" field=$nowarn_insecure}}
|
||||
|
|
|
@ -22,7 +22,10 @@
|
|||
|
||||
{{include file="field_themeselect.tpl" field=$theme}}
|
||||
|
||||
{{* Show the mobile theme selection only if mobile themes are available *}}
|
||||
{{if count($mobile_theme.4) > 1}}
|
||||
{{include file="field_themeselect.tpl" field=$mobile_theme}}
|
||||
{{/if}}
|
||||
|
||||
<div class="form-group pull-right settings-submit-wrapper" >
|
||||
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
|
||||
|
|
Loading…
Reference in a new issue