Merge pull request #1 from TypiCMS/2.1

2.1

Author: sdebacker

composer.json

@@ -8,7 +8,7 @@
         }
     ],
     "require": {
-        "typicms/core": "~2.0.0"
+        "typicms/core": "~2.1.0"
     },
     "autoload": {
         "psr-4": {

src/Http/Controllers/PublicController.php

@@ -24,10 +24,7 @@ public function __construct(PlaceInterface $place)
      */
     public function index()
     {
-        TypiCMS::setModel($this->repository->getModel());
-
         $models = $this->repository->all();
-
         return view('places::public.index')
             ->with(compact('models'));
     }
@@ -39,9 +36,7 @@ public function index()
      */
     public function search()
     {
-
         $models = $this->repository->all();
-
         return view('places::public.results')
             ->with(compact('models'));
     }
@@ -54,9 +49,6 @@ public function search()
     public function show($slug)
     {
         $model = $this->repository->bySlug($slug);
-
-        TypiCMS::setModel($model);
-
         return view('places::public.show')
             ->with(compact('model'));
     }

src/Providers/RouteServiceProvider.php

@@ -1,9 +1,9 @@
 <?php
 namespace TypiCMS\Modules\Places\Providers;
 
-use Config;
-use Illuminate\Routing\Router;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+use Illuminate\Routing\Router;
+use TypiCMS\Facades\TypiCMS;
 
 class RouteServiceProvider extends ServiceProvider {
 
@@ -42,12 +42,13 @@ public function map(Router $router)
             /**
              * Front office routes
              */
-            $routes = $this->app->make('TypiCMS.routes');
-            foreach (Config::get('translatable.locales') as $lang) {
-                if (isset($routes['places'][$lang])) {
-                    $uri = $routes['places'][$lang];
-                    $router->get($uri, array('as' => $lang.'.places', 'uses' => 'PublicController@index'));
-                    $router->get($uri.'/{slug}', array('as' => $lang.'.places.slug', 'uses' => 'PublicController@show'));
+            if ($page = TypiCMS::getPageLinkedToModule('places')) {
+                foreach (config('translatable.locales') as $lang) {
+                    $options = $page->private ? ['middleware' => 'auth'] : [] ;
+                    if ($uri = $page->uri($lang)) {
+                        $router->get($uri, $options + ['as' => $lang.'.places', 'uses' => 'PublicController@index']);
+                        $router->get($uri.'/{slug}', $options + ['as' => $lang.'.places.slug', 'uses' => 'PublicController@show']);
+                    }
                 }
             }
 

src/resources/views/admin/_form.blade.php

@@ -5,11 +5,6 @@
     <script src="{{ asset('js/admin/gmaps.js') }}"></script>
 @stop
 
-@section('otherSideLink')
-    @include('core::admin._navbar-public-link')
-@stop
-
-
 @include('core::admin._buttons-form')
 
 {!! BootForm::hidden('id') !!}

src/resources/views/public/index.blade.php

@@ -1,8 +1,7 @@
-@extends('core::public.master')
+@extends('pages::public.master')
+<?php $page = TypiCMS::getPageLinkedToModule('places') ?>
 
-@section('title', trans('places::global.name') . ' – ' . $websiteTitle)
-@section('ogTitle', trans('places::global.name'))
-@section('bodyClass', 'body-places')
+@section('bodyClass', 'body-places body-places-index body-page body-page-' . $page->id)
 
 @section('js')
     <script src="{{ asset('//maps.googleapis.com/maps/api/js?sensor=false&amp;language='.config('app.locale')) }}"></script>
@@ -11,7 +10,9 @@
 
 @section('main')
 
-    <h1>@lang('places::global.name')</h1>
+    {!! $page->body !!}
+
+    @include('galleries::public._galleries', ['model' => $page])
 
     <div class="row">
 

src/resources/views/public/show.blade.php

@@ -1,10 +1,11 @@
 @extends('core::public.master')
+<?php $page = TypiCMS::getPageLinkedToModule('places') ?>
 
 @section('title', $model->title . ' – ' . trans('news::global.name') . ' – ' . $websiteTitle)
 @section('ogTitle', $model->title)
 @section('description', $model->summary)
 @section('image', $model->present()->thumbAbsoluteSrc())
-@section('bodyClass', 'body-place body-place-' . $model->id)
+@section('bodyClass', 'body-places body-place-' . $model->id . ' body-page body-page-' . $page->id)
 
 @section('js')
     <script src="{{ asset('//maps.googleapis.com/maps/api/js?sensor=false&amp;language='.config('app.locale')) }}"></script>