j1-template 2024.3.21 → 2024.3.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f56bc42f6f9037bdb6efb8972fa4c6d5f145ef4588bfb366332016463a10bc5
-  data.tar.gz: 4661ab124bf7b0435814dd487f08f9bda5729878c6261ea47d342b9b483b97bb
+  metadata.gz: 0de83c8644954a64d439a97054ca2e8ddfc9e35bccf5ba4c5e62731b2c9bd3db
+  data.tar.gz: be8c05d3ff902d257fca78d250fa86eb5c4c5ca96fe1aacc51d9902856eafb50
 SHA512:
-  metadata.gz: d15fcd27af97eb3f0fdebdcf71d3b610d5250f785a4e88fcc604e2b53c5b26a8c5b2e484401f5db436ab11c7c31e4152f0e5dbe4f002fd8613bc716ba2db461e
-  data.tar.gz: 7c764ff4352cdb8583103f835d869a60341b73aa2adbc4ad4aea98f9bc5a2a6cc4dd18fd2a5eea883ce808bd619c6a231282b36e62cc0f78b70e05a847ebaaec
+  metadata.gz: 2edd13fc4e637fc1323a1b0de4f0839f5bf449935f4392a94c7050a3d0250200dd30a9b46141482720e9fcaf3c126a2a71877fcef523ab30d18d3d5522f20262
+  data.tar.gz: 541a069d76c5ea146d5a79a8a072218f72d3839b5787bf8d671df3a9d8c0cdb773d5355255de0ccb6bce72c43b6727651578a86c0e2e26f7362d8a0a9d09db09

data/assets/data/amplitude_app.html

@@ -304,6 +304,8 @@ exclude_from_search:                    true
             <input
               id="volume_slider_{{player_id}}"
               class="mini-player amplitude-volume-slider"
+              data-amplitude-source="{{source_media_attribute}}"
+              data-amplitude-playlist="{{player_playlist}}"
               type="range"
               min="{{volume_slider_min}}"
               max="{{volume_slider_max}}"
@@ -353,8 +355,11 @@ exclude_from_search:                    true
                   <!-- place initial (first) info URL -->
                   {% if playlist_audio_info and forloop.first %}
                     <span class="amplitude-audio-info">
-                      <a class="audio-info-link" href="{{item.audio_info}}" target="_blank">
-                        <i class="mdib mdib-information md-gray-400 mdib-24px"></i>
+                      <a
+                        class="audio-info-link-{{player_playlist}} audio-info-link-screen-controls"
+                        data-amplitude-playlist="{{player_playlist}}"
+                        href="{{item.audio_info}}" target="_blank">
+                          <i class="mdib mdib-information md-gray-400 mdib-24px"></i>
                       </a>
                     </span>
                   {% else %}
@@ -379,16 +384,17 @@ exclude_from_search:                    true
 
                 <div class="song-artist-album">
                   <span
+                    class="artist audio-rating-screen-controls"
                     data-amplitude-source="{{source_media_attribute}}"
                     data-amplitude-playlist="{{player_playlist}}"
                     data-amplitude-song-info="artist">
                   </span>
-                  <span class="song-artist-album-delimiter">·</span>
+                  <!--span class="song-artist-album-delimiter">·</span>
                   <span
                     data-amplitude-source="audio"
                     data-amplitude-playlist="{{player_playlist}}"
                     data-amplitude-song-info="album">
-                  </span>  
+                  </span -->  
                 </div>
               </div>
               {% if playlist_controls %}
@@ -414,61 +420,59 @@ exclude_from_search:                    true
               </div>
               {% endif %}
             </div> <!-- END playlist controls -->
-            
 
             <!-- START playlist items (COMPACT player )-->
-            <div
+            <ul
               id="compact_player_title_list_{{player_playlist}}"
-              class="amplitude-scroller-gradient compact-player-title-list">
+              class="compact-player-title-list player-title-list playlist-scroller-gradient">
               {% for item in playlist_items %}{% if item.enabled %}
+              <li>
               <!-- START list item -->
-              <div
-                class="amplitude-song-container-compact-player song amplitude-song-container amplitude-play-pause amplitude-paused"
-                data-amplitude-source="{{source_media_attribute}}"
-                data-amplitude-song-index="{{forloop.index0}}"
-                data-amplitude-playlist="{{player_playlist}}">
-
-                <span class="song-number-now-playing">
-                  <span class="title-number">
-                    {{forloop.index}}
-                    <img
-                      class="now-playing"
-                      src="/assets/theme/j1/modules/amplitudejs/icons/player/dark/now-playing.svg"
-                      alt="now-playing">
-                  </span>
-                </span>
-
                 <div
-                  class="playlist-song-meta song-meta-container"
+                  class="amplitude-song-container-compact-player song amplitude-song-container amplitude-play-pause amplitude-paused"
                   data-amplitude-source="{{source_media_attribute}}"
+                  data-amplitude-song-index="{{forloop.index0}}"
                   data-amplitude-playlist="{{player_playlist}}">
 
-                  <span class="song-name">{{item.title}}</span>
-                  <span class="song-artist-album">
-                    <span>{{item.artist}}</span>
+                  <span class="song-number-now-playing">
+                    <span class="title-number">
+                      {{forloop.index}}
+                      <img
+                        class="now-playing"
+                        src="/assets/theme/j1/modules/amplitudejs/icons/player/dark/now-playing.svg"
+                        alt="now-playing">
+                    </span>
                   </span>
 
-                  <!-- place audio rating for playlist (COMPACT player) -->
-                  {% if playlist_audio_rating %}
-                    {% capture rating_image %}{{image_rating_path}}/{{item.rating}}-star.svg{% endcapture %}
-                    <span class="audio-rating" data-amplitude-playlist="{{player_playlist}}">
-                      <img src="{{rating_image}}" alt="song rating">
-                    </span>
-                  {% else %}
-                    <!-- place empty (span) element (placeholder) -->
-                    <span class="audio-rating audio-rating-screen-controls"></span>
-                  {% endif %}
+                  <div
+                    class="playlist-song-meta song-meta-container"
+                    data-amplitude-source="{{source_media_attribute}}"
+                    data-amplitude-playlist="{{player_playlist}}">
 
-                  <span class="audio-duration">{{item.duration}}</span>
+                    <span class="song-name">{{item.title}}</span>
+                    <span class="song-artist-album">
+                      <span>{{item.artist}}</span>
+                    </span>
 
-                </div> <!-- END song-meta-container -->
+                    <!-- place audio rating for playlist (COMPACT player) -->
+                    {% if playlist_audio_rating %}
+                      {% capture rating_image %}{{image_rating_path}}/{{item.rating}}-star.svg{% endcapture %}
+                      <span class="audio-rating" data-amplitude-playlist="{{player_playlist}}">
+                        <img src="{{rating_image}}" alt="song rating">
+                      </span>
+                    {% else %}
+                      <!-- place empty (span) element (placeholder) -->
+                      <span class="audio-rating audio-rating-screen-controls"></span>
+                    {% endif %}
 
+                    <span class="audio-duration">{{item.duration}}</span>
 
-              </div>
+                  </div> <!-- END song-meta-container -->
+                </div>
               <!-- END list item -->
+              </li>
               {% endif %}{% endfor %}
-
-            </div> <!-- END  playlist items -->
+            </ul> <!-- END  playlist items -->
 
           </div> <!-- END list screen -->
 
@@ -582,6 +586,8 @@ exclude_from_search:                    true
                         <input
                           id="volume_slider_{{player_id}}"
                           class="amplitude-volume-slider"
+                          data-amplitude-source="{{source_media_attribute}}"
+                          data-amplitude-playlist="{{player_playlist}}"
                           type="range"
                           min="{{volume_slider_min}}"
                           max="{{volume_slider_max}}"
@@ -718,12 +724,12 @@ exclude_from_search:                    true
                 data-amplitude-source="{{source_media_attribute}}"
                 data-amplitude-song-info="artist">
               </span>
-              <span class="song-artist-album-delimiter">·</span>
+              <!-- span class="song-artist-album-delimiter">·</span>
               <span
                 data-amplitude-playlist="{{player_playlist}}"
                 data-amplitude-source="{{source_media_attribute}}"
                 data-amplitude-song-info="album">
-              </span>
+              </span -->
             </span>
           </div>
 
@@ -822,6 +828,7 @@ exclude_from_search:                    true
                   <input
                     id="volume_slider_{{player_id}}"
                     class="amplitude-volume-slider"
+                    data-amplitude-playlist="{{player_playlist}}"
                     data-amplitude-source="{{source_media_attribute}}"
                     type="range"
                     min="{{volume_slider_min}}"
@@ -952,9 +959,12 @@ exclude_from_search:                    true
                   {% if playlist_audio_info and forloop.first %}
 
                   <!-- place initial (first element) info URL -->
-                  <span class="amplitude-audio-info">
-                    <a class="audio-info-link-{{player_playlist}} audio-info-link" href="{{item.audio_info}}" target="_blank">
-                      <i class="mdib mdib-information md-gray-400 mdib-24px"></i>
+                  <span class="amplitude-audio-info-large-player amplitude-audio-info">
+                    <a
+                      class="audio-info-link-{{player_playlist}} audio-info-link-screen-controls"
+                      data-amplitude-playlist="{{player_playlist}}"
+                      href="{{item.audio_info}}" target="_blank">
+                        <i class="mdib mdib-information md-gray-400 mdib-24px"></i>
                     </a>
                   </span>
                   {% else %}
@@ -990,13 +1000,13 @@ exclude_from_search:                    true
                       data-amplitude-song-info="artist">
                     </span>
                     <!-- jadams, 2024-12-08: make album info configurable -->
-                    <span class="song-artist-album-delimiter">·</span>
+                    <!-- span class="song-artist-album-delimiter">·</span>
                     <span
                       class="song-info-{{player_playlist}}"
                       data-amplitude-source="audio"
                       data-amplitude-playlist="{{player_playlist}}"
                       data-amplitude-song-info="album">
-                    </span>                    
+                    </span -->                    
                   </div>
                 </div>
 
@@ -1027,8 +1037,7 @@ exclude_from_search:                    true
               <!-- START playlist items (Large Player) -->
               <ul
                 id="large_player_title_list_{{player_playlist}}"
-                class="amplitude-scroller-gradient large-player-title-list"
-                style="margin-bottom: 0px; padding-left: 0px;">
+                class="large-player-title-list player-title-list playlist-scroller-gradient">
 
                 <!-- START Playlist item -->
                 <li>

data/assets/theme/j1/adapter/js/advertising.js

@@ -89,6 +89,8 @@ regenerate:                             true
 "use strict";
 j1.adapter.advertising = ((j1, window) => {
 
+  const isDev = (j1.env === "development" || j1.env === "dev") ? true : false;
+
   {% comment %} Set global variables
   ----------------------------------------------------------------------------- {% endcomment %}
   var environment           = '{{environment}}';
@@ -196,8 +198,8 @@ j1.adapter.advertising = ((j1, window) => {
           _this.ad_initializer();
 
           if (!validpublisherID) {
-            logger.warn('\n' + 'invalid publisher id: ' + publisherID);
-            logger.info('\n' + 'module disabled' );
+            isDev && logger.warn('invalid publisher id: ' + publisherID);
+            logger.info('module disabled' );
 
             clearInterval(dependencies_met_page_ready);
             return false;
@@ -210,22 +212,22 @@ j1.adapter.advertising = ((j1, window) => {
           // initialize state flag
           _this.setState('started');
 
-          logger.debug('\n' + 'state: ' + _this.getState());
+          logger.debug('state: ' + _this.getState());
 
           if (user_consent.personalization) {
-            logger.info('\n' + 'adsense api is being initialized');
+            logger.info('adsense api is being initialized');
 
             if (!validpublisherID) {
-              logger.debug('\n' + 'invalid publisherID detected for Google Adsense: ' + publisherID);
-              logger.info('\n' + 'skip initialization for provider: ' + advertisingProvider);
+              logger.debug('invalid publisherID detected for Google Adsense: ' + publisherID);
+              logger.info('skip initialization for provider: ' + advertisingProvider);
 
               return false;
             } else {
-              logger.info('\n' + 'use publisherID for Google Adsense: ' + publisherID);
+              logger.info('use publisherID for Google Adsense: ' + publisherID);
             }
 
             // add Google Adsense API dynamically in head section loaded async
-            logger.info('\n' + 'add Google AdsenseAPI in section: head');
+            logger.info('add Google AdsenseAPI in section: head');
 
             gasScript.async = true;
             gasScript.id    = 'gas-api';
@@ -233,22 +235,22 @@ j1.adapter.advertising = ((j1, window) => {
             gasScript.setAttribute('data-ad-client', publisherID);
 
             document.head.appendChild(gasScript);
-            logger.info('\n' + 'adsense api initialized');
+            logger.info('adsense api initialized');
 
             // setup monitor for state changes on all ads configured
             setTimeout(() => {
               var ads_found = (document.getElementsByClassName('adsbygoogle').length > 0) ? true : false;
               if (ads_found > 0) {
-                logger.info('\n' + 'setup Google Ad monitoring');
+                logger.info('setup Google Ad monitoring');
                 _this.ad_monitor();
               } else {
-                logger.warn('\n' + 'no initialized Google Ads found in page');
+                isDev && logger.warn('no initialized Google Ads found in page');
               }
             }, 1000);
 
             // run protection check
             if (checkTrackingProtection) {
-              logger.debug('\n' + 'run checks for tracking protection');
+              logger.debug('run checks for tracking protection');
 
               _this.check_tracking_protection();
               var dependencies_met_tracking_check_ready = setInterval (() => {
@@ -256,14 +258,14 @@ j1.adapter.advertising = ((j1, window) => {
                   var browser_tracking_feature = navigator.DoNotTrack;
 
                   if (!tracking_protection && !browser_tracking_feature) {
-                    logText = '\n' + 'tracking protection: disabled';
+                    logText = 'tracking protection: disabled';
                     logger.info(logText);
                   } else {
-                    logText = '\n' + 'tracking protection: enabled';
+                    logText = 'tracking protection: enabled';
                     logger.debug(logText);
 
                     if (showErrorPageOnBlocked) {
-                      logger.error('\n' + 'redirect to error page (blocked content): HTML-447');
+                      logger.error('redirect to error page (blocked content): HTML-447');
                       // redirect to error page: blocked content
                       window.location.href = '/447.html';
                     }
@@ -275,11 +277,11 @@ j1.adapter.advertising = ((j1, window) => {
             } else {
               // no protection check enabled
               _this.setState('finished');
-              logger.debug('\n' + 'state: ' + _this.getState());
-              logger.info('\n' + 'initializing module: finished');
+              logger.debug('state: ' + _this.getState());
+              logger.info('initializing module: finished');
 
               endTimeModule = Date.now();
-              logger.info('\n' + 'module initializing time: ' + (endTimeModule-startTimeModule) + 'ms');
+              logger.info('module initializing time: ' + (endTimeModule-startTimeModule) + 'ms');
 
               clearInterval(dependencies_met_tracking_check_ready);
             } // END if checkTrackingProtection
@@ -290,8 +292,8 @@ j1.adapter.advertising = ((j1, window) => {
               console.debug('cookies for personalization rejected');
               console.debug('initialization of module advertising skipped');
             } else {
-              logger.warn('\n' + 'user consent on personalization: ' + user_consent.personalization);
-              logger.warn('\n' + 'initializing module: skipped');
+              isDev && logger.warn('user consent on personalization: ' + user_consent.personalization);
+              isDev && logger.warn('initializing module: skipped');
             }
 
             // if consent is rejected, detect and remove Adsense cookies
@@ -305,13 +307,13 @@ j1.adapter.advertising = ((j1, window) => {
             if (checkTrackingProtection) {
               if (!user_consent.personalization) {
                 if (development) {
-                  logText = '\n' + 'consent on cookies disabled for personalization';
+                  logText = 'consent on cookies disabled for personalization';
                   logger.debug(logText);
                 }
 
                 if (showErrorPageOnBlocked) {
                   if (development) {
-                    logger.error('\n' + 'redirect to error page (blocked content): HTML-447');
+                    logger.error('redirect to error page (blocked content): HTML-447');
                   }
                   // redirect to error page: blocked content
                   window.location.href = '/448.html';
@@ -329,8 +331,8 @@ j1.adapter.advertising = ((j1, window) => {
             var ads_found = document.getElementsByClassName('adsbygoogle').length;
 
             logger = log4javascript.getLogger('j1.adapter.advertising');
-            logger.debug('\n' + 'found ads in page: #' + ads_found);
-            logger.debug('\n' + 'no ads initialized, advertising disabled');
+            logger.debug('found ads in page: #' + ads_found);
+            logger.debug('no ads initialized, advertising disabled');
 
           {% endif %} // END if 'advertising'
 
@@ -399,18 +401,18 @@ j1.adapter.advertising = ((j1, window) => {
                 ads_initialized ++;
               } else {
                 if (ad.layout === layout) {
-                  logger.warn('\n' + 'ad disabled on id ' + ad.id + ' for slot: ' + ad.slot);
+                  isDev && logger.warn('ad disabled on id ' + ad.id + ' for slot: ' + ad.slot);
                 }
               }
             } else {
-              logger.warn('\n' + 'skipped add settings on all ad containers');
+              isDev && logger.warn('skipped add settings on all ad containers');
             } // END if user_consent.personalization
 
           });
           // END loading adverting containers
 
           if (ads_initialized > 0) {
-            logger.info('\n' + 'ads enabled found in page (total): ' + ads_initialized);
+            logger.info('ads enabled found in page (total): ' + ads_initialized);
 
             var google_ads = document.getElementsByClassName('adsbygoogle');
             var counter    = document.getElementsByClassName('adsbygoogle').length;
@@ -431,7 +433,7 @@ j1.adapter.advertising = ((j1, window) => {
               counter --;
             });
           } else {
-            logger.warn('\n' + 'no ads found in page for layout: ' + layout);
+            isDev && logger.warn('no ads found in page for layout: ' + layout);
           } // END if ads_initialized
 
           clearInterval(dependencies_met_page_visible);
@@ -465,19 +467,19 @@ j1.adapter.advertising = ((j1, window) => {
               if (production) {
                 console.debug('detected ad blocks in state: unfilled');
               } else {
-                logger.warn('\n' + 'detected ad on slot ' + elm.adSlot + ' in state: ' + event.newValue);
+                isDev && logger.warn('detected ad on slot ' + elm.adSlot + ' in state: ' + event.newValue);
               }
               if (addBorderOnUnfilled) {
                 $('.adsbygoogle').addClass('border--dotted');
               }
               if (autoHideOnUnfilled) {
                 if (development) {
-                  logger.info('\n' + ' hide ad on slot: ' + elm.adSlot);
+                  logger.info(' hide ad on slot: ' + elm.adSlot);
                 }
                 $('.adsbygoogle').hide();
               }
             } else if (event.newValue === 'filled') {
-              logger.info('\n' + 'detected ad on slot ' + elm.adSlot + ' in state: ' + event.newValue);
+              logger.info('detected ad on slot ' + elm.adSlot + ' in state: ' + event.newValue);
             } else {
               var filled = (event.newValue.includes('display') ? true : false);
               var unfilled = (event.newValue.includes('dotted') ? true : false);
@@ -485,19 +487,19 @@ j1.adapter.advertising = ((j1, window) => {
                 if (production) {
                   console.info('detected ad blocks in state: filled');
                 } else {
-                  logger.info('\n' + 'detected ad block on slot ' + elm.adSlot + ' in state: filled');
+                  logger.info('detected ad block on slot ' + elm.adSlot + ' in state: filled');
                 }
               } else if (unfilled) {
                 if (production) {
                   console.info('detected ad blocks in state: unfilled');
                 } else {
-                  logger.info('\n' + 'detected ad block on slot ' + elm.adSlot + ' in state: unfilled');
+                  logger.info('detected ad block on slot ' + elm.adSlot + ' in state: unfilled');
                 }
               } else {
                 if (production) {
                   console.warn('unknown ad state detected: ' + event.newValue);
                 } else {
-                  logger.warn('\n' + 'unknown ad state detected on slot ' + elm.adSlot + ' : ' + event.newValue);
+                  isDev && logger.warn('unknown ad state detected on slot ' + elm.adSlot + ' : ' + event.newValue);
                 }
               }
             } // END if 'event.newValue'
@@ -521,7 +523,7 @@ j1.adapter.advertising = ((j1, window) => {
     check_tracking_protection: () => {
       var logger = log4javascript.getLogger('j1.adapter.advertising.monitor.tracking');
 
-      logText = '\n' + 'check for trackingprotection';
+      logText = 'check for trackingprotection';
       logger.info(logText);
 
       function checkTrackingProtection() {
@@ -543,7 +545,7 @@ j1.adapter.advertising = ((j1, window) => {
             tracking_protection = false;
           }).catch(e => {
             tracking_protection = true;
-            logger.debug('\n' + 'detection details: ' + e);
+            logger.debug('detection details: ' + e);
           });
         }
       }
@@ -558,7 +560,7 @@ j1.adapter.advertising = ((j1, window) => {
     messageHandler: (sender, message) => {
       var json_message = JSON.stringify(message, undefined, 2);
 
-      logText = '\n' + 'received message from ' + sender + ': ' + json_message;
+      logText = 'received message from ' + sender + ': ' + json_message;
       logger.debug(logText);
 
       // -----------------------------------------------------------------------
@@ -571,7 +573,7 @@ j1.adapter.advertising = ((j1, window) => {
         //
 
         if (development) {
-          logger.info('\n' + message.text);
+          logger.info(message.text);
         }
       }
 

data/assets/theme/j1/adapter/js/algolia.js

@@ -78,6 +78,8 @@ regenerate:                             false
 "use strict";
 j1.adapter.algolia = ((j1, window) => {
 
+  const isDev = (j1.env === "development" || j1.env === "dev") ? true : false;  
+
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
   var environment   = '{{environment}}';
@@ -126,8 +128,8 @@ j1.adapter.algolia = ((j1, window) => {
       startTimeModule = Date.now();
 
       _this.setState('started');
-      logger.debug('\n' + 'state: ' + _this.getState());
-      logger.info('\n' + 'module is being initialized');
+      isDev && logger.debug('state: ' + _this.getState());
+      logger.info('module is being initialized');
 
       {% comment %} Load module config from yaml data file
       -------------------------------------------------------------------------- {% endcomment %}
@@ -185,7 +187,7 @@ j1.adapter.algolia = ((j1, window) => {
         }
 
         // state = 'finished search';
-        // logger.debug('\n' + 'state: ' + state);
+        // isDev && logger.debug('state: ' + state);
       };
 
       if (moduleOptions.enabled == true) {
@@ -275,16 +277,16 @@ j1.adapter.algolia = ((j1, window) => {
         $('#searcher').addClass('row');
 
         _this.setState('finished');
-        logger.debug('\n' + 'state: ' + _this.getState());
-        logger.info('\n' + 'module initialized successfully');
+        isDev && logger.debug('state: ' + _this.getState());
+        logger.info('module initialized successfully');
 
         endTimeModule = Date.now();
-        logger.info('\n' + 'module initializing time: ' + (endTimeModule-startTimeModule) + 'ms');
+        logger.info('module initializing time: ' + (endTimeModule-startTimeModule) + 'ms');
       } else {
         $('#algolia-site-search').append('<p class="ml-5 mt-5 mb-5 "> <strong>Algolia Search DISABLED</strong> </p>');
         _this.setState('finished');
-        logger.debug('\n' + 'state: ' + _this.getState());
-        logger.warn('\n' + 'module disabled');
+        isDev && logger.debug('state: ' + _this.getState());
+        isDev && logger.warn('module disabled');
       } // END if moduleOptions enabled
 
       return true;
@@ -297,8 +299,8 @@ j1.adapter.algolia = ((j1, window) => {
     messageHandler: (sender, message) => {
       var json_message = JSON.stringify(message, undefined, 2);
 
-      logText = '\n' + 'received message from ' + sender + ': ' + json_message;
-      logger.debug(logText);
+      logText = 'received message from ' + sender + ': ' + json_message;
+      isDev && logger.debug(logText);
 
       // -----------------------------------------------------------------------
       //  Process commands|actions
@@ -309,7 +311,7 @@ j1.adapter.algolia = ((j1, window) => {
         // Place handling of command|action here
         //
 
-        logger.info('\n' + message.text);
+        logger.info(message.text);
       }
 
       //