daniel/dumbo
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sommer Style, Avatare, Duplikate

Browse Source
This commit is contained in:
Daniel
2015-10-21 07:02:29 +02:00
parent 62d4c32d53
commit 0de0eefa37
10 changed files with 475 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/views/film.blade.php
View File

@@ -12,9 +12,12 @@
@else
<div class="label label-danger" <?php if(!is_null(Auth::user()) && Auth::user()->admin) { echo "id='gesehen'"; } ?> style="cursor: pointer;"><span class="glyphicon glyphicon-unchecked"></span> Nicht gesehen</div>
@endif
<span class="label label-info">
<img class="img-circle" src="{{ $film->besitzer->getAvatar() }}" width="16"> {{$film->besitzer->name}}
</span>
</div>
<div class="col-md-9">
<ul class="nav nav-tabs">
<ul class="nav nav-pills">
<li class="active"><a href="#ueberblick" data-toggle="tab">Überblick</a></li>
<li><a href="#cast" data-toggle="tab">Schauspieler</a></li>
<li><a href="#trailer" data-toggle="tab">Trailer</a></li>
@@ -53,14 +56,10 @@
</dd>
<dt>Bewertung</dt>
<dd>{{ $tfilm['vote_average']}} von 10 </dd>
@if(!is_null($film->gesehen) && Comment::where('film', $film->id)->where('bewertung', '>', 0)->count() > 0)
@if($film->getBewertung() > 0)
<dt>Eigene Bewertung</dt>
<dd>
<?php
$count = Comment::where('film', $film->id)->where('bewertung', '>', 0)->count();
$avg = Comment::where('film', $film->id)->where('bewertung', '>', 0)->sum('bewertung') / $count;
?>
<div class="label label-{{$labels[round($avg)]}}">{{$avg}}</div>
<div class="label label-{{$labels[round($film->getBewertung())]}}">{{$film->getBewertung()}}</div>
</dd>
@endif
@for($i = 0; $i < 3 && $i < count($cast['crew']); $i++)
@@ -77,7 +76,7 @@
<div class="row" style="margin-top:10px;">
@for($i = 0; $i < 10 && $i < count($cast['cast']); $i++)
<div class="col-md-6">
<div class="pull-left" style="margin-right:5px; min-height: 80px;"><img class="img-thumbnail media-object" src="{{ !is_null($cast['cast'][$i]['profile_path']) ? $tmdb->getImageUrl($cast['cast'][$i]['profile_path'], TMDb::IMAGE_PROFILE, 'w185') : "http://d3a8mw37cqal2z.cloudfront.net/assets/649ae87ebcf4285/images/no-profile-w185.jpg"}}" alt="{{$cast['cast'][$i]['name']}}" width="55"></div>
<div class="pull-left" style="margin-right:5px; min-height: 80px;"><img class="media-object" src="{{ !is_null($cast['cast'][$i]['profile_path']) ? $tmdb->getImageUrl($cast['cast'][$i]['profile_path'], TMDb::IMAGE_PROFILE, 'w185') : asset("img/no-avatar.jpg") }}" alt="{{$cast['cast'][$i]['name']}}" width="55"></div>
<div class="media-body">
<h4 class="media-heading">{{$cast['cast'][$i]['name']}}</h4>
{{$cast['cast'][$i]['character']}}
@@ -91,7 +90,7 @@
</div>
<div class="tab-pane" id="trailer">
@foreach($trail['youtube'] as $yt)
<iframe width="420" height="315" src="//www.youtube.com/embed/{{ $yt['source'] }}" frameborder="0" allowfullscreen></iframe>
<p></p><iframe width="420" height="315" src="//www.youtube.com/embed/{{ $yt['source'] }}" frameborder="0" allowfullscreen></iframe>
@endforeach
</div>
</div>
@@ -110,13 +109,18 @@
<dt>Daf&uuml;r</dt>
<dd>
@foreach($pv as $v)
<span class="badge">{{$v}}</span>
<span class="badge">
<img class="img-circle" src="{{ $v->getAvatar() }}" width="20"> {{$v->name}}
</span>&nbsp;
@endforeach
</dd>
<p></p>
<dt>Nicht daf&uuml;r</dt>
<dd>
@foreach($nv as $v)
<span class="badge">{{$v}}</span>
<span class="badge">
<img class="img-circle" src="{{ $v->getAvatar() }}" width="20"> {{$v->name}}
</span>&nbsp;
@endforeach
</dd>
</dl>
@@ -129,7 +133,7 @@
<a class="btn btn-lg btn-success <?php echo $uvote[0] && $uvote[1] ? "disabled" : ""; ?>" href="{{ url('vote', array('yes', Auth::user()->id, $film->id)) }}">
<span class="glyphicon glyphicon-thumbs-up"></span> Daf&uuml;r
</a>
<a class="btn btn-lg btn-warning <?php echo $uvote[0] && !$uvote[1] ? "disabled" : ""; ?>" href="{{ url('vote', array('no', Auth::user()->id, $film->id)) }}">
<a class="btn btn-lg btn-default <?php echo $uvote[0] && !$uvote[1] ? "disabled" : ""; ?>" href="{{ url('vote', array('no', Auth::user()->id, $film->id)) }}">
<span class="glyphicon glyphicon-hand-right"></span> Nicht daf&uuml;r
</a>
</div>
@@ -187,7 +191,7 @@
<div class="pull-left label label-{{ $labels[$comment->bewertung] }}" style="margin-right: 5px;">{{$comment->bewertung}}</div>
@endif
<p>{{$comment->text}}</p>
<button type="button" class="btn btn-xs" onclick="toggleComment('#comment{{$comment->id}}')">Bearbeiten</button>
<button type="button" class="btn btn-default btn-xs" onclick="toggleComment('#comment{{$comment->id}}')">Bearbeiten</button>
</div>
<div class="collapse" id="comment{{$comment->id}}edit">
{{Form::open(array('route' => 'modcomment'))}}
@@ -206,7 +210,7 @@
<div class="form-group"><textarea class="form-control" rows="1" name="text">{{$comment->text}}</textarea></div>
<div class="form-group">
<button type="submit" class="btn btn-primary btn-xs">Absenden</button>
<button type="button" class="btn btn-xs" onclick="toggleComment('#comment{{$comment->id}}')">Abbrechen</button>
<button type="button" class="btn btn-default btn-xs" onclick="toggleComment('#comment{{$comment->id}}')">Abbrechen</button>
</div>
{{Form::close()}}
</div>
@@ -231,9 +235,9 @@
$(id + 'comment').collapse('toggle');
}
$(function() {
$('.tooltip-enable').tooltip({ html: true, placement: "bottom" });
});
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
$(function() {
$('#gesehen').popover({

8
app/views/hello.blade.php
View File

@@ -4,18 +4,16 @@
<meta charset="utf-8">
<title>@yield('title') Dumbo</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="{{ asset('css/bootstrap.css') }}" type="text/css" rel="stylesheet">
<link href="{{ asset('css/bootstrap-superhero.min.css') }}" type="text/css" rel="stylesheet">
<link href="{{ asset('css/general.css') }}" type="text/css" rel="stylesheet">
@yield('styles')
</head>
<body><div id="wrap">
<div class="navbar navbar-inverse navbar-static-top" role="navigation">
<div class="navbar navbar-inversex navbar-static-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="glyphicon glyphicon-menu-hamburger" aria-hidden="true"></span>
</button>
{{ HTML::link('/', 'Dumbo', array("class" => "navbar-brand")) }}
</div>

161
app/views/index.blade.php
View File

@@ -3,91 +3,95 @@
@section('content')
<div class="row">
<div class="col-md-6">
<div class="panel panel-info">
<div class="panel panel-primary">
<div class="panel-heading">Meistgew&uuml;nschter Film</div>
<div class="panel-body">
<img src="{{$image}}" class="pull-left thumbnail" style="max-height: 100px; margin-right: 15px;">
<h4>{{$topfilm->name}}</h4>
<p><span class="glyphicon glyphicon-thumbs-up"></span>&nbsp;{{$topfilm->upvotes}}
<span class="glyphicon glyphicon-tree-deciduous"></span>&nbsp;{{$topfilm->downvotes + $topfilm->upvotes}}</p>
<?php $topfilm = $meistgw->shift(); ?>
<img src="{{$images["top"]}}" class="pull-left thumbnail" style="max-height: 100px; margin-right: 15px;">
<h4>
{{$topfilm->name}}
<small><span class="badge">
<img class="img-circle" src="{{ $topfilm->besitzer->getAvatar() }}" width="20"> {{$topfilm->besitzer->name}}
</span></small>
</h4>
<p><span class="glyphicon glyphicon-thumbs-up"></span>&nbsp;{{$topfilm->getUpvotes()}}
<span class="glyphicon glyphicon-transfer"></span>&nbsp;{{$topfilm->getVotes()}}</p>
{{ link_to_route('film', "Filmdetails", array($topfilm->id), array('class' => 'btn btn-info btn-xs'))}}
@if(!is_null(Auth::user()) && Auth::user()->admin)
<a href='{{ url('view-next/' . $topfilm->id) }}' class='btn btn-success btn-xs'>Als n&auml;chstes sehen</a>
@endif
</div>
<div class="list-group">
{{ link_to_route('film', "Filmdetails", array($topfilm->id), array('class' => 'list-group-item'))}}
{{ link_to('beliebt', 'Mehr beliebte Filme', array('class' => 'list-group-item')); }}
@foreach ($meistgw as $film)
<a href="{{ route('film', array($film->id)); }}" class="list-group-item">{{$film->name}} <small><span class="badge">
<img class="img-circle" src="{{ $film->besitzer->getAvatar() }}" width="16"> {{$film->besitzer->name}}
</span></small></a>
@endforeach
<i>{{ link_to('beliebt', 'Mehr...', array('class' => 'list-group-item')); }}</i>
</div>
</div>
<div class="panel panel-success">
<div class="panel-heading">Neue Vorschl&auml;ge</div>
<div class="panel-body">
<?php $topfilm = $vorgeschlagen->shift(); ?>
<img src="{{$images["neu"]}}" class="pull-left thumbnail" style="max-height: 100px; margin-right: 15px;">
<h4>{{$topfilm->name}}
<small><span class="badge">
<img class="img-circle" src="{{ $topfilm->besitzer->getAvatar() }}" width="20"> {{$topfilm->besitzer->name}}
</span></small>
</h4>
<p><span class="glyphicon glyphicon-thumbs-up"></span>&nbsp;{{$topfilm->getUpvotes()}}
<span class="glyphicon glyphicon-transfer"></span>&nbsp;{{$topfilm->getVotes()}}</p>
{{ link_to_route('film', "Filmdetails", array($topfilm->id), array('class' => 'btn btn-info btn-xs'))}}
@if(!is_null(Auth::user()) && Auth::user()->admin)
<a href='{{ url('view-next/' . $topfilm->id) }}' class='btn btn-success btn-xs'>Als n&auml;chstes sehen</a>
@endif
</div>
<div class="list-group">
@foreach ($vorgeschlagen as $film)
<a href="{{ route('film', array($film->id)); }}" class="list-group-item">{{$film->name}} <small><span class="badge">
<img class="img-circle" src="{{ $film->besitzer->getAvatar() }}" width="15"> {{$film->besitzer->name}}
</span></small></a>
@endforeach
<i>{{ link_to('vorgeschlagen', 'Mehr...', array('class' => 'list-group-item')); }}</i>
</div>
</div>
<div class="panel-group" id="accordion">
@foreach ($news as $new)
<div class="panel panel-info">
<div class="panel-heading">
<h4 class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#news{{$new->id}}">{{$new->headline}}</a>
<small>
<span class="badge">
<img class="img-circle" src="{{ $new->ersteller->getAvatar() }}" width="16"> {{$new->ersteller->name}}
</span> - {{\Carbon\Carbon::parse($new->updated_at)->format('d.m.Y')}}</small>
</h4>
</div>
<div id="news{{$new->id}}" class="panel-collapse collapse {{$new === $news[0] ? "in" : ""}}">
<div class="panel-body">{{nl2br(htmlentities($new->body))}}</div>
</div>
</div>
@endforeach
</div>
</div>
<div class="col-md-6">
<div class="panel panel-primary">
<div class="panel-heading">N&auml;chster Film</div>
<div class="panel-body">
<img src="{{$nimage}}" class="pull-left thumbnail" style="max-height: 100px; margin-right: 15px;">
<h4>{{is_object($nextfilm) ? $nextfilm->name : "Steht nicht fest"}}</h4>
<img src="{{$images["next"]}}" class="pull-left thumbnail" style="max-height: 100px; margin-right: 15px;">
<h4>{{is_object($nextfilm) ? $nextfilm->name . " <small><i>(" . $nextfilm->besitzer->name . ")</i></small>" : "Steht nicht fest"}}</h4>
@if(is_object($nextfilm)) {{ link_to_route('film', "Filmdetails", array($nextfilm->id), array('class' => 'btn btn-info btn-xs'))}}
@endif
@if(is_object($nextfilm) && !is_null(Auth::user()) && Auth::user()->admin) <a href='{{ url('mark-read/' . $nextfilm->id) }}' class='btn btn-success btn-xs'>Gesehen</a>
@endif
</div>
@if(is_object($nextfilm))
<div class="list-group">
{{ link_to_route('film', "Filmdetails", array($nextfilm->id), array('class' => 'list-group-item'))}}
</div>
@endif
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="panel panel-success">
<div class="panel-heading">Neue Vorschl&auml;ge</div>
<div class="list-group">
@foreach ($vorgeschlagen as $film)
<a href="{{ route('film', array($film->id)); }}" class="list-group-item">{{$film->name}} <small>({{ $film->besitzer->name }})</small></a>
@endforeach
{{ link_to('vorgeschlagen', 'Mehr...', array('class' => 'list-group-item')); }}
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-danger">
<div class="panel-heading">Gesehene Filme</div>
<div class="list-group">
@foreach ($gesehen as $film)
{{ link_to_route('film', $film->name, array($film->id), array('class' => 'list-group-item'))}}
@endforeach
{{ link_to('gesehen', 'Mehr...', array('class' => 'list-group-item')); }}
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="panel-group" id="accordion">
@foreach ($news as $new)
<div class="panel panel-warning">
<div class="panel-heading">
<h4 class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#news{{$new->id}}">{{$new->headline}}</a>
<small>{{$new->ersteller->name}} - {{\Carbon\Carbon::parse($new->updated_at)->format('d.m.Y')}}</small>
</h4>
</div>
<div id="news{{$new->id}}" class="panel-collapse collapse">
<div class="panel-body">{{nl2br(htmlentities($new->body))}}</div>
</div>
</div>
@endforeach
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Letzte Kommentare</div>
@@ -104,6 +108,35 @@
@endforeach
</div>
</div>
<div class="panel panel-danger">
<div class="panel-heading">Gesehene Filme</div>
<div class="panel-body">
<?php $topfilm = $gesehen->shift(); ?>
<img src="{{$images["alt"]}}" class="pull-left thumbnail" style="max-height: 100px; margin-right: 15px;">
<h4>{{$topfilm->name}}
<small><span class="badge">
<img class="img-circle" src="{{ $topfilm->besitzer->getAvatar() }}" width="20"> {{$topfilm->besitzer->name}}
</span></small></h4>
<p>Bewertung:
@if($topfilm->getBewertung() > 0)
<span class="label label-{{$labels[round($topfilm->getBewertung())]}}">{{$topfilm->getBewertung()}}</span>
@else
&mdash;
@endif
</p>
<p>{{ link_to_route('film', "Filmdetails", array($topfilm->id), array('class' => 'btn btn-info btn-xs'))}}</p>
</div>
<div class="list-group">
@foreach ($gesehen as $film)
<a href="{{ route('film', array($film->id)); }}" class="list-group-item">{{$film->name}} <small><span class="badge">
<img class="img-circle" src="{{ $film->besitzer->getAvatar() }}" width="16"> {{$film->besitzer->name}}
</span></small></a>
@endforeach
<i>{{ link_to('gesehen', 'Mehr...', array('class' => 'list-group-item')); }}</i>
</div>
</div>
</div>
</div>

8
app/views/seen.blade.php
View File

@@ -16,8 +16,10 @@
<tr>
<td>{{ HTML::link('film/' . $film->id, $film->name) }}</td>
<td>{{ \Carbon\Carbon::parse($film->gesehen)->format('d.m.Y')}}</td>
<td>{{ $film->besitzer->name }}</td>
<td>{{ $film->comments()->count()}}</td>
<td><span class="badge">
<img class="img-circle" src="{{ $film->besitzer->getAvatar() }}" width="20"> {{$film->besitzer->name}}
</span></td>
<td><span class="glyphicon glyphicon-comment"></span> {{ $film->comments()->count()}}</td>
</tr>
@endforeach
</table>
@@ -27,7 +29,7 @@
@stop
@section('title')
Vorschläge ~
Gesehen ~
@stop
@section('script')

10
app/views/suggest.blade.php
View File

@@ -27,7 +27,7 @@
$vp = $film->upvotes;
$np = $film->downvotes;
?>
<span class="glyphicon glyphicon-tree-deciduous"></span>&nbsp;{{ $vp + $np }}
<span class="glyphicon glyphicon-transfer"></span>&nbsp;{{ $vp + $np }}
</td>
<td>
@if(($vp) > 0) <span class="label label-default">+{{$vp}}</span>
@@ -36,11 +36,15 @@
@if($stimme == 1)
&nbsp;<span class="label label-success tooltip-enable" data-toggle="tooltip" title="Daf&uuml;r gestimmt."><span class="glyphicon glyphicon-thumbs-up"></span></span>
@elseif($stimme == 0)
&nbsp;<span class="label label-warning tooltip-enable" data-toggle="tooltip" title="Nicht daf&uuml;r gestimmt."><span class="glyphicon glyphicon-hand-right"></span></span>
&nbsp;<span class="label label-default tooltip-enable" data-toggle="tooltip" title="Nicht daf&uuml;r gestimmt."><span class="glyphicon glyphicon-hand-right"></span></span>
@endif
</td>
<td>{{ \Carbon\Carbon::parse($film->vorgeschlagen)->format('d.m.Y')}}</td>
<td>{{ Film::find($film->id)->besitzer->name }}</td>
<td>
<span class="badge">
<img class="img-circle" src="{{ Film::find($film->id)->besitzer->getAvatar() }}" width="20"> {{Film::find($film->id)->besitzer->name}}
</span>
</td>
</tr>
@endforeach
</table>

2
app/views/users.blade.php
View File

@@ -7,6 +7,7 @@
<table class="table">
<tr>
<th></th>
<th>Name</th>
<th>Email</th>
<th>Filme</th>
@@ -15,6 +16,7 @@
</tr>
@foreach($users as $user)
<tr>
<td><img class="img-circle" src="{{$user->getAvatar()}}" width="32"></td>
<td>{{$user->name}}</td>
<td>{{$user->email}}</td>
<td>{{$user->films()->count()}}</td>