diff --git a/src/components/com_kunena/language/en-GB/en-GB.com_kunena.templates.ini b/src/components/com_kunena/language/en-GB/en-GB.com_kunena.templates.ini index 245ceb5d43..4c390c72bd 100644 --- a/src/components/com_kunena/language/en-GB/en-GB.com_kunena.templates.ini +++ b/src/components/com_kunena/language/en-GB/en-GB.com_kunena.templates.ini @@ -426,6 +426,8 @@ COM_KUNENA_EDITOR_COLOR_WHITE = "White" COM_KUNENA_EDITOR_COLOR_GRAY = "Gray" COM_KUNENA_TEMPLATE_LOAD_TOOLTIPS="Load Tooltips" COM_KUNENA_TEMPLATE_LOAD_TOOLTIPS_DESC="Set Yes to load the Jquery tooltips" +COM_KUNENA_TEMPLATE_LOCALSTORAGE="Load Localstorage" +COM_KUNENA_TEMPLATE_LOCALSTORAGE_DESC="Remember the collapse state of the windows. Like announcements" ; Automatically generated strings for COM_KUNENA_MYPROFILE_* diff --git a/src/components/com_kunena/template/crypsis/assets/js/localstorage.js b/src/components/com_kunena/template/crypsis/assets/js/localstorage.js new file mode 100644 index 0000000000..183f7e8fa4 --- /dev/null +++ b/src/components/com_kunena/template/crypsis/assets/js/localstorage.js @@ -0,0 +1,18 @@ +jQuery(document).ready(function($) { + /* To hide or open collapse localStorage */ + $('.collapse').on('hidden', function () { + if (this.id) { + if (this.id != 'search') { + localStorage[this.id] = 'true'; + } + } + }).on('shown', function () { + if (this.id) { + localStorage.removeItem(this.id); + } + }).each(function () { + if (this.id && localStorage[this.id] === 'true') { + $(this).collapse('hide'); + } + }); +}); diff --git a/src/components/com_kunena/template/crypsis/assets/js/main.js b/src/components/com_kunena/template/crypsis/assets/js/main.js index 6af323af98..d40c0a6fa8 100644 --- a/src/components/com_kunena/template/crypsis/assets/js/main.js +++ b/src/components/com_kunena/template/crypsis/assets/js/main.js @@ -15,24 +15,7 @@ function kunenatableOrdering(order, dir, task, form) { form.submit(task); } -jQuery(document).ready(function ($) { - /* To hide or open collapse localStorage */ - $('.collapse').on('hidden', function () { - if (this.id) { - if (this.id != 'search') { - localStorage[this.id] = 'true'; - } - } - }).on('shown', function () { - if (this.id) { - localStorage.removeItem(this.id); - } - }).each(function () { - if (this.id && localStorage[this.id] === 'true') { - $(this).collapse('hide'); - } - }); - +jQuery(document).ready(function($) { /* To check or uncheck boxes to select items */ $('input.kcheckall').click(function () { $('.kcheck').prop('checked', $(this).prop("checked")); diff --git a/src/components/com_kunena/template/crypsis/config/config.xml b/src/components/com_kunena/template/crypsis/config/config.xml index 2b4c5a7971..4c239eafc0 100644 --- a/src/components/com_kunena/template/crypsis/config/config.xml +++ b/src/components/com_kunena/template/crypsis/config/config.xml @@ -127,16 +127,20 @@ + + + + + - + - - + diff --git a/src/components/com_kunena/template/crypsis/template.php b/src/components/com_kunena/template/crypsis/template.php index 7878a0cda6..656cf9e7ba 100644 --- a/src/components/com_kunena/template/crypsis/template.php +++ b/src/components/com_kunena/template/crypsis/template.php @@ -48,6 +48,14 @@ public function initialize() // Load JavaScript. $this->addScript('assets/js/main.js'); + $this->ktemplate = KunenaFactory::getTemplate(); + $storage = $this->ktemplate->params->get('storage'); + + if ($storage) + { + $this->addScript('assets/js/localstorage.js'); + } + // Compile CSS from LESS files. $this->compileLess('assets/less/crypsis.less', 'kunena.css'); $this->addStyleSheet('kunena.css'); @@ -67,9 +75,8 @@ public function initialize() $this->addStyleSheet('assets/css/custom.css'); } - $this->ktemplate = KunenaFactory::getTemplate(); - $bootstrap = $this->ktemplate->params->get('bootstrap'); - $doc = JFactory::getDocument(); + $bootstrap = $this->ktemplate->params->get('bootstrap'); + $doc = JFactory::getDocument(); if ($bootstrap) { diff --git a/src/components/com_kunena/template/crypsisb3/assets/js/localstorage.js b/src/components/com_kunena/template/crypsisb3/assets/js/localstorage.js new file mode 100644 index 0000000000..183f7e8fa4 --- /dev/null +++ b/src/components/com_kunena/template/crypsisb3/assets/js/localstorage.js @@ -0,0 +1,18 @@ +jQuery(document).ready(function($) { + /* To hide or open collapse localStorage */ + $('.collapse').on('hidden', function () { + if (this.id) { + if (this.id != 'search') { + localStorage[this.id] = 'true'; + } + } + }).on('shown', function () { + if (this.id) { + localStorage.removeItem(this.id); + } + }).each(function () { + if (this.id && localStorage[this.id] === 'true') { + $(this).collapse('hide'); + } + }); +}); diff --git a/src/components/com_kunena/template/crypsisb3/assets/js/main.js b/src/components/com_kunena/template/crypsisb3/assets/js/main.js index e48341e97f..a87ec677e9 100644 --- a/src/components/com_kunena/template/crypsisb3/assets/js/main.js +++ b/src/components/com_kunena/template/crypsisb3/assets/js/main.js @@ -15,24 +15,7 @@ function kunenatableOrdering(order, dir, task, form) { form.submit(task); } -jQuery(document).ready(function ($) { - /* To hide or open collapse localStorage */ - $('.collapse').on('hidden', function () { - if (this.id) { - if (this.id != 'search') { - localStorage[this.id] = 'true'; - } - } - }).on('shown', function () { - if (this.id) { - localStorage.removeItem(this.id); - } - }).each(function () { - if (this.id && localStorage[this.id] === 'true') { - $(this).collapse('hide'); - } - }); - +jQuery(document).ready(function($) { /* To check or uncheck boxes to select items */ $('input.kcheckall').click(function () { $('.kcheck').prop('checked', $(this).prop("checked")); diff --git a/src/components/com_kunena/template/crypsisb3/config/config.xml b/src/components/com_kunena/template/crypsisb3/config/config.xml index 637d14d8ce..76203316ec 100644 --- a/src/components/com_kunena/template/crypsisb3/config/config.xml +++ b/src/components/com_kunena/template/crypsisb3/config/config.xml @@ -122,16 +122,20 @@ + + + + + - + - - + diff --git a/src/components/com_kunena/template/crypsisb3/template.php b/src/components/com_kunena/template/crypsisb3/template.php index 3b909a7cf5..553007bdc7 100644 --- a/src/components/com_kunena/template/crypsisb3/template.php +++ b/src/components/com_kunena/template/crypsisb3/template.php @@ -102,6 +102,14 @@ public function initialize() $this->compileLess('assets/less/crypsisb3.less', 'kunena.css'); $this->addStyleSheet('kunena.css'); + $this->ktemplate = KunenaFactory::getTemplate(); + $storage = $this->ktemplate->params->get('storage'); + + if ($storage) + { + $this->addScript('assets/js/localstorage.js'); + } + $filenameless = JPATH_SITE . '/components/com_kunena/template/crypsisb3/assets/less/custom.less'; if (file_exists($filenameless) && 0 != filesize($filenameless)) @@ -117,9 +125,8 @@ public function initialize() $this->addStyleSheet('assets/css/custom.css'); } - $this->ktemplate = KunenaFactory::getTemplate(); - $fontawesome = $this->ktemplate->params->get('fontawesome'); - $doc = JFactory::getDocument(); + $fontawesome = $this->ktemplate->params->get('fontawesome'); + $doc = JFactory::getDocument(); if ($fontawesome) {