Merge pull request #127 from henrywright/markup

Fix nested row markup on groups page
main
psychobunny 10 years ago
commit be178ee7fd

@ -5,17 +5,19 @@
<!-- ENDIF allowGroupCreation --> <!-- ENDIF allowGroupCreation -->
</div> </div>
<div class="col-lg-8"> <div class="col-lg-8">
<div class="col-xs-3 text-left pull-right"> <div class="row">
<select class="form-control" id="search-sort"> <div class="col-xs-3 text-left pull-right">
<option value="alpha">[[groups:details.group_name]]</option> <select class="form-control" id="search-sort">
<option value="count">[[groups:details.member_count]]</option> <option value="alpha">[[groups:details.group_name]]</option>
<option value="date">[[groups:details.creation_date]]</option> <option value="count">[[groups:details.member_count]]</option>
</select> <option value="date">[[groups:details.creation_date]]</option>
</div> </select>
<div class="col-xs-5 text-left pull-right"> </div>
<div class="input-group"> <div class="col-xs-5 text-left pull-right">
<input type="text" class="form-control" placeholder="[[global:search]]" name="query" value="" id="search-text"> <div class="input-group">
<span id="search-button" class="input-group-addon search-button"><i class="fa fa-search"></i></span> <input type="text" class="form-control" placeholder="[[global:search]]" name="query" value="" id="search-text">
<span id="search-button" class="input-group-addon search-button"><i class="fa fa-search"></i></span>
</div>
</div> </div>
</div> </div>
</div> </div>

Loading…
Cancel
Save