neuester Stand

app/views/hello.blade.php

@@ -21,16 +21,47 @@
 			</div>     
 		    <div class="navbar-collapse collapse">
 				<ul class="nav navbar-nav">
-					<li>{{ HTML::link('/', 'Vorschläge') }}</li>
-					<li>{{ HTML::link('/', 'Liste') }}</li>
+					<li>{{ HTML::link('vorgeschlagen', 'Vorgeschlagen') }}</li>
+					<li>{{ HTML::link('gesehen', 'Gesehen') }}</li>
+					<li>{{ HTML::link('neu', 'Film vorschlagen')}}
 				</ul>
-				<ul class="nav navbar-nav pull-right">
+				<ul class="nav navbar-nav pull-right">			$U->save;
+
+					@if(is_null(Auth::user()))
 					<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>
+						<ul class="dropdown-menu">
+							<li>{{ HTML::link('settings', 'Passwort &amp; Email &auml;ndern')}}</li>
+							@if(Auth::user()->admin)
+							<li>{{ HTML::link('users', 'Benutzerverwaltung')}}</li>
+							@endif
+							<li class="divider"></li>
+							<li>{{ HTML::link('logout', "Logout")}}
+						</ul>
+					</li>
+					@endif
 				</ul>
 		    </div>
 	    </div>
     </div>
-
+@if(isset($message))
+<div class="container">
+	<div class="alert alert-success alert-dismissable">
+	  <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+	  {{ $message }}
+	</div>
+</div>
+@endif
+@if(Session::has('message'))
+<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') }}
+	</div>
+</div>
+@endif
 <div class="container" id="content">
 	@yield('content')
 </div>
@@ -45,5 +76,6 @@
 
 <script type="text/javascript" src="{{ asset('js/jquery-2.0.3.min.js') }}"></script>
 <script type="text/javascript" src="{{ asset('js/bootstrap.min.js') }}"></script>
+@yield('script')
 </body>
 </html>