futuro 0.7.4 → 0.7.5

data/_includes/html/page/content.liquid

@@ -0,0 +1,135 @@
+
+{% if PageIsChapter %}
+
+  <div class="area {{ PageType }} {{ PageBook | prepend : 'book-' }} {{ PageChapter | prepend : 'chapter-' }}
+              {% if site.setup.style %}{{ SiteStyle }}{% endif %}">
+
+  {%- unless SiteIsDoc -%}
+
+    <h2>{{ page.weight | slice: 0,3 }}</h2>
+
+  {%- endunless -%}
+
+{% else %}
+
+  {%- include html/page/subtitle.liquid -%}
+
+  <div class="area {{ PageType }} {{ PageTitle | prepend : 'title-' }}
+              {% if site.setup.style %}{{ SiteStyle }}{% endif %}
+              {% unless NoSubtitle %}has-subtitle{% endunless %}
+              {% if page.row %} has-row {% endif %}
+              {% if page.pies %}is-pie{% endif %}">
+
+{% endif %}
+
+{{ page.content | markdownify }}
+
+{%- unless PageIsChapter -%}
+
+  {%- include {{ SiteContent | append : 'more.liquid' }} -%}
+
+  {% include html/page/util.liquid %}
+
+  {%- if page.break -%}
+
+    {% for i in (1..page.break) %}<br>{% endfor %}
+
+  {%- endif -%}
+
+  {%- if page.chart -%}
+
+    {%- include {{ SiteContent | append : 'chart.liquid' }} -%}
+
+  {%- endif -%}
+
+  {%- if page.number -%}
+
+    <div class="block number-container">
+
+      {%- include {{ SiteContent | append : 'loop.liquid' }} type="number" -%}
+
+    </div>
+
+  {%- endif -%}
+
+  {%- if page.pies -%}
+
+    <ul class="list pies">
+
+      {%- include {{ SiteContent | append : 'loop.liquid' }} type="pies" -%}
+
+    </ul>
+
+  {%- endif -%}
+
+  {%- if page.roller -%}
+
+    {%- include {{ SiteContent | append : 'roller.liquid' }} -%}
+
+  {%- endif -%}
+
+  {%- if page.artwork -%}
+
+    {%- include {{ SiteContent | append : 'loop.liquid' }} type="artwork" -%}
+
+  {%- endif -%}
+
+  {%- if page.form -%}
+
+    {%- include {{ SiteContent | append : 'loop.liquid' }} type="form" -%}
+
+  {%- endif -%}
+
+  {%- if page.header -%}
+
+    {%- include {{ SiteContent | append : 'header.liquid' }} -%}
+
+  {%- endif -%}
+
+  {%- if page.screen -%}
+
+  <div class="block screen-container">
+
+    {%- include {{ SiteContent | append : 'loop.liquid' }} type="screen" -%}
+
+  </div>
+
+  {%- endif -%}
+
+  {%- if page.loader -%}
+
+    <div class="loader page-wrap">
+
+      <div class="loader page-bg">
+
+        {%- include {{ SvgIcon }} type="carrier" -%}
+
+      </div>
+
+      <div class="loader page-bg ghost">
+
+        {%- include {{ SvgIcon }} type="carrier" -%}
+
+      </div>
+
+      <div class="loader page-bg ghost">
+
+        {%- include {{ SvgIcon }} type="carrier" -%}
+
+      </div>
+
+    </div>
+
+  {%- endif -%}
+
+  {%- if page.ticker -%}
+
+    <div class="ticker onemoment">
+
+      <div class="ticker message">{{ page.ticker }}</div>
+
+    </div>
+
+  {%- endif -%}
+
+{%- endunless -%}

data/_includes/html/page/footnote.liquid

@@ -0,0 +1,24 @@
+
+{%- if page.footnote -%}
+
+  <p class="block page-footnote">
+
+    {%- for item in page.footnote -%}
+
+      {%- if item.pre -%}
+
+        <strong>{{ item.pre | append : ':' }}</strong>
+
+      {%- endif -%}
+
+      {%- if item.msg -%}
+
+        {{ item.msg | prepend : ' ' }}
+
+      {%- endif -%}
+
+    {%- endfor -%}
+
+  </p>
+
+{%- endif -%}

data/_includes/html/page/header.liquid

@@ -1,38 +1,12 @@
 
-{% assign style   = site.setup.style | replace: ' ','-' | prepend: ' style-' | downcase %}
-{% assign type    = page.type | prepend: ' type-' %}
-{% assign book    = page.collection | prepend: ' book-' %}
-{% assign chapter = page.chapter | replace: ' ','-' | prepend: ' chapter-' | downcase %}
-{% assign topic   = page.topic | prepend: ' topic-' | downcase %}
-{% assign title   = page.title | replace: ' ','-' | prepend: ' title-' | downcase %}
-{% assign tag     = page.tag | replace: ' ',' tag-' | prepend: ' tag-' %}
-{% assign id1     = page.chapter | replace: ' ','-' | append: '-' %}
-{% assign id2     = page.title | replace: ' ','-' %}
-{% assign id      = id1 | append: id2 | downcase %}
-
 <div class="wrap
-            {{ type }}
-            {% if site.setup.style %}{{ style }}{% endif %}
-            {% if page.collection %}{{ book }}{% endif %}
-            {% if page.chapter %}{{ chapter }}{% endif %}
-            {% if page.topic %}{{ topic }}{% endif %}
-            {{ title }}">
-
-<div class="block stop" id="{{ id }}"></div>
-
-{% if page.type == 'chapter' %}
-
-  <div class="area
-              {{ type }}
-              {% if site.setup.style %}{{ style }}{% endif %}
-              {{ book }}
-              {{ chapter }}">
-
-{% else %}
+            {{ PageType }}
+            {% if site.setup.style %}{{ SiteStyle }}{% endif %}
+            {% if page.collection %}{{ PageBook | prepend : 'book-' }}{% endif %}
+            {% if page.chapter %}{{ PageChapter | prepend : 'chapter-' }}{% endif %}
+            {% if page.topic %}{{ PageTopic | prepend : 'topic-' }} in-topic{% endif %}
+            {{ PageTitle | prepend : 'title-' }}">
 
-  <div class="area
-              {{ type }}
-              {% if site.setup.style %}{{ style }}{% endif %}
-              {% if page.tag %}{{ tag }}{% endif %}">
+<div class="block stop" id="{{ ScrollID }}"></div>
 
-{% endif %}
+{% include html/page/title.liquid %}

data/_includes/html/page/info.liquid

@@ -1,35 +1,30 @@
 
-{% assign info    = page.type | append: '-info' %}
-{% assign chap    = page.type | append: '-chapter' %}
-{% assign weight  = page.type | append: '-weight' %}
-{% assign chapter = page.chapter | replace: ' ','-' | downcase %}
-{% assign bPath   = page.collection | prepend: '/artwork/' %}
-{% assign cPath   = chapter | append: '/icon.svg' %}
-{% assign cWrap   = page.chapter | prepend: '<div>' | append: '</div>' %}
-{% assign cDivs   = cWrap | split: ' ' | join: '</div><div>' %}
-
-<div class="block {{ info }}">
-
-  <h5 class="title {{ chap }} {{ chapter }}">
-    {{ cDivs }}
+<div class="block {{ PageInfo }}">
+
+  <h5 class="title {{ TypeChapter }} {{ PageChapter | prepend : 'chapter-' }}">
+
+    {{ ChapterSplit }}
+
   </h5>
 
-  {%- if page.icon -%}
+  {%- unless SiteIsDoc -%}
+
+    {%- if page.icon -%}
 
-    <div class="block page-icon {{ chapter }}">
+      <div class="block {{ TypeIcon }} {{ PageChapter | prepend : 'chapter-' }}">
 
-      {%- if site.setup.install == 'book' -%}
-        {% include {{ cPath | prepend: '/artwork/' }} %}
-      {%- else -%}
-        {% include {{ bPath }}/{{ cPath }} %}
-      {%- endif -%}
+        {%- include {{ IconPath | append : 'icon.svg' }} -%}
 
-    </div>
+      </div>
 
-  {%- endif -%}
+    {%- endif -%}
+
+  {%- endunless -%}
+
+  <h5 class="title {{ TypeWeight }} {{ PageChapter | prepend : 'chapter-' }}">
 
-  <h5 class="title {{ weight }} {{ chapter }}">
     {{ page.weight | slice: 0,5 }}
+
   </h5>
 
 </div>

data/_includes/html/page/layout/home.liquid

@@ -2,12 +2,15 @@
 {% assign loop = site.collections | sort: 'weight' %}
 
 <div class="wrap home">
+
   {% for book in loop %}
+
     {% assign title = book.label %}
     {% assign url = title | prepend: '/' | append: '/' %}
     {% assign svg = title | prepend: '/svg/site/book/' | append: '.svg' %}
 
     {% if book.live == true %}
+
       <div class="area book">
         <div class="wrap book {{ title }}">
           <a class="lnk book" href="{{ url }}">
@@ -15,7 +18,9 @@
           </a>
         </div>
       </div>
+
     {% elsif book.live == false %}
+
       <div class="area book">
         <div class="wrap book draft">
           <div class="lnk book">
@@ -23,7 +28,9 @@
           </div>
         </div>
       </div>
+
     {% endif %}
 
   {% endfor %}
+
 </div>

data/_includes/html/page/layout/page.liquid

@@ -1,41 +1,32 @@
 
-{% include html/page/header.liquid %}
+    {%- include html/page/header.liquid -%}
 
-  {%- if site.setup.style == 'docs' -%}
+    {%- include html/page/content.liquid -%}
 
-    {% include html/page/title.liquid %}
-
-    {% include html/page/artwork.liquid %}
-
-  {% else %}
-
-    <div class="{{ split }} left {% unless page.subtitle %}no-subtitle{% endunless %}">
-
-      {% include html/page/title.liquid %}
+  </div>
 
-      <div class="block page-content">
+  {%- if page.row -%}
 
-        {% include html/page/subtitle.liquid %}
+    <!-- <div class="area {{ PageType }} row-content">
+       include {{ ContentLoop }} type="row" -%}
+    </div> -->
 
-        {{ page.content | markdownify }}
+  {%- endif -%}
 
-        {%- unless page.error -%}
-          {% include html/page/util.liquid %}
-        {%- endunless -%}
+  {%- include html/page/footnote.liquid -%}
 
-      </div>
+  {%- if PageIsChapter -%}
 
-    </div>
+    {%- include html/page/util.liquid -%}
 
-    <div class="{{ split }} right">
+  {%- else -%}
 
-      {% include html/page/artwork.liquid %}
+    {%- unless SiteIsDoc -%}
 
-      {% include html/page/info.liquid %}
+      {%- include html/page/info.liquid -%}
 
-    </div>
+    {%- endunless -%}
 
   {%- endif -%}
 
-  </div>
 </div>

data/_includes/html/page/subtitle.liquid

@@ -1,8 +1,6 @@
 
 {% if page.subtitle %}
 
-<h1 class="page-subtitle">
-  {{ page.subtitle }}
-</h1>
+  <h1 class="subtitle {{ PageType }}{% if page.wide %} wide{% endif %}">{{ page.subtitle }}</h1>
 
 {% endif %}

data/_includes/html/page/title.liquid

@@ -1,35 +1,36 @@
 
-{% assign type    = page.type | append: '-title' %}
-{% assign style   = site.setup.style | prepend: 'style-' %}
-{% assign chapter = page.chapter | prepend: '<div>' | append: '</div>' %}
-{% assign cDivs   = chapter | split: ' ' | join: '</div><div>' %}
+{% unless PageInTopic %}
 
-{% unless page.topic %}
+  {%- if SiteIsDoc -%}
 
-  {%- if site.setup.style == "docs" -%}
+    {% if PageIsChapter %}
 
-      {% if page.type == "chapter" %}
-
-      <h5 class="title {{ type }} {{ style }}">
-        {{ cDivs }}
+      <h5 class="title {{ PageType }} {{ SiteStyle }}">
+        {{ ChapterSplit }}
       </h5>
 
-      {% else %}
+    {% else %}
 
-      <h5 class="title {{ type }} {{ style }}">
+      <h5 class="title {{ PageType }} {{ SiteStyle }}">
         {{ page.title }}
       </h5>
 
-      {% endif %}
+    {% endif %}
 
   {%- else -%}
 
-    <h3 class="title {{ type }}">
-      {% if page.type == "chapter" %}
-        {{ cDivs }}
+    <h3 class="title {{ PageType }}">
+
+      {%- if PageIsChapter -%}
+
+        {{ ChapterSplit }}
+
       {% else %}
+
         {{ page.title | truncate: 13 }}
-      {% endif %}
+
+      {%- endif -%}
+
     </h3>
 
   {%- endif -%}

data/_includes/html/page/topbar.liquid

@@ -4,26 +4,30 @@
 <div class="area topbar">
 
     <div class="block navigation left">
+
       <button type="button" class="navigation about">
-        {% include svg/site/btn/about.svg %}
+        {% include {{ SvgBtn | append : 'about.svg' }} %}
       </button>
+
       <button type="button" class="navigation browse">
-        {% include svg/site/btn/browse.svg %}
+        {% include {{ SvgBtn | append : 'browse.svg' }} %}
       </button>
+
     </div>
 
     <div class="block navigation main">
+
       {% assign loop = site.collections | sort: 'weight' %}
 
       {% for page in loop %}
 
         {% if page.live %}
 
-        <button type="button" class="navigation book {{ page.label }}">
-          <a class="link navigation {{ page.label }}" href="{%- if site.setup.install == 'library' -%}{{ label }}{%- else -%}/{%- endif -%}">
+        <a class="link navigation {{ page.label }}" href="{%- if site.setup.install == 'library' -%}{{ page.label | prepend: '/' }}{%- else -%}/{%- endif -%}">
+          <button type="button" name="button">
             <strong>{{ page.label }}</strong>
-          </a>
-        </button>
+          </button>
+        </a>
 
         {% endif %}
 
@@ -32,15 +36,19 @@
     </div>
 
     <div class="block navigation right">
+
       <button type="button" class="navigation cart" style="display:none;">
-        {% include svg/site/btn/cart.svg %}
+        {% include {{ SvgBtn | append : 'cart.svg' }} %}
       </button>
+
       <button type="button" class="navigation count" style="display:none;">
         <strong>0</strong>
       </button>
+
       <button type="button" class="navigation search">
-        {% include svg/site/btn/search.svg %}
+        {% include {{ SvgIcon }} type="search" %}
       </button>
+
     </div>
 
 </div>

data/_includes/html/page/{utils → util}/author.liquid

@@ -1,5 +1,5 @@
 
 <div class="block util-author">
-  {% include svg/site/btn/author.svg %}
+  {% include {{ SvgBtn | append : 'author.svg' }} %}
   <p>By {{ page.author }}</p>
 </div>

data/_includes/html/page/util/share.liquid

@@ -0,0 +1,24 @@
+
+{%- if SiteIsShare -%}
+
+  <div class="block util-share {{ PageType }}">
+
+    {% assign DynamicShare = page.type | prepend : 'share/' | append : '.svg' %}
+
+    {% include {{ SvgBtn | append : DynamicShare }} %}
+
+    {%- if PageIsChapter -%}
+
+      <h5></h5>
+
+    {%- else -%}
+
+      <p>Copy page</p>
+
+    {%- endif -%}
+
+    <div class="block util-url">{{ PageShare }}</div>
+
+  </div>
+
+{%- endif -%}

data/_includes/html/page/{utils → util}/update.liquid

@@ -1,5 +1,5 @@
 
 <div class="block util-update">
-  {% include svg/site/btn/update.svg %}
+  {% include {{ SvgBtn | append : 'update.svg' }} %}
   <p>Updated {{ page.update | date: "%b %y" }}</p>
 </div>

data/_includes/html/page/util.liquid

@@ -1,20 +1,36 @@
 
-{% assign type = page.type %}
+{%- unless SiteIsDoc or page.error -%}
 
-<div class="block util {{ type }}">
+    {%- if SiteIsShare or
+           page.update or
+           page.author -%}
 
-{% include html/page/utils/share.liquid %}
+    <div class="block util {{ PageType }}">
 
-{%- unless page.type == 'chapter' -%}
+    {%- if SiteIsShare -%}
 
-  {% if page.update %}
-  {% include html/page/utils/update.liquid %}
-  {% endif %}
+      {% include {{ SiteUtil | append : 'share.liquid' }} %}
 
-  {% if page.author %}
-  {% include html/page/utils/author.liquid %}
-  {% endif %}
+    {%- endif -%}
 
-{%- endunless -%}
+    {%- unless PageIsChapter -%}
+
+      {% if page.update %}
+
+        {% include {{ SiteUtil | append : 'update.liquid' }} %}
+
+      {% endif %}
+
+      {% if page.author %}
+
+        {% include {{ SiteUtil | append : 'author.liquid' }} %}
 
-</div>
+      {% endif %}
+
+    {%- endunless -%}
+
+    </div>
+
+  {%- endif -%}
+
+{%- endunless -%}

data/_includes/html/search/loop.liquid

@@ -0,0 +1,11 @@
+
+{% for item in loop %}
+
+  {
+    "book"    : "{{ item.collection }}",
+    "chapter" : "{{ item.chapter }}",
+    "title"   : "{{ item.title }}",
+    "url"     : "{{ item.url }}"
+  },
+
+{% endfor %}

data/_includes/html/site/footer.liquid

@@ -0,0 +1,10 @@
+
+{% if site.footer %}
+
+  <footer>
+
+    {{ site.footer }}
+
+  </footer>
+
+{% endif %}

data/_includes/html/site/header.liquid

@@ -0,0 +1,10 @@
+
+{% if site.header %}
+
+  <header>
+
+    {{ site.header }}
+
+  </header>
+
+{% endif %}

data/_includes/html/site/scroller.liquid

@@ -0,0 +1,68 @@
+
+{% assign ScrollLength = 0 %}
+
+{%- for item in loop -%}
+
+  {%- if item.type == 'chapter' -%}
+
+    {% assign ScrollLength = ScrollLength | plus : 1 %}
+
+  {%- endif -%}
+
+{%- endfor -%}
+
+{%- if ScrollLength > 1 -%}
+
+  <div class="block scroller">
+
+    <ol class="list scrollers">
+
+      {% assign ScrollItem = 0 %}
+
+      {%- for item in loop -%}
+
+        {%- if item.type == 'chapter' -%}
+
+          {% assign ScrollItem = ScrollItem | plus : 1 %}
+
+          {% assign ItemChapter = item.chapter | replace : ' ','-' | append : '-' | downcase %}
+          {% assign ItemTitle   = item.title   | replace : ' ','-' | downcase %}
+          {% assign ItemID      = ItemChapter  | append : ItemTitle %}
+
+          <li class="item scroller {{ ItemTitle }}">
+
+            <a href="{{ ItemID | prepend : '#' }}" class="link scroller">
+
+              {%- if ScrollItem == 1 -%}
+
+                <svg version="1.1" width="20" height="14" viewBox="0 0 20 14">
+                  <path d="M10,0l9,14H1L10,0z"/>
+                </svg>
+
+              {%- elsif ScrollItem == (ScrollLength -1) -%}
+
+                <svg version="1.1" width="20" height="14" viewBox="0 0 20 14">
+                  <path d="M10,14L1,0h18L10,14z"/>
+                </svg>
+
+              {%- else -%}
+
+                <svg version="1.1" width="20" height="20" viewBox="0 0 20 20">
+                  <circle cx="10" cy="10" r="9"/>
+                </svg>
+
+              {%- endif -%}
+
+            </a>
+
+          </li>
+
+        {%- endif -%}
+
+      {%- endfor -%}
+
+    </ol>
+
+  </div>
+
+{%- endif -%}