Updated libs to use /templates and /themes/{theme}/templates

Renamed /themes/core to /themes/daux
Updated /themes/{theme}/less/theme.less to allow for bootstrap overrides
Added /themes/daux/less/theme.less to allow daux to function as theme - used daux-navy colors
Moved fonts from themes variants into /themes/daux/fonts

libs/Daux.php

@@ -102,7 +102,7 @@ class Daux
             throw new Exception('The Themes directory does not exist. Check the path again : ' . $this->themes_path);
         }
         $this->options['themes_path'] = $this->themes_path;
-        $this->options['templates'] = $this->themes_path . DIRECTORY_SEPARATOR . 'core' . DIRECTORY_SEPARATOR . 'templates';
+        $this->options['templates'] = 'templates';
     }
 
     public function setDocumentationPath($path)
@@ -189,7 +189,7 @@ class Daux
                 'local_base' => $this->local_base,
                 'docs_path' => $this->docs_path,
                 'themes_path' => $this->themes_path,
-                'templates' => $this->themes_path . DIRECTORY_SEPARATOR . 'core' . DIRECTORY_SEPARATOR . 'templates'
+                'templates' => 'templates'
             ];
             $this->options->conservativeMerge($default);
 

libs/DauxHelper.php

@@ -49,7 +49,7 @@ class DauxHelper
             'fonts' => [],
             'require-jquery' => false,
             'bootstrap-js' => false,
-            'favicon' => '<base_url>resources/img/favicon.png',
+            'favicon' => '<base_url>themes/daux/img/favicon.png',
             'templates' => $theme_folder . DIRECTORY_SEPARATOR . 'templates',
         ];
 

templates/layout/00_layout.php

@@ -43,12 +43,12 @@
     <!-- jQuery -->
     <?php
     if ($params['theme']['require-jquery']) {
-        echo '<script src="' . $base_url . 'resources/js/jquery-1.11.3.min.js' . '"></script>';
+        echo '<script src="' . $base_url . 'themes/daux/js/jquery-1.11.3.min.js' . '"></script>';
     }
     ?>
 
     <!-- hightlight.js -->
-    <script src="<?= $base_url; ?>resources/js/highlight.min.js"></script>
+    <script src="<?= $base_url; ?>themes/daux/js/highlight.min.js"></script>
     <script>hljs.initHighlightingOnLoad();</script>
 
     <!-- JS -->
@@ -56,6 +56,6 @@
         echo '<script src="' . $js . '"></script>';
     } ?>
 
-    <script src="<?= $base_url; ?>resources/js/daux.js"></script>
+    <script src="<?= $base_url; ?>themes/daux/js/daux.js"></script>
 </body>
 </html>

themes/daux-blue/config.json

@@ -1,6 +1,6 @@
 {
     "favicon": "<theme_url>img/favicon-blue.png",
-    "css": ["<theme_url>css/theme.min.css"],
+    "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,

themes/daux-blue/less/theme.less

@@ -1,13 +1,19 @@
-//Daux.io Blue
-@sidebar-background: #f7f7f7;
-@sidebar-hover: #c5c5cb;
-@lines: #e7e7e9;
-@dark: #3f4657;
-@light: #82becd;
-@text: #2d2d2d;
-@syntax-string: #022e99;
-@syntax-comment: #84989b;
-@syntax-number: #2f9b92;
-@syntax-label: #840d7a;
 
-@import "../../core/less/daux-base.less";
+//Daux.io Blue
+  @sidebar-background: #f7f7f7;
+  @sidebar-hover: #c5c5cb;
+  @lines: #e7e7e9;
+  @dark: #3f4657;
+  @light: #82becd;
+  @text: #2d2d2d;
+  @syntax-string: #022e99;
+  @syntax-comment: #84989b;
+  @syntax-number: #2f9b92;
+  @syntax-label: #840d7a;
+
+// Bootstrap
+  @import "../../daux/less/bootstrap/bootstrap.less";
+  @icon-font-path: "../../daux/fonts/";
+
+// Daux.io Base
+  @import "../../daux/less/theme-base.less";

themes/daux-green/config.json

@@ -1,6 +1,6 @@
 {
     "favicon": "<theme_url>img/favicon-green.png",
-    "css": ["<theme_url>css/theme.min.css"],
+    "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,

themes/daux-green/less/theme.less

@@ -1,13 +1,19 @@
-//Daux.io Green
-@sidebar-background: #f5f5f6;
-@sidebar-hover: #a0d55d;
-@lines: #e7e7e9;
-@dark: #000000;
-@light: #8acc37;
-@text: #2d2d2d;
-@syntax-string: #e0ff00;
-@syntax-comment: #c4e598;
-@syntax-number: #097c4e;
-@syntax-label: #022e99;
 
-@import "../../core/less/daux-base.less";
+//Daux.io Green
+  @sidebar-background: #f5f5f6;
+  @sidebar-hover: #a0d55d;
+  @lines: #e7e7e9;
+  @dark: #000000;
+  @light: #8acc37;
+  @text: #2d2d2d;
+  @syntax-string: #e0ff00;
+  @syntax-comment: #c4e598;
+  @syntax-number: #097c4e;
+  @syntax-label: #022e99;
+
+// Bootstrap
+  @import "../../daux/less/bootstrap/bootstrap.less";
+  @icon-font-path: "../../daux/fonts/";
+
+// Daux.io Base
+  @import "../../daux/less/theme-base.less";

themes/daux-navy/config.json

@@ -1,6 +1,6 @@
 {
     "favicon": "<theme_url>img/favicon-navy.png",
-    "css": ["<theme_url>css/theme.min.css"],
+    "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,

themes/daux-navy/less/theme.less

@@ -1,13 +1,19 @@
-//Daux.io Navy
-@sidebar-hover: #c5c5cb;
-@lines: #e7e7e9;
-@sidebar-background: #f5f5f6;
-@dark: #13132a;
-@light: #7795b4;
-@text: #2d2d2d;
-@syntax-string: #000000;
-@syntax-comment: #505050;
-@syntax-number: #09559b;
-@syntax-label: #001775;
 
-@import "../../core/less/daux-base.less";
+//Daux.io Navy
+  @sidebar-hover: #c5c5cb;
+  @lines: #e7e7e9;
+  @sidebar-background: #f5f5f6;
+  @dark: #13132a;
+  @light: #7795b4;
+  @text: #2d2d2d;
+  @syntax-string: #000000;
+  @syntax-comment: #505050;
+  @syntax-number: #09559b;
+  @syntax-label: #001775;
+
+// Bootstrap
+  @import "../../daux/less/bootstrap/bootstrap.less";
+  @icon-font-path: "../../daux/fonts/";
+
+// Daux.io Base
+  @import "../../daux/less/theme-base.less";

themes/daux-red/config.json

@@ -1,6 +1,6 @@
 {
     "favicon": "<theme_url>img/favicon-red.png",
-    "css": ["<theme_url>css/theme.min.css"],
+    "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,

themes/daux-red/less/theme.less

@@ -1,13 +1,19 @@
-//Daux.io Red
-@sidebar-hover: #eeeeee;
-@lines: #eeeeee;
-@sidebar-background: #f7f7f7;
-@dark: #c64641; //#df4f49;
-@light: #ecb5a1;
-@text: #2d2d2d;
-@syntax-string: #557aa2;
-@syntax-comment: #ecdfd0;
-@syntax-number: #9b2f7d;
-@syntax-label: #a31621;
 
-@import "../../core/less/daux-base.less";
+// Daux.io Red
+  @sidebar-hover: #eeeeee;
+  @lines: #eeeeee;
+  @sidebar-background: #f7f7f7;
+  @dark: #c64641; //#df4f49;
+  @light: #ecb5a1;
+  @text: #2d2d2d;
+  @syntax-string: #557aa2;
+  @syntax-comment: #ecdfd0;
+  @syntax-number: #9b2f7d;
+  @syntax-label: #a31621;
+
+// Bootstrap
+  @import "../../daux/less/bootstrap/bootstrap.less";
+  @icon-font-path: "../../daux/fonts/";
+
+// Daux.io Base
+  @import "../../daux/less/theme-base.less";

themes/daux/config.json

@@ -1,6 +1,6 @@
 {
-    "favicon": "<theme_url>img/favicon-blue.png",
+    "favicon": "<theme_url>img/favicon.png",
-    "css": ["<theme_url>css/theme.min.css"],
+    "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,