Add support for BizMark.Quicksilver.

PictureElement · Jan 30, 2023 · 7b5d4a2 · 7b5d4a2
1 parent 5144865
commit 7b5d4a2
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 41 deletions.
diff --git a/README.md b/README.md
@@ -47,12 +47,13 @@ Rapido is a polished single-page business-oriented theme with a blog.
 * Maintenance
 
 ## Required plugins
-* [Msof.Portfolio](https://octobercms.com/plugin/msof-portfolio) - Ajax-powered Masonry portfolio with category filters and a modal dialog.
+* [BizMark.Quicksilver](https://octobercms.com/plugin/bizmark-quicksilver) - The fastest static files cache system for OctoberCMS.
 * [BlakeJones.MagicForms](https://octobercms.com/plugin/blakejones-magicforms) - Create easy AJAX forms.
 * [OFFLINE.SiteSearch](https://octobercms.com/plugin/offline-sitesearch) - Global search for your frontend.
 * [Tallpro.Related](https://octobercms.com/plugin/tallpro-related) - Get related articles by category.
 * PolloZen.MostVisited - Register visit to RainLab Blog publication and retrieve the most visited publications.
 * [Rahman.BlogTags](https://octobercms.com/plugin/rahman-blogtags) - Blog tags for rainlab.blog plugin.
+* [Msof.Portfolio](https://octobercms.com/plugin/msof-portfolio) - Ajax-powered Masonry portfolio with category filters and a modal dialog.
 * [RainLab.Blog](https://octobercms.com/plugin/rainlab-blog) - A robust blogging platform.
 
 ## Contribution

diff --git a/pages/blog-category.htm b/pages/blog-category.htm
@@ -129,15 +129,15 @@ <h2>Latest posts from “{{ categoryName }}”</h2>
 
 {# STYLES #}
 {% put styles %}
-    <link href="{{ [
+    <link rel="stylesheet" href="{{ [
         'assets/vendor/@fortawesome/fontawesome-free/css/all.min.css',
         'assets/vendor/aos/dist/aos.css',
         'assets/vendor/cookieconsent/build/cookieconsent.min.css',
         'assets/sass/rapido.scss'
-    ]|theme }}" rel="stylesheet">
+    ]|theme }}">
 {% endput %}
 
 {# SCRIPTS #}
 {% put scripts %}
-    <script src="{{ 'assets/vendor/bootstrap/dist/js/bootstrap.min.js'|theme }}"></script>
+    <script type="text/javascript" src="{{ 'assets/vendor/bootstrap/dist/js/bootstrap.min.js'|theme }}"></script>
 {% endput %}
diff --git a/pages/blog-tag.htm b/pages/blog-tag.htm
@@ -126,15 +126,15 @@ <h2>Total results: {{ searchPosts.posts.total }}</h2>
 
 {# STYLES #}
 {% put styles %}
-    <link href="{{ [
+    <link rel="stylesheet" href="{{ [
         'assets/vendor/@fortawesome/fontawesome-free/css/all.min.css',
         'assets/vendor/aos/dist/aos.css',
         'assets/vendor/cookieconsent/build/cookieconsent.min.css',
         'assets/sass/rapido.scss'
-    ]|theme }}" rel="stylesheet">
+    ]|theme }}">
 {% endput %}
 
 {# SCRIPTS #}
 {% put scripts %}
-    <script src="{{ 'assets/vendor/bootstrap/dist/js/bootstrap.min.js'|theme }}"></script>
+    <script type="text/javascript" src="{{ 'assets/vendor/bootstrap/dist/js/bootstrap.min.js'|theme }}"></script>
 {% endput %}
diff --git a/pages/blog.htm b/pages/blog.htm
@@ -115,15 +115,15 @@ <h2>Latest posts</h2>
 
 {# STYLES #}
 {% put styles %}
-    <link href="{{ [
+    <link rel="stylesheet" href="{{ [
         'assets/vendor/@fortawesome/fontawesome-free/css/all.min.css',
         'assets/vendor/aos/dist/aos.css',
         'assets/vendor/cookieconsent/build/cookieconsent.min.css',
         'assets/sass/rapido.scss'
-    ]|theme }}" rel="stylesheet">
+    ]|theme }}">
 {% endput %}
 
 {# SCRIPTS #}
 {% put scripts %}
-    <script src="{{ 'assets/vendor/bootstrap/dist/js/bootstrap.min.js'|theme }}"></script>
+    <script type="text/javascript" src="{{ 'assets/vendor/bootstrap/dist/js/bootstrap.min.js'|theme }}"></script>
 {% endput %}
diff --git a/pages/error-500.htm b/pages/error-500.htm
@@ -29,15 +29,15 @@
 
 {# STYLES #}
 {% put styles %}
-    <link href="{{ [
+    <link rel="stylesheet" href="{{ [
         'assets/vendor/@fortawesome/fontawesome-free/css/all.min.css',
         'assets/vendor/aos/dist/aos.css',
         'assets/vendor/cookieconsent/build/cookieconsent.min.css',
         'assets/sass/rapido.scss'
-    ]|theme }}" rel="stylesheet">
+    ]|theme }}">
 {% endput %}
 
 {# SCRIPTS #}
 {% put scripts %}
-    <script src="{{ 'assets/vendor/bootstrap/dist/js/bootstrap.min.js'|theme }}"></script>
+    <script type="text/javascript" src="{{ 'assets/vendor/bootstrap/dist/js/bootstrap.min.js'|theme }}"></script>
 {% endput %}
diff --git a/pages/home.htm b/pages/home.htm
@@ -144,20 +144,20 @@ <h2>{{ this.theme.projects_title }}</h2>
 {% if this.theme.projects_enable == 1 %}
     {# STYLES #}
     {% put styles %}
-        <link href="{{ [
+        <link rel="stylesheet" href="{{ [
             'assets/vendor/@fortawesome/fontawesome-free/css/all.min.css',
             'assets/vendor/owl.carousel2/dist/assets/owl.carousel.min.css',
             'assets/vendor/owl.carousel2/dist/assets/owl.theme.default.min.css',
             'assets/vendor/aos/dist/aos.css',
             'assets/vendor/cookieconsent/build/cookieconsent.min.css',
             'assets/sass/rapido.scss'
-        ]|theme }}" rel="stylesheet">
+        ]|theme }}">
     {% endput %}
 
     {# SCRIPTS #}
     {% put scripts %}
-        <script src="{{ 'assets/vendor/bootstrap/dist/js/bootstrap.min.js'|theme }}"></script>
-        <script src="{{ [
+        <script type="text/javascript" src="{{ 'assets/vendor/bootstrap/dist/js/bootstrap.min.js'|theme }}"></script>
+        <script type="text/javascript" src="{{ [
             '@framework',
             'assets/vendor/owl.carousel2/dist/owl.carousel.min.js',
             'assets/vendor/counterup2/dist/index.js',
@@ -167,21 +167,21 @@ <h2>{{ this.theme.projects_title }}</h2>
 {% else %}
     {# STYLES #}
     {% put styles %}
-        <link href="{{ [
+        <link rel="stylesheet" href="{{ [
             'assets/vendor/@fortawesome/fontawesome-free/css/all.min.css',
             'assets/vendor/owl.carousel2/dist/assets/owl.carousel.min.css',
             'assets/vendor/owl.carousel2/dist/assets/owl.theme.default.min.css',
             'assets/vendor/aos/dist/aos.css',
             'assets/vendor/cookieconsent/build/cookieconsent.min.css',
             'assets/vendor/@fancyapps/fancybox/dist/jquery.fancybox.min.css',
             'assets/sass/rapido.scss'
-        ]|theme }}" rel="stylesheet">
+        ]|theme }}">
     {% endput %}
 
     {# SCRIPTS #}
     {% put scripts %}
-        <script src="{{ 'assets/vendor/bootstrap/dist/js/bootstrap.min.js'|theme }}"></script>
-        <script src="{{ [
+        <script type="text/javascript" src="{{ 'assets/vendor/bootstrap/dist/js/bootstrap.min.js'|theme }}"></script>
+        <script type="text/javascript" src="{{ [
             '@framework',
             'assets/vendor/owl.carousel2/dist/owl.carousel.min.js',
             'assets/vendor/counterup2/dist/index.js',

diff --git a/pages/maintenance.htm b/pages/maintenance.htm
@@ -4,11 +4,11 @@
 ==
 {# STYLES #}
 {% put styles %}
-    <link href="{{ [
+    <link rel="stylesheet" href="{{ [
         'assets/vendor/@fortawesome/fontawesome-free/css/all.min.css',
         'assets/vendor/aos/dist/aos.css',
         'assets/sass/rapido.scss'
-    ]|theme }}" rel="stylesheet">
+    ]|theme }}">
 {% endput %}
 
 <!doctype html>
@@ -79,8 +79,8 @@ <h1 data-aos="fade-up" data-aos-once="true" class="alert-heading my-2">{{ this.t
         </main>
 
         {# SCRIPTS #}
-        <script src="{{ [
-            '@jquery',
+        <script type="text/javascript" src="{{ [
+            'assets/vendor/jquery/dist/jquery.min.js',
             'assets/vendor/aos/dist/aos.js',
             'assets/js/rapido.js'
         ]|theme }}"></script>

diff --git a/pages/page-not-found-404.htm b/pages/page-not-found-404.htm
@@ -29,15 +29,15 @@
 
 {# STYLES #}
 {% put styles %}
-    <link href="{{ [
+    <link rel="stylesheet" href="{{ [
         'assets/vendor/@fortawesome/fontawesome-free/css/all.min.css',
         'assets/vendor/aos/dist/aos.css',
         'assets/vendor/cookieconsent/build/cookieconsent.min.css',
         'assets/sass/rapido.scss'
-    ]|theme }}" rel="stylesheet">
+    ]|theme }}">
 {% endput %}
 
 {# SCRIPTS #}
 {% put scripts %}
-    <script src="{{ 'assets/vendor/bootstrap/dist/js/bootstrap.min.js'|theme }}"></script>
+    <script type="text/javascript" src="{{ 'assets/vendor/bootstrap/dist/js/bootstrap.min.js'|theme }}"></script>
 {% endput %}
diff --git a/pages/post.htm b/pages/post.htm
@@ -136,20 +136,20 @@
 
 {# STYLES #}
 {% put styles %}
-    <link href="{{ [
+    <link rel="stylesheet" href="{{ [
         'assets/vendor/@fortawesome/fontawesome-free/css/all.min.css',
         'assets/vendor/owl.carousel2/dist/assets/owl.carousel.min.css',
         'assets/vendor/owl.carousel2/dist/assets/owl.theme.default.min.css',
         'assets/vendor/aos/dist/aos.css',
         'assets/vendor/cookieconsent/build/cookieconsent.min.css',
         'assets/sass/rapido.scss'
-    ]|theme }}" rel="stylesheet">
+    ]|theme }}">
 {% endput %}
 
 {# SCRIPTS #}
 {% put scripts %}
-    <script src="{{ 'assets/vendor/bootstrap/dist/js/bootstrap.bundle.min.js'|theme }}"></script>
-    <script src="{{ [
+    <script type="text/javascript" src="{{ 'assets/vendor/bootstrap/dist/js/bootstrap.bundle.min.js'|theme }}"></script>
+    <script type="text/javascript" src="{{ [
         'assets/vendor/owl.carousel2/dist/owl.carousel.min.js',
         'assets/vendor/clipboard/dist/clipboard.min.js'
     ]|theme }}"></script>

diff --git a/pages/privacy-policy.htm b/pages/privacy-policy.htm
@@ -36,15 +36,15 @@
 
 {# STYLES #}
 {% put styles %}
-    <link href="{{ [
+    <link rel="stylesheet" href="{{ [
         'assets/vendor/@fortawesome/fontawesome-free/css/all.min.css',
         'assets/vendor/aos/dist/aos.css',
         'assets/vendor/cookieconsent/build/cookieconsent.min.css',
         'assets/sass/rapido.scss'
-    ]|theme }}" rel="stylesheet">
+    ]|theme }}">
 {% endput %}
 
 {# SCRIPTS #}
 {% put scripts %}
-    <script src="{{ 'assets/vendor/bootstrap/dist/js/bootstrap.min.js'|theme }}"></script>
+    <script type="text/javascript" src="{{ 'assets/vendor/bootstrap/dist/js/bootstrap.min.js'|theme }}"></script>
 {% endput %}
diff --git a/pages/search-results.htm b/pages/search-results.htm
@@ -59,15 +59,15 @@ <h2>Total results: {{ searchResults.results.total }}</h2>
 
 {# STYLES #}
 {% put styles %}
-    <link href="{{ [
+    <link rel="stylesheet" href="{{ [
         'assets/vendor/@fortawesome/fontawesome-free/css/all.min.css',
         'assets/vendor/aos/dist/aos.css',
         'assets/vendor/cookieconsent/build/cookieconsent.min.css',
         'assets/sass/rapido.scss'
-    ]|theme }}" rel="stylesheet">
+    ]|theme }}">
 {% endput %}
 
 {# SCRIPTS #}
 {% put scripts %}
-    <script src="{{ 'assets/vendor/bootstrap/dist/js/bootstrap.min.js'|theme }}"></script>
+    <script type="text/javascript" src="{{ 'assets/vendor/bootstrap/dist/js/bootstrap.min.js'|theme }}"></script>
 {% endput %}
diff --git a/partials/global/scripts.htm b/partials/global/scripts.htm
@@ -1,10 +1,10 @@
-<script src="{{ [
+<script type="text/javascript" src="{{ [
     'assets/vendor/jquery/dist/jquery.min.js',
     'assets/vendor/aos/dist/aos.js',
     'assets/vendor/cookieconsent/build/cookieconsent.min.js'
 ]|theme }}"></script>
 
-<script>
+<script type="text/javascript">
     // Add Analytics
     function addAnalytics() {
         window['ga-disable-{{ this.theme.misc_analytics_id }}'] = false;

diff --git a/theme.yaml b/theme.yaml
@@ -7,6 +7,7 @@ code: rapido
 database: '0'
 previewImage: assets/images/theme-preview.png
 require:
+    - BizMark.Quicksilver
     - BlakeJones.MagicForms
     - OFFLINE.SiteSearch
     - Tallpro.Related

diff --git a/version.yaml b/version.yaml
@@ -25,4 +25,5 @@
 4.0.6: Fix for "Unable to preventDefault inside passive event listener due to target being treated as passive" errors.
 4.0.7: Update frontend vendor libraries.
 4.0.8: Move bootstrap.min.js and bootstrap.bundle.min.js outside the combiner.
-4.0.9: Fix minor CSS specificity issue.
+4.0.9: Fix minor CSS specificity issue.
+4.1.0: Add support for BizMark.Quicksilver.