From 02bc32c773ebb78bdf13b3491d31625d10c5a1f3 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 28 Sep 2020 11:48:12 +0300 Subject: [PATCH 1/5] #2200 admin assuming language is Hausa --- .../defaultadmin-theme/resources/views/layouts/default.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/views/layouts/default.twig b/addons/default/visiosoft/defaultadmin-theme/resources/views/layouts/default.twig index 8fdd1fce8..8031c5e70 100644 --- a/addons/default/visiosoft/defaultadmin-theme/resources/views/layouts/default.twig +++ b/addons/default/visiosoft/defaultadmin-theme/resources/views/layouts/default.twig @@ -1,6 +1,6 @@ - + {% include "theme::partials/metadata" %} From db01b19c7bd241d9f1c3948d149b7827df5cdda9 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 28 Sep 2020 13:02:18 +0300 Subject: [PATCH 2/5] #2129 adding no follow to listing --- .../advs-module/resources/css/list.css | 5 ++++ .../views/list/partials/list-filter.twig | 4 ++-- .../views/list/partials/list-sort-by.twig | 24 +++++++++---------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/css/list.css b/addons/default/visiosoft/advs-module/resources/css/list.css index 9a5cdecf2..6cb92603a 100644 --- a/addons/default/visiosoft/advs-module/resources/css/list.css +++ b/addons/default/visiosoft/advs-module/resources/css/list.css @@ -141,4 +141,9 @@ a.sort-by-open-dropdown:hover { .list-view-type button small { font-weight: 500; color: #8598AA; +} + +.sort-by-item:hover { + text-decoration: underline; + cursor: pointer; } \ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig index b94efc4d6..0991832e0 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig @@ -1,5 +1,5 @@ {% set formHtml %} -
+ {% endset %} {% set catSlug = null %} {% set citySlug = null %} @@ -12,7 +12,7 @@ {% endif %} {% if catSlug %} {% set formHtml %} - + {% endset %} {% endif %} {{ formHtml }} diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-sort-by.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-sort-by.twig index 479055cbd..da17dfce7 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-sort-by.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-sort-by.twig @@ -8,34 +8,34 @@ From 471e426caffd4494d3f9fb13d1e2a33c035e64ea Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 28 Sep 2020 15:37:04 +0300 Subject: [PATCH 3/5] #2161 oc.com lazy loading for images --- .../resources/views/list/partials/ads.twig | 3 +- .../base-theme/resources/js/lazy-loading.js | 64 +++++++++++++++++++ .../resources/views/partials/assets.twig | 1 + 3 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 addons/default/visiosoft/base-theme/resources/js/lazy-loading.js diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig index 6b1a34ed6..2a26c3a9c 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig @@ -4,7 +4,8 @@
- {{ adv.name }}
diff --git a/addons/default/visiosoft/base-theme/resources/js/lazy-loading.js b/addons/default/visiosoft/base-theme/resources/js/lazy-loading.js new file mode 100644 index 000000000..866480c7d --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/js/lazy-loading.js @@ -0,0 +1,64 @@ +document.addEventListener("DOMContentLoaded", function() { + var lazyImages = [].slice.call(document.querySelectorAll(".lazy")); + + if ("IntersectionObserver" in window) { // If intersection observer is supported + let lazyImageObserver = new IntersectionObserver(function(entries, observer) { + entries.forEach(function(entry) { + if (entry.isIntersecting) { + let lazyImage = entry.target; + if (lazyImage.dataset.background) { + console.log(123) + lazyImage.style.backgroundImage = `url('${lazyImage.dataset.background}')` + } else { + lazyImage.src = lazyImage.dataset.src; + } + lazyImage.classList.remove("lazy"); + lazyImageObserver.unobserve(lazyImage); + } + }); + }); + + lazyImages.forEach(function(lazyImage) { + lazyImageObserver.observe(lazyImage); + }); + } else { // Fallback if intersection observer is not supported + let active = false; + + const lazyLoad = function() { + if (active === false) { + active = true; + + setTimeout(function() { + lazyImages.forEach(function(lazyImage) { + if ((lazyImage.getBoundingClientRect().top <= window.innerHeight + && lazyImage.getBoundingClientRect().bottom >= 0) + && getComputedStyle(lazyImage).display !== "none") { + if (lazyImage.dataset.background) { + lazyImage.style.backgroundImage = `url('${lazyImage.dataset.background}')` + } else { + lazyImage.src = lazyImage.dataset.src; + } + lazyImage.classList.remove("lazy"); + + lazyImages = lazyImages.filter(function(image) { + return image !== lazyImage; + }); + + if (lazyImages.length === 0) { + document.removeEventListener("scroll", lazyLoad); + window.removeEventListener("resize", lazyLoad); + window.removeEventListener("orientationchange", lazyLoad); + } + } + }); + + active = false; + }, 200); + } + }; + + document.addEventListener("scroll", lazyLoad); + window.addEventListener("resize", lazyLoad); + window.addEventListener("orientationchange", lazyLoad); + } +}); \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig b/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig index e623a9d63..d2df4bce3 100644 --- a/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig +++ b/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig @@ -13,6 +13,7 @@ {{ asset_add("theme.js", "visiosoft.theme.base::js/utils.js") }} {{ asset_add("theme.js", "visiosoft.theme.base::js/phonefield.js") }} {{ asset_add("theme.js", "visiosoft.theme.base::js/jquery.inputmask.bundle.min.js") }} +{{ asset_add("theme.js", "visiosoft.theme.base::js/lazy-loading.js") }} {# Theme Scripts #} {#{{ asset_add("theme.js", "visiosoft.theme.base::js/plugins/*") }}#} From db540108b730abc0240322b4498c496816e27fd5 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 28 Sep 2020 15:51:43 +0300 Subject: [PATCH 4/5] remove console log --- addons/default/visiosoft/base-theme/resources/js/lazy-loading.js | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/default/visiosoft/base-theme/resources/js/lazy-loading.js b/addons/default/visiosoft/base-theme/resources/js/lazy-loading.js index 866480c7d..e70dfed26 100644 --- a/addons/default/visiosoft/base-theme/resources/js/lazy-loading.js +++ b/addons/default/visiosoft/base-theme/resources/js/lazy-loading.js @@ -7,7 +7,6 @@ document.addEventListener("DOMContentLoaded", function() { if (entry.isIntersecting) { let lazyImage = entry.target; if (lazyImage.dataset.background) { - console.log(123) lazyImage.style.backgroundImage = `url('${lazyImage.dataset.background}')` } else { lazyImage.src = lazyImage.dataset.src; From baef7495ed5dd62259eacb693fbed7179ae4a019 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 28 Sep 2020 15:58:16 +0300 Subject: [PATCH 5/5] =?UTF-8?q?#2231=20Panel=20Logo=20De=C4=9Fi=C5=9Fecek?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../defaultadmin-theme/resources/config/settings.php | 8 +++++++- .../defaultadmin-theme/resources/lang/en/setting.php | 7 +++++-- .../defaultadmin-theme/resources/views/login.twig | 8 ++++---- .../resources/views/partials/topbar.twig | 4 ++-- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/config/settings.php b/addons/default/visiosoft/defaultadmin-theme/resources/config/settings.php index 329e91fff..c93613ca2 100644 --- a/addons/default/visiosoft/defaultadmin-theme/resources/config/settings.php +++ b/addons/default/visiosoft/defaultadmin-theme/resources/config/settings.php @@ -6,7 +6,13 @@ return [ 'type' => 'anomaly.field_type.textarea', 'input_view' => 'visiosoft.theme.defaultadmin::admin/navigation/settings', ], - "icon" => [ + "login_icon" => [ + "type" => "anomaly.field_type.file", + "config" => [ + "folders" => ['images'], + ] + ], + "panel_icon" => [ "type" => "anomaly.field_type.file", "config" => [ "folders" => ['images'], diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/en/setting.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/en/setting.php index 1ce7e1483..5fdd0c618 100644 --- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/en/setting.php +++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/en/setting.php @@ -11,8 +11,11 @@ return [ 'warning' => 'The first accessible navigation item is used as the home area.', 'reorder' => 'Drag and drop the primary navigation items in the sidebar to reorder them.', ], - "icon" => [ - 'name' => 'Icon', + "login_icon" => [ + 'name' => 'Login Icon', + ], + "panel_icon" => [ + 'name' => 'Panel Icon', ], "title" => [ 'name' => 'Title', diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/views/login.twig b/addons/default/visiosoft/defaultadmin-theme/resources/views/login.twig index e150db2bd..174877348 100644 --- a/addons/default/visiosoft/defaultadmin-theme/resources/views/login.twig +++ b/addons/default/visiosoft/defaultadmin-theme/resources/views/login.twig @@ -4,8 +4,8 @@