Skip to content

Commit

Permalink
Merge branch 'master' into add-filters-to-history-view
Browse files Browse the repository at this point in the history
  • Loading branch information
@HDVinnie
HDVinnie authored Jan 19, 2019
2 parents 04c5d7e + d60e24b commit c71e481
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 60 deletions.
50 changes: 25 additions & 25 deletions resources/views/torrent/cards.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<div id="facetedDefault" style="{{ ($user->torrent_filters ? 'display: none;' : '') }}">
<div class="box">
<div class="container mt-5">
<div class="mx-0 mt-5 form-group">
<div class="mx-0 mt-5 form-group fatten-me">
<div>
<input type="text" class="form-control facetedSearch" trigger="keyup" id="query" placeholder="@lang('torrent.search')">
</div>
Expand All @@ -41,29 +41,29 @@
<div class="container well search mt-5">
<form role="form" method="GET" action="TorrentController@torrents" class="form-horizontal form-condensed form-torrent-search form-bordered">
@csrf
<div class="mx-0 mt-5 form-group">
<label for="name" class="mt-5 col-sm-1 label label-default">@lang('torrent.name')</label>
<div class="mx-0 mt-5 form-group fatten-me">
<label for="name" class="mt-5 col-sm-1 label label-default fatten-me">@lang('torrent.name')</label>
<div class="col-sm-9">
<input type="text" class="form-control facetedSearch" trigger="keyup" id="search" placeholder="@lang('torrent.name')">
</div>
</div>

<div class="mx-0 mt-5 form-group">
<label for="name" class="mt-5 col-sm-1 label label-default">@lang('torrent.description')</label>
<div class="mx-0 mt-5 form-group fatten-me">
<label for="name" class="mt-5 col-sm-1 label label-default fatten-me">@lang('torrent.description')</label>
<div class="col-sm-9">
<input type="text" class="form-control facetedSearch" trigger="keyup" id="description" placeholder="@lang('torrent.description')">
</div>
</div>

<div class="mx-0 mt-5 form-group">
<label for="uploader" class="mt-5 col-sm-1 label label-default">@lang('torrent.uploader')</label>
<div class="mx-0 mt-5 form-group fatten-me">
<label for="uploader" class="mt-5 col-sm-1 label label-default fatten-me">@lang('torrent.uploader')</label>
<div class="col-sm-9">
<input type="text" class="form-control facetedSearch" trigger="keyup" id="uploader" placeholder="@lang('torrent.uploader')">
</div>
</div>

<div class="mx-0 mt-5 form-group">
<label for="imdb" class="mt-5 col-sm-1 label label-default">ID</label>
<div class="mx-0 mt-5 form-group fatten-me">
<label for="imdb" class="mt-5 col-sm-1 label label-default fatten-me">ID</label>
<div class="col-sm-2">
<input type="text" class="form-control facetedSearch" trigger="keyup" id="imdb" placeholder="IMDB #">
</div>
Expand All @@ -78,8 +78,8 @@
</div>
</div>

<div class="mx-0 mt-5 form-group">
<label for="category" class="mt-5 col-sm-1 label label-default">@lang('torrent.category')</label>
<div class="mx-0 mt-5 form-group fatten-me">
<label for="category" class="mt-5 col-sm-1 label label-default fatten-me">@lang('torrent.category')</label>
<div class="col-sm-10">
@foreach ($repository->categories() as $id => $category)
<span class="badge-user">
Expand All @@ -91,8 +91,8 @@
</div>
</div>

<div class="mx-0 mt-5 form-group">
<label for="type" class="mt-5 col-sm-1 label label-default">@lang('torrent.type')</label>
<div class="mx-0 mt-5 form-group fatten-me">
<label for="type" class="mt-5 col-sm-1 label label-default fatten-me">@lang('torrent.type')</label>
<div class="col-sm-10">
@foreach ($repository->types() as $id => $type)
<span class="badge-user">
Expand All @@ -104,8 +104,8 @@
</div>
</div>

<div class="mx-0 mt-5 form-group">
<label for="genre" class="mt-5 col-sm-1 label label-default">Genre</label>
<div class="mx-0 mt-5 form-group fatten-me">
<label for="genre" class="mt-5 col-sm-1 label label-default fatten-me">Genre</label>
<div class="col-sm-10">
@foreach ($repository->tags() as $id => $genre)
<span class="badge-user">
Expand All @@ -117,8 +117,8 @@
</div>
</div>

<div class="mx-0 mt-5 form-group">
<label for="type" class="mt-5 col-sm-1 label label-default">@lang('torrent.discounts')</label>
<div class="mx-0 mt-5 form-group fatten-me">
<label for="type" class="mt-5 col-sm-1 label label-default fatten-me">@lang('torrent.discounts')</label>
<div class="col-sm-10">
<span class="badge-user">
<label class="inline">
Expand All @@ -138,8 +138,8 @@
</div>
</div>

<div class="mx-0 mt-5 form-group">
<label for="type" class="mt-5 col-sm-1 label label-default">@lang('torrent.special')</label>
<div class="mx-0 mt-5 form-group fatten-me">
<label for="type" class="mt-5 col-sm-1 label label-default fatten-me">@lang('torrent.special')</label>
<div class="col-sm-10">
<span class="badge-user">
<label class="inline">
Expand All @@ -164,8 +164,8 @@
</div>
</div>

<div class="mx-0 mt-5 form-group">
<label for="type" class="mt-5 col-sm-1 label label-default">@lang('torrent.health')</label>
<div class="mx-0 mt-5 form-group fatten-me">
<label for="type" class="mt-5 col-sm-1 label label-default fatten-me">@lang('torrent.health')</label>
<div class="col-sm-10">
<span class="badge-user">
<label class="inline">
Expand All @@ -184,8 +184,8 @@
</span>
</div>
</div>
<div class="mx-0 mt-5 form-group">
<label for="sort" class="mt-5 col-sm-1 label label-default">@lang('common.sort')</label>
<div class="mx-0 mt-5 form-group fatten-me">
<label for="sort" class="mt-5 col-sm-1 label label-default fatten-me">@lang('common.sort')</label>
<div class="col-sm-2">
<select id="sorting" trigger="change" name="sorting" class="form-control facetedSearch">
@foreach ($repository->sorting() as $value => $sort)
Expand All @@ -194,8 +194,8 @@
</select>
</div>
</div>
<div class="mx-0 mt-5 form-group">
<label for="sort" class="mt-5 col-sm-1 label label-default">@lang('common.direction')</label>
<div class="mx-0 mt-5 form-group fatten-me">
<label for="sort" class="mt-5 col-sm-1 label label-default fatten-me">@lang('common.direction')</label>
<div class="col-sm-2">
<select id="direction" trigger="change" name="direction" class="form-control facetedSearch">
@foreach ($repository->direction() as $value => $dir)
Expand Down
50 changes: 25 additions & 25 deletions resources/views/torrent/groupings.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<div id="facetedDefault" style="{{ ($user->torrent_filters ? 'display: none;' : '') }}">
<div class="box">
<div class="container mt-5">
<div class="mx-0 mt-5 form-group">
<div class="mx-0 mt-5 form-group fatten-me">
<div>
<input type="text" class="form-control facetedSearch" trigger="keyup" id="query" placeholder="@lang('torrent.search')">
</div>
Expand All @@ -49,29 +49,29 @@
<div class="container well search mt-5">
<form role="form" method="GET" action="TorrentController@torrents" class="form-horizontal form-condensed form-torrent-search form-bordered">
@csrf
<div class="mx-0 mt-5 form-group">
<label for="name" class="mt-5 col-sm-1 label label-default">@lang('torrent.name')</label>
<div class="mx-0 mt-5 form-group fatten-me">
<label for="name" class="mt-5 col-sm-1 label label-default fatten-me">@lang('torrent.name')</label>
<div class="col-sm-9">
<input type="text" class="form-control facetedSearch" trigger="keyup" id="search" placeholder="@lang('torrent.name')">
</div>
</div>

<div class="mx-0 mt-5 form-group">
<label for="name" class="mt-5 col-sm-1 label label-default">@lang('torrent.description')</label>
<div class="mx-0 mt-5 form-group fatten-me">
<label for="name" class="mt-5 col-sm-1 label label-default fatten-me">@lang('torrent.description')</label>
<div class="col-sm-9">
<input type="text" class="form-control facetedSearch" trigger="keyup" id="description" placeholder="@lang('torrent.description')">
</div>
</div>

<div class="mx-0 mt-5 form-group">
<label for="uploader" class="mt-5 col-sm-1 label label-default">@lang('torrent.uploader')</label>
<div class="mx-0 mt-5 form-group fatten-me">
<label for="uploader" class="mt-5 col-sm-1 label label-default fatten-me">@lang('torrent.uploader')</label>
<div class="col-sm-9">
<input type="text" class="form-control facetedSearch" trigger="keyup" id="uploader" placeholder="@lang('torrent.uploader')">
</div>
</div>

<div class="mx-0 mt-5 form-group">
<label for="imdb" class="mt-5 col-sm-1 label label-default">ID</label>
<div class="mx-0 mt-5 form-group fatten-me">
<label for="imdb" class="mt-5 col-sm-1 label label-default fatten-me">ID</label>
<div class="col-sm-2">
<input type="text" class="form-control facetedSearch" trigger="keyup" id="imdb" placeholder="IMDB #">
</div>
Expand All @@ -86,8 +86,8 @@
</div>
</div>

<div class="mx-0 mt-5 form-group">
<label for="category" class="mt-5 col-sm-1 label label-default">@lang('torrent.category')</label>
<div class="mx-0 mt-5 form-group fatten-me">
<label for="category" class="mt-5 col-sm-1 label label-default fatten-me">@lang('torrent.category')</label>
<div class="col-sm-10">
@foreach ($repository->categories() as $id => $category)
<span class="badge-user">
Expand All @@ -99,8 +99,8 @@
</div>
</div>

<div class="mx-0 mt-5 form-group">
<label for="type" class="mt-5 col-sm-1 label label-default">@lang('torrent.type')</label>
<div class="mx-0 mt-5 form-group fatten-me">
<label for="type" class="mt-5 col-sm-1 label label-default fatten-me">@lang('torrent.type')</label>
<div class="col-sm-10">
@foreach ($repository->types() as $id => $type)
<span class="badge-user">
Expand All @@ -112,8 +112,8 @@
</div>
</div>

<div class="mx-0 mt-5 form-group">
<label for="genre" class="mt-5 col-sm-1 label label-default">Genre</label>
<div class="mx-0 mt-5 form-group fatten-me">
<label for="genre" class="mt-5 col-sm-1 label label-default fatten-me">Genre</label>
<div class="col-sm-10">
@foreach ($repository->tags() as $id => $genre)
<span class="badge-user">
Expand All @@ -125,8 +125,8 @@
</div>
</div>

<div class="mx-0 mt-5 form-group">
<label for="type" class="mt-5 col-sm-1 label label-default">@lang('torrent.discounts')</label>
<div class="mx-0 mt-5 form-group fatten-me">
<label for="type" class="mt-5 col-sm-1 label label-default fatten-me">@lang('torrent.discounts')</label>
<div class="col-sm-10">
<span class="badge-user">
<label class="inline">
Expand All @@ -146,8 +146,8 @@
</div>
</div>

<div class="mx-0 mt-5 form-group">
<label for="type" class="mt-5 col-sm-1 label label-default">@lang('torrent.special')</label>
<div class="mx-0 mt-5 form-group fatten-me">
<label for="type" class="mt-5 col-sm-1 label label-default fatten-me">@lang('torrent.special')</label>
<div class="col-sm-10">
<span class="badge-user">
<label class="inline">
Expand All @@ -172,8 +172,8 @@
</div>
</div>

<div class="mx-0 mt-5 form-group">
<label for="type" class="mt-5 col-sm-1 label label-default">@lang('torrent.health')</label>
<div class="mx-0 mt-5 form-group fatten-me">
<label for="type" class="mt-5 col-sm-1 label label-default fatten-me">@lang('torrent.health')</label>
<div class="col-sm-10">
<span class="badge-user">
<label class="inline">
Expand All @@ -192,8 +192,8 @@
</span>
</div>
</div>
<div class="mx-0 mt-5 form-group">
<label for="sort" class="mt-5 col-sm-1 label label-default">@lang('common.sort')</label>
<div class="mx-0 mt-5 form-group fatten-me">
<label for="sort" class="mt-5 col-sm-1 label label-default fatten-me">@lang('common.sort')</label>
<div class="col-sm-2">
<select id="sorting" trigger="change" name="sorting" class="form-control facetedSearch">
@foreach ($repository->sorting() as $value => $sort)
Expand All @@ -202,8 +202,8 @@
</select>
</div>
</div>
<div class="mx-0 mt-5 form-group">
<label for="sort" class="mt-5 col-sm-1 label label-default">@lang('common.direction')</label>
<div class="mx-0 mt-5 form-group fatten-me">
<label for="sort" class="mt-5 col-sm-1 label label-default fatten-me">@lang('common.direction')</label>
<div class="col-sm-2">
<select id="direction" trigger="change" name="direction" class="form-control facetedSearch">
@foreach ($repository->direction() as $value => $dir)
Expand Down
20 changes: 10 additions & 10 deletions resources/views/torrent/torrents.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,26 +45,25 @@
<form role="form" method="GET" action="TorrentController@torrents" class="form-horizontal form-condensed form-torrent-search form-bordered">
@csrf

<div class="mx-0 mt-5 form-group fatten-me">
<label for="name" class="mt-5 col-sm-1 label label-default fatten-me">@lang('torrent.name')</label>
<div class="col-sm-9">
<input type="text" class="form-control facetedSearch" trigger="keyup" id="search" placeholder="@lang('torrent.name')">
</div>
</div>
<div class="mx-0 mt-5 form-group fatten-me">
<label for="name" class="mt-5 col-sm-1 label label-default fatten-me">@lang('torrent.name')</label>
<div class="col-sm-9 fatten-me">
<input type="text" class="form-control facetedSearch" trigger="keyup" id="search" placeholder="@lang('torrent.name')">
</div>
</div>
<div class="mx-0 mt-5 form-group fatten-me">
<label for="name" class="mt-5 col-sm-1 label label-default fatten-me">@lang('torrent.description')</label>
<div class="col-sm-9">
<div class="col-sm-9 fatten-me">
<input type="text" class="form-control facetedSearch" trigger="keyup" id="description" placeholder="@lang('torrent.description')">
</div>
</div>

<div class="mx-0 mt-5 form-group fatten-me">
<label for="uploader" class="mt-5 col-sm-1 label label-default fatten-me">@lang('torrent.uploader')</label>
<div class="col-sm-9">
<div class="col-sm-9 fatten-me">
<input type="text" class="form-control facetedSearch" trigger="keyup" id="uploader" placeholder="@lang('torrent.uploader')">
</div>
</div>

<div class="mx-0 mt-5 form-group fatten-me">
<label for="imdb" class="mt-5 col-sm-1 label label-default fatten-me">ID</label>
<div class="col-sm-2">
Expand Down Expand Up @@ -222,6 +221,7 @@

</div>
</div>

<div class="mx-0 mt-5 form-group fatten-me">
<label for="qty" class="mt-5 col-sm-1 label label-default fatten-me">@lang('common.quantity')</label>
<div class="col-sm-2">
Expand Down

0 comments on commit c71e481

Please sign in to comment.