Merge branch 'refactoring' into elixir

resources/views/admin/fileManager/directories/form.blade.php

@@ -1,18 +1,20 @@
 <form method="POST" action="{{$action}}">
     {!! csrf_field() !!}
-    <input type="text" name="name" placeholder="@lang('admin/fileManager.directoryName')" class="form-control"
+    <input type="text" name="name" required placeholder="@lang('admin/fileManager.directoryName')" class="form-control"
            value="{{old('name', $directory->name)}}" />
 
     <textarea name="description" class="form-control" placeholder="@lang('admin/fileManager.directoryDescription')"
               rows="3">{{old('description', $directory->description)}}</textarea>
 
+    @if ($parentDirectory->id)
+        <input type="hidden" 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
-
     </button>
-
 </form>

resources/views/admin/fileManager/directories/subdirectoriesOptionList.blade.php

@@ -0,0 +1,10 @@
+<option value="{{$directory->id}}" @if($file->directory_id == $directory->id) selected @endif>
+    {{str_repeat('-', $depth)}}
+    {{$directory->is_root ? trans('admin/fileManager.rootDirectory') : $directory->name}}
+</option>
+
+@if (!is_null($directory->subdirectories))
+    @foreach($directory->subdirectories as $dir)
+        @include('admin.fileManager.directories.subdirectoriesOptionList', ['directory' => $dir, 'depth' => $depth +1, 'file' => $file])
+    @endforeach
+@endif

resources/views/admin/fileManager/directories/subdirectoriesTiles.blade.php

@@ -1,7 +1,7 @@
-@if($directory->id)
+@if (!$directory->is_root)
     <div class="col-sm-4 col-md-3 text-center">
         @include('admin.snippets.card', [
-        'body' => '<a href="'.route('upload.overview', ['id' => $directory->parent_id]).'"><p><i class="fa fa-2x fa-level-up"></i><br />'.trans('admin/fileManager.parentDirectory').'</p></a>',
+        'body' => '<a href="'.route('upload.overview', ['directory' => $directory->parent_id]).'"><p><i class="fa fa-2x fa-level-up"></i><br />'.trans('admin/fileManager.parentDirectory').'</p></a>',
         'cardClass' => 'file-preview',
     ])
     </div>
@@ -10,7 +10,7 @@
 @foreach($subdirectories as $dir)
     <div class="col-sm-4 col-md-3 text-center">
         @include('admin.snippets.card', [
-        'body' => '<a href="'.route('upload.overview', ['id' => $dir->id]).'"><p><i class="fa fa-2x fa-folder"></i><br />'.e(str_limit($dir->name, 15)).'</p></a>',
+        'body' => '<a href="'.route('upload.overview', ['directory' => $dir]).'"><p><i class="fa fa-2x fa-folder"></i><br />'.e(str_limit($dir->name, 15)).'</p></a>',
         'cardClass' => 'file-preview',
     ])
     </div>

resources/views/admin/fileManager/editForm.blade.php

@@ -12,6 +12,15 @@
     </label>
 
     <input class="form-control" type="text" name="keywords" id="keywords" value="{{$file->keywords}}" />
+
+    <lavel class="control-label">
+        @lang('admin/fileManager.directory')
+    </lavel>
+
+    <select name="directory_id" class="form-control">
+        @include('admin/fileManager.directories.subdirectoriesOptionList', ['directory' => $root, 'depth' => 0, 'file' => $file])
+    </select>
+
     <label class="control-label">
         @lang('admin/fileManager.description')
     </label>

resources/views/admin/fileManager/newFileForm.blade.php

@@ -5,7 +5,7 @@
         <input type="hidden" name="directoryId" value="{{$directory->id}}" />
     @endif
 
-    <input type="file" multiple name="files[]" class="form-control" id="file" />
+    <input type="file" multiple name="files[]" required class="form-control" id="file" />
 
     <input type="text" name="name" id="name" class="form-control" placeholder="@lang('admin/fileManager.name')"
            value="{{old('name')}}" />

resources/views/admin/fileManager/overview.blade.php

@@ -1,6 +1,6 @@
 @extends('admin.layoutWithNavigation')
 
-@if ($directory->id)
+@if (!$directory->is_root)
     @section('pageHeading', @trans('admin/fileManager.directories', ['directory' => $directory->name]))
 @else
     @section('pageHeading', @trans('admin/fileManager.rootDirectories'))
@@ -11,7 +11,7 @@
     <div class="row">
         <div class="col-lg-8">
             @include('admin.fileManager.directories.subdirectoriesTiles')
-            @include('admin.fileManager.filesTiles')
+            @include('admin.fileManager.filesTiles', ['files' => $directory->files])
         </div>
 
         <div class="col-lg-4">
@@ -31,7 +31,7 @@
                     </div>
                 </div>
 
-                @if ($directory->id)
+                @if (!$directory->is_root)
                     <div class="panel panel-default">
                         <div class="panel-heading" role="tab" id="edit-dir-title">
                             <h5 class="panel-title">

resources/views/admin/userManagement/detail.blade.php

@@ -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>

resources/views/admin/userManagement/overview.blade.php

@@ -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">

resources/views/admin/widgets/area/overview.blade.php

@@ -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>
 

resources/views/admin/widgets/socialButtons/edit.blade.php

@@ -0,0 +1,15 @@
+@extends('admin.layoutWithNavigation')
+
+@section('pageHeading', @trans('widgets/socialButtons.edit', ['name' => $widget->name]))
+
+@section('content')
+    <div class="col-lg-8">
+        @include('admin.widgets.socialButtons.form', ['action' => route('widgets.postEdit', ['id' => $widget->id])])
+    </div>
+    <div class="col-lg-4">
+        <h3>@lang('widgets/socialButtons.preview')</h3>
+
+        @widgetPreview($widget)
+    </div>
+@stop
+

resources/views/admin/widgets/socialButtons/form.blade.php

@@ -0,0 +1,7 @@
+<form action="{{$action}}" method="POST">
+    @include('admin.widgets.snippets.commonForm')
+
+    <button type="submit" class="btn btn-primary">
+        @lang('widgets/socialButtons.save')
+    </button>
+</form>

resources/views/admin/widgets/socialButtons/new.blade.php

@@ -0,0 +1,9 @@
+@extends('admin.layoutWithNavigation')
+
+@section('pageHeading', @trans('widgets/socialButtons.new'))
+@section('pageDescription', @trans($type->description))
+
+@section('content')
+    @include('admin.widgets.socialButtons.form', ['action' => route('widgets.postNew', ['type' => $type])])
+@stop
+