Merge branch 'dev' into widget_menu
This commit is contained in:
Michal Kváček
@@ -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')
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="columns large-12">
|
||||
<div class="columns large-6">
|
||||
<label>
|
||||
<select name="status">
|
||||
@foreach($contentStatuses as $status => $translation)
|
||||
@@ -41,7 +41,26 @@
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
<div class="column large-6">
|
||||
<label>
|
||||
<select name="parentPage">
|
||||
<option value="">@lang('admin/contents.noParentPage')</option>
|
||||
|
||||
@foreach($rootPages as $rootPage)
|
||||
<option value="{{$rootPage->id}}"
|
||||
@if(old('parent_page', $page->parent_id) == $rootPage->id) selected @endif>
|
||||
{{$rootPage->title}}
|
||||
</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</label>
|
||||
|
||||
@if (isset($errors) && $errors->has('parentPage'))
|
||||
<div class="callout alert">
|
||||
{{ $errors->first('parentPage') }}
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
|
||||
@@ -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')
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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')
|
||||
|
||||
|
||||
@@ -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')
|
||||
|
||||
|
||||
@@ -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')
|
||||
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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>
|
||||
@@ -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
|
||||
|
||||
@@ -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>
|
||||
Reference in New Issue
Block a user