diff --git a/src/templates/layout-original.pug b/src/templates/layout-original.pug
deleted file mode 100644
index 4190fe6..0000000
--- a/src/templates/layout-original.pug
+++ /dev/null
@@ -1,366 +0,0 @@
-doctype
-html(lang="en")
- head
- meta(charset="utf-8")
- title {% if self.page_title() %}{% block page_title %}{% endblock %} — {% endif %}Blender Cloud
- meta(name="viewport", content="width=device-width, initial-scale=1.0")
- meta(name="description", content="Blender Cloud is a web based service developed by Blender Institute that allows people to access the training videos and all the data from the open projects.")
- meta(name="author", content="Blender Institute")
- meta(name="theme-color", content="#3e92aa")
-
- | {% if config['GOOGLE_SITE_VERIFICATION'] %}
- meta(name="google-site-verification" content="{{ config['GOOGLE_SITE_VERIFICATION'] }}")
- | {% endif %}
-
- meta(property="og:site_name", content="Blender Cloud")
- meta(property="og:locale", content="en_US")
- meta(name="twitter:card", content="summary_large_image")
- meta(name="twitter:site", content="@Blender_Cloud")
-
- | {% block og %}
- meta(property="og:title", content="Blender Cloud")
- meta(property="og:url", content="https://cloud.blender.org")
- meta(property="og:type", content="website")
- meta(property="og:image", content="{{ url_for('static', filename='assets/img/backgrounds/background_gleb_locomotive.jpg')}}")
- meta(property="og:description", content="Blender Cloud is a web based service developed by Blender Institute that allows people to access the training videos and all the data from the open projects.")
-
- meta(name="twitter:title", content="Blender Cloud")
- meta(name="twitter:description", content="Blender Cloud is a web based service developed by Blender Institute that allows people to access the training videos and all the data from the open projects.")
- meta(name="twitter:image", content="{{ url_for('static', filename='assets/img/backgrounds/background_gleb_locomotive.jpg')}}")
- | {% endblock og %}
-
- script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery-3.1.0.min.js')}}")
- script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.typeahead-0.11.1.min.js')}}")
- script(src="{{ url_for('static_pillar', filename='assets/js/vendor/js.cookie-2.0.3.min.js')}}")
- | {% if current_user.is_authenticated %}
- script(src="{{ url_for('static_pillar', filename='assets/js/vendor/clipboard.min.js')}}")
- | {% endif %}
-
- | {% if current_user.has_cap('subscriber') %}
- | {# Only load if we can comment (for converting markdown as-we-type) #}
- script(src="{{ url_for('static_pillar', filename='assets/js/markdown.min.js') }}")
- | {% endif %}
-
- script(src="{{ url_for('static_pillar', filename='assets/js/tutti.min.js') }}")
-
- link(href="{{ url_for('static', filename='assets/img/favicon.png') }}", rel="shortcut icon")
- link(href="{{ url_for('static', filename='assets/img/apple-touch-icon-precomposed.png') }}", rel="icon apple-touch-icon-precomposed", sizes="192x192")
-
- link(href="{{ url_for('static_pillar', filename='assets/css/vendor/bootstrap.min.css') }}", rel="stylesheet")
- link(href="{{ url_for('static', filename='assets/google-font-roboto/roboto.css') }}", rel="stylesheet")
-
- | {% block head %}{% endblock %}
-
- | {% block css %}
- link(href="{{ url_for('static_pillar', filename='assets/css/font-pillar.css') }}", rel="stylesheet")
- link(href="{{ url_for('static_pillar', filename='assets/css/base.css') }}", rel="stylesheet")
- | {% if title == 'blog' %}
- link(href="{{ url_for('static_pillar', filename='assets/css/blog.css') }}", rel="stylesheet")
- | {% else %}
- link(href="{{ url_for('static_cloud', filename='assets/css/main.css') }}", rel="stylesheet")
- | {% endif %}
- | {% endblock css %}
-
-
- | {% if not title %}{% set title="default" %}{% endif %}
-
- body(class="{{ title }}")
- .container-page
- | {% with messages = get_flashed_messages(with_categories=True) %}
- | {% if messages %}
-
- | {% for (category, message) in messages %}
- .alert(role="alert", class="alert-{{ category }}")
- i.alert-icon(class="{{ category }}")
- span {{ message }}
- button.close(type="button", data-dismiss="alert")
- i.pi-cancel
- | {% endfor %}
-
- | {% endif %}
- | {% endwith %}
-
- nav.navbar
- .navbar-container
- header.navbar-header
- button.navbar-toggle(data-target=".navbar-collapse", data-toggle="collapse", type="button")
- span.sr-only Toggle navigation
- i.pi-menu
- a.navbar-brand(
- href="{{ url_for('main.homepage') }}",
- title="Blender Cloud")
- span.app-logo
- i.pi-blender-cloud
-
- | {% block navigation_search %}
- .search-input
- input#cloud-search(
- type="text",
- placeholder="Search assets, tutorials...")
- i.search-icon.pi-search
- | {% endblock navigation_search %}
-
- nav.collapse.navbar-collapse
- ul.nav.navbar-nav.navbar-right
- | {% if node and node.properties and node.properties.category %}
- | {% set category = node.properties.category %}
- | {% else %}
- | {% set category = title %}
- | {% endif %}
-
- | {% block navigation_sections %}
- li
- a.navbar-item(
- href="{{ url_for('main.main_blog') }}",
- title="Blender Cloud Blog",
- data-toggle="tooltip",
- data-placement="bottom",
- class="{% if category == 'blog' %}active{% endif %}")
- span Blog
-
- li(class="dropdown libraries")
- a.navbar-item.dropdown-toggle(
- href="",
- data-toggle="dropdown",
- title="Libraries")
- span Libraries
- i.pi-angle-down
-
- ul.dropdown-menu
- li
- a.navbar-item(
- href="{{ url_for('projects.view', project_url='hdri') }}",
- title="HDRI Library",
- data-toggle="tooltip",
- data-placement="left")
- i.pi-globe
- | HDRI
- li
- a.navbar-item(
- href="{{ url_for('projects.view', project_url='textures') }}",
- title="Textures Library",
- data-toggle="tooltip",
- data-placement="left")
- i.pi-folder-texture
- | Textures
- li
- a.navbar-item(
- href="{{ url_for('projects.view', project_url='characters') }}",
- title="Character Library",
- data-toggle="tooltip",
- data-placement="left")
- i.pi-character
- | Characters
-
-
- li(class="dropdown libraries")
- a.navbar-item.dropdown-toggle(
- href="",
- data-toggle="dropdown",
- title="Training")
- span Training
- i.pi-angle-down
-
- ul.dropdown-menu
- li
- a.navbar-item(
- href="{{ url_for('cloud.courses') }}",
- title="Courses",
- data-toggle="tooltip",
- data-placement="left")
- i.pi-graduation-cap
- | Courses
- li
- a.navbar-item(
- href="{{ url_for('cloud.workshops') }}",
- title="Workshops",
- data-toggle="tooltip",
- data-placement="left")
- i.pi-lightbulb
- | Workshops
- li
- a.navbar-item(
- href="{{ url_for('projects.view', project_url='gallery') }}",
- title="Curated artwork collection",
- data-toggle="tooltip",
- data-placement="left")
- i.pi-image
- | Art Gallery
-
- li
- a.navbar-item(
- href="{{ url_for('cloud.open_projects') }}",
- title="Browse all the Open Projects",
- data-toggle="tooltip",
- data-placement="bottom",
- class="{% if category in ['open-projects', 'film'] %}active{% endif %}")
- span Open Projects
- li
- a.navbar-item(
- href="{{ url_for('cloud.services') }}",
- title="Blender Cloud Services",
- data-toggle="tooltip",
- data-placement="bottom",
- class="{% if category == 'services' %}active{% endif %}")
- span Services
- | {% endblock navigation_sections %}
-
-
- | {% if current_user.is_anonymous %}
- li
- a.navbar-item(
- href="https://store.blender.org/product/membership/",
- title="Sign up") Sign up
- | {% endif %}
-
-
- | {% block navigation_user %}
-
- | {% include 'menus/notifications.html' %}
- | {% include 'menus/user.html' %}
-
- | {% endblock navigation_user %}
-
-
- .page-content
- #search-overlay
- | {% block page_overlay %}
- #page-overlay
- | {% endblock page_overlay %}
- .page-body
- | {% block body %}{% endblock %}
-
- | {% block footer_container %}
- #footer-container
- | {% block footer_navigation %}
- #footer-navigation
- .container
- .row
- .col-md-4.col-xs-6
- .footer-support
- h4 Support & Feedback
- p.
- Let us know what you think or if you have any issues
- just write to cloudsupport at blender dot org
-
- .col-md-2.col-xs-6
- ul.footer-social
- li
- a(href="https://www.facebook.com/BlenderCloudOfficial/",
- title="Follow us on Facebook")
- i.pi-social-facebook
- li
- a(href="https://twitter.com/Blender_Cloud",
- title="Follow us on Twitter")
- i.pi-social-twitter
-
- .col-md-2.col-xs-6
- h4
- a(href="{{ url_for('main.homepage') }}")
- | Blender Cloud
- ul.footer-links
- li
- a(href="{{ url_for('main.main_blog') }}",
- title="Blender Cloud Blog")
- | Blog
- li
- a(href="{{ url_for('cloud.services') }}",
- title="Blender Cloud Services")
- | Services
- li
- a(href="{{ url_for('cloud.about') }}",
- title="About Blender Cloud")
- | About
- 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
-
- .col-md-2.col-xs-6
- h4
- a(href="https://www.blender.org",
- title="Blender official Website")
- | Blender
- ul.footer-links
- li
- a(href="https://www.blender.org",
- title="Blender official Website")
- | Blender.org
- li
- a(href="https://store.blender.org/",
- title="The official Blender Store")
- | Blender Store
-
- .col-md-2.col-xs-6.special
- | With the support of the
MEDIA Programme of the European Union
- img(alt="MEDIA Programme of the European Union",
- src="https://gooseberry.blender.org/wp-content/uploads/2014/01/media_programme.png")
- | {% endblock footer_navigation %}
-
- | {% block footer %}
- footer.container
- #hop(title="Be awesome in space")
- i.pi-angle-up
- | {% endblock footer %}
- | {% endblock footer_container %}
-
- #notification-pop(data-url="", data-read-toggle="")
- .nc-progress
- a#pop-close(href="#", title="Dismiss")
- i.pi-cancel
- .nc-item
- .nc-avatar
- .nc-text
- span.nc-date
- a(href="")
-
- noscript
- link(href='//fonts.googleapis.com/css?family=Roboto:300,400', rel='stylesheet', type='text/css')
-
- script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.bootstrap-3.3.7.min.js') }}")
-
- | {% if current_user.is_authenticated %}
- script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.typewatch-3.0.0.min.js') }}")
- script.
- // When sending an AJAX request, always add the X-CSRFToken header to it.
- var csrf_token = "{{ csrf_token() }}";
- $.ajaxSetup({
- beforeSend: function (xhr, settings) {
- if (!/^(GET|HEAD|OPTIONS|TRACE)$/i.test(settings.type) && !this.crossDomain) {
- xhr.setRequestHeader("X-CSRFToken", csrf_token);
- }
- }
- });
- | {% endif %}
-
- script.
- $(document).ready(function() {
- {% if current_user.is_authenticated %}
- getNotificationsLoop(); // Check for new notifications in the background
-
- // Resize #notifications and change overflow for scrollbars
- $(window).on("resize", function() { notificationsResize(); });
- {% endif %}
- });
-
- if (typeof $().tooltip != 'undefined'){
- $('[data-toggle="tooltip"]').tooltip({'delay' : {'show': 0, 'hide': 0}});
- }
- if(typeof($.fn.popover) != 'undefined'){
- $('[data-toggle="popover"]').popover();
- }
-
- | {% block footer_scripts_pre %}{% endblock %}
- | {% block footer_scripts %}{% endblock %}
-
- script.
- (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
- (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
- m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
- })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
- ga('create', '{{ config.GOOGLE_ANALYTICS_TRACKING_ID }} ', 'auto', {'allowAnchor': true});
- ga('send', 'pageview');
diff --git a/src/templates/layout.pug b/src/templates/layout.pug
index ecd5a2a..9c30a81 100644
--- a/src/templates/layout.pug
+++ b/src/templates/layout.pug
@@ -102,10 +102,33 @@ html(lang="en")
| {% block navigation_sections %}
li.nav-item
a.nav-link(href="{{ url_for('main.main_blog') }}", class="{% if category == 'blog' %}active{% endif %}") Blog
- li.nav-item
- a.nav-link(href="#") Libraries
- li.nav-item
- a.nav-link(href="#") Training
+ li.nav-item.dropdown
+ a.nav-link.dropdown-toggle(href="#", data-toggle="dropdown") Libraries
+ .dropdown-menu
+ a.dropdown-item(
+ href="{{ url_for('projects.view', project_url='hdri') }}")
+ i.pi-globe
+ | HDRI
+ a.dropdown-item(
+ href="{{ url_for('projects.view', project_url='textures') }}")
+ i.pi-folder-texture
+ | Textures
+ a.dropdown-item(
+ href="{{ url_for('projects.view', project_url='characters') }}")
+ i.pi-character
+ | Characters
+ li.nav-item.dropdown
+ a.nav-link.dropdown-toggle(href="#", data-toggle="dropdown") Training
+ .dropdown-menu
+ a.dropdown-item(href="{{ url_for('cloud.courses') }}")
+ i.pi-graduation-cap
+ | Courses
+ a.dropdown-item(href="{{ url_for('cloud.workshops') }}")
+ i.pi-lightbulb
+ | Workshops
+ a.dropdown-item(href="{{ url_for('projects.view', project_url='gallery') }}")
+ i.pi-image
+ | Art Gallery
li.nav-item
a.nav-link(href="{{ url_for('cloud.open_projects') }}",
class="{% if category in ['open-projects', 'film'] %}active{% endif %}") Open Projects