archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Simplify Errors (404 & 403)

Browse Source 
TODO: Use a generic error template and pass error/text
This commit is contained in:
Pablo Vazquez
2017-06-12 16:49:43 +02:00
parent de96e8e189
commit 3a500f3ea3
8 changed files with 88 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
src/templates/errors/403_embed.jade
View File

@@ -1,75 +1,35 @@
#error_container.403
#error_box
#error-container(class="error-403")
#error-box
.error-top-container
.error-top-header-overlay
.error-top-header(
style="background-image: url({{ url_for('static', filename='assets/img/backgrounds/background_agent327_02.jpg')}})")
.error-title Forbidden.
.error-lead
p You don't have access to this content.
.error-title
span.icon
i.pi-lock-open
span.text Get this and more with your<br/> Blender Cloud subscription.
.buttons
a.sign-up.btn.btn-outline(href="https://store.blender.org/product/membership/")
i.pi-check
| Subscribe
| {% if not current_user.is_authenticated %}
a.sign-in.btn.btn-empty(href="{{ url_for('users.login') }}")
i.pi-log-in
| Log in
| {% if current_user.is_authenticated %}
| {% if current_user.has_role('demo') %}
| {% set subscription = 'demo' %}
| {% elif current_user.has_role('subscriber') %}
| {% set subscription = 'subscriber' %}
| {% else %}
| {% set subscription = 'none' %}
| {% endif %}
hr
| {% if subscription == 'none' %}
hr
p
| Support Blender and get awesome stuff.&nbsp;
a(href="https://store.blender.org/product/membership/") Subscribe Now
| {% endif %}
section.error-watchamissing
h2 Support Blender and get awesome stuff.
| {% else %}
p
a(href="{{ url_for('users.login') }}") Login
| {% endif %}
.row
.col-md-4
a(href="{{ url_for('main.training') }}")
h3 Training &amp; Tutorials
p.
Character modeling, 3D printing, VFX, rigging and more. We offer
12 complete training series with +100 hours of training.
.col-md-4
a(href="{{ url_for('main.open_projects') }}")
h3 Open Projects
p.
The iconic Blender Institute Open Movies,
featuring all the production files, assets, artwork, and never-seen-before content.
.col-md-4
a(href="{{ url_for('main.services') }}")
h3 Services & Tools
p.
Create your personal projects, collaborate with other members, store
and sync your Blender settings across multiple workstations.
.row
.col-md-4
a(href="{{ url_for('projects.view', project_url='textures') }}")
h3 Textures
p.
More than 1500 texture maps to browse online or within Blender via our awesome add-on.
Create your own Texture libraries!
.col-md-4
a(href="{{ url_for('projects.view', project_url='hdri') }}")
h3 HDRI
p.
Up to 8K and 18 EVs (extremely high) HDR images to light your renders.
.col-md-4
a(href="{{ url_for('projects.view', project_url='characters') }}")
h3 Characters
p.
Production quality, fully rigged and shaded characters ready to animate.
hr
.error-lead.extra.
If you have just subscribed, please <a href="{{ url_for('users.logout') }}">log out</a> and in again.
For any other issue get in touch via <a href="mailto:cloudsupport@blender.org">cloudsupport@blender.org</a>
.error-lead.extra
| {% if current_user.is_authenticated %}
p.
If you have just subscribed, please <a href="{{ url_for('users.logout') }}">log out</a> and in again.
| {% endif %}
p.
Need help? Get in touch via <a href="mailto:cloudsupport@blender.org">e-mail</a>.

18
src/templates/errors/404.jade
View File

@@ -1,17 +1,17 @@
| {% extends "errors/layout.html" %}
| {% block body %}
#error_container.404.standalone
#error_box
#error-container(class="error-404")
#error-box
.error-top-container
.error-title Not found.
.error-lead
p.
The error has been logged and we're working on getting it fixed.
hr
.error-lead
p Whatever you're looking for, it's not here.
.error-lead.extra
p.
Looking for the Open Movies? Check out <a href="https://www.youtube.com/BlenderFoundation">Blender Foundation's YouTube</a> channel. <br/> Were you looking for tutorials instead? <a href="http://www.blender.org/support/tutorials/">blender.org</a> has a good selection.
p.
Is this content missing? Let us know on <a href="https://twitter.com/Blender_Cloud">Twitter</a>
or <a href="mailto:cloudsupport@blender.org">e-mail</a>.
.error-lead.extra.
We'll be back soon, in the meantime follow <a href="https://twitter.com/Blender_Cloud">@Blender_Cloud</a> for updates.
| {% endblock %}

23
src/templates/errors/404_embed.jade
View File

@@ -1,12 +1,13 @@
#error_container.404
#error_box
.error-title 404. Not Found.
#error-container(class="error-404")
#error-box
.error-top-container
.error-title Not found.
.error-lead
p {{ description | default("Whatever you're looking for, it's not here.", True) }}
.error-lead.
{{ description | default("Whatever you're looking for, it's not here.", True) }}
hr
.error-lead.extra.
Is this content missing? Let us know on <a href="https://twitter.com/Blender_Cloud">Twitter</a>
or email <a href="mailto:cloudsupport@blender.org">cloudsupport@blender.org</a>
.error-lead.extra
p.
Looking for the Open Movies? Check out <a href="https://www.youtube.com/BlenderFoundation">Blender Foundation's YouTube</a> channel. <br/> Were you looking for tutorials instead? <a href="http://www.blender.org/support/tutorials/">blender.org</a> has a good selection.
p.
Is this content missing? Let us know on <a href="https://twitter.com/Blender_Cloud">Twitter</a>
or <a href="mailto:cloudsupport@blender.org">e-mail</a>.

2
src/templates/errors/layout.jade
View File

@@ -7,8 +7,8 @@ html(lang="en")
link(href="{{ url_for('static_pillar', filename='assets/ico/favicon.png') }}", rel="shortcut icon")
link(href="{{ url_for('static_pillar', filename='assets/ico/apple-touch-icon-precomposed.png') }}", rel="icon apple-touch-icon-precomposed", sizes="192x192")
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")
link(href="{{ url_for('static_pillar', filename='assets/css/main.css') }}", rel="stylesheet")
link(href='//fonts.googleapis.com/css?family=Roboto:300,400', rel='stylesheet', type='text/css')
body.error