fix #2983 @0:10

diff --git a/src/app/Http/Controllers/CubistPWAController.php b/src/app/Http/Controllers/CubistPWAController.php
new file mode 100644 (file)
index 0000000..2518ccd
--- /dev/null
+++ b/src/app/Http/Controllers/CubistPWAController.php
@@ -0,0 +1,14 @@
+<?php
+
+
+namespace Cubist\Backpack\app\Http\Controllers;
+
+use Illuminate\Routing\Controller as BaseController;
+
+class CubistPWAController extends BaseController
+{
+    public function manifest(\Illuminate\Http\Request $request)
+    {
+
+    }
+}

diff --git a/src/app/Http/Controllers/CubistSEOController.php b/src/app/Http/Controllers/CubistSEOController.php
index 768a6a974f8e2cadb388851c138a75bccb774494..42c86b865b0e8d757891ec72b0a4f52ab9053ce5 100644 (file)
--- a/src/app/Http/Controllers/CubistSEOController.php
+++ b/src/app/Http/Controllers/CubistSEOController.php
@@ -6,14 +6,10 @@ namespace Cubist\Backpack\app\Http\Controllers;
 
 use Cubist\Backpack\app\Magic\Menu\Menu;
 use Cubist\Backpack\app\Magic\Menu\PageItem;
-use Cubist\Backpack\app\Magic\Menu\VirtualItem;
-use Cubist\Backpack\app\Template\Navigation;
-use Cubist\Backpack\app\Template\Redirection;
-use Cubist\Util\XML\DOMSelector;
-use Cviebrock\LaravelElasticsearch\Facade as Elasticsearch;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Controller as BaseController;
 
-class CubistSEOController
+class CubistSEOController extends BaseController
 {
     public function robots(Request $request)
     {

diff --git a/src/app/Magic/Fields/Color.php b/src/app/Magic/Fields/Color.php
index 4baf7c8f4a05117114b7334b2e36058ead97a8c1..88447b5a2e31313f4fef50d67c3c859af006a0bc 100644 (file)
--- a/src/app/Magic/Fields/Color.php
+++ b/src/app/Magic/Fields/Color.php
@@ -4,7 +4,7 @@
 namespace Cubist\Backpack\app\Magic\Fields;
 
 
-class Color
+class Color extends Field
 {
-    protected $_adminType = 'color';
+    protected $_adminType = 'color_picker';
 }

diff --git a/src/app/Magic/Models/Settings.php b/src/app/Magic/Models/Settings.php
index 50f2bb80c6b835b13eb8bf79c86d68893b6b7907..1d6e437b5eaadf47e44f8e50583bcbc67a45bb49 100644 (file)
--- a/src/app/Magic/Models/Settings.php
+++ b/src/app/Magic/Models/Settings.php
@@ -21,6 +21,29 @@ class Settings extends CubistMagicModel
         $this->_favicon();
     }
 
+    protected function _favicon()
+    {
+        $tab = 'Icônes';
+        $this->addField(['name' => 'favicon',
+            'label' => 'Favicon',
+            'type' => 'Images',
+            'hint' => 'Image utilisée comme favicon (1024x1024, PNG, transparence)',
+            'tab' => $tab]);
+
+        $this->addField(['name' => 'favicon_android',
+            'label' => 'Icône Android',
+            'type' => 'Images',
+            'hint' => 'Image utilisée comme icône sur Android (1024x1024, PNG, transparence)',
+            'tab' => $tab]);
+
+        $this->addField(['name' => 'favicon_ios',
+            'label' => 'Icône iOS',
+            'type' => 'Images',
+            'hint' => 'Image utilisée comme icône sur iOS (1024x1024, PNG, sans transparence)',
+            'tab' => $tab]);
+
+    }
+
     protected function _pwa()
     {
         $tab = 'Progressive Web App';