feat: change log output and template structure

- new global variable debugMode
- demo templates are now based on hippie defaults joined with template inheritance
- add log macros
- new function logAdd()
- log uses global state

source/screens/basics.njk

@@ -1,8 +1,8 @@
-<!-- basics.screen -->
+<!-- basics.page -->
 {% set pageBase = "../" %}
 {% set pageId = "basics" %}
 
-{% extends "demo/_extended.njk" %}
+{% extends "demo/_docs.njk" %}
 
 {% block title %}Grundlagen{% endblock %}
 {% block head %}
@@ -959,12 +959,11 @@
   <script src="{{ pageBase }}js/variables.js"></script>
   <script src="{{ pageBase }}js/functions.js"></script>
   <script src="{{ pageBase }}js/global.js"></script>
-  <!-- endbuild -->
   <script>
-    // Page specific
-    // ------------------------------------------------------------------------------
     assetsLoaded = true;
     logPerf('Assets loaded.', assetsLoaded);
+    // Page specific
+    // ------------------------------------------------------------------------------
     // Create instance of object made by contructor function
     var scrollUi = new HippieScroll($('.js_scrolltop'), $('.js_scrolldown'));
     var helpUi = new HippieMeta($('.js_showmeta'), $('.js_pop'));
@@ -976,6 +975,6 @@
     $(document).scroll(function () {
       scrollUi.check();
     });
-    logPerf('Application ready.');
+    logPerf('Application ready... not.');
   </script>
 {% endblock %}

source/screens/components.njk

@@ -2,7 +2,7 @@
 {% set pageBase = "../" %}
 {% set pageId = "components" %}
 
-{% extends "demo/_extended.njk" %}
+{% extends "demo/_docs.njk" %}
 
 {% block title %}Komponenten{% endblock %}
 {% block head %}
@@ -69,7 +69,8 @@
   <script src="{{ pageBase }}js/variables.js"></script>
   <script src="{{ pageBase }}js/functions.js"></script>
   <script src="{{ pageBase }}js/global.js"></script>
-  <!-- endbuild -->
+  {{ log.asset(true) }}
+  {{ log.log('Assets loaded.', assetsLoaded) }}
   <script>
     // Page specific
     // ------------------------------------------------------------------------------

source/screens/demo/card.njk

@@ -3,7 +3,7 @@
 {% set pageId = "card" %}
 {% set pageClass = "html_card" %}
 
-{% extends "demo/_default.njk" %}
+{% extends "demo/_demo.njk" %}
 {% import "hippie/macros/_placeholder.njk" as ph %}
 
 {% block title %}Karte{% endblock %}
@@ -60,7 +60,6 @@
   <script src="{{ pageBase }}js/variables.js"></script>
   <script src="{{ pageBase }}js/functions.js"></script>
   <script src="{{ pageBase }}js/global.js"></script>
-  <!-- endbuild -->
   <script>
     $(document).ready(function () {
       // composeMail('.card_address', 'neues', 'interaktionsweise', 'de', '', '');

source/screens/demo/portal.njk

@@ -3,7 +3,7 @@
 {% set pageId = "index" %}
 {% set bodyClass = "body_portal" %}
 
-{% extends "demo/_default.njk" %}
+{% extends "demo/_demo.njk" %}
 
 {% import "demo/macros/_gates.njk" as gate %}
 

source/screens/index.njk

@@ -3,7 +3,7 @@
 {% set pageId = "index" %}
 {% set pageClass = "h_full_view" %}
 
-{% extends "demo/_default.njk" %}
+{% extends "demo/_demo.njk" %}
 
 {% block title %}Index{% endblock %}
 {% block head %}
@@ -71,16 +71,15 @@
   <script src="{{ pageBase }}js/variables.js"></script>
   <script src="{{ pageBase }}js/functions.js"></script>
   <script src="{{ pageBase }}js/global.js"></script>
-  <!-- endbuild -->
   <script>
-    // Page specific
-    // ------------------------------------------------------------------------------
     assetsLoaded = true;
     logPerf('BODY        :: Assets loaded, running page specific script...');
+    // Page specific
+    // ------------------------------------------------------------------------------
     $(document).ready(function () {
       logPerf('EVENT       :: jQuery \'ready\' event fired.');
       setup();
-      logPerf('Application ready.');
     });
+    logPerf('Application ready... not.');
   </script>
 {% endblock %}

source/screens/introduction.njk

@@ -1,8 +1,8 @@
-<!-- introduction.screen -->
+<!-- introduction.page -->
 {% set pageBase = "../" %}
 {% set pageId = "intro" %}
 
-{% extends "demo/_extended.njk" %}
+{% extends "demo/_docs.njk" %}
 
 {% block title %}Einführung{% endblock %}
 {% block head %}
@@ -23,8 +23,6 @@
       <p>&hellip;</p>
     </article>
   </section>
-
-
 {% endblock %}
 
 {% block script %}
@@ -34,12 +32,11 @@
   <script src="{{ pageBase }}js/variables.js"></script>
   <script src="{{ pageBase }}js/functions.js"></script>
   <script src="{{ pageBase }}js/global.js"></script>
-  <!-- endbuild -->
   <script>
-    // Page specific
-    // ------------------------------------------------------------------------------
     assetsLoaded = true;
     logPerf('Assets loaded.', assetsLoaded);
+    // Page specific
+    // ------------------------------------------------------------------------------
     // Create instance of object made by contructor function
     var scrollUi = new HippieScroll($('.js_scrolltop'), $('.js_scrolldown'));
     var helpUi = new HippieMeta($('.js_showmeta'), $('.js_pop'));
@@ -51,6 +48,6 @@
     $(document).scroll(function () {
       scrollUi.check();
     });
-    logPerf('Application ready.');
+    logPerf('Application ready... not.');
   </script>
 {% endblock %}

source/screens/layouts.njk

@@ -2,7 +2,7 @@
 {% set pageBase = "../" %}
 {% set pageId = "layouts" %}
 
-{% extends "demo/_extended.njk" %}
+{% extends "demo/_docs.njk" %}
 
 {% block title %}Gestaltungen{% endblock %}
 {% block head %}
@@ -322,7 +322,8 @@
   <script src="{{ pageBase }}js/variables.js"></script>
   <script src="{{ pageBase }}js/functions.js"></script>
   <script src="{{ pageBase }}js/global.js"></script>
-  <!-- endbuild -->
+  {{ log.asset(true) }}
+  {{ log.log('Assets loaded.', assetsLoaded) }}
   <script>
     // Page specific
     // ------------------------------------------------------------------------------

source/screens/pages/blank.njk

@@ -14,3 +14,7 @@
 {% block body %}
 
 {% endblock %}
+
+{% block script %}
+{{ super() }}
+{% endblock %}