Merge branch 'master' into wip-breadcrumbs

This commit is contained in:
Pablo Vazquez 2019-03-28 21:04:13 +01:00
commit 1bd1c6e5fd
4 changed files with 114 additions and 125 deletions

View File

@ -20,16 +20,16 @@ button.navbar-toggler(
href="{{ url_for('main.homepage') }}")
i.pi-blender-cloud-logo
+nav-secondary-link(
href="{{ url_for('cloud.learn') }}",
class="{% if title in ('learn', 'courses', 'workshops') %}active{% endif %}")
span Training
+nav-secondary-link(
href="{{ url_for('cloud.open_projects') }}",
class="{% if title == 'open-projects' %}active{% endif %}")
span Films
+nav-secondary-link(
href="{{ url_for('cloud.learn') }}",
class="{% if title in ('learn', 'courses', 'workshops') %}active{% endif %}")
span Training
+nav-secondary-link(
href="{{ url_for('cloud.libraries') }}",
class="{% if title == 'libraries' %}active{% endif %}")

View File

@ -11,63 +11,36 @@ include ../../../pillar/src/templates/mixins/components
| {% endblock navigation_tabs %}
| {% block body %}
.container.pb-5
.container.py-4
.row
.col-12
.pt-4
h2.text-uppercase.font-weight-bold
| Learn
.lead
| Production quality training by Blender professionals.
h2.text-uppercase.font-weight-bold
| Learn
.lead
| Production quality training by Blender professionals.
hr.pb-2
hr.pb-2
.page-triplet-container.homepage.p-0
.row
.col-md-4
.triplet-card(data-url="{{ url_for('cloud.courses') }}")
.triplet-card-thumbnail
img(
alt="Courses",
src="{{ url_for('static', filename='assets/img/features/training_motion_graphics.jpg')}}")
.triplet-card-info
h3 Courses
p.
Character modeling, 3D printing, VFX, rigging and more.
a.triplet-cta(href="{{ url_for('cloud.courses') }}")
| LEARN MORE
+category_list_item(
'COURSES',
'Character modeling, 3D printing, VFX, rigging and more.',
"{{ url_for('cloud.courses') }}",
"{{ url_for('static', filename='assets/img/features/training_motion_graphics.jpg')}}")
.col-md-4
.triplet-card(data-url="{{ url_for('cloud.workshops') }}")
.triplet-card-thumbnail
img(
alt="Workshops",
src="{{ url_for('static', filename='assets/img/features/training_minecraft_animation.jpg')}}")
.triplet-card-info
h3 Workshops
p.
Enter the artist workshop and learn by example.
a.triplet-cta(href="{{ url_for('cloud.workshops') }}")
| LEARN MORE
hr
.col-md-4
.triplet-card(data-url="{{ url_for('cloud.production') }}")
.triplet-card-thumbnail
img(
alt="Production Lessons",
src="{{ url_for('static', filename='assets/img/features/open_movies_02.jpg')}}")
.triplet-card-info
h3 Production Lessons
p.
Tips and tricks by the open projects crew.
a.triplet-cta(href="{{ url_for('cloud.production') }}")
| LEARN MORE
+category_list_item(
'WORKSHOPS',
'Enter the artist workshop and learn by example.',
"{{ url_for('cloud.workshops') }}",
"{{ url_for('static', filename='assets/img/features/training_minecraft_animation.jpg')}}")
hr
+category_list_item(
'PRODUCTION LESSONS',
'Tips and tricks by the Open Projects crew.',
"{{ url_for('cloud.production') }}",
"{{ url_for('static', filename='assets/img/features/open_movies_02.jpg')}}")
| {% endblock body %}
| {% block footer_scripts %}
script.
$('.triplet-card').click(function(){
window.location.href = $(this).attr('data-url');
});
| {% endblock footer_scripts %}

View File

@ -11,59 +11,45 @@ include ../../../pillar/src/templates/mixins/components
| {% endblock navigation_tabs %}
| {% block body %}
.container.pb-5
.container.py-4
.row
.col-12
.pt-4
h2.text-uppercase.font-weight-bold
| Libraries
.lead
| Download 1000s of files and assets.
h2.text-uppercase.font-weight-bold
| Libraries
.lead
| Download 1000s of files and assets.
hr.pb-2
hr.pb-2
.page-triplet-container.homepage.p-0
.row
.col-md-4
.triplet-card(data-url="{{ url_for('projects.view', project_url='textures') }}")
.triplet-card-thumbnail
img(
alt="Textures",
src="{{ url_for('static', filename='assets/img/features/textures_01.jpg')}}")
.triplet-card-info
h3 Textures
p.
More than 1500 texture maps.
Browse online or from Blender with our add-on.
+category_list_item(
'TEXTURES',
'More than 1500 texture maps. Browse online or from Blender with our add-on.',
"{{ url_for('projects.view', project_url='textures') }}",
"{{ url_for('static', filename='assets/img/features/textures_01.jpg')}}")
a.triplet-cta(href="{{ url_for('projects.view', project_url='textures') }}")
| LEARN MORE
hr
.col-md-4
.triplet-card(data-url="{{ url_for('projects.view', project_url='hdri') }}")
.triplet-card-thumbnail
img(
alt="HDRI",
src="{{ url_for('static', filename='assets/img/features/hdri_01.jpg')}}")
.triplet-card-info
h3 HDRI
p.
Up to 16K and 24 EVs (extremely high) HDR images to light your renders.
a.triplet-cta(href="{{ url_for('projects.view', project_url='hdri') }}")
| LEARN MORE
+category_list_item(
'HDRI',
'Up to 16K and 24 EVs (extremely high) HDR images to light your renders.',
"{{ url_for('projects.view', project_url='hdri') }}",
"{{ url_for('static', filename='assets/img/features/hdri_01.jpg')}}")
.col-md-4
.triplet-card(data-url="{{ url_for('projects.view', project_url='characters') }}")
.triplet-card-thumbnail
img(
alt="Characters",
src="{{ url_for('static', filename='assets/img/features/characters_01.jpg')}}")
.triplet-card-info
h3 Characters
p.
Production quality, fully rigged and shaded characters ready to animate.
a.triplet-cta(href="{{ url_for('projects.view', project_url='characters') }}")
| LEARN MORE
hr
+category_list_item(
'CHARACTERS',
'Production quality, fully rigged and shaded characters ready to animate.',
"{{ url_for('projects.view', project_url='hdri') }}",
"{{ url_for('static', filename='assets/img/features/characters_01.jpg')}}")
hr
+category_list_item(
'ART GALLERY',
'Learn by example.',
"{{ url_for('projects.view', project_url='gallery') }}",
"{{ url_for('static', filename='assets/img/features/training_bob_forest.jpg')}}")
| {% endblock body %}

View File

@ -27,8 +27,13 @@ meta(name="twitter:image", content="{{ url_for('static', filename='assets/img/ba
| {% endblock %}
| {% block body %}
- var header_text = "On Blender Cloud you can create and share personal projects, access our texture and HDRI library (or create your own), keep track of your production, manage your renders and much more!";
+jumbotron("Services", header_text, "{{ url_for('static', filename='assets/img/backgrounds/services_projects.jpg')}}")(class="jumbotron-overlay")
.container.py-4
.row.pb-3
.col-12
h2.text-uppercase.font-weight-bold
| Services
.lead
| On Blender Cloud you can create and share personal projects, access our texture and HDRI library (or create your own), keep track of your production, manage your renders and much more!
- var addon_text = 'Available through the <a href="{{ url_for(\'cloud.services\') }}#blender-cloud-add-on">Blender Cloud add-on</a>';
section#blender-cloud-add-on.page-card
@ -46,15 +51,18 @@ section#blender-cloud-add-on.page-card
small Blender Cloud add-on requires Blender 2.78 or newer
a.btn.btn-primary(
href="/r/downloads/blender_cloud-latest-addon.zip")
href="/r/downloads/blender_cloud-latest-addon.zip",
title="Download Blender Cloud add-on")
i.pi-download
| Download add-on &nbsp;<small>v</small> {{ config.BLENDER_CLOUD_ADDON_VERSION }}
.page-card-side
a.page-card-side(
href="/r/downloads/blender_cloud-latest-addon.zip",
title="Download Blender Cloud add-on")
img(
src="{{ url_for('static', filename='assets/img/features/blender_cloud_addon_thumbnail.png')}}")
section#blender-sync.page-card.right
section#blender-sync.page-card
.page-card-side
h2.page-card-title Blender Sync
.page-card-summary
@ -68,21 +76,25 @@ section#blender-sync.page-card.right
.tip !{addon_text}
a.btn.btn-outline-primary(
href="/r/downloads/blender_cloud-latest-addon.zip")
href="/r/downloads/blender_cloud-latest-addon.zip",
title="Download Blender Cloud add-on")
i.pi-download
| Download add-on &nbsp;<small>v</small> {{ config.BLENDER_CLOUD_ADDON_VERSION }}
a.btn.btn-link(
href="/blog/introducing-blender-sync")
href="/blog/introducing-blender-sync",
title="Learn more about Blender Sync")
| Learn More
i.pi-angle-right
.page-card-side
a.page-card-side(
href="/blog/introducing-blender-sync",
title="Learn more about Blender Sync")
img(
src="{{ url_for('static', filename='assets/img/features/sync_thumbnail.jpg')}}")
section#texture-browser.page-card.right
section#texture-browser.page-card
.page-card-side
h2.page-card-title Texture & HDRI Browser
.page-card-summary
@ -95,16 +107,21 @@ section#texture-browser.page-card.right
a.btn.btn-outline-primary.js-watch-video(
href="https://www.youtube.com/watch?v=-srXYv2Osjw",
data-youtube-id="-srXYv2Osjw")
data-youtube-id="-srXYv2Osjw",
title="Watch video about Texture and HDRI Browser")
i.pi-play
| Watch Video
.page-card-side
a.page-card-side(
class="js-watch-video",
href="https://www.youtube.com/watch?v=-srXYv2Osjw",
data-youtube-id="-srXYv2Osjw",
title="Watch video about Texture and HDRI Browser")
img(
src="{{ url_for('static', filename='assets/img/features/tex_library_thumbnail.jpg')}}")
section#image-sharing.page-card.right
section#image-sharing.page-card
.page-card-side
h2.page-card-title Image Sharing
.page-card-summary
@ -115,21 +132,27 @@ section#image-sharing.page-card.right
a.btn.btn-outline-primary.js-watch-video(
href="https://www.youtube.com/watch?v=yvtqeMBOAyk",
data-youtube-id="yvtqeMBOAyk")
data-youtube-id="yvtqeMBOAyk",
title="Watch video about Image Sharing")
i.pi-play
| Watch Video
a.btn.btn-link(
href="/blog/introducing-image-sharing")
href="/blog/introducing-image-sharing",
title="Learn more about Image Sharing")
| Learn More
i.pi-angle-right
.page-card-side
a.page-card-side(
class="js-watch-video",
href="https://www.youtube.com/watch?v=yvtqeMBOAyk",
data-youtube-id="yvtqeMBOAyk",
title="Watch video about Image Sharing")
img(
src="{{ url_for('static', filename='assets/img/features/image_sharing_thumbnail.jpg')}}")
section#projects.page-card.right
section#projects.page-card
.page-card-side
h2.page-card-title Private Projects
.page-card-summary.
@ -137,16 +160,19 @@ section#projects.page-card.right
Upload assets and collaborate with other Blender Cloud members.
a.btn.btn-link(
href="/blog/introducing-private-projects")
href="/blog/introducing-private-projects",
title="Learn more about Private Projects")
| Learn More
i.pi-angle-right
.page-card-side
a.page-card-side(
href="/blog/introducing-private-projects",
title="Learn more about Private Projects")
img(
src="{{ url_for('static', filename='assets/img/features/projects_thumbnail.jpg')}}")
section#attract.page-card.right
section#attract.page-card
.page-card-side
h2.page-card-title
| Attract
@ -165,12 +191,14 @@ section#attract.page-card.right
| Learn More
i.pi-angle-right
.page-card-side
a.page-card-side(
href="/blog/attract-and-flamenco-public-beta",
title="Learn more about Attract")
img(
src="{{ url_for('static', filename='assets/img/features/attract_thumbnail.jpg')}}")
section#flamenco.page-card.right
section#flamenco.page-card
.page-card-side
h2.page-card-title
| Flamenco
@ -189,7 +217,9 @@ section#flamenco.page-card.right
| Learn More
i.pi-angle-right
.page-card-side
a.page-card-side(
href="https://flamenco.io",
title="Learn more about Flamenco")
img(
src="{{ url_for('static', filename='assets/img/features/flamenco_thumbnail.jpg')}}")