fix the request page sort/approve button alignment

This commit is contained in:
Drewster727 2016-03-29 10:54:15 -05:00
parent 591385ae34
commit 6fc4cbf9a4
2 changed files with 45 additions and 39 deletions

View file

@ -99,7 +99,7 @@ namespace PlexRequests.UI.Modules
ReleaseDateTicks = movie.ReleaseDate.Ticks, ReleaseDateTicks = movie.ReleaseDate.Ticks,
RequestedDate = movie.RequestedDate.Humanize(), RequestedDate = movie.RequestedDate.Humanize(),
RequestedDateTicks = movie.RequestedDate.Ticks, RequestedDateTicks = movie.RequestedDate.Ticks,
Approved = movie.Available ? true : movie.Approved, Approved = movie.Available || movie.Approved,
Title = movie.Title, Title = movie.Title,
Overview = movie.Overview, Overview = movie.Overview,
RequestedBy = movie.RequestedBy, RequestedBy = movie.RequestedBy,
@ -136,7 +136,7 @@ namespace PlexRequests.UI.Modules
ReleaseDateTicks = tv.ReleaseDate.Ticks, ReleaseDateTicks = tv.ReleaseDate.Ticks,
RequestedDate = tv.RequestedDate.Humanize(), RequestedDate = tv.RequestedDate.Humanize(),
RequestedDateTicks = tv.RequestedDate.Ticks, RequestedDateTicks = tv.RequestedDate.Ticks,
Approved = tv.Available ? true : tv.Approved, Approved = tv.Available || tv.Approved,
Title = tv.Title, Title = tv.Title,
Overview = tv.Overview, Overview = tv.Overview,
RequestedBy = tv.RequestedBy, RequestedBy = tv.RequestedBy,

View file

@ -20,43 +20,49 @@
<!-- Tab panes --> <!-- Tab panes -->
<div class="tab-content contentList"> <div class="tab-content contentList">
<div class="btn-group col-sm-push-8"> <div class="row">
@if (Context.CurrentUser.IsAuthenticated()) <div class="col-sm-12">
{ <div class="pull-right">
@if (Model.SearchForMovies) <div class="btn-group">
{ @if (Context.CurrentUser.IsAuthenticated())
<button id="approveMovies" class="btn btn-success-outline approve-category" type="submit"><i class="fa fa-plus"></i> Approve Movies</button> {
} @if (Model.SearchForMovies)
@if (Model.SearchForTvShows) {
{ <button id="approveMovies" class="btn btn-success-outline approve-category" type="submit"><i class="fa fa-plus"></i> Approve Movies</button>
<button id="approveTVShows" class="btn btn-success-outline approve-category" type="submit" style="display: none;"><i class="fa fa-plus"></i> Approve TV Shows</button> }
} @if (Model.SearchForTvShows)
} {
</div> <button id="approveTVShows" class="btn btn-success-outline approve-category" type="submit" style="display: none;"><i class="fa fa-plus"></i> Approve TV Shows</button>
<div class="btn-group col-sm-push-8"> }
<a href="#" class="btn btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> }
Filter </div>
<i class="fa fa-filter"></i> <div class="btn-group">
</a> <a href="#" class="btn btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<ul class="dropdown-menu"> Filter
<li><a href="#" class="filter" data-filter="all"><i class="fa fa-square"></i> All</a></li> <i class="fa fa-filter"></i>
<li><a href="#" class="filter" data-filter=".approved-true"><i class="fa fa-square-o"></i> Approved</a></li> </a>
<li><a href="#" class="filter" data-filter=".approved-false"><i class="fa fa-square-o"></i> Not Approved</a></li> <ul class="dropdown-menu">
<li><a href="#" class="filter" data-filter=".available-true"><i class="fa fa-square-o"></i> Available</a></li> <li><a href="#" class="filter" data-filter="all"><i class="fa fa-square"></i> All</a></li>
<li><a href="#" class="filter" data-filter=".available-false"><i class="fa fa-square-o"></i> Not Available</a></li> <li><a href="#" class="filter" data-filter=".approved-true"><i class="fa fa-square-o"></i> Approved</a></li>
</ul> <li><a href="#" class="filter" data-filter=".approved-false"><i class="fa fa-square-o"></i> Not Approved</a></li>
</div> <li><a href="#" class="filter" data-filter=".available-true"><i class="fa fa-square-o"></i> Available</a></li>
<div class="btn-group col-sm-push-8"> <li><a href="#" class="filter" data-filter=".available-false"><i class="fa fa-square-o"></i> Not Available</a></li>
<a href="#" class="btn btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> </ul>
Order </div>
<i class="fa fa-sort"></i> <div class="btn-group">
</a> <a href="#" class="btn btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<ul class="dropdown-menu"> Order
<li><a href="#" class="sort" data-sort="requestorder:desc"><i class="fa fa-square"></i> Recent Requests</a></li> <i class="fa fa-sort"></i>
<li><a href="#" class="sort" data-sort="requestorder:asc"><i class="fa fa-square-o"></i> Older Requests</a></li> </a>
<li><a href="#" class="sort" data-sort="releaseorder:desc"><i class="fa fa-square-o"></i> Recent Releases</a></li> <ul class="dropdown-menu">
<li><a href="#" class="sort" data-sort="releaseorder:asc"><i class="fa fa-square-o"></i> Older Releases</a></li> <li><a href="#" class="sort" data-sort="requestorder:desc"><i class="fa fa-square"></i> Recent Requests</a></li>
</ul> <li><a href="#" class="sort" data-sort="requestorder:asc"><i class="fa fa-square-o"></i> Older Requests</a></li>
<li><a href="#" class="sort" data-sort="releaseorder:desc"><i class="fa fa-square-o"></i> Recent Releases</a></li>
<li><a href="#" class="sort" data-sort="releaseorder:asc"><i class="fa fa-square-o"></i> Older Releases</a></li>
</ul>
</div>
</div>
</div>
</div> </div>
@if (Model.SearchForMovies) @if (Model.SearchForMovies)
{ {