Layout: move footer and main menu into their own files

This commit is contained in:
2018-09-17 17:18:43 +02:00
parent a5c7ec285d
commit 00cd29befc
3 changed files with 263 additions and 260 deletions

107
src/templates/_footer.pug Normal file
View File

@@ -0,0 +1,107 @@
.footer-wrapper
| {% block footer_navigation %}
.footer-navigation
.container
.row
.col-md-4.col-xs-6
h4
a(href="{{ url_for('main.homepage') }}")
i.pi-blender-cloud-logo
p.pl-2.
Blender Cloud is the creative hub for your projects,
powered by Free and Open Source Software.
h5.d-flex
a.px-2(href="https://twitter.com/Blender_Cloud",
title="Follow us on Twitter")
i.pi-social-youtube
a.px-2(href="https://twitter.com/Blender_Cloud",
title="Follow us on Twitter")
i.pi-social-twitter
a.px-2(href="https://www.facebook.com/BlenderCloudOfficial/",
title="Follow us on Facebook")
i.pi-social-facebook
.col-md-2.col-xs-6
h7.font-weight-bold
| TRAINING
ul.list-unstyled
li
a(href="{{ url_for('cloud.courses') }}")
| Courses
li
a(href="{{ url_for('cloud.workshops') }}")
| Workshops
li
a(href="{{ url_for('projects.view', project_url='gallery') }}")
| Art Gallery
.col-md-2.col-xs-6
h7.font-weight-bold
| LIBRARIES
ul.list-unstyled
li
a(href="{{ url_for('main.main_blog') }}",
title="Blender Cloud Blog")
| HDRIs
li
a(href="{{ url_for('cloud.services') }}",
title="Blender Cloud Services")
| Textures
li
a(href="{{ url_for('cloud.about') }}",
title="About Blender Cloud")
| Characters
.col-md-2.col-xs-6
h7.font-weight-bold
a(href="{{ url_for('cloud.services') }}")
| SERVICES
ul.list-unstyled
li
a(href="{{ url_for('main.main_blog') }}",
title="Blender Cloud Blog")
| Add-on
li
a(href="{{ url_for('main.main_blog') }}",
title="Blender Cloud Blog")
| Blender Sync
li
a(href="{{ url_for('cloud.services') }}",
title="Blender Cloud Services")
| Attract
li
a(href="{{ url_for('cloud.about') }}",
title="About Blender Cloud")
| Flamenco
li
a(href="{{ url_for('cloud.about') }}",
title="About Blender Cloud")
| Image Sharing
.col-md-2.col-xs-6
h7.font-weight-bold
| BLENDER
ul.list-unstyled
li
a(href="{{ url_for('main.main_blog') }}",
title="Blender Cloud Blog")
| blender.org
li
a(href="{{ url_for('cloud.terms_and_conditions') }}",
title="Terms and Conditions")
| Terms and Conditions
li
a(href="{{ url_for('cloud.privacy') }}",
title="Privacy")
| Privacy
| {% endblock footer_navigation %}
#hop(title="Be awesome in space")
i.pi-angle-up

View File

@@ -91,158 +91,7 @@ html(lang="en")
span Blender Cloud
i.pi-angle-down
ul.dropdown-menu.nav-main
+nav-secondary()(
class="nav-secondary-vertical float-left bg-light border-left rounded-left")
+nav-secondary-link(
href="{{ url_for('main.homepage') }}",
data-toggle='dropdown-tab',
data-tab-target='home')
i.mr-2.pi-home
span Home
+nav-secondary-link(
href="{{ url_for('cloud.open_projects') }}",
data-toggle='dropdown-tab',
data-tab-target='films')
i.mr-2.pi-film-thick
span Films
+nav-secondary-link(
href="{{ url_for('cloud.workshops') }}",
data-toggle='dropdown-tab',
data-tab-target='training')
i.mr-2.pi-graduation-cap
span Training
+nav-secondary-link(
href="/p/textures",
data-toggle='dropdown-tab',
data-tab-target='libraries')
i.mr-2.pi-file-archive
span Libraries
+nav-secondary-link(
href="{{ url_for('cloud.services') }}",
data-toggle='dropdown-tab',
data-tab-target='services',
class="{% if title == 'services' %}active{% endif %}")
i.mr-2.pi-whoosh
span Services
.dropdown-menu-tab(data-tab='home')
.dropdown-menu-column
+nav-secondary()(class="nav-secondary-vertical rounded-right border-left overflow-hidden")
+nav-secondary-link(href="{{ url_for('projects.index') }}")
i.pi-star
span My Projects
+nav-secondary-link(href="{{ url_for('projects.index') }}")
i.pi-heart
span Shared with me
| {% if current_user.has_organizations() %}
+nav-secondary-link(href="{{ url_for('pillar.web.organizations.index') }}")
i.mr-2.pi-users
span My Organizations
| {% endif %}
+nav-secondary-link(href="{{ url_for('projects.home_project_shared_images')}}")
i.pi-picture
span Image Sharing
+nav-secondary-link(href="{{ url_for('projects.home_project') }}")
i.pi-blender
span Blender Sync
.dropdown-menu-tab(data-tab='films')
.dropdown-menu-column
+nav-secondary()(class="nav-secondary-vertical rounded-right border-left overflow-hidden")
+nav-secondary-link(
href="{{ url_for('cloud.open_projects') }}",
class="nav-see-more border-bottom")
span
| All Open Movies
i.pi-angle-right.pl-2
+nav-secondary-link(
href="{{ url_for('projects.view', project_url='spring') }}")
span Spring
+nav-secondary-link(
href="{{ url_for('projects.view', project_url='hero') }}")
span Hero
+nav-secondary-link(
href="{{ url_for('projects.view', project_url='dailydweebs') }}")
span The Daily Dweebs
+nav-secondary-link(
href="{{ url_for('projects.view', project_url='agent-327') }}")
span Agent 327
.dropdown-menu-tab(data-tab='training')
.dropdown-menu-column
+nav-secondary('Training')(class="nav-secondary-vertical rounded-right border-left overflow-hidden")
+nav-secondary-link(
href="{{ url_for('cloud.courses') }}")
i.pi-graduation-cap
span Courses
+nav-secondary-link(
href="{{ url_for('cloud.workshops') }}")
i.pi-lightbulb
span Workshops
+nav-secondary-link(
href="{{ url_for('cloud.production') }}")
i.pi-puzzle
span Production Lessons
.dropdown-menu-tab(data-tab='libraries')
.dropdown-menu-column
+nav-secondary('Libraries')(class="nav-secondary-vertical rounded-right border-left overflow-hidden")
+nav-secondary-link(href="{{ url_for('projects.view', project_url='textures') }}")
i.pi-folder-texture
span Textures
+nav-secondary-link(href="{{ url_for('projects.view', project_url='hdri') }}")
i.pi-globe
span HDRI
+nav-secondary-link(href="{{ url_for('projects.view', project_url='characters') }}")
i.pi-character
span Characters
+nav-secondary-link(href="{{ url_for('projects.view', project_url='gallery') }}")
i.pi-picture
span Art Gallery
.dropdown-menu-tab(data-tab='services')
.dropdown-menu-column
+nav-secondary()(class="nav-secondary-vertical rounded-right border-left overflow-hidden")
+nav-secondary-link(
href="{{ url_for('cloud.services') }}",
class="nav-see-more border-bottom")
span
| All Services
i.pi-angle-right.pl-2
+nav-secondary-link(href="/attract")
i.pi-attract
span Attract
+nav-secondary-link(href="/flamenco")
i.pi-attract
span Flamenco
+nav-secondary-link(href="{{ url_for('cloud.services') }}#blender-cloud-add-on")
i.pi-blender
span Blender Cloud add-on
+nav-secondary-link(href="{{ url_for('cloud.services') }}#texture-browser")
i.pi-texture
span Texture & HDRI Browser
| {% include 'menus/_dropdown_main.html' %}
| {% block navigation_tabs %}
| {% endblock navigation_tabs %}
@@ -292,114 +141,7 @@ html(lang="en")
| {% block body %}{% endblock %}
| {% block footer_container %}
.footer-wrapper
| {% block footer_navigation %}
.footer-navigation
.container
.row
.col-md-4.col-xs-6
h4
a(href="{{ url_for('main.homepage') }}")
i.pi-blender-cloud-logo
p.pl-2.
Blender Cloud is the creative hub for your projects,
powered by Free and Open Source Software.
h5.d-flex
a.px-2(href="https://twitter.com/Blender_Cloud",
title="Follow us on Twitter")
i.pi-social-youtube
a.px-2(href="https://twitter.com/Blender_Cloud",
title="Follow us on Twitter")
i.pi-social-twitter
a.px-2(href="https://www.facebook.com/BlenderCloudOfficial/",
title="Follow us on Facebook")
i.pi-social-facebook
.col-md-2.col-xs-6
h7.font-weight-bold
| TRAINING
ul.list-unstyled
li
a(href="{{ url_for('cloud.courses') }}")
| Courses
li
a(href="{{ url_for('cloud.workshops') }}")
| Workshops
li
a(href="{{ url_for('projects.view', project_url='gallery') }}")
| Art Gallery
.col-md-2.col-xs-6
h7.font-weight-bold
| LIBRARIES
ul.list-unstyled
li
a(href="{{ url_for('main.main_blog') }}",
title="Blender Cloud Blog")
| HDRIs
li
a(href="{{ url_for('cloud.services') }}",
title="Blender Cloud Services")
| Textures
li
a(href="{{ url_for('cloud.about') }}",
title="About Blender Cloud")
| Characters
.col-md-2.col-xs-6
h7.font-weight-bold
a(href="{{ url_for('cloud.services') }}")
| SERVICES
ul.list-unstyled
li
a(href="{{ url_for('main.main_blog') }}",
title="Blender Cloud Blog")
| Add-on
li
a(href="{{ url_for('main.main_blog') }}",
title="Blender Cloud Blog")
| Blender Sync
li
a(href="{{ url_for('cloud.services') }}",
title="Blender Cloud Services")
| Attract
li
a(href="{{ url_for('cloud.about') }}",
title="About Blender Cloud")
| Flamenco
li
a(href="{{ url_for('cloud.about') }}",
title="About Blender Cloud")
| Image Sharing
.col-md-2.col-xs-6
h7.font-weight-bold
| BLENDER
ul.list-unstyled
li
a(href="{{ url_for('main.main_blog') }}",
title="Blender Cloud Blog")
| blender.org
li
a(href="{{ url_for('cloud.terms_and_conditions') }}",
title="Terms and Conditions")
| Terms and Conditions
li
a(href="{{ url_for('cloud.privacy') }}",
title="Privacy")
| Privacy
| {% endblock footer_navigation %}
#hop(title="Be awesome in space")
i.pi-angle-up
| {% include '_footer.html' %}
| {% endblock footer_container %}
#notification-pop(data-url="", data-read-toggle="")

View File

@@ -0,0 +1,154 @@
include ../../../../pillar/src/templates/mixins/components
ul.dropdown-menu.nav-main
+nav-secondary()(
class="nav-secondary-vertical float-left bg-light border-left rounded-left")
+nav-secondary-link(
href="{{ url_for('main.homepage') }}",
data-toggle='dropdown-tab',
data-tab-target='home')
i.mr-2.pi-home
span Home
+nav-secondary-link(
href="{{ url_for('cloud.open_projects') }}",
data-toggle='dropdown-tab',
data-tab-target='films')
i.mr-2.pi-film-thick
span Films
+nav-secondary-link(
href="{{ url_for('cloud.workshops') }}",
data-toggle='dropdown-tab',
data-tab-target='training')
i.mr-2.pi-graduation-cap
span Training
+nav-secondary-link(
href="/p/textures",
data-toggle='dropdown-tab',
data-tab-target='libraries')
i.mr-2.pi-file-archive
span Libraries
+nav-secondary-link(
href="{{ url_for('cloud.services') }}",
data-toggle='dropdown-tab',
data-tab-target='services',
class="{% if title == 'services' %}active{% endif %}")
i.mr-2.pi-whoosh
span Services
.dropdown-menu-tab(data-tab='home')
.dropdown-menu-column
+nav-secondary()(class="nav-secondary-vertical rounded-right border-left overflow-hidden")
+nav-secondary-link(href="{{ url_for('projects.index') }}")
i.pi-star
span My Projects
+nav-secondary-link(href="{{ url_for('projects.index') }}")
i.pi-heart
span Shared with me
| {% if current_user.has_organizations() %}
+nav-secondary-link(href="{{ url_for('pillar.web.organizations.index') }}")
i.mr-2.pi-users
span My Organizations
| {% endif %}
+nav-secondary-link(href="{{ url_for('projects.home_project_shared_images')}}")
i.pi-picture
span Image Sharing
+nav-secondary-link(href="{{ url_for('projects.home_project') }}")
i.pi-blender
span Blender Sync
.dropdown-menu-tab(data-tab='films')
.dropdown-menu-column
+nav-secondary()(class="nav-secondary-vertical rounded-right border-left overflow-hidden")
+nav-secondary-link(
href="{{ url_for('cloud.open_projects') }}",
class="nav-see-more border-bottom")
span
| All Open Movies
i.pi-angle-right.pl-2
+nav-secondary-link(
href="{{ url_for('projects.view', project_url='spring') }}")
span Spring
+nav-secondary-link(
href="{{ url_for('projects.view', project_url='hero') }}")
span Hero
+nav-secondary-link(
href="{{ url_for('projects.view', project_url='dailydweebs') }}")
span The Daily Dweebs
+nav-secondary-link(
href="{{ url_for('projects.view', project_url='agent-327') }}")
span Agent 327
.dropdown-menu-tab(data-tab='training')
.dropdown-menu-column
+nav-secondary('Training')(class="nav-secondary-vertical rounded-right border-left overflow-hidden")
+nav-secondary-link(
href="{{ url_for('cloud.courses') }}")
i.pi-graduation-cap
span Courses
+nav-secondary-link(
href="{{ url_for('cloud.workshops') }}")
i.pi-lightbulb
span Workshops
+nav-secondary-link(
href="{{ url_for('cloud.production') }}")
i.pi-puzzle
span Production Lessons
.dropdown-menu-tab(data-tab='libraries')
.dropdown-menu-column
+nav-secondary('Libraries')(class="nav-secondary-vertical rounded-right border-left overflow-hidden")
+nav-secondary-link(href="{{ url_for('projects.view', project_url='textures') }}")
i.pi-folder-texture
span Textures
+nav-secondary-link(href="{{ url_for('projects.view', project_url='hdri') }}")
i.pi-globe
span HDRI
+nav-secondary-link(href="{{ url_for('projects.view', project_url='characters') }}")
i.pi-character
span Characters
+nav-secondary-link(href="{{ url_for('projects.view', project_url='gallery') }}")
i.pi-picture
span Art Gallery
.dropdown-menu-tab(data-tab='services')
.dropdown-menu-column
+nav-secondary()(class="nav-secondary-vertical rounded-right border-left overflow-hidden")
+nav-secondary-link(
href="{{ url_for('cloud.services') }}",
class="nav-see-more border-bottom")
span
| All Services
i.pi-angle-right.pl-2
+nav-secondary-link(href="/attract")
i.pi-attract
span Attract
+nav-secondary-link(href="/flamenco")
i.pi-attract
span Flamenco
+nav-secondary-link(href="{{ url_for('cloud.services') }}#blender-cloud-add-on")
i.pi-blender
span Blender Cloud add-on
+nav-secondary-link(href="{{ url_for('cloud.services') }}#texture-browser")
i.pi-texture
span Texture & HDRI Browser