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

Bugfix Order

Browse Source
This commit is contained in:
Daniel
2015-11-11 02:49:59 +01:00
parent e5cfb4b5a9
commit 161eabdf00
7 changed files with 231 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,17 +3,23 @@
@section('content')
<div class="row">
<div class="col-md-6">
@if(is_object($nextfilm))
<div class="panel panel-primary">
<div class="panel-heading">N&auml;chster Film</div>
<div class="panel-body">
<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>
<h4>
{{ $nextfilm->name }}
<small><span class="badge">
<img class="img-circle" src="{{ $nextfilm->besitzer->getAvatar() }}" width="20"> {{$nextfilm->besitzer->name}}
</span></small>
</h4>
{{ link_to_route('film', "Filmdetails", array($nextfilm->id), array('class' => 'btn btn-info btn-xs'))}}
@if(!is_null(Auth::user()) && Auth::user()->admin) <a href='{{ url('mark-read/' . $nextfilm->id) }}' class='btn btn-success btn-xs'>Gesehen</a>
@endif
</div>
</div>
@endif
<div class="panel panel-primary">
<div class="panel-heading">Meistgew&uuml;nschter Film</div>
@@ -102,11 +108,6 @@
</div>
<div class="col-md-6">
<div class="jumbotron">
<h1>Dumbo</h1>
<p>Suchst du noch oder guckst du schon?</p>
</div>
<div class="panel panel-default">
<div class="panel-heading">Letzte Kommentare</div>

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

@@ -6,7 +6,7 @@
<div class="col-md-2">
<ul class="nav nav-pills nav-stacked">
<li class="active"><a href="#avatar" data-toggle="pill">Avatar</a></li>
<li><a href="#password" data-toggle="pill">Password</a></li>
<li><a href="#password" data-toggle="pill">Passwort</a></li>
<li><a href="#email" data-toggle="pill">E-Mail</a></li>
</ul>
</div>

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

@@ -25,11 +25,16 @@
@if($user->admin)
@if($user->name != "Daniel")
<button class="btn btn-primary btn-xs" type="button">Admin</button>
<a class="btn btn-warning btn-xs" type="button" href="{{ url('users/rmadm/' . $user->id) }}">Rechte entziehen</a>
<a class="btn btn-default btn-xs" type="button" href="{{ url('users/rmadm/' . $user->id) }}">Rechte entziehen</a>
@else
&mdash;
@endif
@else
@if(!$user->getSetting("disabled"))
<a class="btn btn-default btn-xs" type="button" href="{{ url("users/inact/" . $user->id) }}">Deaktivieren</a>
@else
<a class="btn btn-default btn-xs" type="button" href="{{ url("users/act/" . $user->id) }}">Aktivieren</a>
@endif
<a class="btn btn-default btn-xs" type="button" href="{{ url('users/mkadm/' . $user->id) }}">Zum Admin machen</a>
<a class="btn btn-danger btn-xs" type="button" href="{{ url('users/rmusr/' . $user->id) }}">Löschen</a>
@endif