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

Merge branch 'master' into elastic

Browse Source
This commit is contained in:
Sybren A. Stüvel
2017-12-08 12:55:57 +01:00
parent b6a93452cd 821f11393c
commit b7773e69c7
22 changed files with 289 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/templates/_macros/_menu.pug
View File

@@ -40,6 +40,11 @@ li(class="dropdown")
title="View subscription info")
i.pi-heart-filled
span You have a free account.
| {% elif current_user.has_cap('can-renew-subscription') %}
a.navbar-item(target='_blank', href="/renew", title="Renew subscription")
i.pi-heart
span.info Your subscription is not active.
span.renew Click here to renew.
| {% else %}
a.navbar-item(
href="https://store.blender.org/product/membership/"

4
src/templates/errors/layout.pug
View File

@@ -2,7 +2,7 @@ doctype
html(lang="en")
head
meta(charset="utf-8")
title Error
title {% block title %}Error{% endblock %}
meta(name="viewport", content="width=device-width, initial-scale=1.0")
link(href="{{ url_for('static_pillar', filename='assets/ico/favicon.png') }}", rel="shortcut icon")
@@ -10,7 +10,7 @@ html(lang="en")
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='//fonts.googleapis.com/css?family=Roboto:300,400', rel='stylesheet', type='text/css')
| {% block head %}{% endblock %}
body.error
| {% block body %}{% endblock %}

9
src/templates/nodes/custom/_node_details.pug
View File

@@ -74,6 +74,15 @@
| Download
| {% endif %}
| {% elif current_user.has_cap('can-renew-subscription') %}
li.download
a.btn.btn-success(
title="Renew your subscription to download",
target="_blank",
href="/renew")
i.pi-heart
| Renew subscription to download
| {% elif current_user.is_authenticated %}
li.download
a.btn(

8
src/templates/nodes/custom/asset/video/view_embed.pug
View File

@@ -27,8 +27,14 @@
span
small Support Blender and get awesome stuff!
hr
a.subscribe(href="{{ url_for('cloud.join') }}") <em>Subscribe</em>
| {% if current_user.has_cap('can-renew-subscription') %}
a.subscribe(href="/renew") You have a subscription, it just needs to be renewed. <em>Renew your subscription now!</em>
| {% else %}
a.subscribe(href="{{ url_for('cloud.join') }}") <em>Subscribe to Blender Cloud.</em>
| {% endif %}
| {% if current_user.is_anonymous %}
a(href="{{ url_for('users.login') }}") Already a subscriber? Log in
| {% endif %}
| {% endif %}

3
src/templates/nodes/custom/comment/list_embed.pug
View File

@@ -49,6 +49,9 @@
| {% if current_user.has_cap('subscriber') %}
i.pi-lock
| Only project members can comment.
| {% elif current_user.has_cap('can-renew-subscription') %}
i.pi-heart
a(href='/renew', target='_blank') Renew your subscription to join the conversation!
| {% else %}
| Join the conversation!&nbsp;<a href="https://store.blender.org/product/membership/">Subscribe to Blender Cloud</a> now.
| {% endif %}

18
src/templates/projects/index_dashboard.pug
View File

@@ -40,12 +40,17 @@ meta(name="twitter:image", content="{{ url_for('static', filename='assets/img/ba
| {% endif %}
| {% if current_user.has_cap('subscriber') %}
li.create(
li.create#project-create(
data-url="{{ url_for('projects.create') }}")
a.btn.btn-success#project-create(
a.btn.btn-success(
href="{{ url_for('projects.create') }}")
i.pi-plus
| Create Project
| {% elif current_user.has_cap('can-renew-subscription') %}
li.create
a.btn(href="/renew", target="_blank")
i.pi-heart
| Renew subscription to create a project
| {% endif %}
nav.nav-tabs__tab.active#own_projects
@@ -83,6 +88,13 @@ meta(name="twitter:image", content="{{ url_for('static', filename='assets/img/ba
.projects__list-details
a.title(href="{{ url_for('projects.create') }}")
| Create a project to get started!
| {% elif current_user.has_cap('can-renew-subscription') %}
li.projects__list-item(data-url="https://store.blender.org/renew-my-subscription.php")
a.projects__list-thumbnail
i.pi-plus
.projects__list-details
a.title(href="https://store.blender.org/renew-my-subscription.php")
| Renew your Blender Cloud subscription to create your own projects!
| {% else %}
li.projects__list-item(data-url="/join")
a.projects__list-thumbnail
@@ -222,7 +234,7 @@ script.
});
// Create project
$nav_tabs_list.find('li.create').on('click', function(e){
$('#project-create').on('click', function(e){
e.preventDefault();
$(this).addClass('disabled');

19
src/templates/users/edit_embed_base.pug
View File

@@ -72,7 +72,8 @@
| none
| {% endif %}
a#button-cancel.btn.btn-default(href="#", data-user-id='{{user.user_id}}') Cancel
a.btn.btn-default(href="javascript:update_from_bid()") Update from Blender ID
a.btn.btn-default(href="javascript:$('#user-edit-container').html('')") Cancel
input#submit_edit_user.btn.btn-default(
data-user-id="{{user.user_id}}",
@@ -101,10 +102,18 @@ script(type="text/javascript").
//- $("#user-edit-form").submit();
});
$('#button-cancel').click(function(e){
$('#user-container').html('')
});
new Clipboard('.copy-to-clipboard');
function update_from_bid() {
var url = '{{ url_for("blender_cloud.subscription.update_subscription_for", user_id=user.user_id) }}';
$.post(url)
.done(function(data) {
toastr.info('User updated from Blender ID');
displayUser('{{ user.user_id }}');
})
.fail(function(data) {
toastr.error(data.responseText);
});
}
| {% endblock %}

18
src/templates/users/settings/profile.pug
View File

@@ -11,13 +11,6 @@
.settings-form
form#settings-form(method='POST', action="{{url_for('settings.profile')}}")
.left
.form-group
| {{ form.full_name.label }}
| {{ form.full_name(size=20, class='form-control') }}
| {% if form.full_name.errors %}
| {% for error in form.full_name.errors %}{{ error|e }}{% endfor %}
| {% endif %}
.form-group
| {{ form.username.label }}
| {{ form.username(size=20, class='form-control') }}
@@ -25,8 +18,15 @@
| {% for error in form.username.errors %}{{ error|e }}{% endfor %}
| {% endif %}
.form-group.settings-password
| {{ _("Change your password at") }} #[a(href="https://blender.org/id/change") Blender ID]
.form-group
label {{ _("Full name") }}
p {{ current_user.full_name }}
.form-group
label {{ _("E-mail") }}
p {{ current_user.email }}
.form-group
| {{ _("Change your full name, email, and password at") }} #[a(href="https://www.blender.org/id/settings/profile",target='_blank') Blender ID].
.right
.settings-avatar