From 9dca1e09c0406c92ce34cc2b934de64a4c24ebdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ste=CC=81phane=20Goetz?= <onigoetz@onigoetz.ch>
Date: Sun, 9 Aug 2015 22:19:06 +0200
Subject: [PATCH] remove bootstrap-js and require-jquery as theme options

---
 libs/DauxHelper.php            | 2 --
 templates/layout/00_layout.php | 6 +-----
 themes/daux-blue/config.json   | 4 +---
 themes/daux-green/config.json  | 4 +---
 themes/daux-navy/config.json   | 4 +---
 themes/daux-red/config.json    | 4 +---
 themes/daux/config.json        | 4 +---
 7 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/libs/DauxHelper.php b/libs/DauxHelper.php
index 2c972d6..f81253b 100644
--- a/libs/DauxHelper.php
+++ b/libs/DauxHelper.php
@@ -47,8 +47,6 @@ class DauxHelper
             'css' => [],
             'js' => [],
             'fonts' => [],
-            'require-jquery' => false,
-            'bootstrap-js' => false,
             'favicon' => '<base_url>themes/daux/img/favicon.png',
             'templates' => $theme_folder . DIRECTORY_SEPARATOR . 'templates',
         ];
diff --git a/templates/layout/00_layout.php b/templates/layout/00_layout.php
index 56f7d47..126b0bc 100644
--- a/templates/layout/00_layout.php
+++ b/templates/layout/00_layout.php
@@ -41,11 +41,7 @@
 
 
     <!-- jQuery -->
-    <?php
-    if ($params['theme']['require-jquery']) {
-        echo '<script src="' . $base_url . 'themes/daux/js/jquery-1.11.3.min.js' . '"></script>';
-    }
-    ?>
+    <?= '<script src="' . $base_url . 'themes/daux/js/jquery-1.11.3.min.js' . '"></script>' ?>
 
     <!-- hightlight.js -->
     <script src="<?= $base_url; ?>themes/daux/js/highlight.min.js"></script>
diff --git a/themes/daux-blue/config.json b/themes/daux-blue/config.json
index d4726e4..5edc1ff 100644
--- a/themes/daux-blue/config.json
+++ b/themes/daux-blue/config.json
@@ -2,7 +2,5 @@
     "favicon": "<theme_url>img/favicon-blue.png",
     "css": ["<theme_url>css/theme.css"],
     "fonts": ["//fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic"],
-    "js": [],
-    "require-jquery": true,
-    "bootstrap-js": false
+    "js": []
 }
diff --git a/themes/daux-green/config.json b/themes/daux-green/config.json
index 30fbd14..4c65e5e 100644
--- a/themes/daux-green/config.json
+++ b/themes/daux-green/config.json
@@ -2,7 +2,5 @@
     "favicon": "<theme_url>img/favicon-green.png",
     "css": ["<theme_url>css/theme.css"],
     "fonts": ["//fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic"],
-    "js": [],
-    "require-jquery": true,
-    "bootstrap-js": false
+    "js": []
 }
diff --git a/themes/daux-navy/config.json b/themes/daux-navy/config.json
index 677f5f8..0d3bda9 100644
--- a/themes/daux-navy/config.json
+++ b/themes/daux-navy/config.json
@@ -2,7 +2,5 @@
     "favicon": "<theme_url>img/favicon-navy.png",
     "css": ["<theme_url>css/theme.css"],
     "fonts": ["//fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic"],
-    "js": [],
-    "require-jquery": true,
-    "bootstrap-js": false
+    "js": []
 }
diff --git a/themes/daux-red/config.json b/themes/daux-red/config.json
index 7d221cc..5ede055 100644
--- a/themes/daux-red/config.json
+++ b/themes/daux-red/config.json
@@ -2,7 +2,5 @@
     "favicon": "<theme_url>img/favicon-red.png",
     "css": ["<theme_url>css/theme.css"],
     "fonts": ["//fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic"],
-    "js": [],
-    "require-jquery": true,
-    "bootstrap-js": false
+    "js": []
 }
diff --git a/themes/daux/config.json b/themes/daux/config.json
index cd38732..c252a4c 100644
--- a/themes/daux/config.json
+++ b/themes/daux/config.json
@@ -2,7 +2,5 @@
     "favicon": "<theme_url>img/favicon.png",
     "css": ["<theme_url>css/theme.css"],
     "fonts": ["//fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic"],
-    "js": [],
-    "require-jquery": true,
-    "bootstrap-js": false
+    "js": []
 }