From 7a5af9282c275c49d9e9c741865fd11271f655b0 Mon Sep 17 00:00:00 2001 From: Francesco Siddi Date: Sun, 5 Aug 2018 14:22:47 +0200 Subject: [PATCH] WIP on new landing pages or projects --- .../nodes/custom/page/view_embed.pug | 22 +++--- src/templates/projects/_macros.pug | 79 +++++++++---------- 2 files changed, 50 insertions(+), 51 deletions(-) diff --git a/src/templates/nodes/custom/page/view_embed.pug b/src/templates/nodes/custom/page/view_embed.pug index 46d1c088..cb02d71a 100644 --- a/src/templates/nodes/custom/page/view_embed.pug +++ b/src/templates/nodes/custom/page/view_embed.pug @@ -1,26 +1,26 @@ | {% extends 'projects/landing.html' %} | {% block body %} + | {% if node.picture %} header - img.header(src="{{ node.picture.thumbnail('h', api=api) }}") + .jumbotron.jumbotron-fluid( + style="background-image: url('{{ node.picture.thumbnail('h', api=api) }}'); background-position: 50% 50%;") | {% endif %} + +| {# Secondary Navigation #} | {% block navbar_secondary %} | {{ super() }} | {% endblock navbar_secondary %} -#node-container - #node-overlay - section.node-details-container.page +.container.landing + section.node-details-container.project + .node-details-title.container + h1 {{node.name}} - .node-details-header - .node-title#node-title - | {{node.name}} - - | {% if node.description %} - .node-details-description#node-description + | {% if node.description %} | {{ node | markdowned('description') }} - | {% endif %} + | {% endif %} .node-details-meta.footer span.updated(title="created {{ node._created | pretty_date }}") updated {{ node._updated | pretty_date }} diff --git a/src/templates/projects/_macros.pug b/src/templates/projects/_macros.pug index 308ebf70..43b4dddc 100644 --- a/src/templates/projects/_macros.pug +++ b/src/templates/projects/_macros.pug @@ -1,42 +1,41 @@ | {% macro render_secondary_navigation(project, pages=None) %} -nav.navbar-secondary - .navbar-container - nav.collapse.navbar-collapse - ul.nav.navbar-nav.navbar-right - li - a.navbar-item( - href="{{ url_for('projects.view', project_url=project.url) }}", - title="{{ project.name }} Homepage") - span - b {{ project.name }} - li - a.navbar-item( - href="{{ url_for('main.project_blog', project_url=project.url) }}", - title="Project Blog", - class="{% if category == 'blog' %}active{% endif %}") - span Blog - | {% if pages %} - | {% for p in pages %} - li - a.navbar-item( - href="{{ url_for('projects.view_node', project_url=project.url, node_id=p._id) }}", - title="{{ p.name }}", - class="{% if category == 'page' %}active{% endif %}") - span {{ p.name }} - | {% endfor %} - | {% endif %} - | {% if project.nodes_featured %} - | {# In some cases featured_nodes might might be embedded #} - | {% if '_id' in project.nodes_featured[0] %} - | {% set featured_node_id=project.nodes_featured[0]._id %} - | {% else %} - | {% set featured_node_id=project.nodes_featured[0] %} - | {% endif %} - li - a.navbar-item( - href="{{ url_for('projects.view_node', project_url=project.url, node_id=featured_node_id) }}", - title="Explore {{ project.name }}", - class="{% if category == 'blog' %}active{% endif %}") - span Explore - | {% endif %} +.container.navbar-secondary + ul.nav.justify-content-left + li.nav-item + a.nav-link.nav-title( + href="{{ url_for('projects.view', project_url=project.url) }}", + title="{{ project.name }} Homepage") {{ project.name }} + li.nav-item + a.nav-link( + href="{{ url_for('main.project_blog', project_url=project.url) }}", + class="{% if title == 'updates' %}active{% endif %}") Updates + | {% if pages %} + | {% for page in pages %} + li.nav-item + a.nav-link( + href="{{ url_for('projects.view_node', project_url=project.url, node_id=page._id) }}", + class="{% if title == 'updates' %}active{% endif %}") {{ page.name }} + | {% endfor %} + | {% endif %} + li.nav-item + a.nav-link( + href="/projects/gallery.html", + class="{% if title == 'gallery' %}active{% endif %}") Gallery + li.nav-item + a.nav-link( + href="#", + class="{% if title == 'assets' %}active{% endif %}") Assets + | {% if project.nodes_featured %} + | {# In some cases featured_nodes might might be embedded #} + | {% if '_id' in project.nodes_featured[0] %} + | {% set featured_node_id=project.nodes_featured[0]._id %} + | {% else %} + | {% set featured_node_id=project.nodes_featured[0] %} + | {% endif %} + | {% endif %} + li.nav-item + a.nav-link( + href="{{ url_for('projects.view_node', project_url=project.url, node_id=featured_node_id) }}", + title="Explore {{ project.name }}") Dashboard + | {% endmacro %}