Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed button sizes and minor UI fixes #1042

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fixed button sizes and minor UI fixes #1042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6789afb
Fixed button sizes and minor UI fixes
LukeSteward Feb 28, 2021
22977a5
allow adding of genre to custom movies & tvShows #1054
Mar 5, 2021
a6c425c
add certification Administration & import
Mar 5, 2021
4ce36c0
Revert "Merge branch 'v1.11'"
LukeSteward Mar 5, 2021
58682a9
allow adding of genre to custom movies & tvShows #1054
Mar 5, 2021
8460a35
add certification Administration & import
Mar 5, 2021
2c76e9e
Revert "Merge branch 'v1.11'"
LukeSteward Mar 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions grails-app/assets/javascripts/streama/templates/admin-movies.tpl.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ <h1>
<video-sort-order-dropdown ng-model="vm.movie.sorter" ng-model-options="{getterSetter: true}" dropdown-type="'movie'"/>
</h1>

<input placeholder="{{vm.searchText}}" type="text" ng-model="vm.movie.filter.title" ng-change="vm.doSearch(vm.movie.filter.title)"
ng-model-options="{debounce: 333}" class="form-control input-sm" />
</div>
<div class="col-md-6">
<br>
Expand All @@ -17,6 +15,13 @@ <h1>
</div>
</div>

<div class="row">
<div class="col-md-5">
<input placeholder="{{vm.searchText}}" type="text" ng-model="vm.movie.filter.title" ng-change="vm.doSearch(vm.movie.filter.title)"
ng-model-options="{debounce: 333}" class="form-control input-sm" />
</div>
</div>

<div class="spinner big" ng-show="vm.movie.isLoading">
<div class="bounce1"></div>
<div class="bounce2"></div>
Expand Down
3 changes: 1 addition & 2 deletions grails-app/assets/javascripts/streama/templates/admin-shows.tpl.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ <h1>
Shows <span class="text-muted text-xs">({{tvShow.total}} items)</span>
<video-sort-order-dropdown ng-model="tvShow.sorter" ng-model-options="{getterSetter: true}" dropdown-type="'tvShow'"/>
</h1>
</div>

</div>
<div class="col-md-6">
<br>
<div class="btn-group pull-right">
Expand All @@ -15,7 +15,6 @@ <h1>
</div>
</div>


<div class="row">
<div class="col-md-5">
<input placeholder="{{searchText}}" type="text" ng-model="tvShow.filter.name" ng-change="doSearch(tvShow.filter.name)"
Expand Down
21 changes: 14 additions & 7 deletions grails-app/assets/javascripts/streama/templates/admin-videos.tpl.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
<button class="btn btn-primary pull-right btn-lg" ng-click="openGenericVideoModal()">Create generic video</button>
<div class="row">
<div class="col-md-6">
<h1>
Other Videos <span class="text-muted text-xs">({{videos.length}} items)</span>
<video-sort-order-dropdown ng-model="currentSort" dropdown-type="'movie'"/>
</h1>

<h1>
Other Videos <span class="text-muted text-xs">({{videos.length}} items)</span>
<video-sort-order-dropdown ng-model="currentSort" dropdown-type="'movie'"/>
</h1>
</div>
<div class="col-md-6">
<br>
<div class="btn-group pull-right">
<button class="btn btn-primary" ng-click="openGenericVideoModal()">Create generic video</button>
</div>
</div>
</div>

<div class="row">
<div class="col-md-5">
Expand Down Expand Up @@ -37,5 +46,3 @@ <h4>{{::video.title}}</h4>
</div>
</div>
</div>