minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' into cwbs_template

Browse Source
This commit is contained in:
Michal Kváček
2016-04-01 17:51:50 +02:00
parent 7d674357fe 9cda47f93d
commit 7a23ca1d3f
71 changed files with 1397 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/css/admin.css
Vendored
+4
View File
@@ -127,6 +127,10 @@ code {
font-size: 80%;
}
#appearance .title-photo img {
max-height: 10em;
}
.red {
color: red;
}
resources/lang/en/admin/contents.php
+2 -1
View File
@@ -36,5 +36,6 @@ return [
'overview' => 'List of all content pages',
'homepageSetup' => 'Homepage successfully set up.',
'setHomepage' => 'Set page as homepage',
'noParentPage' => ' -- No parent page -- '
'noParentPage' => ' -- No parent page -- ',
'uploadTitleImage' => 'Upload title image'
];
resources/lang/en/admin/fileManager.php
+1
View File
@@ -20,6 +20,7 @@ return [
'noFileSpecified' => 'You have not specified any file for upload',
'uploadSuccessfull' => 'Your file was successfully uploaded',
'selectFile' => 'Select file for upload',
'name' => 'Name',
'keywords' => 'Keywords (comma separated)',
'description' => 'File description',
'noFiles' => 'No files were found. Try to upload some.',
resources/lang/en/admin/history.php
+19 -18
View File
@@ -1,22 +1,23 @@
<?php
return [
'pageName' => 'History of :name',
'columnPageContent' => 'Page content',
'columnUrl' => 'URL',
'columnTitle' => 'Title',
'columnMetaKeywords' => 'Meta keywords',
'columnMetaDescription' => 'Description',
'columnStatus' => 'Page visibility',
'columnTemplate' => 'Template',
'columnIs_homepage' => 'Homepage',
'columnParentPage' => 'Parent page',
'emptyValue' => '<em>none</em>',
'changedFromTo' => 'Changed from <del>:from</del> to <ins>:to</ins>',
'numOfChanges' => 'One change|:count changes',
'diff' => 'Difference',
'diffPageName' => 'Difference of :column',
'backToOverview' => 'Back to history overview',
'backToEdit' => 'Back to editation form',
'setupAsHomepage' => 'Setup as homepage'
'pageName' => 'History of :name',
'columnPageContent' => 'Page content',
'columnUrl' => 'URL',
'columnTitle' => 'Title',
'columnMetaKeywords' => 'Meta keywords',
'columnMetaDescription' => 'Description',
'columnStatus' => 'Page visibility',
'columnTemplate' => 'Template',
'columnIs_homepage' => 'Homepage',
'columnParentPage' => 'Parent page',
'columnTitlePhotoFilename' => 'Title photo',
'emptyValue' => '<em>none</em>',
'changedFromTo' => 'Changed from <del>:from</del> to <ins>:to</ins>',
'numOfChanges' => 'One change|:count changes',
'diff' => 'Difference',
'diffPageName' => 'Difference of :column',
'backToOverview' => 'Back to history overview',
'backToEdit' => 'Back to editation form',
'setupAsHomepage' => 'Setup as homepage'
];
resources/lang/en/admin/widgets.php
+1
View File
@@ -21,5 +21,6 @@ return [
'successfullyAssociated' => 'Association successfull',
'associationDoesNotExists' => 'This association does not exist',
'successfullyDeassociated' => 'Successfully removed from widget area',
'widgetExists' => 'Widget :id already exists.'
];
resources/lang/en/widgets/orbitSlider.php
+15
View File
@@ -0,0 +1,15 @@
<?php
return [
'widgetName' => 'Orbit slider',
'widgetDescription' => 'Slider for images. Uses Foundation framework.',
'name' => 'Slider name',
'description' => 'Slider description',
'containerClass' => 'Extra HTML class for slider',
'createNew' => 'Create new',
'new' => 'Create new orbit slider',
'edit' => 'Edit slider :name',
'editExisting' => 'Save',
'preview' => 'Slider preview',
'upload' => 'Add photos into slider',
'code' => 'Some extra HTML/JS code for slider'
];
resources/views/admin/content/editForm.blade.php
+1 -1
View File
@@ -10,7 +10,7 @@
</div>
@endif
<form method="POST" action="{{route('content.editPost', ['pageId' => $page->id])}}">
<form method="POST" enctype="multipart/form-data" action="{{route('content.editPost', ['pageId' => $page->id])}}">
{!! csrf_field() !!}
@include('admin.content.formInputs')
resources/views/admin/content/formParts/appearance.blade.php
+23
View File
@@ -1,3 +1,26 @@
@if($page->title_photo)
<div class="row">
<div class="column large-12 title-photo text-center">
<img src="{{config('app.upload_url')}}/{{$page->title_photo}}" alt="" />
</div>
</div>
@endif
<div class="row">
<div class="column large-12">
<label>
@lang('admin/contents.uploadTitleImage')
<input type="file" id="titlePhoto" name="titlePhoto" />
</label>
@if (isset($errors) && $errors->has('titlePhoto'))
<div class="callout alert">
{{ $errors->first('titlePhoto') }}
</div>
@endif
</div>
</div>
<div class="row">
<div class="columns large-12">
<label>
resources/views/admin/content/formParts/basicInformation.blade.php
+2 -3
View File
@@ -55,13 +55,12 @@
</select>
</label>
@if (isset($errors) && $errors->has('status'))
@if (isset($errors) && $errors->has('parentPage'))
<div class="callout alert">
{{ $errors->first('status') }}
{{ $errors->first('parentPage') }}
</div>
@endif
</div>
</div>
<div class="row">
resources/views/admin/content/newForm.blade.php
+1 -1
View File
@@ -10,7 +10,7 @@
</div>
@endif
<form method="POST" action="{{route('content.newPost', ['moduleId' => $moduleId])}}">
<form method="POST" enctype="multipart/form-data" action="{{route('content.newPost', ['moduleId' => $moduleId])}}">
{!! csrf_field() !!}
@include('admin.content.formInputs')
resources/views/admin/content/overviewTiles.blade.php
+28 -9
View File
@@ -1,7 +1,12 @@
<div class="row" id="static-page-overview" data-equalizer>
<div class="row" id="static-page-overview" data-equalizer data-equalize-by-row="true">
@forelse($pages as $page)
<div class="columns @if(!isset($tileClass)) large-3 @else {{$tileClass}} @endif">
<div class="page callout" data-equalizer-watch>
@if ($page->title_photo)
<img src="{{config('app.upload_url')}}/{{$page->title_photo}}" alt="" />
@endif
<h4>{{$page->title}}</h4>
<span class="date">{{date('d.m.Y', strtotime($page->created_at))}}</span>
<span class="author">{{$page->author_name}}</span>
@@ -24,22 +29,36 @@
@if($page->is_homepage)
<a class="button tiny disabled"><i class="fa fa-home"></i></a>
@else
<a href="{{route('content.setHomepage', ['id' => $page->id])}}" class="button tiny success has-tip" data-tooltip aria-haspopup="true" title="@lang('admin/contents.setHomepage', ['name' => $page->title])"><i class="fa fa-home"></i></a>
<a href="{{route('content.setHomepage', ['id' => $page->id])}}"
class="button tiny success has-tip" data-tooltip aria-haspopup="true"
title="@lang('admin/contents.setHomepage', ['name' => $page->title])"><i
class="fa fa-home"></i></a>
@endif
<a href="{{route('content.edit', ['id' => $page->id])}}" class="button tiny success has-tip" data-tooltip aria-haspopup="true" title="@lang('admin/contents.edit', ['name' => $page->title])"><i class="fa fa-edit"></i></a>
<a href="{{route('content.edit', ['id' => $page->id])}}" class="button tiny success has-tip"
data-tooltip aria-haspopup="true"
title="@lang('admin/contents.edit', ['name' => $page->title])"><i class="fa fa-edit"></i></a>
@if($page->status == \App\Models\Content::STATUS_DRAFT)
<a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_PUBLIC])}}" class="button tiny success confirm has-tip" data-tooltip aria-haspopup="true" title="@lang('admin/contents.makePublic')"><i class="fa fa-eye"></i></a>
<a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_PROTECTED])}}" class="button tiny warning confirm has-tip" data-tooltip aria-haspopup="true" title="@lang('admin/contents.makeProtected')"><i class="fa fa-lock"></i></a>
<a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_PUBLIC])}}"
class="button tiny success confirm has-tip" data-tooltip aria-haspopup="true"
title="@lang('admin/contents.makePublic')"><i class="fa fa-eye"></i></a>
<a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_PROTECTED])}}"
class="button tiny warning confirm has-tip" data-tooltip aria-haspopup="true"
title="@lang('admin/contents.makeProtected')"><i class="fa fa-lock"></i></a>
@else
<a href="{{route('page.content', ['url' => $page->url])}}" target="_blank" class="button tiny secondary has-tip" data-tooltip aria-haspopup="true" title="@lang('admin/contents.viewPage')"><i class="fa fa-desktop"></i></a>
<a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_DRAFT])}}" class="button tiny warning confirm has-tip" data-tooltip aria-haspopup="true" title="@lang('admin/contents.makeDraft')"><i class="fa fa-eye-slash"></i></a>
<a href="{{route('page.content', ['url' => $page->url])}}" target="_blank"
class="button tiny secondary has-tip" data-tooltip aria-haspopup="true"
title="@lang('admin/contents.viewPage')"><i class="fa fa-desktop"></i></a>
<a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_DRAFT])}}"
class="button tiny warning confirm has-tip" data-tooltip aria-haspopup="true"
title="@lang('admin/contents.makeDraft')"><i class="fa fa-eye-slash"></i></a>
@endif
<a href="{{route('content.delete', ['id' => $page->id])}}" class="button tiny alert confirm has-tip" data-tooltip aria-haspopup="true" title="@lang('admin/contents.deletePage')"><i class="fa fa-remove"></i></a>
<a href="{{route('content.delete', ['id' => $page->id])}}"
class="button tiny alert confirm has-tip" data-tooltip aria-haspopup="true"
title="@lang('admin/contents.deletePage')"><i class="fa fa-remove"></i></a>
</p>
</div>
</div>
@empty
resources/views/admin/fileManager/editForm.blade.php
+12
View File
@@ -14,6 +14,18 @@
<form method="POST" action="{{route('upload.postEdit', ['id' => $file->id])}}" enctype="multipart/form-data">
{!! csrf_field() !!}
<label>
@lang('admin/fileManager.name')
<input type="text" name="name" id="name" value="{{$file->name}}"/>
@if (isset($errors) && $errors->has('name'))
<div class="callout alert">
{{ $errors->first('name') }}
</div>
@endif
</label>
<label>
@lang('admin/fileManager.keywords')
resources/views/admin/fileManager/newFileForm.blade.php
+13
View File
@@ -18,6 +18,19 @@
</div>
@endif
</label>
<label>
@lang('admin/fileManager.name')
<input type="text" name="name" id="name" value="{{old('name')}}"/>
@if (isset($errors) && $errors->has('name'))
<div class="callout alert">
{{ $errors->first('name') }}
</div>
@endif
</label>
<label>
@lang('admin/fileManager.keywords')
resources/views/admin/userManagement/editForm.blade.php
+1 -1
View File
@@ -24,7 +24,7 @@
<input type="text" name="password" value="">
</label>
@if (\Auth::user()->role == \App\Models\User::ROLE_ADMIN)
@if (\Auth::user()->role == \App\Models\User::ROLE_ADMIN && \Auth::user()->id != $user->id)
<label>
@lang('admin/userManagement.roles')
resources/views/admin/widgets/htmlCode/editForm.blade.php
+2 -2
View File
@@ -43,7 +43,7 @@
@lang('widgets/htmlCode.containerClass')
<input type="text" name="containerClass" placeholder="@lang('widgets/htmlCode.containerClass')"
value="{{$widget->containerClass}}" />
value="{{$settings->containerClass}}" />
@if (isset($errors) && $errors->has('containerClass'))
<div class="callout alert">
@@ -55,7 +55,7 @@
<label>
@lang('widgets/htmlCode.code')
<textarea rows="4" name="code" placeholder="@lang('widgets/htmlCode.code')">{{$widget->code}}</textarea>
<textarea rows="4" name="code" placeholder="@lang('widgets/htmlCode.code')">{{$settings->code}}</textarea>
@if (isset($errors) && $errors->has('code'))
<div class="callout alert">
resources/views/admin/widgets/orbitSlider/edit.blade.php
+20
View File
@@ -0,0 +1,20 @@
@extends('admin.layout')
@section('pageName', @trans('widgets/orbitSlider.edit', ['name' => $widget->name]))
@section('content')
<h1>@lang('widgets/orbitSlider.edit', ['name' => $widget->name])</h1>
<div class="row">
<div class="column large-8">
@include('admin.widgets.orbitSlider.editForm')
</div>
<div class="column large-4">
<h3>@lang('widgets/orbitSlider.preview')</h3>
@widgetPreview($widget)
</div>
</div>
@stop
resources/views/admin/widgets/orbitSlider/editForm.blade.php
+74
View File
@@ -0,0 +1,74 @@
@if (!isset($hideMessages))
@if (session('success'))
<div class="callout success">
{{ session('success') }}
</div>
@endif
@if (session('error'))
<div class="callout alert">
{{ session('error') }}
</div>
@endif
@endif
<form action="{{route('widgets.postEdit', ['id' => $widget->id])}}" method="POST">
{!! csrf_field() !!}
<label>
@lang('widgets/orbitSlider.name')
<input type="text" name="name" value="{{$widget->name}}" placeholder="@lang('widgets/orbitSlider.name')" />
@if (isset($errors) && $errors->has('name'))
<div class="callout alert">
{{ $errors->first('name') }}
</div>
@endif
</label>
<label>
@lang('widgets/orbitSlider.description')
<input type="text" name="description" placeholder="@lang('widgets/orbitSlider.description')"
value="{{$widget->description}}" />
@if (isset($errors) && $errors->has('description'))
<div class="callout alert">
{{ $errors->first('description') }}
</div>
@endif
</label>
<label>
@lang('widgets/orbitSlider.containerClass')
<input type="text" name="containerClass" placeholder="@lang('widgets/orbitSlider.containerClass')"
value="{{$settings->sliderClass}}" />
@if (isset($errors) && $errors->has('containerClass'))
<div class="callout alert">
{{ $errors->first('description') }}
</div>
@endif
</label>
<label>
@lang('widgets/orbitSlider.code')
<textarea rows="4" name="code" placeholder="@lang('widgets/orbitSlider.code')">{{$settings->code}}</textarea>
@if (isset($errors) && $errors->has('code'))
<div class="callout alert">
{{ $errors->first('code') }}
</div>
@endif
</label>
<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>
<button type="submit" class="button success">@lang('widgets/orbitSlider.editExisting')</button>
</form>
resources/views/admin/widgets/orbitSlider/new.blade.php
+10
View File
@@ -0,0 +1,10 @@
@extends('admin.layout')
@section('pageName', @trans('widgets/htmlCode.new'))
@section('content')
<h1>@lang('widgets/orbitSlider.new')</h1>
@include('admin.widgets.orbitSlider.newForm')
@stop
resources/views/admin/widgets/orbitSlider/newForm.blade.php
+69
View File
@@ -0,0 +1,69 @@
@if (!isset($hideMessages))
@if (session('success'))
<div class="callout success">
{{ session('success') }}
</div>
@endif
@if (session('error'))
<div class="callout alert">
{{ session('error') }}
</div>
@endif
@endif
<form action="{{route('widgets.postNew', ['type' => $type])}}" method="POST">
{!! csrf_field() !!}
<label>
@lang('widgets/orbitSlider.name')
<input type="text" name="name" value="{{old("name")}}" placeholder="@lang('widgets/orbitSlider.name')" />
@if (isset($errors) && $errors->has('name'))
<div class="callout alert">
{{ $errors->first('name') }}
</div>
@endif
</label>
<label>
@lang('widgets/orbitSlider.description')
<input type="text" name="description" placeholder="@lang('widgets/orbitSlider.description')"
value="{{old("description")}}" />
@if (isset($errors) && $errors->has('description'))
<div class="callout alert">
{{ $errors->first('description') }}
</div>
@endif
</label>
<label>
@lang('widgets/orbitSlider.containerClass')
<input type="text" name="containerClass" placeholder="@lang('widgets/orbitSlider.containerClass')"
value="{{old("containerClass")}}" />
@if (isset($errors) && $errors->has('containerClass'))
<div class="callout alert">
{{ $errors->first('description') }}
</div>
@endif
</label>
<label>
@lang('widgets/orbitSlider.code')
<textarea rows="4" name="code" placeholder="@lang('widgets/orbitSlider.code')">{{old('code')}}</textarea>
@if (isset($errors) && $errors->has('code'))
<div class="callout alert">
{{ $errors->first('code') }}
</div>
@endif
</label>
<button type="submit" class="button success">@lang('widgets/orbitSlider.createNew')</button>
</form>
resources/views/widgets/orbitSlider/element.blade.php
+20
View File
@@ -0,0 +1,20 @@
<div class="orbit header {{$settings->sliderClass}}" role="region" data-orbit>
<ul class="orbit-container">
<button class="orbit-previous" aria-label="previous"><span class="show-for-sr">Previous Slide</span><i
class="fa fa-fw fa-2x fa-chevron-left"></i></button>
<button class="orbit-next" aria-label="next"><span class="show-for-sr">Next Slide</span><i
class="fa fa-fw fa-2x fa-chevron-right"></i></button>
@foreach($images as $i => $image)
@include('widgets.orbitSlider.image', ['image' => $image, 'order' => $i])
@endforeach
</ul>
<nav class="orbit-bullets">
@foreach($images as $i => $image)
<button @if($i == 0) class="is-active" @endif data-slide="{{$i}}"></button>
@endforeach
</nav>
{!! $settings->code !!}
</div>
resources/views/widgets/orbitSlider/image.blade.php
+5
View File
@@ -0,0 +1,5 @@
<li class="orbit-slide @if($order == 0)is-active @endif">
<h2>{{$image->name}}</h2>
<h3>{{$image->description}}</h3>
<div class="img" style="background-image: url({{config('app.upload_url')}}/{{$image->filename}})"></div>
</li>