Merge branch 'template_support' into dev

templates/Base/OnePage/Handlers/OnePage.php

@@ -32,30 +32,42 @@ abstract class OnePage implements TemplateHandler
         $menu->route('template.setHomepage', trans('template::admin/mainMenu.setHomepage'), [], 1, ['icon' => 'fa fa-fw fa-home']);
     }
 
+    /**
+     * Getter for pages displayed on homepage
+     *
+     * @return array
+     */
+    public static function getPagesOnHomepage()
+    {
+        $pageIds = (array)json_decode(Settings::get(self::HOMEPAGE_PAGES_SETTINGS_KEY, '[]'));
+
+        if (empty($pageIds)) {
+            return [];
+        }
+
+        // get all available pages
+        $pages = Content::whereIn('id', $pageIds);
+
+        if (Auth::user()) {
+            $pages = $pages->where('status', '!=', Content::STATUS_DRAFT);
+        } else {
+            $pages = $pages->where('status', Content::STATUS_PUBLIC);
+        }
+
+        return $pages->get();
+    }
+
     /**
      * Prepare Content object to be rendered using Blade template
      *
      * @param Content $content
+     *
+     * @return array
      */
     public static function beforeRender(Content & $content)
     {
         if ($content->is_homepage) {
-            $pageIds = (array)json_decode(Settings::get(self::HOMEPAGE_PAGES_SETTINGS_KEY, '[]'));
-
-            if (empty($pageIds)) {
-                return [];
-            }
-
-            // get all available pages
-            $pages = Content::whereIn('id', $pageIds);
-
-            if (Auth::user()) {
-                $pages = $pages->where('status', '!=', Content::STATUS_DRAFT);
-            } else {
-                $pages = $pages->where('status', Content::STATUS_PUBLIC);
-            }
-
-            $pages = $pages->get();
+            $pages = self::getPagesOnHomepage();
 
             // create real content from pages
             $pagesRaw = $pagesInTemplates = [];

templates/Base/OnePage/Providers/OnePageTemplate.php

@@ -2,6 +2,7 @@
 namespace Templates\Base\OnePage\Providers;
 
 use Illuminate\Support\ServiceProvider;
+use Templates\Base\OnePage\Widgets\OnePageMenu\OnePageMenu;
 
 class OnePageTemplate extends ServiceProvider
 {
@@ -11,20 +12,46 @@ class OnePageTemplate extends ServiceProvider
      * @return void
      */
     public function register()
-    {
+    {        $this->registerTranslations();
     }
 
     public function boot()
     {
-        // register translations
-        $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'template');
-
-        // load views
-        $this->loadViewsFrom(array_merge(array_map(function ($path) {
-            return $path;
-        }, \Config::get('view.paths')), [__DIR__ . '/../Resources/views']), 'template');
+        $this->registerViews();
+        $this->registerWidgets();
 
         // register event service provider for this template
         $this->app->register(EventProvider::class);
     }
+
+    /**
+     * Register translations used in this base template
+     */
+    private function registerTranslations()
+    {
+        // register translations
+        $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'template');
+    }
+
+    /**
+     * Register views used in this template - both visitor's and admin's
+     */
+    private function registerViews()
+    {
+        // load views
+        $this->loadViewsFrom(array_merge(array_map(function ($path) {
+            return $path;
+        }, \Config::get('view.paths')), [__DIR__ . '/../Resources/views']), 'template');
+    }
+
+    /**
+     * Register all widgets related to this template
+     */
+    private function registerWidgets()
+    {
+        $registrator = $this->app->make('registerWidget');
+
+        // register all available widgets
+        $registrator->register(OnePageMenu::class);
+    }
 }

templates/Base/OnePage/Resources/lang/en/admin/setHomepage.php

@@ -11,6 +11,7 @@ return [
     'notUsedPages'                      => 'Not used pages',
     'reallyRemovePage'                  => 'Do you really want to remove this page from homepage?',
     'cannotSetHomepageAsPartOfHomepage' => 'Cannot set currently set homepage as one of homepage pages.',
+    'noHomepageSet'                     => 'No homepage set, following settings will not take effect!',
     'addToHomepage'                     => 'Add page into homepage',
     'events'                            => [
         'names' => [

templates/Base/OnePage/Resources/lang/en/widget/menu.php

@@ -0,0 +1,12 @@
+<?php
+return [
+    'name'        => 'One page menu',
+    'description' => 'Simple menu used for one page templates. This menu navigates using nachor links on page. Links are generated automatically using list of pages on homepage.',
+    'new'         => 'Create new menu',
+    'form'        => [
+        'name'           => 'Menu name',
+        'description'    => 'Description',
+        'containerClass' => 'HTML class for container element',
+        'save'           => 'Save',
+    ]
+];

templates/Base/OnePage/Resources/views/admin/homepage/set.blade.php

@@ -11,14 +11,17 @@ Improvement: http://www.html5rocks.com/en/tutorials/dnd/basics/
 
     <div class="row">
         <div class="col-lg-8">
-
-            @include('admin.snippets.card', [
-                        'type' => 'primary',
-                        'title' => $homepage->title.' <small>'.trans($homepage->module_name).'</small>',
-                        'body' => '<p>'.str_limit(strip_tags($homepage->content), 200).'</p>',
-                        'footerClass' => 'text-right',
-                        'footer' => '<a href="'.route('content.edit', ['id' => $homepage->id]).'" class="btn btn-secondary btn-sm"><i class="fa fa-fw fa-pencil"></i></a>'
-                    ])
+            @if(isset($homepage))
+                @include('admin.snippets.card', [
+                            'type' => 'primary',
+                            'title' => $homepage->title.' <small>'.trans($homepage->module_name).'</small>',
+                            'body' => '<p>'.str_limit(strip_tags($homepage->content), 200).'</p>',
+                            'footerClass' => 'text-right',
+                            'footer' => '<a href="'.route('content.edit', ['id' => $homepage->id]).'" class="btn btn-secondary btn-sm"><i class="fa fa-fw fa-pencil"></i></a>'
+                        ])
+            @else
+                <div class="alert alert-warning">@lang('template::admin/setHomepage.noHomepageSet')</div>
+            @endif
 
             <h3>@lang('template::admin/setHomepage.usedPages')</h3>
 
@@ -51,7 +54,9 @@ Improvement: http://www.html5rocks.com/en/tutorials/dnd/basics/
                 <div class="card card-default">
                     <div class="card-header">
                         <div class="header-block">
-                            <p class="title">{{$page->title}}  <small>@lang($page->module_name)</small></p>
+                            <p class="title">{{$page->title}}
+                                <small>@lang($page->module_name)</small>
+                            </p>
                         </div>
                     </div>
                     <div class="card-block">
@@ -61,7 +66,7 @@ Improvement: http://www.html5rocks.com/en/tutorials/dnd/basics/
                         <a href="{{route('content.edit', ['id' => $page->id])}}"
                            class="btn btn-secondary btn-sm"><i
                                     class="fa fa-fw fa-pencil"></i></a>
-                    @if(!$page->is_homepage)
+                        @if(!$page->is_homepage)
                             <a href="{{route('content.setHomepage', ['id' => $page->id])}}"
                                class="btn btn-secondary confirm btn-sm"
                                data-toggle="tooltip" title="@lang('admin/contents.setHomepage')">
@@ -69,7 +74,9 @@ Improvement: http://www.html5rocks.com/en/tutorials/dnd/basics/
                             </a>
                         @endif
                         <a href="{{route('template.homepage.addPage', ['id' => $page->id])}}"
-                           class="btn btn-sm btn-primary" data-toggle="tooltip" title="@lang('template::admin/setHomepage.addToHomepage')"><i class="fa green fa-fw fa-plus"></i></a>
+                           class="btn btn-sm btn-primary" data-toggle="tooltip"
+                           title="@lang('template::admin/setHomepage.addToHomepage')"><i
+                                    class="fa green fa-fw fa-plus"></i></a>
                     </div>
                 </div>
             @empty

templates/Base/OnePage/Resources/views/admin/widgets/onePageMenu/edit.blade.php

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

templates/Base/OnePage/Resources/views/admin/widgets/onePageMenu/form.blade.php

@@ -0,0 +1,27 @@
+<form action="{{$action}}" method="POST">
+    {!! csrf_field() !!}
+    <label class="label-control">
+        @lang('template::widget/menu.form.name')
+    </label>
+    <input class="form-control" type="text" name="name" value="{{old('name', $widget->name)}}"
+           placeholder="@lang('template::widget/menu.form.name')" />
+
+
+    <label class="label-control">
+        @lang('template::widget/menu.form.description')
+    </label>
+    <input class="form-control" type="text" name="description" placeholder="@lang('template::widget/menu.form.description')"
+           value="{{old('description', $widget->description)}}" />
+
+
+    <label class="label-control">
+        @lang('template::widget/menu.form.containerClass')
+    </label>
+
+    <input class="form-control" type="text" name="containerClass" placeholder="@lang('template::widget/menu.form.containerClass')"
+           value="{{old('containerClass', isset($settings->containerClass) ? $settings->containerClass : '')}}" />
+
+    <button type="submit" class="btn btn-primary">
+        @lang('template::widget/menu.form.save')
+    </button>
+</form>

templates/Base/OnePage/Resources/views/admin/widgets/onePageMenu/new.blade.php

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

templates/Base/OnePage/Widgets/OnePageMenu/OnePageMenu.php

@@ -0,0 +1,55 @@
+<?php
+namespace Templates\Base\OnePage\Widgets\OnePageMenu;
+
+use App\Models\Widget;
+use App\Widgets\Contracts\WidgetRenderer;
+use App\Widgets\NonInstallableWidget;
+use stdClass;
+
+class OnePageMenu extends NonInstallableWidget
+{
+    /**
+     * Name getter
+     *
+     * @return string
+     */
+    public static function getName()
+    {
+        return 'template::widget/menu.name';
+    }
+
+    /**
+     * Getter for description
+     *
+     * @return string
+     */
+    public static function getDescription()
+    {
+        return 'template::widget/menu.description';
+    }
+
+    /**
+     * Getter for presenter/renderer of this widget
+     *
+     * @return WidgetRenderer
+     */
+    public static function getPresenter()
+    {
+        return Presenter::class;
+    }
+
+    /**
+     * @param Widget $widget
+     * @param stdClass          $data
+     *
+     * @return mixed
+     */
+    public static function save(Widget $widget, stdClass $data)
+    {
+        $widgetSettings = ['containerClass' => isset($data->containerClass) ? $data->containerClass : ''];
+
+        $widget->settings = json_encode($widgetSettings);
+
+        return $widget;
+    }
+}

templates/Base/OnePage/Widgets/OnePageMenu/Presenter.php

@@ -0,0 +1,65 @@
+<?php
+namespace Templates\Base\OnePage\Widgets\OnePageMenu;
+
+use App\Models\Widget;
+use App\Models\WidgetType;
+use App\Widgets\Contracts\WidgetRenderer;
+use Templates\Base\OnePage\Handlers\OnePage;
+
+class Presenter implements WidgetRenderer
+{
+    /**
+     * @var string path to template
+     */
+    public static $template;
+
+    /**
+     * Method used for displaying widget.
+     *
+     * This method renders some HTML code for displaying.
+     *
+     * @param object $settings
+     *
+     * @return mixed
+     * @throws \ErrorException
+     */
+    public static function render($settings)
+    {
+        if (!self::$template) {
+            throw new \ErrorException('Cannot render menu without template! Please, set Presenter::$template variable before rendering.');
+        }
+
+        $pages = OnePage::getPagesOnHomepage();
+
+        return view(self::$template, ['pages' => $pages])->render();
+    }
+
+    /**
+     * Display form for creating new instance of widget
+     *
+     * @param WidgetType $type
+     *
+     * @return mixed
+     */
+    public static function renderAddForm(WidgetType $type)
+    {
+        return view('template::admin.widgets.onePageMenu.new', [
+            'type'     => $type,
+            'widget'   => new Widget(),
+            'settings' => new \stdClass()
+        ]);
+    }
+
+    /**
+     * Display form for editing already existing widget
+     *
+     * @param Widget $widget
+     *
+     * @return mixed
+     */
+    public static function renderEditForm(Widget $widget)
+    {
+        $settings = json_decode($widget->settings);
+        return view('template::admin.widgets.onePageMenu.edit', ['widget' => $widget, 'settings' => $settings]);
+    }
+}