Merge pull request #52 from bolt/new-skeleton-theme

Use simplecss for Skeleton theme. Even simpler!
bolt · Jan 22, 2021 · a2c1878 · a2c1878
2 parents ef911fe + d9ef883
commit a2c1878
Show file tree

Hide file tree

Showing 10 changed files with 503 additions and 639 deletions.
diff --git a/skeleton/css/new.css b/skeleton/css/new.css
diff --git a/skeleton/css/simple.css b/skeleton/css/simple.css
diff --git a/skeleton/index.twig b/skeleton/index.twig
@@ -4,12 +4,14 @@
 
     {% if record|default %}
 
-        <h1><a href="{{ record|link }}">{{ record|title }}</a></h1>
+        <h1>{{ record|title }}</h1>
 
         {# Remove this block if you don't need it anymore. #}
         {{ include('partials/_fresh_install.twig') }}
 
-        {{ record|excerpt }}
+        {# Output the `introduction` field. If it doesn't exist, 'default' to
+           the full excerpt of the current Record #}
+        {{ record.introduction|default(record|excerpt) }}
 
         {% include 'partials/_image.twig' with ({'image': record|image}) %}
 
@@ -20,3 +22,9 @@
     {% endif %}
 
 {% endblock main %}
+
+{% block aside %}
+
+    {{ include('partials/_aside.twig') }}
+
+{% endblock aside %}
diff --git a/skeleton/partials/_aside.twig b/skeleton/partials/_aside.twig
@@ -1,21 +1,19 @@
 <!-- Sidebar -->
 <aside>
 
-    <hr>
-
+    {# Show if there are widgets in the 'aside_top' widgets slot. #}
     {{ widgets('aside_top') }}
 
-    {# This part is only shown if there are no widgets in the 'aside_top' widgets slot. #}
-    <div>
+    <hr>
         {# The next section attempts to fill the panel in the sidebar with the contents of the
             'about'-block, if it exists. First, attempt to fetch the block by its slug #}
         {% setcontent block = "block/about" %}
 
-        {# check if we have a title. If so, we know we have content to display. Otherwise, we will
+        {# check if we have a block. If so, we know we have content to display. Otherwise, we will
             output a default text, telling the user to create the 'blocks' in the backend. #}
         {% if block %}
 
-            <h5>{{ block.title }}</h5>
+            <h5>{{ block|title }}</h5>
             <p>{{ block.content|default(block|excerpt) }}</p>
 
             {% set edit_link = block|edit_link %}

diff --git a/skeleton/partials/_footer.twig b/skeleton/partials/_footer.twig
@@ -1,6 +1,5 @@
 <!-- Footer -->
 <footer>
-    <hr>
 
     <h4>{{ __('Menu') }}</h4>
     {{ menu(template = 'partials/_sub_menu.twig') }}
@@ -14,14 +13,6 @@
         <button type="submit">{{ __('action.search') }}</button>
     </form>
 
-    <hr>
-
-    <h4>{{ __('general.phrase.select_language') }}</h4>
-
-    {% include 'helpers/_languageselect.html.twig' with {'type': 'select'} %}
-
-    <hr>
-
     <p>
         {{ __('general.phrase.built-with-bolt') }}
     </p>

diff --git a/skeleton/partials/_header.twig b/skeleton/partials/_header.twig
@@ -2,7 +2,7 @@
 <header>
     {# the values in the 'config' object are taken directly from the file app/config/config.yml #}
     <h2><a href="{{ path('homepage') }}">{{ config.get('general/sitename') }}</a></h2>
-    {% if config.has('general/payoff') %}
+    {% if config.has('general/payoff') and record is defined and record|feature == 'homepage' %}
         <p>{{ config.get('general/payoff') }}</p>
     {% endif %}
 

diff --git a/skeleton/partials/_image.twig b/skeleton/partials/_image.twig
@@ -1,10 +1,10 @@
 {% if image %}
-    <div class="imageholder">
+    <figure>
         <a href="{{ record|image }}">
             <img src="{{ thumbnail(record, 1368, 1026) }}" alt="{{ (record|image).alt|default(record|title) }}">
         </a>
         {% if image.alt %}
-            <small>{{ image.alt }}</small>
+            <figcaption>{{ image.alt }}</figcaption>
         {% endif %}
-    </div>
+    </figure>
 {% endif %}
diff --git a/skeleton/partials/_master.twig b/skeleton/partials/_master.twig
@@ -15,12 +15,14 @@
                 {{- ' | ' ~ config.get('general/payoff') -}}
             {%- endif -%}
         </title>
-        <link rel="stylesheet" href="{{ asset('css/new.css') }}">
+        <link rel="stylesheet" href="{{ asset('css/simple.css') }}">
     </head>
     <body>
-        {% block body %}
+    {{ include('partials/_header.twig') }}
+
+    <main>
+    {% block body %}
 
-            {{ include('partials/_header.twig') }}
 
             {{ widgets('main_top') }}
 
@@ -29,11 +31,13 @@
 
             {{ widgets('main_bottom') }}
 
-            {{ include('partials/_aside.twig') }}
-
         {% endblock body %}
+    </main>
+
+    {% block aside %}
+    {% endblock aside %}
 
-        {{ include('partials/_footer.twig') }}
+    {{ include('partials/_footer.twig') }}
 
     </body>
 </html>
diff --git a/skeleton/partials/_recordfooter.twig b/skeleton/partials/_recordfooter.twig
@@ -35,20 +35,17 @@
     {% endif %}
 
     {% set related_content_types = record|related_by_type %}
+
     {% if related_content_types is not empty %}
-        <p class="meta">{{ __('general.phrase.related-content') }}
-        <ul>
+        <h3>{{ __('general.phrase.related-content') }}</h3>
             {% for content_type, related_records in related_content_types %}
-                <li>
                     <h4>Related {{ config.get('contenttypes/' ~ content_type ~ '/name') }}</h4>
                     <ul>
                         {% for related_record in related_records %}
                             <li><a href="{{ related_record|link }}">{{ related_record|title }}</a></li>
                         {% endfor %}
                     </ul>
-                </li>
             {%  endfor %}
-        </ul>
-        </p>
     {% endif %}
+
 {% endif %}
diff --git a/skeleton/partials/_sub_menu_header.twig b/skeleton/partials/_sub_menu_header.twig
@@ -26,7 +26,6 @@
     {% if item.label is defined %}
         {{ display_menu_item(item, loop, withsubmenus) }}
     {% endif %}
-    |
 {% endfor %}
 {% include 'helpers/_languageselect.html.twig' with {'type': 'select'} %}
 </nav>