FEATURE: change directory structure

This commit is contained in:
Michal Kváček
2016-10-17 00:07:21 +02:00
parent 87f1920373
commit 2ded2924a1
242 changed files with 742 additions and 1171 deletions
@@ -16,7 +16,7 @@
<li @if($odd) class="timeline-inverted" @endif>
<?php $odd = !$odd;?>
<div class="timeline-badge big"
style="background: url('{{\App\Helpers\Gravatar::img($action->email, 40)}}') no-repeat center center"
style="background: url('{{\App\CMS\Helpers\Gravatar::img($action->email, 40)}}') no-repeat center center"
data-toggle="tooltip" data-placement="top"
title="{{$action->user_name}} {{$action->email}}"></div>
<div class="timeline-panel">
@@ -35,7 +35,7 @@
<div class="row p-tb-15">
<div class="col-md-1 hidden-sm-down text-center with-placeholder">
<a href="{{route('content.edit', ['id' => $page->id])}}">
@if(!view()->exists(\App\Helpers\Template::name($page->template, false)))
@if(!view()->exists(\App\CMS\Helpers\Template::name($page->template, false)))
<i class="fa fa-2x text-warning fa-warning" data-toggle="tooltip"
title="@lang('admin/contents.invalidTemplateSelected')"></i>
@else
@@ -58,8 +58,8 @@
@if($page->is_homepage) <span class="m-l-10 tag tag-primary">@lang('admin/contents.homepage')</span> @endif
</div>
<div class="col-lg-2 col-md-3 hidden-sm-down">
<span class="tag @if($page->status == \App\Models\Content::STATUS_PUBLIC) tag-success
@elseif ($page->status == \App\Models\Content::STATUS_DRAFT) tag-danger
<span class="tag @if($page->status == \App\Models\Content\Content::STATUS_PUBLIC) tag-success
@elseif ($page->status == \App\Models\Content\Content::STATUS_DRAFT) tag-danger
@else tag-warning @endif">{{$statuses[$page->status]}}</span>
</div>
<div class="col-lg-2 col-md-3 hidden-sm-down">
@@ -98,16 +98,16 @@
</a>
</li>
@if($page->status == \App\Models\Content::STATUS_DRAFT)
@if($page->status == \App\Models\Content\Content::STATUS_DRAFT)
<li>
<a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_PUBLIC])}}"
<a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content\Content::STATUS_PUBLIC])}}"
class="confirm" data-toggle="tooltip"
title="@lang('admin/contents.makePublic')">
<i class="fa fa-eye"></i>
</a>
</li>
<li>
<a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_PROTECTED])}}"
<a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content\Content::STATUS_PROTECTED])}}"
class="confirm" data-toggle="tooltip"
title="@lang('admin/contents.makeProtected')">
<i class="fa fa-lock"></i>
@@ -121,7 +121,7 @@
</a>
</li>
<li>
<a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_DRAFT])}}"
<a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content\Content::STATUS_DRAFT])}}"
class="button tiny warning confirm" data-toggle="tooltip"
title="@lang('admin/contents.makeDraft')">
<i class="fa fa-eye-slash"></i>
@@ -12,7 +12,7 @@
<div class="row">
<div class="col-lg-8">
<div class="large-preview">
{!! \App\Helpers\FileManager::getLargePreview($file) !!}
{!! \App\CMS\Helpers\FileManager::getLargePreview($file) !!}
</div>
</div>
<div class="col-lg-4">
@@ -26,7 +26,7 @@
<li>@lang('admin/fileManager.mime'): {{$file->mime_type}}</li>
<li>@lang('admin/fileManager.hash'): <span title="{{$file->file_hash}}">{{str_limit($file->file_hash, 10)}}</span></li>
<li>@lang('admin/fileManager.url'): <a href="{{config('app.upload_url')}}/{{$file->filename}}">{{$file->filename}}</a></li>
<li>@lang('admin/fileManager.fileSize'): {{\App\Helpers\FileManager::getFormattedSize($file)}}</li>
<li>@lang('admin/fileManager.fileSize'): {{\App\CMS\Helpers\FileManager::getFormattedSize($file)}}</li>
@foreach($extraInfo as $column => $info)
<li>{{$column}}: {{$info}}</li>
@@ -1,7 +1,7 @@
@forelse($files as $file)
<div class="col-sm-4 col-md-3 text-center">
@include('admin.snippets.card', [
'body' => '<a href="'.route('upload.detail', ['id' => $file->id]).'">'.\App\Helpers\FileManager::getPreview($file).'</a>',
'body' => '<a href="'.route('upload.detail', ['id' => $file->id]).'">'.\App\CMS\Helpers\FileManager::getPreview($file).'</a>',
'footerClass' => 'text-right',
'cardClass' => 'file-preview',
'footer' => (!isset($hideDelete) || !$hideDelete) ? '<a href="'.route('upload.delete', ['id' => $file->id]).'" data-toggle="tooltip"
@@ -15,8 +15,6 @@
</div>
<div class="col-lg-4">
<div id="file-manager-controls" role="tablist" aria-multiselectable="true">
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="new-file-title">
@@ -61,7 +59,7 @@
</div>
<div id="new-dir" class="panel-collapse collapse" role="tabpanel"
aria-labelledby="new-dir-title">
@include('admin.fileManager.directories.form', ['directory' => new \App\Models\Directory(), 'action' => route('upload.postNewDirectory')])
@include('admin.fileManager.directories.form', ['directory' => $newDirectory, 'action' => route('upload.postNewDirectory')])
</div>
</div>
</div>
+1 -1
View File
@@ -7,7 +7,7 @@
<div class="card-header">
<div class="header-block">
<p class="title">
@lang('admin/history.changedAt', ['time' => \App\Helpers\Template::date($change->changed_at)])
@lang('admin/history.changedAt', ['time' => \App\CMS\Helpers\Date::date($change->changed_at)])
</p>
</div>
</div>
@@ -10,7 +10,7 @@
<li @if($odd) class="timeline-inverted" @endif>
<?php $odd = !$odd;?>
<div class="timeline-badge big"
style="background: url('{{\App\Helpers\Gravatar::img($history['info'][$revision]['user']['email'], 40)}}') no-repeat center center"
style="background: url('{{\App\CMS\Helpers\Gravatar::img($history['info'][$revision]['user']['email'], 40)}}') no-repeat center center"
data-toggle="tooltip" data-placement="top"
title="{{$history['info'][$revision]['user']['name']}} {{$history['info'][$revision]['user']['email']}}"></div>
<div class="timeline-panel">
@@ -1,5 +1,5 @@
<form action="{{$formAction}}" id="widget-menu" method="POST">
<input type="hidden" name="settings" id="widgetSettings" value="{{json_encode($widget->settingsObj->links)}}" />
<input type="hidden" name="settings" id="widgetSettings" value="{{json_encode($widget->settings->links)}}" />
@include('admin.widgets.snippets.commonForm')
@@ -8,7 +8,7 @@
<h3>@lang('widgets/menu.addedPages')</h3>
<div id="menu-items-container">
@foreach($widget->settingsObj->links as $pageId => $details)
@foreach($widget->settings->links as $pageId => $details)
<span class="added-menu-item btn btn-sm btn-info" data-page-id="{{$pageId}}"
id="item-{{$pageId}}">{{$details->text}}</span>
@endforeach
@@ -20,7 +20,7 @@
@foreach ($pages as $page)
<a href="#"
class="btn btn-sm menu-item @if(isset($widget->settingsObj->links->{$page->id})) btn-secondary @else btn-info @endif "
class="btn btn-sm menu-item @if(isset($widget->settings->links->{$page->id})) btn-secondary @else btn-info @endif "
data-page-url="{{$page->url}}" data-page-id="{{$page->id}}"
id="page-{{$page->id}}">{{$page->title}}</a>
@endforeach
@@ -1,8 +0,0 @@
@extends('admin.layoutWithNavigation')
@section('pageHeading', @trans('widgets/orbitSlider.edit', ['name' => $widget->name]))
@section('content')
@include('admin.widgets.orbitSlider.form', ['formAction' => route('widgets.postEdit', ['id' => $widget->id])])
@stop
@@ -1,87 +0,0 @@
<form action="{{$formAction}}" method="POST">
{!! csrf_field() !!}
<label class="control-label">
@lang('widgets/orbitSlider.name')
</label>
<input class="form-control" type="text" name="name" value="{{old('name', $widget->name)}}"
placeholder="@lang('widgets/orbitSlider.name')" />
<label class="control-label">
@lang('widgets/orbitSlider.description')
</label>
<input class="form-control" type="text" name="description" placeholder="@lang('widgets/orbitSlider.description')"
value="{{old('description', $widget->description)}}" />
<div class="row">
<div class="col-lg-10">
<label class="control-label">
@lang('widgets/orbitSlider.imagesPerSlide')
</label>
<select class="form-control" name="imagePerSlide">
@foreach($availableColumns as $value => $name)
<option value="{{$value}}"
@if (old('imagePerSlide', $settings->imagePerSlide) == $value) selected="selected" @endif>
{{$name}}
</option>
@endforeach
</select>
</div>
<div class="col-lg-2 text-center">
<label>
<input class="checkbox" value="1" id="displayBullets"
@if(old('displayBullets', $settings->displayBullets)) checked
@endif name="displayBullets" type="checkbox">
<span>@lang('widgets/orbitSlider.displayBullets')</span>
</label>
</div>
</div>
<h4>@lang('widgets/orbitSlider.extraSettings')</h4>
<div class="row">
<div class="col-lg-6">
<label class="control-label">
@lang('widgets/orbitSlider.containerClass')
</label>
<input class="form-control" type="text" name="containerClass"
placeholder="@lang('widgets/orbitSlider.containerClass')"
value="{{old('containerClass', $settings->sliderClass)}}" />
</div>
<div class="col-lg-6">
<label class="control-label">
@lang('widgets/orbitSlider.slideContainerClass')
</label>
<input class="form-control" type="text" name="slideContainerClass"
placeholder="@lang('widgets/orbitSlider.slideContainerClass')"
value="{{old('slideContainerClass', $settings->slideContainerClass)}}" />
</div>
</div>
<label class="control-label">
@lang('widgets/orbitSlider.code')
</label>
@include('admin.snippets.aceEditor', [
'name' => 'code',
'value' => old('code', isset($settings->code) ? $settings->code : ''),
'theme' => 'xcode',
'mode' => 'html'
])
@if($settings->directoryId)
<div class="row column text-center">
<a href="{{route('upload.overview', ['id' => $settings->directoryId])}}"
class="button expanded large success">@lang('widgets/orbitSlider.upload')</a>
</div>
@endif
<button type="submit" class="btn btn-primary">@lang('widgets/orbitSlider.editExisting')</button>
@@ -1,10 +0,0 @@
@extends('admin.layout')
@section('pageName', @trans('widgets/htmlCode.new'))
@section('content')
<h1>@lang('widgets/orbitSlider.new')</h1>
@include('admin.widgets.orbitSlider.form', ['formAction' => route('widgets.postNew', ['type' => $type])])
@stop