Sommer Style, Avatare, Duplikate

This commit is contained in:
2015-06-08 17:49:17 +02:00
parent 25dbc25ad4
commit 62d4c32d53
16 changed files with 861 additions and 477 deletions

View File

@@ -4,7 +4,7 @@
<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-my.min.css') }}" type="text/css" rel="stylesheet">
<link href="{{ asset('css/bootstrap.css') }}" type="text/css" rel="stylesheet">
<link href="{{ asset('css/general.css') }}" type="text/css" rel="stylesheet">
@yield('styles')
</head>
@@ -21,8 +21,8 @@
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li>{{ HTML::link('beliebt', 'Beliebt') }}</li>
<li>{{ HTML::link('vorgeschlagen', 'Vorgeschlagen') }}</li>
<li>{{ HTML::link('beliebt', 'Beliebt (Wertung)') }}</li>
<li>{{ HTML::link('vorgeschlagen', 'Vorgeschlagen (Datum)') }}</li>
<li>{{ HTML::link('gesehen', 'Gesehen') }}</li>
<li>{{ HTML::link('neu', 'Film vorschlagen')}}
</ul>
@@ -32,9 +32,11 @@
<li>{{ HTML::link('login', 'Login') }}</li>
@else
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">{{Auth::user()->name}} <span class="caret"></span></a>
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
<img src="{{ Auth::user()->getAvatar() }}" height="25" }}>
{{Auth::user()->name}} <span class="caret"></span></a>
<ul class="dropdown-menu">
<li>{{ HTML::link('settings', 'Passwort &amp; Email &auml;ndern')}}</li>
<li>{{ HTML::link('settings', 'Einstellungen')}}</li>
@if(Auth::user()->admin)
<li>{{ HTML::link('users', 'Benutzerverwaltung')}}</li>
<li>{{ HTML::link('news', 'News erstellen')}}</li>
@@ -60,7 +62,7 @@
<div class="container">
<div class="alert alert-success alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
{{ Session::get('message') }}
{{ Session::get('message') }} <?php Session::forget('message'); ?>
</div>
</div>
@endif