FIX: lots of bugfixes, sorry for ugly commit

This commit is contained in:
Michal Kváček
2017-02-09 23:10:11 +01:00
parent 99ed8806da
commit b7d4ab9515
47 changed files with 180 additions and 199 deletions
@@ -6,10 +6,15 @@
<textarea name="description" class="form-control" placeholder="@lang('admin/fileManager.directoryDescription')"
rows="3">{{old('description', $directory->description)}}</textarea>
@if ($parentDirectory->id)
<input type="text" name="parentDirectory" value="{{$parentDirectory->id}}">
@endif
<button type="submit" class="btn btn-primary">
@if ($directory->id)
@lang('admin/fileManager.editDirectory')
@else
@lang('admin/fileManager.editDirectory')
@else
@lang('admin/fileManager.newDirectory')
@endif
@@ -15,7 +15,7 @@
<div class="col-lg-2">
<div class="callout">
<figure class="user-img text-center figure">
<img class="img-rounded" src="{{$user->gravatar(200)}}" alt="" />
<img class="img-rounded" src="@gravatar($user->email, 200)" alt="" />
@if($user->id == Auth::user()->id)
<figcaption class="figure-caption">@lang('admin/userManagement.gravatarLink')</figcaption>
@@ -17,7 +17,7 @@
<div class="card-block container truncate sameheight-item">
<div class="col-xs-12 text-center">
<a href="{{route('users.edit', ['id' => $user->id])}}">
<img src="{{$user->gravatar(100)}}" alt="" />
<img src="{{\App\CMS\Helpers\Gravatar::img($user->email, 100)}}" alt="" />
</a>
</div>
<div class="col-xs-12">
@@ -62,7 +62,7 @@
<div class="col-lg-4">
<h3>@lang('admin/widgetAreas.new')</h3>
@include('admin.widgets.area.form', ['action' => route('widgetareas.postNew'), 'area' => new \App\Models\WidgetArea()])
@include('admin.widgets.area.form', ['action' => route('widgetareas.postNew'), 'area' => new \App\Models\Widgets\WidgetArea()])
</div>
</div>