From 04c83f9c8be51684329b1c9d1475e55c849c684f Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Tue, 7 Jun 2016 22:13:07 +0100
Subject: [PATCH] Fix duplication on project pages

Issue #26
---
 app/config/sculpin_kernel.yml               |  2 +-
 assets/sass/pages/_portfolio.sass           | 21 ---------------
 assets/sass/pages/_projects.sass            | 13 +++++++++
 source/_includes/project-company.html.twig  | 25 -----------------
 source/_includes/project-skills.html.twig   | 14 ----------
 source/_includes/projects/company.html.twig | 21 +++++++++++++++
 source/_includes/projects/skills.html.twig  | 11 ++++++++
 source/_layouts/project.html.twig           | 30 +++++++--------------
 source/_projects/2015-roadcc.md             |  4 ++-
 9 files changed, 58 insertions(+), 83 deletions(-)
 delete mode 100644 assets/sass/pages/_portfolio.sass
 create mode 100644 assets/sass/pages/_projects.sass
 delete mode 100644 source/_includes/project-company.html.twig
 delete mode 100644 source/_includes/project-skills.html.twig
 create mode 100644 source/_includes/projects/company.html.twig
 create mode 100644 source/_includes/projects/skills.html.twig

diff --git a/app/config/sculpin_kernel.yml b/app/config/sculpin_kernel.yml
index 89dad7368..56614bc59 100644
--- a/app/config/sculpin_kernel.yml
+++ b/app/config/sculpin_kernel.yml
@@ -4,7 +4,7 @@ sculpin_content_types:
         taxonomies:
             - tags
     projects:
-        permalink: projects/:slug_title/
+        permalink: projects/:filename/
         taxonomies:
             - skills
             - tags
diff --git a/assets/sass/pages/_portfolio.sass b/assets/sass/pages/_portfolio.sass
deleted file mode 100644
index c3225b635..000000000
--- a/assets/sass/pages/_portfolio.sass
+++ /dev/null
@@ -1,21 +0,0 @@
-.project--skills
-    ul
-        list-style: none
-        margin-left: 0
-        padding-left: 0
-
-    li
-        display: inline-block
-        margin-right: 5px
-
-    img
-        max-height: 30px
-
-.project--company__has-logo
-    a:link,
-    a:hover
-        border-bottom: 0
-        display: block
-
-    img
-        max-height: 50px
diff --git a/assets/sass/pages/_projects.sass b/assets/sass/pages/_projects.sass
new file mode 100644
index 000000000..a5c0627c2
--- /dev/null
+++ b/assets/sass/pages/_projects.sass
@@ -0,0 +1,13 @@
+.project
+    &--company__has-logo
+        a:link,
+        a:hover
+            border-bottom: 0
+            display: block
+
+        img
+            max-height: 50px
+
+    &__website
+        @extend .btn
+        @extend .btn-primary
diff --git a/source/_includes/project-company.html.twig b/source/_includes/project-company.html.twig
deleted file mode 100644
index 9259adfd6..000000000
--- a/source/_includes/project-company.html.twig
+++ /dev/null
@@ -1,25 +0,0 @@
-{% if page.company %}
-    {% set company = site.companies[page.company] %}
-
-    <div class="project--company{% if company.logo %} project--company__has-logo{% endif %}">
-        {% if page.freelance %}
-            <h2>Built for</h2>
-        {% else %}
-            <h2>Built whilst at</h2>
-        {% endif %}
-
-        {% if company.logo %}
-            {% set name = '<img src="/assets/images/experience/' ~ company.logo ~ '" alt="' ~ company.title ~ '">' %}
-        {% else %}
-            {% set name = company.title %}
-        {% endif %}
-
-        {% if company.website %}
-            <a href="{{ company.website }}" title="{{ company.title }}">
-                {{ name|raw }}
-            </a>
-        {% else %}
-            {{ name|raw }}
-        {% endif %}
-    </div>
-{% endif %}
diff --git a/source/_includes/project-skills.html.twig b/source/_includes/project-skills.html.twig
deleted file mode 100644
index 7d71c5671..000000000
--- a/source/_includes/project-skills.html.twig
+++ /dev/null
@@ -1,14 +0,0 @@
-{% if page.skills %}
-    <div class="project--skills">
-        <h2>Skills</h2>
-
-        <ul>
-            {% for item in page.skills %}
-                {% set skill = site.skills[item] %}
-                <li>
-                    <img src="/assets/images/skills/{{ skill.image }}" alt="{{ skill.title }}" title="{{ skill.title }}">
-                </li>
-            {% endfor %}
-        </ul>
-    </div>
-{% endif %}
diff --git a/source/_includes/projects/company.html.twig b/source/_includes/projects/company.html.twig
new file mode 100644
index 000000000..466e2bc16
--- /dev/null
+++ b/source/_includes/projects/company.html.twig
@@ -0,0 +1,21 @@
+{% if page.company %}
+    {% set company = site.companies[page.company] %}
+
+    <div class="project__company project__company--{{ company.logo ? 'has-logo' : 'no-logo' }}">
+        <h2>Built {{ page.freelance ? 'for' : 'whilst at' }}</h2>
+
+        {% if company.logo %}
+            {% set name = '<img src="/assets/images/experience/' ~ company.logo ~ '" alt="' ~ company.name ~ '">' %}
+        {% else %}
+            {% set name = company.name %}
+        {% endif %}
+
+        {% if company.website %}
+            <a href="{{ company.website }}" title="{{ company.name }}">
+                {{ name|raw }}
+            </a>
+        {% else %}
+            {{ name|raw }}
+        {% endif %}
+    </div>
+{% endif %}
diff --git a/source/_includes/projects/skills.html.twig b/source/_includes/projects/skills.html.twig
new file mode 100644
index 000000000..c5fdfa7a7
--- /dev/null
+++ b/source/_includes/projects/skills.html.twig
@@ -0,0 +1,11 @@
+{% if page.skills %}
+    <div class="project--skills">
+        <h2>Skills</h2>
+
+        <ul>
+            {% for item in page.skills|sort %}
+                <li>{{ site.skills[item].title }}</li>
+            {% endfor %}
+        </ul>
+    </div>
+{% endif %}
diff --git a/source/_layouts/project.html.twig b/source/_layouts/project.html.twig
index a47b8ddc5..16f3e6d96 100644
--- a/source/_layouts/project.html.twig
+++ b/source/_layouts/project.html.twig
@@ -1,30 +1,18 @@
 {% extends 'page' %}
 
 {% block content_wrapper %}
-    <main class="col-md-9">
-        {{ page.blocks.content_top|raw }}
-        {{ page.blocks.content|raw }}
-        {{ page.blocks.content_bottom|raw }}
-    </main>
-{% endblock %}
+    {% if page.image -%}
+        <img src="/assets/images/projects/{{ page.image.name ?: page.image }}" alt="{{ page.image.alt }}">
+    {%- endif %}
 
-{% block content_top %}
-    {{ parent() }}
+    {% block content %}{% endblock %}
 
-    {% if page.image %}
-        <div class="project--image">
-            <img class="img-responsive" src="/assets/images/projects/{{ page.image }}" alt="The {{ page.title }} website.">
-        </div>
-    {% endif %}
-{% endblock %}
-
-{% block content_bottom %}
     {% if page.website %}
-        <div class="project--website">
-            <a href="{{ page.website }}" class="btn btn-primary">View the website</a>
-        </div>
+        <a class="project__website" href="{{ page.website }}">
+            View the website
+        </a>
     {% endif %}
 
-    {{ include('project-skills') }}
-    {{ include('project-company') }}
+    {{ include('projects/skills') }}
+    {{ include('projects/company') }}
 {% endblock %}
diff --git a/source/_projects/2015-roadcc.md b/source/_projects/2015-roadcc.md
index 7b44c6fb6..a3d286082 100644
--- a/source/_projects/2015-roadcc.md
+++ b/source/_projects/2015-roadcc.md
@@ -4,7 +4,9 @@ website: http://road.cc
 tags:
     - drupal
     - drupal-7
-image: roadcc.png
+image:
+    name: roadcc.png
+    alt: The new road.cc website
 company: microserve
 role: Lead Developer
 skills: [drupal, php, git, less]