diff --git a/src/templates/_macros/_navigation.pug b/src/templates/_macros/_navigation.pug index 0335980..eac6d7c 100644 --- a/src/templates/_macros/_navigation.pug +++ b/src/templates/_macros/_navigation.pug @@ -151,20 +151,11 @@ button.navbar-toggler( span {{ link['label'] }} | {% endfor %} - //- 'Explore' links to first featured node it can find. - | {% 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 %} +nav-secondary-link( - href="{{ url_for('projects.view_node', project_url=project.url, node_id=featured_node_id) }}", - title="Explore {{ project.name }}", + href="{{ url_for('cloud.project_browse', project_url=project.url) }}", + title="Browse {{ project.name }}", class="{% if title == 'project' %}active{% endif %}") - span Explore - | {% endif %} + span Browse //- Link to Production Tools (Attract, Flamenco, SVN, etc). | {% if extension_sidebar_links %} diff --git a/src/templates/emails/welcome.pug b/src/templates/emails/welcome.pug index 882c2ab..806796a 100644 --- a/src/templates/emails/welcome.pug +++ b/src/templates/emails/welcome.pug @@ -11,7 +11,7 @@ section our team to create more Open Projects, training, services and of course to make Blender the best CG pipeline in the world. You rock! p.buttons - a.button(href="{{ abs_url('cloud.login', next='/') }}", target='_blank') Explore Now > + a.button(href="{{ abs_url('cloud.login', next='/') }}", target='_blank') Browse Now > p. Here is a quick guide to help you get started with Blender Cloud. diff --git a/src/templates/films.pug b/src/templates/films.pug index 2a46dc7..e8a2698 100644 --- a/src/templates/films.pug +++ b/src/templates/films.pug @@ -48,7 +48,7 @@ include mixins/components .d-flex.align-items-center.mt-auto a.btn-link.mr-auto.my-3(href="{{ project_url }}") - | Explore #[i.pi-angle-right] + | Browse #[i.pi-angle-right] | {% endif %} | {% if project.status == 'pending' and current_user.is_authenticated and current_user.has_role('admin') %} diff --git a/src/templates/homepage.pug b/src/templates/homepage.pug index bae907f..44b9c65 100644 --- a/src/templates/homepage.pug +++ b/src/templates/homepage.pug @@ -40,7 +40,7 @@ meta(name="twitter:image", content="{% if main_project.picture_header %}{{ main_ | #[br] A poetic short film about a mountain spirit and her wise little dog. a.btn.btn-link.btn-sm.pl-0(href="/p/spring") - | Explore + | See more i.pi-angle-right .col-md-6 diff --git a/src/templates/projects/landing.pug b/src/templates/projects/landing.pug index d641daf..969c4e2 100644 --- a/src/templates/projects/landing.pug +++ b/src/templates/projects/landing.pug @@ -99,7 +99,7 @@ link(href="{{ url_for('static_cloud', filename='assets/css/project-main.css') }} | {% set project_header = project.picture_header.thumbnail('h', api=api) %} | {% endif %} -| {% set project_explore_url = url_for('projects.view', project_url=project.url) %} +| {% set project_browse_url = url_for('cloud.project_browse', project_url=project.url) %} .jumbotron.text-white.jumbotron-overlay-gradient-fade-to-gray( style="background-image: url(\'{{ project_header }}\');") @@ -108,12 +108,12 @@ link(href="{{ url_for('static_cloud', filename='assets/css/project-main.css') }} .col-md-6 .display-4.text-uppercase.font-weight-bold | {% if project.extension_props.cloud.logo %} - a(href="{{ project_explore_url }}") + a(href="{{ project_browse_url }}") img.img-fluid( alt="{{ project.name }}", src="{{ project.extension_props.cloud.logo.thumbnail('m', api=api) }}") | {% else %} - a.text-white(href="{{ project_explore_url }}") + a.text-white(href="{{ project_browse_url }}") | {{ project.name }} | {% endif %} @@ -132,8 +132,8 @@ link(href="{{ url_for('static_cloud', filename='assets/css/project-main.css') }} | WATCH | {% endif %} - a.btn.btn-link.px-5.text-white(href="{{ project_explore_url }}") - | Explore + a.btn.btn-link.px-5.text-white(href="{{ project_browse_url }}") + | Browse i.pi-angle-right.pl-2 @@ -162,20 +162,11 @@ link(href="{{ url_for('static_cloud', filename='assets/css/project-main.css') }} | {% endif %} | {% endfor %} - .clearfix + .text-center.mx-auto.py-3 + a.btn.btn-outline-primary.px-5( + href="{{ project_browse_url }}") + | See More Artwork - | {% 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 %} - .text-center.p-5 - a.btn.btn-outline-primary.px-5( - href="{{ url_for('projects.view_node', project_url=project.url, node_id=featured_node_id) }}") - | See More Artwork - | {% endif %} .row .col-md-10.mx-auto diff --git a/src/templates/welcome.pug b/src/templates/welcome.pug index 294b742..5a7e842 100644 --- a/src/templates/welcome.pug +++ b/src/templates/welcome.pug @@ -29,10 +29,10 @@ meta(property="og:image", content="{{ url_for('static', filename='assets/img/bac li.pr-1 | {% if current_user.is_anonymous %} a.btn.btn-sm.btn-outline-primary.px-3(href="{{ url_for('users.login', next='/') }}") - | Log in & Explore + | Log in & Browse | {% else %} a.btn.btn-sm.btn-outline-primary.px-3(href="{{ url_for('main.homepage') }}") - | Explore + | Browse | {% endif %} | {% endblock navigation_user %}