#3350087: Page display issue (when aggregate js)

CHANGELOG.txt

 CHANGELOG - ZERO POINT responsive theme for Drupal 8, 9 and 10.
 
+0 Point 8.x-1.7 (Mar 29, 2023)
+------------------------------
+    - #3350087: Page display issue (when aggregate js)
+
 0 Point 8.x-1.6 (Mar 19, 2023)
 ------------------------------
-    - CSS and twig templates improvment.
+    - CSS and twig templates improvement.
     - Reworking some images.
 
 0 Point 8.x-1.5 (Feb 22, 2023)

config/install/zeropoint.settings.yml

@@ -28,7 +28,6 @@ pageicons: 1
 roundcorners: 1
 headerimg: 1
 devlink: 1
-httpheaders: 1
 
 # Breadcrumbs display
 breadcrumb_display: 1
@@ -54,11 +53,11 @@ slide2_head: 'Headline 2'
 slide3_head: 'Headline 3'
 slide4_head: 'Headline 4'
 slide5_head: 'Headline 5'
-slide1_image_url: '/themes/zeropoint/_custom/sliderimg/slide-1.jpg'
-slide2_image_url: '/themes/zeropoint/_custom/sliderimg/slide-2.jpg'
-slide3_image_url: '/themes/zeropoint/_custom/sliderimg/slide-3.jpg'
-slide4_image_url: '/themes/zeropoint/_custom/sliderimg/slide-4.jpg'
-slide5_image_url: '/themes/zeropoint/_custom/sliderimg/slide-5.jpg'
+slide1_image_url: '/themes/contrib/zeropoint/_custom/sliderimg/slide-1.jpg'
+slide2_image_url: '/themes/contrib/zeropoint/_custom/sliderimg/slide-2.jpg'
+slide3_image_url: '/themes/contrib/zeropoint/_custom/sliderimg/slide-3.jpg'
+slide4_image_url: '/themes/contrib/zeropoint/_custom/sliderimg/slide-4.jpg'
+slide5_image_url: '/themes/contrib/zeropoint/_custom/sliderimg/slide-5.jpg'
 slide1_desc: 'Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit...'
 slide2_desc: 'Morbi id lacus. Etiam malesuada diam ut libero. Sed blandit, justo nec euismod laoreet, nunc nulla iaculis elit, vitae'
 slide3_desc: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin sed libero in nisl consequat tincidunt eget et libero.'
@@ -75,3 +74,7 @@ social_links_display: 1
 facebook_url: 'https://www.facebook.com/cfradut'
 linkedin_url: 'https://www.linkedin.com/in/cfradut'
 drupal_url: 'https://www.drupal.org/u/florian'
+
+# Other settings
+httpheaders: 1
+toolbarfix: 1

css/_toolbarfix.css

+.toolbar-fixed #pgwp {
+	padding: 2.5em 0 0;
+}
\ No newline at end of file

css/z_style.css

@@ -797,9 +797,6 @@ a#edit-delete.button {
 
 
 /*** MODULE SPECIFIC STYLES ***/
-.toolbar-fixed #pgwp {
-	padding: 2.5em 0 0;
-}
 .book-navigation ul.book-pager {
 	border-top: 1px dashed #ccc;
 	border-bottom: 1px dashed #ccc;

theme-settings.php

@@ -267,7 +267,7 @@ function zeropoint_form_system_theme_settings_alter(&$form, \Drupal\Core\Form\Fo
     '#description'   => t('Check this option to show Slideshow on all pages.'),
   );
   $form['slideshow']['slideimage'] = array(
-    '#markup' => t('<sup>To change the slide images, you can choose from predefined images in _custom/sliderimg folder of the theme or from any other folder or server, <b>Image URL</b> must be formated as "/themes/zeropoint/_custom/sliderimg/IMAGE" or "//otherserver.com/IMAGE". The slides are language aware and <b>Slide URL</b> can point to Home (if left blank), internal pages ("/node/NODE_NUMBER"), or any page on Internet ("//www.website.com"). </sup>'),
+    '#markup' => t('<sup>To change the slide images, you can choose from predefined images in _custom/sliderimg folder of the theme or from any other folder or server, <b>Image URL</b> must be formated as "/themes/contrib/zeropoint/_custom/sliderimg/IMAGE" or "//otherserver.com/IMAGE". The slides are language aware and <b>Slide URL</b> can point to Home (if left blank), internal pages ("/node/NODE_NUMBER"), or any page on Internet ("//www.website.com"). </sup>'),
   );
   $form['slideshow']['slide1'] = array(
     '#type' => 'details',
@@ -553,6 +553,12 @@ function zeropoint_form_system_theme_settings_alter(&$form, \Drupal\Core\Form\Fo
     '#description' => t('If your blocks need to update the content every time there is a page load, you can disable cache for all blocks.'),
     '#default_value' => theme_get_setting('blockscache'),
   );
+  $form['themedev']['toolbarfix'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Toolbar fix'),
+    '#description' => t('Adds additional space under the toolbar.'),
+    '#default_value' => theme_get_setting('toolbarfix'),
+  );
   $form['themedev']['siteid'] = array(
     '#type' => 'textfield',
     '#title' => t('Site ID: '),

zeropoint.libraries.yml

@@ -152,6 +152,12 @@ zeropoint-montserrat-regular:
       css/_montserrat-regular.css: {}
       '//fonts.googleapis.com/css?family=Montserrat&display=swap': { type: external, minified: true }
 
+zeropoint-toolbarfix:
+  Version: VERSION
+  css:
+    theme:
+      css/_toolbarfix.css: {}
+
 # *** Color Styles START ***
 
 zeropoint-style-grey:

zeropoint.theme

@@ -267,6 +267,8 @@ function zeropoint_preprocess_page(&$variables) {
     'drupal_url',
     'rss_url',
     'myother_url',
+// Other settings
+    'toolbarfix',
   ];
   foreach ($pvar as $value) {
     $variables[$value] = theme_get_setting($value);
@@ -413,6 +415,10 @@ function zeropoint_preprocess_page(&$variables) {
   if ($sociald == '1') {
     $variables['#attached']['library'][] = 'zeropoint/zeropoint-social';
   }
+  $toolbarfix = theme_get_setting('toolbarfix');
+  if ($toolbarfix == '1') {
+    $variables['#attached']['library'][] = 'zeropoint/zeropoint-toolbarfix';
+  }
 }
 
 
@@ -703,6 +709,18 @@ function zeropoint_preprocess_field(&$variables, $hook) {
 }
 
 
+/**
+ * Implements hook_js_alter().
+ */
+function zeropoint_js_alter(&$js) {
+  foreach ($js as $path => &$values) {
+    if (is_string($values['data']) && strpos($values['data'], 'js/toggles.min.js') !== FALSE) {
+      $values['preprocess'] = FALSE;
+    }
+  }
+}
+
+
 /**
  * Use language code for the language switcher
  */