diff options
| -rw-r--r-- | app/class/Config.php | 16 | ||||
| -rw-r--r-- | app/view/templates/admin.php | 7 | ||||
| -rw-r--r-- | app/view/templates/edit.php | 8 | ||||
| -rw-r--r-- | app/view/templates/home.php | 6 | ||||
| -rw-r--r-- | app/view/templates/media.php | 5 | ||||
| -rw-r--r-- | package-lock.json | 6 | ||||
| -rw-r--r-- | package.json | 2 |
7 files changed, 44 insertions, 6 deletions
diff --git a/app/class/Config.php b/app/class/Config.php index 5c5fe76..7b2b50c 100644 --- a/app/class/Config.php +++ b/app/class/Config.php @@ -39,6 +39,12 @@ abstract class Config /** Database config */ protected static $markdownhardwrap = true; + + /** Site config */ + protected static $disablejavascript = false; + + + public const SECRET_KEY_MIN = 16; public const SECRET_KEY_MAX = 128; @@ -284,6 +290,11 @@ abstract class Config return self::$markdownhardwrap; } + public static function disablejavascript() + { + return self::$disablejavascript; + } + // __________________________________________ S E T ______________________________________ @@ -494,7 +505,10 @@ abstract class Config self::$markdownhardwrap = boolval($markdownhardwrap); } - + public static function setdisablejavascript($disablejavascript) + { + self::$disablejavascript = boolval($disablejavascript); + } diff --git a/app/view/templates/admin.php b/app/view/templates/admin.php index adda7f8..33f27a9 100644 --- a/app/view/templates/admin.php +++ b/app/view/templates/admin.php @@ -228,6 +228,13 @@ <h2 id="interface">Interface</h2> + <div class="checkbox"> + <input type="hidden" name="disablejavascript" value="0" form="admin"> + <input type="checkbox" name="disablejavascript" id="disablejavascript" value="1" <?= Wcms\Config::disablejavascript() ? 'checked' : '' ?> form="admin"> + <label for="disablejavascript">Disable javascript</label> + </div> + + <p>Set interface Style</p> <select name="interfacecss" id="interfacecss" form="admin"> diff --git a/app/view/templates/edit.php b/app/view/templates/edit.php index 22dda20..dfb4dec 100644 --- a/app/view/templates/edit.php +++ b/app/view/templates/edit.php @@ -1,4 +1,6 @@ -<?php $this->layout('layout', ['title' => '✏ '.$page->title(), 'stylesheets' => [$css . 'edit.css'], 'favicon' => $page->favicon()]) ?> +<?php + +$this->layout('layout', ['title' => '✏ '.$page->title(), 'stylesheets' => [$css . 'edit.css'], 'favicon' => $page->favicon()]) ?> @@ -26,10 +28,14 @@ </main> +<?php if(!Wcms\Config::disablejavascript()) { ?> + <script> const pageid = '<?= $page->id() ?>'; let pagetitle = '<?= $page->title() ?>'; </script> <script src="<?= Wcms\Model::jspath() ?>edit.bundle.js"></script> +<?php } ?> + <?php $this->stop('page') ?>
\ No newline at end of file diff --git a/app/view/templates/home.php b/app/view/templates/home.php index 387ef0c..3d0b497 100644 --- a/app/view/templates/home.php +++ b/app/view/templates/home.php @@ -236,9 +236,15 @@ <?php $this->insert('footer', ['footer' => $footer]) ?> + +<?php if(!Wcms\Config::disablejavascript()) { ?> + <script src="<?= Wcms\Model::jspath() ?>home.bundle.js"></script> <?php } ?> +<?php } ?> + + <?php $this->stop() ?>
\ No newline at end of file diff --git a/app/view/templates/media.php b/app/view/templates/media.php index a8b7157..7f2101b 100644 --- a/app/view/templates/media.php +++ b/app/view/templates/media.php @@ -185,7 +185,12 @@ $this->layout('layout', ['title' => 'media', 'stylesheets' => [$css . 'home.css' </main> +<?php if(!Wcms\Config::disablejavascript()) { ?> + <script src="<?= Wcms\Model::jspath() ?>media.bundle.js"></script> +<?php } ?> + + <?php $this->stop('page') ?>
\ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 84df74f..b96cab2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1335,9 +1335,9 @@ } }, "codemirror": { - "version": "5.49.0", - "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.49.0.tgz", - "integrity": "sha512-Hyzr0HToBdZpLBN9dYFO/KlJAsKH37/cXVHPAqa+imml0R92tb9AkmsvjnXL+SluEvjjdfkDgRjc65NG5jnMYA==" + "version": "5.56.0", + "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.56.0.tgz", + "integrity": "sha512-MfKVmYgifXjQpLSgpETuih7A7WTTIsxvKfSLGseTY5+qt0E1UD1wblZGM6WLenORo8sgmf+3X+WTe2WF7mufyw==" }, "collection-visit": { "version": "1.0.0", diff --git a/package.json b/package.json index 5a7f3e3..102c75c 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "repository": "github:vincent-peugnet/wcms", "license": "MIT", "dependencies": { - "codemirror": "^5.49.0", + "codemirror": "^5.56.0", "cytoscape": "^3.14.1", "cytoscape-cose-bilkent": "^4.1.0" }, |