merge in tidusjar's dev changes, remove approve all, fix alignment on approve all category buttons

This commit is contained in:
Drewster727 2016-03-29 09:03:34 -05:00
commit dce5983720
26 changed files with 592 additions and 109 deletions

View file

@ -2,13 +2,8 @@
<div>
<h1>Requests</h1>
<h4>Below you can see yours and all other requests, as well as their download and approval status.</h4>
@if (Context.CurrentUser.IsAuthenticated())
{
<button id="approveAll" class="btn btn-success-outline" type="submit"><i class="fa fa-plus"></i> Approve All</button>
<br />
<br />
<br />
}
<!-- Nav tabs -->
<ul id="nav-tabs" class="nav nav-tabs" role="tablist">
@if (Model.SearchForMovies)
@ -23,10 +18,9 @@
</ul>
<br />
<!-- Tab panes -->
<div class="tab-content contentList">
<div class="btn-group col-sm-2">
<div class="btn-group col-sm-push-8">
@if (Context.CurrentUser.IsAuthenticated())
{
@if (Model.SearchForMovies)