backports murph-skeleton

core/Controller/Site/NavigationAdminController.php

@@ -107,6 +107,7 @@ class NavigationAdminController extends CrudController
             ->setPageRoute('sort', 'admin_site_navigation_sort')
             ->setPageRoute('delete', 'admin_site_navigation_delete')
             ->setPageRoute('filter', 'admin_site_navigation_filter')
+            ->setPageRoute('redirects', 'admin_redirect_index')
 
             ->setForm('edit', Type::class, [])
             ->setForm('new', Type::class)

core/Entity/NavigationSetting.php

@@ -16,33 +16,33 @@ class NavigationSetting implements EntityInterface
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
      */
-    private $id;
+    protected $id;
 
     /**
      * @ORM\Column(type="string", length=255)
      */
-    private $section;
+    protected $section;
 
     /**
      * @ORM\Column(type="string", length=255)
      */
-    private $label;
+    protected $label;
 
     /**
      * @ORM\Column(type="string", length=255)
      */
-    private $code;
+    protected $code;
 
     /**
      * @ORM\Column(type="text", nullable=true)
      */
-    private $value;
+    protected $value;
 
     /**
      * @ORM\ManyToOne(targetEntity=Navigation::class, inversedBy="navigationSettings")
      * @ORM\JoinColumn(nullable=false, onDelete="CASCADE")
      */
-    private $navigation;
+    protected $navigation;
 
     public function getId(): ?int
     {

core/Entity/Setting.php

@@ -15,27 +15,27 @@ class Setting implements EntityInterface
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
      */
-    private $id;
+    protected $id;
 
     /**
      * @ORM\Column(type="string", length=255)
      */
-    private $section;
+    protected $section;
 
     /**
      * @ORM\Column(type="string", length=255)
      */
-    private $label;
+    protected $label;
 
     /**
      * @ORM\Column(type="string", length=255)
      */
-    private $code;
+    protected $code;
 
     /**
      * @ORM\Column(type="text", nullable=true)
      */
-    private $value;
+    protected $value;
 
     public function getId(): ?int
     {

core/Entity/Site/Navigation.php

@@ -63,12 +63,12 @@ class Navigation implements EntityInterface
     /**
      * @ORM\Column(type="integer", nullable=true)
      */
-    private $sortOrder;
+    protected $sortOrder;
 
     /**
      * @ORM\OneToMany(targetEntity=NavigationSetting::class, mappedBy="navigation", orphanRemoval=true)
      */
-    private $navigationSettings;
+    protected $navigationSettings;
 
     public function __construct()
     {

core/Entity/Site/Node.php

@@ -137,7 +137,7 @@ class Node implements EntityInterface
     /**
      * @ORM\Column(type="string", length=255, nullable=true)
      */
-    private $contentType;
+    protected $contentType;
 
     public function __construct()
     {

core/Resources/translations/messages.fr.yaml

@@ -193,3 +193,15 @@
 "Choose": "Choisir"
 "Associated": "Associé(e)"
 "Directory": "Répertoire"
+"Redirects": "Redirections"
+"New redirect": "Nouvelle redirection"
+"Scheme": "Schéma"
+"Rule": "Règle"
+"Path": "Chemin"
+"Location": "Emplacement"
+"301 - Moved Permanently": "301 - Redirection permanante"
+"307 - Temporary Redirect": "307 - Redirection temporaire"
+"Enabled": "Activé(e)"
+"Enable": "Activer"
+"Disable": "Désactiver"
+"Reuse the query string": "Réutiliser la chaîne de requête"

core/Resources/views/admin/crud/field/button.html.twig

@@ -1 +1 @@
-<{{ options.button_tag }} {% for k, v in options.button_attr %}{{ k }}="{{ v }}"{% endfor %}>{% if options.raw %}{{ value|raw }}{% else %}{{ value }}{% endif %}</{{  options.button_tag }}>
+<{{ options.button_tag }} {% for k, v in options.button_attr %}{{ k }}="{{ v }}"{% endfor %}>{% if options.raw %}{{ value|raw }}{% else %}{{ value|trans }}{% endif %}</{{  options.button_tag }}>

core/Resources/views/admin/crud/field/text.html.twig

@@ -1,2 +1,2 @@
-{% if options.raw %}{{ value|raw }}{% else %}{{ value }}{% endif %}
+{% if options.raw %}{{ value|raw }}{% else %}{{ value|trans }}{% endif %}
 

core/Resources/views/site/navigation_admin/index.html.twig

@@ -1,5 +1,12 @@
 {% extends '@Core/admin/crud/index.html.twig' %}
 
+{% block header_actions_before %}
+    <a href="{{ path(configuration.pageRoute('redirects'), configuration.pageRouteParams('redirects')) }}" class="btn btn-light">
+        <span class="fa fa-map-signs pr-1"></span>
+        {{ configuration.actionTitle(context, 'redirects', 'Redirects')|trans }}
+    </a>
+{% endblock %}
+
 {% block list_item_actions_before %}
     <a href="{{ path('admin_site_tree_navigation', {navigation: item.id}) }}" class="btn btn-sm btn-success mr-1">
         <span class="fa fa-sitemap"></span>