diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/acl_selector.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/field_checkbox.tpl | 7 | ||||
| -rwxr-xr-x | view/tpl/field_input.tpl | 9 | ||||
| -rwxr-xr-x | view/tpl/field_intcheckbox.tpl | 9 | ||||
| -rwxr-xr-x | view/tpl/field_password.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/field_select.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/field_textarea.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/field_yesno.tpl | 4 |
8 files changed, 26 insertions, 29 deletions
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index e0b31162a..f4f851c8a 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -32,7 +32,7 @@ <div id="acl-wrapper"> <div id="acl-list"> <input class="form-control" type="text" id="acl-search" placeholder=" {{$search}}"> - <div class="p-2 dropdown-sub-text">{{$showlimitedDesc}}</div> + <small class="text-muted">{{$showlimitedDesc}}</small> <div id="acl-list-content"></div> </div> </div> diff --git a/view/tpl/field_checkbox.tpl b/view/tpl/field_checkbox.tpl index 6785e522a..f779f937c 100755 --- a/view/tpl/field_checkbox.tpl +++ b/view/tpl/field_checkbox.tpl @@ -1,6 +1,5 @@ - <div id="{{$field.0}}_container" class="form-group field checkbox"> + <div id="{{$field.0}}_container" class="clearfix form-group checkbox"> <label for="id_{{$field.0}}">{{$field.1}}</label> - <div class="pull-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.5}}{{$field.5}}{{/if}} /><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span></label></div> - <span class="help-block">{{$field.3}}</span> + <div class="float-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.5}}{{$field.5}}{{/if}} /><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span></label></div> + <small class="form-text text-muted">{{$field.3}}</small> </div> - <div class="clear"></div> diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl index d6a7f56b2..65a837e5f 100755 --- a/view/tpl/field_input.tpl +++ b/view/tpl/field_input.tpl @@ -1,6 +1,5 @@ - <div id="id_{{$field.0}}_wrapper" class='form-group field input'> - <label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label> - <input class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}> - <span id='help_{{$field.0}}' class='help-block'>{{$field.3}}</span> - <div class="clear"></div> + <div id="id_{{$field.0}}_wrapper" class="form-group"> + <label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label> + <input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="text" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}> + <small id="help_{{$field.0}}" class="form-text text-muted">{{$field.3}}</small> </div> diff --git a/view/tpl/field_intcheckbox.tpl b/view/tpl/field_intcheckbox.tpl index 565f97760..abfe6e189 100755 --- a/view/tpl/field_intcheckbox.tpl +++ b/view/tpl/field_intcheckbox.tpl @@ -1,6 +1,5 @@ - <div class="form-group field checkbox"> - <label for='id_{{$field.0}}'>{{$field.1}}</label> - <div class="pull-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3}}" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.5}}{{$field.5.1}}{{/if}}' data-off='{{if $field.5}}{{$field.5.0}}{{/if}}'></span><span class="onoffswitch-switch"></span> </label></div> - <span class='help-block'>{{$field.4}}</span> + <div class="clearfix form-group checkbox"> + <label for="id_{{$field.0}}">{{$field.1}}</label> + <div class="pull-right"><input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.3}}" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for="id_{{$field.0}}"> <span class="onoffswitch-inner" data-on="{{if $field.5}}{{$field.5.1}}{{/if}}" data-off="{{if $field.5}}{{$field.5.0}}{{/if}}"></span><span class="onoffswitch-switch"></span> </label></div> + <small class="form-text text-muted">{{$field.4}}</small> </div> - <div class="clear"></div> diff --git a/view/tpl/field_password.tpl b/view/tpl/field_password.tpl index 1643fa855..fa5e14582 100755 --- a/view/tpl/field_password.tpl +++ b/view/tpl/field_password.tpl @@ -1,5 +1,5 @@ - <div class='form-group field password'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> - <input class="form-control" type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}>{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} - <span id="help_{{$field.0}}" class="help-block">{{$field.3}}</span> + <div class="form-group"> + <label for="id_{{$field.0}}">{{$field.1}}</label> + <input class="form-control" type="password" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}>{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} + <small id="help_{{$field.0}}" class="form-text text-muted">{{$field.3}}</small> </div> diff --git a/view/tpl/field_select.tpl b/view/tpl/field_select.tpl index 762447290..cda9a823a 100755 --- a/view/tpl/field_select.tpl +++ b/view/tpl/field_select.tpl @@ -1,7 +1,7 @@ - <div class='form-group field select'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> - <select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}'> + <div class="form-group"> + <label for="id_{{$field.0}}">{{$field.1}}</label> + <select class="form-control" name="{{$field.0}}" id="id_{{$field.0}}"> {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}} </select> - <span class='help-block'>{{$field.3}}</span> + <small class="form-text text-muted">{{$field.3}}</small> </div> diff --git a/view/tpl/field_textarea.tpl b/view/tpl/field_textarea.tpl index 01fdc23f5..437dece93 100755 --- a/view/tpl/field_textarea.tpl +++ b/view/tpl/field_textarea.tpl @@ -1,5 +1,5 @@ - <div class='form-group field textarea'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> - <textarea class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.4}}{{$field.4}}{{/if}} >{{$field.2}}</textarea> - <span class='help-block'>{{$field.3}}</span> + <div class="form-group"> + <label for="id_{{$field.0}}">{{$field.1}}</label> + <textarea class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.4}}{{$field.4}}{{/if}} >{{$field.2}}</textarea> + <small class="form-text text-muted">{{$field.3}}</small> </div> diff --git a/view/tpl/field_yesno.tpl b/view/tpl/field_yesno.tpl index f5a909833..8a4cda55b 100755 --- a/view/tpl/field_yesno.tpl +++ b/view/tpl/field_yesno.tpl @@ -1,4 +1,4 @@ - <div class='field yesno'> + <div class='clearfix form-group'> <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> <div class='onoff' id="id_{{$field.0}}_onoff"> <input type="hidden" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"> @@ -9,5 +9,5 @@ {{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}} </a> </div> - <span class='field_help'>{{$field.3}}</span> + <small class='form-text text-muted'>{{$field.3}}</small> </div> |