Merge branch 'patch-1' into 'dev'

button sticking fixed

See merge request hubzilla/core!1305
This commit is contained in:
Mario 2018-10-04 13:53:00 +02:00
commit c1002557cf

View File

@ -172,6 +172,7 @@
</div> </div>
<div id="miscellaneous-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="miscellaneous-settings" data-parent="#settings" > <div id="miscellaneous-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="miscellaneous-settings" data-parent="#settings" >
<div class="section-content-tools-wrapper"> <div class="section-content-tools-wrapper">
<div class="form-group">
{{if $profselect}} {{if $profselect}}
<label for="contact-profile-selector">{{$profseltxt}}</label> <label for="contact-profile-selector">{{$profseltxt}}</label>
{{$profselect}} {{$profselect}}
@ -181,7 +182,7 @@
<label for="channel_menu">{{$menu_desc}}</label> <label for="channel_menu">{{$menu_desc}}</label>
<select name="channel_menu" class="form-control"> <select name="channel_menu" class="form-control">
{{foreach $menus as $menu }} {{foreach $menus as $menu }}
<option value="{{$menu.name}}" {{$menu.selected}} >{{$menu.name}} </option> <option value="{{$menu.name}}" {{$menu.selected}}>{{$menu.name}}</option>
{{/foreach}} {{/foreach}}
</select> </select>
</div> </div>
@ -197,6 +198,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</form> </form>
{{$aclselect}} {{$aclselect}}
</div> </div>