diff --git a/src/styles/_homepage.sass b/src/styles/_homepage.sass index 0109102..0376603 100644 --- a/src/styles/_homepage.sass +++ b/src/styles/_homepage.sass @@ -234,7 +234,6 @@ section.stream margin-left: 0 .ribbon - +ribbon right: -47px top: 5px font-size: 12px @@ -295,7 +294,6 @@ section.random-asset border-top: none .ribbon - +ribbon right: -47px top: 5px font: diff --git a/src/styles/project-landing.sass b/src/styles/project-landing.sass index 3d65012..5096335 100644 --- a/src/styles/project-landing.sass +++ b/src/styles/project-landing.sass @@ -254,9 +254,6 @@ section font-size: 1.6em left: 7px - .ribbon - +ribbon - .info width: 100% height: 100% diff --git a/src/templates/homepage.pug b/src/templates/homepage.pug index ca4eba8..454c2ea 100644 --- a/src/templates/homepage.pug +++ b/src/templates/homepage.pug @@ -1,6 +1,7 @@ | {% extends 'layout.html' %} | {% from '_macros/_navigation.html' import navigation_tabs %} | {% from 'nodes/custom/blog/_macros.html' import render_blog_post %} +include ../../../pillar/src/templates/mixins/components | {% set title = 'homepage' %} @@ -62,69 +63,24 @@ meta(name="twitter:image", content="{% if main_project.picture_header %}{{ main_ section.stream.py-3 h6.title-underline Latest Assets - ul.activity-stream__list.list-unstyled + | {% if activity_stream %} + .card-padless.p-2 | {% for n in activity_stream %} - li( - class="{{ n.node_type }} {{ n.properties.content_type }} {% if n.picture %}with-picture{% endif %}", - data-url="{{ n.url }}") - a.activity-stream__list-thumbnail( - class="{{ n.properties.content_type }}", - href="{{ n.url }}") - | {% if n.picture %} - img(src="{{ n.picture.thumbnail('m', api=api) }}") - | {% endif %} - - .activity-stream__list-thumbnail-icon - | {% if n.node_type == 'asset' %} - | {% if n.properties.content_type == 'video' %} - i.pi-play - | {% elif n.properties.content_type == 'image' %} - i.pi-picture - | {% elif n.properties.content_type == 'file' %} - i.pi-file-archive - | {% else %} - i.pi-folder - | {% endif %} - | {% endif %} - - - .activity-stream__list-details - a.title(href="{{ n.url }}") - | {{ n.name }} - - | {% if n.permissions.world %} - .ribbon - span free - | {% endif %} - ul.list-unstyled.d-flex.text-muted - | {% if not n.picture %} - li.when - a(href="{{ n.url }}", title="{{ n._created }}") {{ n._created | pretty_date_time }} - li.who {{ n.user.full_name }} - | {% endif %} - - | {% if n.attached_to %} - li.where-parent - a(href="{{ n.attached_to.url }}") {{ n.attached_to.name }} - | {% endif %} - li.where-project - a.project(href="{{ url_for('projects.view', project_url=n.project.url) }}") {{ n.project.name }} - li.what - | {% if n.node_type == 'asset' %} - | {{ n.properties.content_type | undertitle }} - | {% endif %} - - | {% if n.picture %} - ul.list-unstyled.d-flex.text-muted.extra - li.when - a(href="{{ n.url }}", title="{{ n._created }}") {{ n._created | pretty_date_time }} - li.who {{ n.user.full_name }} - | {% endif %} + | {% if n.node_type not in ['comment'] %} + +list-asset( + '{{ n.name }}', + '{{ url_for_node(node=n) }}', + "{% if n.picture %}{{ n.picture.thumbnail('l', api=api) }}{% endif %}", + "{% if n.properties.content_type %}{{ n.properties.content_type | undertitle }}{% else %}{{ n.node_type | undertitle }}{% endif %}", + "{{ n._updated | pretty_date }}")(class="{% if n.permissions.world %}free{% endif %}") + | {% endif %} | {% endfor %} - - li.activity-stream__list-item.empty#activity-stream__empty - | No items to list. - + | {% else %} + .card + .card-body + h6.card-title + | No assets. + | {% endif %} section.random-asset.py-3 h6.title-underline @@ -151,7 +107,7 @@ meta(name="twitter:image", content="{% if main_project.picture_header %}{{ main_ li.random-asset__list-item.featured | {% if n.permissions.world %} .ribbon - span free + span FREE | {% endif %} a.random-asset__thumbnail( href="{{ n.url }}", @@ -179,7 +135,7 @@ meta(name="twitter:image", content="{% if main_project.picture_header %}{{ main_ li | {% if n.permissions.world %} .ribbon - span free + span FREE | {% endif %} a.random-asset__list-thumbnail( href="{{ n.url }}", diff --git a/src/templates/projects_index_collection.pug b/src/templates/projects_index_collection.pug index 92a1445..cd5ff4a 100644 --- a/src/templates/projects_index_collection.pug +++ b/src/templates/projects_index_collection.pug @@ -77,7 +77,10 @@ meta(name="twitter:image", content="{{ page_header_image }}") | {% 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(data-url="{{ url_for('projects.view', project_url=project.url) }}", tabindex='{{ loop.index }}') + +card( + class='js-project-go card-fade cursor-pointer mb-4', + 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(