wip #2908 @0.5

diff --git a/app/Templates/Aboutus.php b/app/Templates/Aboutus.php
index f8a6fe35f95660e2468ac86f9954cd5c591b25f5..e97ef9e4b50e06f979faa9839be180e9ebe1f766 100644 (file)
--- a/app/Templates/Aboutus.php
+++ b/app/Templates/Aboutus.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by IntelliJ IDEA.
- * User: Vincent
- * Date: 14/03/2019
- * Time: 18:25
- */
 
 namespace App\Templates;
 
@@ -25,67 +19,71 @@ class Aboutus extends Base
     {
         parent::init();
 
-//        $this->addField([
-//            'name' => 'content',
-//            'label' => trans('backpack::pagemanager.content'),
-//            'type' => 'Markdown',
-//            'placeholder' => trans('backpack::pagemanager.content_placeholder'),
-//        ]);
+        //=== Some big text
+        $this->addField(['name' => 'content',
+            'type' => 'Markdown',
+            'label' => 'Contenus  colonne de gauche',
+            'tab'=>'Contenus']);
+
+        $this->addField(['name' => 'content_right',
+            'type' => 'Markdown',
+            'label' => 'Contenus colonne de droite',
+            'tab'=>'Contenus']);
 
         //=== Our values
         $this->addField([
             'name' => 'values_title',
-            'label' => __('Titre'),
+            'label' => 'Titre',
             'type' => 'Text',
-            'tab' => __('Nos Valeurs'),
+            'tab' => 'Nos Valeurs',
         ]);
 
         $this->addField([
             'name' => 'values_text',
-            'label' => __('Texte'),
+            'label' => 'Texte',
             'type' => 'Markdown',
-            'tab' => __('Nos Valeurs'),
+            'tab' => 'Nos Valeurs',
         ]);
 
         $this->addField([
             'name' => 'values',
             'type' => 'BunchOfFieldsMultiple',
             'bunch' => 'App\SubForms\Value',
-            'label' => __('Values'),
-            'tab' => __('Nos Valeurs'),
+            'label' => 'Values',
+            'tab' => 'Nos Valeurs',
         ]);
 
 
         //=== Team
         $this->addField([
             'name' => 'team_title',
-            'label' => __('Titre'),
+            'label' => 'Titre',
             'type' => 'Text',
-            'tab' => __("L'équipe"),
+            'tab' => "L'équipe",
         ]);
 
         $this->addField([
             'name' => 'team',
             'type' => 'BunchOfFieldsMultiple',
             'bunch' => 'App\SubForms\Person',
-            'label' => __("L'équipe"),
-            'tab' => __("L'équipe"),
+            'label' => "L'équipe",
+            'tab' => "L'équipe",
         ]);
 
         //=== Partners
         $this->addField([
             'name' => 'partners_title',
-            'label' => __('Titre'),
+            'label' => 'Titre',
             'type' => 'Text',
-            'tab' => __('Nos Partenaires'),
+            'tab' => 'Nos Partenaires',
         ]);
 
         $this->addField([
             'name' => 'partners',
             'type' => 'BunchOfFieldsMultiple',
             'bunch' => 'App\SubForms\Logo',
-            'label' => __('Nos Partenaires'),
-            'tab' => __('Nos Partenaires'),
+            'label' => 'Nos Partenaires',
+            'tab' => 'Nos Partenaires',
         ]);
 
     }

diff --git a/app/Templates/Text.php b/app/Templates/Text.php
index 27bffed6e6487913ad5ccbed254999af15b6ea50..3791fd16702e0b4118ce95cc401c840a2ee47c51 100644 (file)
--- a/app/Templates/Text.php
+++ b/app/Templates/Text.php
@@ -16,7 +16,7 @@ class Text extends TemplatePage
 
     public function init()
     {
-        parent::init(); // TODO: Change the autogenerated stub
+        parent::init();
 
         $this->addField(['name' => 'content',
             'type' => 'Markdown',

diff --git a/resources/views/pages/aboutus.blade.php b/resources/views/pages/aboutus.blade.php
index b26799e7ac7038ac983cbeea5be7d76166be1569..4696969f5c42c48244759ef6aa5c5f9d235afa48 100644 (file)
--- a/resources/views/pages/aboutus.blade.php
+++ b/resources/views/pages/aboutus.blade.php
@@ -1,7 +1,22 @@
 @extends('layouts/app')
 
 @section('content')
-
     @intro(['padding' => 'pb-4v'])
 
+    <full-width padding="pb-4v">
+        <content>
+            <columns>
+                <column>
+                    <text-block padding="text-block-default-padding pl-2v pr-1v">
+                        @markdown($page->get('content'))
+                    </text-block>
+                </column>
+                <column>
+                    <text-block padding="text-block-default-padding pl-2v pr-1v">
+                        @markdown($page->get('content_right'))
+                    </text-block>
+                </column>
+            </columns>
+        </content>
+    </full-width>
 @endsection