From f0b18e88f446e21df1e7325514f5f28488ed879c Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Fri, 31 Aug 2018 13:57:51 +0200 Subject: [PATCH] Use pug mixins for header, cards and navigation --- src/templates/projects_index_collection.pug | 45 +++++++++------------ src/templates/services.pug | 24 +++++------ 2 files changed, 29 insertions(+), 40 deletions(-) diff --git a/src/templates/projects_index_collection.pug b/src/templates/projects_index_collection.pug index ab33296..9df7eaa 100644 --- a/src/templates/projects_index_collection.pug +++ b/src/templates/projects_index_collection.pug @@ -1,4 +1,5 @@ | {% extends 'layout.html' %} +include mixins/components | {# Default case is Open Projects #} | {% set page_title = 'Open Projects' %} @@ -39,37 +40,31 @@ meta(name="twitter:image", content="{{ page_header_image }}") | {% endblock %} | {% block body %} -.jumbotron.jumbotron-overlay.text-white(style="background-image: url({{ page_header_image }})") - .container - .row - .col-md-8 - .display-4.text-uppercase.font-weight-bold {{ page_title }} - .lead {{ page_header_text }} + ++jumbotron("{{ page_title }}", "{{ page_header_text }}", "{{ page_header_image }}") .container.pb-5 - ul.nav.nav-secondary.justify-content-center.mb-5 - li.nav-item.nav-title - | {% if title in ['courses', 'workshops'] %}Training{% else %}Open Projects{% endif %} - - li.nav-item - a.nav-link( + +nav-secondary("{% if title in ['courses', 'workshops'] %}Training{% else %}Open Projects{% endif %}") + +nav-secondary-link( class="{% if title == 'workshops' %}active{% endif %}", - href="{{ url_for('cloud.workshops') }}") Workshops - li.nav-item - a.nav-link( - class="{% if title == 'courses' %}active{% endif %}", - href="{{ url_for('cloud.courses') }}") Courses - li.nav-item - a.nav-link( - class="{% if title == 'gallery' %}active{% endif %}", - href="{{ url_for('projects.view', project_url='gallery') }}") Art Gallery + href="{{ url_for('cloud.workshops') }}") + | Workshops - .card-deck.card-padless.card-3-columns + +nav-secondary-link( + class="{% if title == 'courses' %}active{% endif %}", + href="{{ url_for('cloud.courses') }}") + | Courses + + +nav-secondary-link( + class="{% if title == 'gallery' %}active{% endif %}", + href="{{ url_for('projects.view', project_url='gallery') }}") + | Art Gallery + + +card-deck(3) | {% for project in projects %} + | {% if (project.status == 'published') or (project.status == 'pending' and current_user.is_authenticated) and project._id != config.MAIN_PROJECT_ID %} - .card.card-fade.cursor-pointer.mb-4.js-project-go( - data-url="{{ url_for('projects.view', project_url=project.url) }}", - tabindex="{{ loop.index }}") + +card(data-url="{{ url_for('projects.view', project_url=project.url) }}", tabindex='{{ loop.index }}') | {% if project.picture_header %} a(href="{{ url_for('projects.view', project_url=project.url) }}") img.card-img-top.rounded-0( diff --git a/src/templates/services.pug b/src/templates/services.pug index f0a03f1..daa0bbc 100644 --- a/src/templates/services.pug +++ b/src/templates/services.pug @@ -1,6 +1,7 @@ | {% extends 'layout.html' %} | {% block page_title %}Services{% endblock %} | {% set title = 'services' %} +include mixins/components | {% block og %} meta(property="og:type", content="website") @@ -20,17 +21,10 @@ meta(name="twitter:image", content="{{ url_for('static', filename='assets/img/ba | {% endblock %} | {% block body %} -.jumbotron.jumbotron-overlay.text-white.mb-1(style="background-image: url({{ url_for('static', filename='assets/img/backgrounds/services_projects.jpg')}})") - .container - .row - .col-md-8 - .display-4.text-uppercase.font-weight-bold - | Services - .lead. - On Blender Cloud you can create and share personal projects, access our texture and HDRI - library (or create your own), keep track of your production, manage your renders and much more! +- var header_text = "On Blender Cloud you can create and share personal projects, access our texture and HDRI library (or create your own), keep track of your production, manage your renders and much more!"; ++jumbotron("Services", header_text, "{{ url_for('static', filename='assets/img/backgrounds/services_projects.jpg')}}") -- var addon_text = 'Available through the Blender Cloud add-on' +- var addon_text = 'Available through the Blender Cloud add-on'; section#blender-cloud-add-on.page-card .page-card-side h2.page-card-title @@ -45,7 +39,7 @@ section#blender-cloud-add-on.page-card small Blender Cloud add-on requires Blender 2.78 or newer - a.btn-success( + a.btn.btn-outline-success( href="https://cloud.blender.org/r/downloads/blender_cloud-latest-addon.zip") i.pi-download | Download add-on  v {{ config.BLENDER_CLOUD_ADDON_VERSION }} @@ -88,7 +82,7 @@ section#texture-browser.page-card.right .tip !{addon_text} - a.btn-success.js-watch-video( + a.btn.btn-outline-success.js-watch-video( href="https://www.youtube.com/watch?v=-srXYv2Osjw", data-youtube-id="-srXYv2Osjw") i.pi-play @@ -108,7 +102,7 @@ section#image-sharing.page-card.right .tip !{addon_text} - a.btn-success.js-watch-video( + a.btn.btn-outline-success.js-watch-video( href="https://www.youtube.com/watch?v=yvtqeMBOAyk", data-youtube-id="yvtqeMBOAyk") i.pi-play @@ -146,7 +140,7 @@ section#attract.page-card.right .page-card-summary. Production-management software for your film, game, or commercial projects. - a.btn-success.js-watch-video( + a.btn.btn-outline-success.js-watch-video( href="https://www.youtube.com/watch?v=b9x1rlyyt_o", data-youtube-id="b9x1rlyyt_o") i.pi-play @@ -169,7 +163,7 @@ section#flamenco.page-card.right .page-card-summary. Take control of your computing infrastructure and get things done. - a.btn-success.js-watch-video( + a.btn.btn-outline-success.js-watch-video( href="https://www.youtube.com/watch?v=7cnFKhsM67Q", data-youtube-id="7cnFKhsM67Q") i.pi-play