Sommer Style, Avatare, Duplikate
This commit is contained in:
@@ -144,7 +144,7 @@
|
||||
@else
|
||||
<div class="media">
|
||||
<div class="pull-left">
|
||||
<img class="media-object" src="{{ "http://www.gravatar.com/avatar/" . md5( strtolower( trim( Auth::user()->email ) ) ) . "?s=40" }}">
|
||||
<img class="media-object" src="{{ Auth::user()->getAvatar() }}" width="64">
|
||||
</div>
|
||||
<div class="media-body">
|
||||
<h4 class="media-heading">Neuer Kommentar</h4>
|
||||
@@ -173,7 +173,7 @@
|
||||
|
||||
<div class="media">
|
||||
<div class="pull-left">
|
||||
<img class="media-object" src="{{ "http://www.gravatar.com/avatar/" . md5( strtolower( trim( $comment->autor->email ) ) ) . "?s=40" }}" alt="{{ $comment->autor->name }}">
|
||||
<img class="media-object" src="{{ $comment->autor->getAvatar() }}" alt="{{ $comment->autor->name }}" width="64">
|
||||
</div>
|
||||
<div class="media-body" id="comment{{$comment->id}}">
|
||||
<h5 class="media-heading">{{ $comment->autor->name }} <small>{{\Carbon\Carbon::parse($comment->created_at)->format('d.m.Y H:i')}}
|
||||
|
||||
@@ -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 & Email ä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">×</button>
|
||||
{{ Session::get('message') }}
|
||||
{{ Session::get('message') }} <?php Session::forget('message'); ?>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
<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> {{$topfilm->upvotes}}
|
||||
<span class="glyphicon glyphicon-tree-conifer"></span> {{$topfilm->downvotes + $topfilm->upvotes}}</p>
|
||||
<span class="glyphicon glyphicon-tree-deciduous"></span> {{$topfilm->downvotes + $topfilm->upvotes}}</p>
|
||||
@if(!is_null(Auth::user()) && Auth::user()->admin)
|
||||
<a href='{{ url('view-next/' . $topfilm->id) }}' class='btn btn-success btn-xs'>Als nächstes sehen</a>
|
||||
@endif
|
||||
|
||||
@@ -1,76 +1,112 @@
|
||||
@extends('hello')
|
||||
|
||||
@section('content')
|
||||
<div class="container" style="margin-top: 40px;">
|
||||
<div class="row">
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading"><h2 class="panel-title">Passwort ändern</h2></div>
|
||||
<div class="panel-body">
|
||||
{{ Form::open(array('url' => 'settings/password')) }}
|
||||
{{ $errors->first() }}
|
||||
<div class="input-group form-group <?php if($errors->has('oldpw')) echo "has-error" ?>">
|
||||
<div class="container" style="margin-top: 40px;">
|
||||
<div class="row">
|
||||
<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="#email" data-toggle="pill">E-Mail</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="col-md-8 tab-content">
|
||||
<div class="tab-pane active" id="avatar">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<h2 class="panel-title">Avatar</h2>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<div class="media media-left">
|
||||
<a href="#"><img class="media-object" src="{{ Auth::user()->getAvatar() }}" width="64"></a>
|
||||
</div>
|
||||
<div class="media-body">
|
||||
<h4 class="media-heading">Aktueller Avatar</h4>
|
||||
Du kannst unten einen neuen Avatar hochladen oder den Avatar zurücksetzen.
|
||||
</div>
|
||||
<p>
|
||||
{{ Form::open(array('url' => 'settings/avatar-upload', 'files' => true)) }}
|
||||
{{ $errors->first() }}
|
||||
{{ Form::file('avatar'); }}
|
||||
<button type="submit" class="btn btn-primary">Absenden</button>
|
||||
{{ Form::close() }}
|
||||
</p>
|
||||
<p>
|
||||
{{ Form::open(array('url' => 'settings/avatar-reset')) }}
|
||||
<button type="submit" class="btn btn-danger">Avatar zurücksetzen</button>
|
||||
{{ Form::close() }}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tab-pane" id="password">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading"><h2 class="panel-title">Passwort ändern</h2></div>
|
||||
<div class="panel-body">
|
||||
{{ Form::open(array('url' => 'settings/password')) }}
|
||||
{{ $errors->first() }}
|
||||
<div class="input-group form-group <?php if ($errors->has('oldpw')) echo "has-error" ?>">
|
||||
<span class="input-group-addon">
|
||||
<span class="glyphicon glyphicon-lock"></span>
|
||||
</span>
|
||||
<input type="password" class="form-control" name="oldpw" placeholder="Altes Passwort">
|
||||
</div>
|
||||
<div class="input-group form-group <?php if($errors->has('newpw')) echo "has-error" ?>">
|
||||
<input type="password" class="form-control" name="oldpw" placeholder="Altes Passwort">
|
||||
</div>
|
||||
<div class="input-group form-group <?php if ($errors->has('newpw')) echo "has-error" ?>">
|
||||
<span class="input-group-addon">
|
||||
<span class="glyphicon glyphicon-lock"></span>
|
||||
</span>
|
||||
<input type="password" class="form-control" name="newpw" placeholder="Neues Passwort">
|
||||
</div>
|
||||
<div class="input-group form-group <?php if($errors->has('newpw')) echo "has-error" ?>">
|
||||
<input type="password" class="form-control" name="newpw" placeholder="Neues Passwort">
|
||||
</div>
|
||||
<div class="input-group form-group <?php if ($errors->has('newpw')) echo "has-error" ?>">
|
||||
<span class="input-group-addon">
|
||||
<span class="glyphicon glyphicon-lock"></span>
|
||||
</span>
|
||||
<input type="password" class="form-control" name="newpw2" placeholder="Neues Passwort bestätigen">
|
||||
</div>
|
||||
<button type="submit" class="btn btn-primary">Absenden</button>
|
||||
{{ Form::close() }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading"><h2 class="panel-title">Email ändern</h2></div>
|
||||
<div class="panel-body">
|
||||
<dl class="dl-horizontal">
|
||||
<dt>Aktuelle Email</dt>
|
||||
<dd>{{Auth::user()->email}}</dd>
|
||||
</dl>
|
||||
{{ Form::open(array('url' => 'settings/email')) }}
|
||||
<div class="input-group form-group <?php if($errors->has('pw')) echo "has-error" ?>">
|
||||
<input type="password" class="form-control" name="newpw2"
|
||||
placeholder="Neues Passwort bestätigen">
|
||||
</div>
|
||||
<button type="submit" class="btn btn-primary">Absenden</button>
|
||||
{{ Form::close() }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tab-pane" id="email">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading"><h2 class="panel-title">E-Mail ändern</h2></div>
|
||||
<div class="panel-body">
|
||||
<dl class="dl-horizontal">
|
||||
<dt>Aktuelle E-Mail</dt>
|
||||
<dd>{{Auth::user()->email}}</dd>
|
||||
</dl>
|
||||
{{ Form::open(array('url' => 'settings/email')) }}
|
||||
<div class="input-group form-group <?php if ($errors->has('pw')) echo "has-error" ?>">
|
||||
<span class="input-group-addon">
|
||||
<span class="glyphicon glyphicon-lock"></span>
|
||||
</span>
|
||||
<input type="password" class="form-control" name="pw" placeholder="Passwort">
|
||||
</div>
|
||||
<div class="input-group form-group <?php if($errors->has('email')) echo "has-error" ?>">
|
||||
<input type="password" class="form-control" name="pw" placeholder="Passwort">
|
||||
</div>
|
||||
<div class="input-group form-group <?php if ($errors->has('email')) echo "has-error" ?>">
|
||||
<span class="input-group-addon">
|
||||
<span class="glyphicon glyphicon-envelope"></span>
|
||||
</span>
|
||||
<input type="email" class="form-control" name="email" placeholder="Neue Email">
|
||||
</div>
|
||||
<div class="input-group form-group <?php if($errors->has('email')) echo "has-error" ?>">
|
||||
<input type="email" class="form-control" name="email" placeholder="Neue E-Mail">
|
||||
</div>
|
||||
<div class="input-group form-group <?php if ($errors->has('email')) echo "has-error" ?>">
|
||||
<span class="input-group-addon">
|
||||
<span class="glyphicon glyphicon-envelope"></span>
|
||||
</span>
|
||||
<input type="email" class="form-control" name="email2" placeholder="Neue Email bestätigen">
|
||||
</div>
|
||||
<button type="submit" class="btn btn-primary">Absenden</button>
|
||||
{{ Form::close() }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<input type="email" class="form-control" name="email2"
|
||||
placeholder="Neue E-Mail bestätigen">
|
||||
</div>
|
||||
<button type="submit" class="btn btn-primary">Absenden</button>
|
||||
{{ Form::close() }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@stop
|
||||
|
||||
@section('title')
|
||||
Einstellungen ~
|
||||
Einstellungen ~
|
||||
@stop
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
$vp = $film->upvotes;
|
||||
$np = $film->downvotes;
|
||||
?>
|
||||
<span class="glyphicon glyphicon-tree-conifer"></span> {{ $vp + $np }}
|
||||
<span class="glyphicon glyphicon-tree-deciduous"></span> {{ $vp + $np }}
|
||||
</td>
|
||||
<td>
|
||||
@if(($vp) > 0) <span class="label label-default">+{{$vp}}</span>
|
||||
|
||||
Reference in New Issue
Block a user