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

Layout: use bootstrap classes

Browse Source
This commit is contained in:
Pablo Vazquez 2018-08-31 19:31:36 +02:00
parent 33bd2c5880
commit b4acfb89fa
31 changed files with 170 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/templates/_macros/_add_new_menu.pug
View File

@ -6,20 +6,21 @@
| {% if node_type_name == 'group' %} | {% if node_type_name == 'group' %}
| {% set node_type_name = 'folder' %} | {% set node_type_name = 'folder' %}
| {% endif %} | {% endif %}
li(class="button-{{ node_type['name'] }}") li.dropdown-item(class="button-{{ node_type['name'] }}")
a.item_add_node( a.item_add_node(
href="#", href="#",
title="{{ node_type['description'] }}", title="{{ node_type['description'] }}",
data-node-type-name="{{ node_type['name'] }}", data-node-type-name="{{ node_type['name'] }}",
data-toggle="tooltip", data-toggle="tooltip",
data-placement="left") data-placement="left")
i.pi(class="icon-{{ node_type['name'] }}") i.pi(class="icon-{{ node_type['name'] }}")
| {% if node_type_name == 'group_texture' %} | {% if node_type_name == 'group_texture' %}
| Texture Folder | Texture Folder
| {% elif node_type_name == 'group_hdri' %} | {% elif node_type_name == 'group_hdri' %}
| HDRi Folder | HDRi Folder
| {% else %} | {% else %}
| {{ node_type_name }} span.text-capitalize
|{{ node_type_name }}
| {% endif %} | {% endif %}
| {% endif %} | {% endif %}
| {% endfor %} | {% endfor %}

10
src/templates/_macros/_file_uploader_form.pug
View File

@ -28,15 +28,15 @@
span Add files... span Add files...
input(type='file', name='file', multiple='') input(type='file', name='file', multiple='')
button.btn.btn-primary.start(type='submit') button.btn.btn-outline-primary.start(type='submit')
i.pi-upload i.pi-upload
span Start upload span Start Upload
button.btn.btn-warning.cancel(type='reset') button.btn.btn-outline-warning.cancel(type='reset')
i.pi-cancel i.pi-cancel
span Cancel upload span Cancel Upload
button.btn.btn-danger.delete(type='button') button.btn.btn-outline-danger.delete(type='button')
i.pi-trash i.pi-trash
span Delete span Delete

6
src/templates/_macros/_file_uploader_javascript.pug
View File

@ -23,7 +23,7 @@ script#template-upload(type="text/x-tmpl").
</button> </button>
{% } %} {% } %}
{% if (!i) { %} {% if (!i) { %}
<button class="btn btn-warning cancel"> <button class="btn btn-outline-secondary cancel">
<i class="ion-close-round"></i> <i class="ion-close-round"></i>
<span>Cancel</span> <span>Cancel</span>
</button> </button>
@ -61,7 +61,7 @@ script#template-download(type="text/x-tmpl").
</td> </td>
<td> <td>
{% if (file.deleteUrl) { %} {% if (file.deleteUrl) { %}
<button class="btn btn-danger delete" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}> <button class="btn btn-outline-danger delete" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
<i class="ion-trash-b"></i> <i class="ion-trash-b"></i>
<span>Delete</span> <span>Delete</span>
</button> </button>
@ -71,7 +71,7 @@ script#template-download(type="text/x-tmpl").
Create Create
</div> </div>
{% } else { %} {% } else { %}
<button class="btn btn-warning cancel"> <button class="btn btn-outline-secondary cancel">
<i class="ion-close-round"></i> <i class="ion-close-round"></i>
<span>Cancel</span> <span>Cancel</span>
</button> </button>

2
src/templates/_modal.pug
View File

@ -9,5 +9,5 @@
.modal-body .modal-body
| ... | ...
.modal-footer .modal-footer
button.btn.btn-default(type='button', data-dismiss='modal') Close button.btn.btn-outline-secondary(type='button', data-dismiss='modal') Close
button.btn.btn-primary(type='button') Save changes button.btn.btn-primary(type='button') Save changes

7
src/templates/layout.pug
View File

@ -66,10 +66,9 @@ html(lang="en")
| {% if not title %}{% set title="default" %}{% endif %} | {% if not title %}{% set title="default" %}{% endif %}
body(class="{{ title }}") body(class="{{ title }}")
.container-page .page-content
.page-content .page-body
.page-body | {% block body %}{% endblock %}
| {% block body %}{% endblock %}
| {% block footer_container %} | {% block footer_container %}
#footer-container #footer-container

15
src/templates/menus/user_base.pug
View File

@ -16,27 +16,27 @@ li.dropdown
a.navbar-item( a.navbar-item(
href="{{ url_for('projects.home_project') }}" href="{{ url_for('projects.home_project') }}"
title="Home") title="Home")
#[i.pi-home] Home | #[i.pi-home] Home
li li
a.navbar-item( a.navbar-item(
href="{{ url_for('projects.index') }}" href="{{ url_for('projects.index') }}"
title="My Projects") title="My Projects")
#[i.pi-star] My Projects | #[i.pi-star] My Projects
| {% if current_user.has_organizations() %} | {% if current_user.has_organizations() %}
li li
a.navbar-item( a.navbar-item(
href="{{ url_for('pillar.web.organizations.index') }}" href="{{ url_for('pillar.web.organizations.index') }}"
title="My Organizations") title="My Organizations")
#[i.pi-users] My Organizations | #[i.pi-users] My Organizations
| {% endif %} | {% endif %}
li li
a.navbar-item( a.navbar-item(
href="{{ url_for('settings.profile') }}" href="{{ url_for('settings.profile') }}"
title="Settings") title="Settings")
#[i.pi-cog] Settings | #[i.pi-cog] Settings
| {% endblock menu_list %} | {% endblock menu_list %}
@ -55,8 +55,9 @@ li.dropdown
| {% else %} | {% else %}
li.nav-item-sign-in li.pt-1.pr-1
a.navbar-item(href="{{ url_for('users.login') }}") a.btn.btn-sm.btn-outline-primary.px-3(
| Log in href="{{ url_for('users.login') }}")
| Log In
| {% endif %} | {% endif %}
| {% endblock menu_body %} | {% endblock menu_body %}

8
src/templates/nodes/custom/_node_preview_forbidden.pug
View File

@ -5,21 +5,21 @@ section.node-preview-forbidden
div div
p Available to Blender Cloud subscribers p Available to Blender Cloud subscribers
hr hr.bg-white
| {% if current_user.has_cap('can-renew-subscription') %} | {% if current_user.has_cap('can-renew-subscription') %}
p p
small You have a subscription, it just needs to be renewed. small You have a subscription, it just needs to be renewed.
a.btn(href="/renew") a.btn.btn-light(href="/renew")
| #[i.pi-heart] Renew Subscription | #[i.pi-heart] Renew Subscription
| {% else %} | {% else %}
p p
small Support Blender and get awesome stuff! small Support Blender and get awesome stuff!
a.btn(href="{{ url_for('cloud.join') }}") a.btn.btn-light(href="{{ url_for('cloud.join') }}")
| #[i.pi-heart] Get a Subscription | #[i.pi-heart] Get a Subscription
| {% endif %} | {% endif %}
| {% if current_user.is_anonymous %} | {% if current_user.is_anonymous %}
p(style="margin-top: 15px") p(style="margin-top: 15px")
small small
a(href="{{ url_for('users.login') }}") Already a subscriber? Log in a.text-white(href="{{ url_for('users.login') }}") Already a subscriber? Log in
| {% endif %} | {% endif %}

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

@ -23,7 +23,7 @@ section.node-preview.video
| {% block node_download %} | {% block node_download %}
| {% if node.file_variations %} | {% if node.file_variations %}
button.btn.btn-default.dropdown-toggle( button.btn.btn-outline-secondary.dropdown-toggle(
type="button", type="button",
data-toggle="dropdown", data-toggle="dropdown",
aria-haspopup="true", aria-haspopup="true",

12
src/templates/nodes/custom/blog/_macros.pug
View File

@ -8,10 +8,10 @@ a.blog_index-header(href="{{ node.url }}")
| {% if project and project._id != config.MAIN_PROJECT_ID %} | {% if project and project._id != config.MAIN_PROJECT_ID %}
| {{ projectmacros.render_secondary_navigation(project, pages=pages) }} | {{ projectmacros.render_secondary_navigation(project, pages=pages) }}
| {% endif %} | {% endif %}
.blog_index-item .blog_index-item.mx-auto
a.item-title( h2.pt-4.px-4
href="{{ node.url }}") a.text-muted(href="{{ node.url }}")
| {{ node.name }} | {{ node.name }}
ul.meta ul.meta
| {% if node.project.name %} | {% if node.project.name %}
li {{ node.project.name }} li {{ node.project.name }}
@ -46,7 +46,7 @@ a.blog_index-header(href="{{ node.url }}")
i.pi-document-text i.pi-document-text
| {% endif %} | {% endif %}
a.item-title( a.item-title.text-muted(
href="{{ node.url }}") href="{{ node.url }}")
| {{node.name}} | {{node.name}}
@ -66,7 +66,7 @@ a.blog_index-header(href="{{ node.url }}")
| {% macro render_blog_index(project, posts, can_create_blog_posts, api, more_posts_available, posts_meta, pages=None) %} | {% macro render_blog_index(project, posts, can_create_blog_posts, api, more_posts_available, posts_meta, pages=None) %}
| {% if can_create_blog_posts %} | {% if can_create_blog_posts %}
.blog-action .blog-action
a.btn.btn-default.button-create(href="{{url_for('nodes.posts_create', project_id=project._id)}}") a.btn.btn-outline-primary.button-create(href="{{url_for('nodes.posts_create', project_id=project._id)}}")
i.pi-plus i.pi-plus
| Create New Post | Create New Post
| {% endif %} | {% endif %}

1
src/templates/nodes/custom/comment/list_embed_base.pug
View File

@ -32,7 +32,6 @@
.comment-reply-preview-md .comment-reply-preview-md
.comment-reply-info .comment-reply-info
.comment-action-cancel( .comment-action-cancel(
type="button",
title="{{ _('cancel') }}") title="{{ _('cancel') }}")
span {{ _('cancel') }} span {{ _('cancel') }}

2
src/templates/nodes/custom/hdri/view_embed.pug
View File

@ -28,7 +28,7 @@ li.node-details-meta-list-item
| {% block node_download %} | {% block node_download %}
| {% if node.properties.files %} | {% if node.properties.files %}
button.btn.btn-default.dropdown-toggle( button.btn.btn-outline-secondary.dropdown-toggle(
title="Download HDRI", title="Download HDRI",
type="button", type="button",
data-toggle="dropdown", data-toggle="dropdown",

4
src/templates/nodes/custom/post/create.pug
View File

@ -68,9 +68,9 @@
| {% endif %} | {% endif %}
| {% endfor %} | {% endfor %}
input.btn.btn-default.button-create(type='submit', value='Create {{ node_type.name }}') input.btn.btn-outline-secondary.button-create(type='submit', value='Create {{ node_type.name }}')
a.btn.btn-default.button-back(href="{{ url_for('projects.view', project_url=project.url) }}blog") a.btn.btn-link.button-back(href="{{ url_for('projects.view', project_url=project.url) }}blog")
| Back to Blog | Back to Blog
#blog_post-create-container #blog_post-create-container

2
src/templates/nodes/custom/post/view_embed.pug
View File

@ -5,7 +5,7 @@
#blog_index-container.expand-image-links #blog_index-container.expand-image-links
.blog-action .blog-action
| {% if node.has_method('PUT') %} | {% if node.has_method('PUT') %}
a.btn.btn-default.button-edit(href="{{url_for('nodes.edit', node_id=node._id)}}") a.btn.btn-outline-secondary.button-edit(href="{{url_for('nodes.edit', node_id=node._id)}}")
i.pi-edit i.pi-edit
| Edit Post | Edit Post
| {% endif %} | {% endif %}

4
src/templates/nodes/custom/texture/view_embed.pug
View File

@ -91,11 +91,11 @@
a(href="{{ f.file.link }}",, a(href="{{ f.file.link }}",,
title="Download texture", title="Download texture",
download="{{ f.file.filename }}") download="{{ f.file.filename }}")
button.btn.btn-default(type="button") button.btn.btn-outline-secondary(type="button")
i.pi-download i.pi-download
| Download | Download
| {% else %} | {% else %}
button.btn.btn-default.disabled.sorry(type="button") button.btn.btn-outline-secondary.disabled.sorry(type="button")
i.pi-lock i.pi-lock
| Download | Download
| {% endif %} | {% endif %}

14
src/templates/nodes/edit_embed.pug
View File

@ -38,18 +38,21 @@
| {% elif field.type == 'HiddenField' %} | {% elif field.type == 'HiddenField' %}
| {{ field }} | {{ field }}
| {% elif field.name == 'attachments' %} | {% elif field.name == 'attachments' %}
hr
#attachments-actions #attachments-actions
.btn.btn-info#attachments-action-add .btn.btn-info#attachments-action-add
i.pi-plus i.pi-plus
| Add New Attachment | Add New Attachment
p.text-muted p.text-muted.mt-3
| Attachments can be included in any MarkDown field by using the #[code {attachment slug}] shortcode | Attachments can be included in any MarkDown field by using the #[code {attachment slug}] shortcode
| (#[a(href='https://pillarframework.org/shortcodes/#attachments', target='_blank') help]). | (#[a(href='https://pillarframework.org/shortcodes/#attachments', target='_blank') help]).
| This shortcode is placed on your copy-paste buffer by clicking "Copy to clipboard". | This shortcode is placed on your copy-paste buffer by clicking "Copy to clipboard".
| {{ render_field(field, field.name) }} | {{ render_field(field, field.name) }}
hr
| {% elif field.name == 'files' %} | {% elif field.name == 'files' %}
#files-actions #files-actions
@ -66,20 +69,23 @@
| {% endfor %} | {% endfor %}
ul.project-edit-tools.bottom hr
ul.project-edit-tools.justify-content-end.h-auto
li.button-cancel li.button-cancel
a#item_cancel.item-cancel.project-mode-edit( a#item_cancel.item-cancel.project-mode-edit.btn.btn-outline-secondary(
href="javascript:void(0);", href="javascript:void(0);",
title="Cancel changes") title="Cancel changes")
i.button-cancel-icon.pi-cancel i.button-cancel-icon.pi-cancel
| Cancel | Cancel
li.button-save li.button-save
a#item_save.item-save.project-mode-edit( a#item_save.item-save.project-mode-edit.btn.btn-outline-success.ml-2(
href="javascript:void(0);", href="javascript:void(0);",
title="Save changes") title="Save changes")
i.button-save-icon.pi-check i.button-save-icon.pi-check
| Save Changes | Save Changes
script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.ui.widget.min.js') }}") script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.ui.widget.min.js') }}")
script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.iframe-transport.min.js') }}") script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.iframe-transport.min.js') }}")
script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.fileupload.min.js') }}") script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.fileupload.min.js') }}")

2
src/templates/organizations/index.pug
View File

@ -27,7 +27,7 @@ meta(name="twitter:image", content="{{ url_for('static', filename='assets/img/ba
ul#sub-nav-tabs__list ul#sub-nav-tabs__list
li.result#create_organization_result_panel li.result#create_organization_result_panel
li.create li.create
button.btn.btn-success(onclick='createNewOrganization(this)') button.btn.btn-outline-success(onclick='createNewOrganization(this)')
i.pi-plus i.pi-plus
| Create Organization | Create Organization
| {% endif %} | {% endif %}

2
src/templates/organizations/view_embed.pug
View File

@ -75,7 +75,7 @@
script $('#admin-picker').hide(); script $('#admin-picker').hide();
.input-group .input-group
button#item-save.btn.btn-success.btn-block(type='submit') button#item-save.btn.btn-outline-success.btn-block(type='submit')
i.pi-check i.pi-check
| Save Changes | Save Changes
| {% else %} | {% else %}

23
src/templates/projects/edit.pug
View File

@ -7,17 +7,16 @@ span#project-edit-title
| Edit Project | Edit Project
ul.project-edit-tools ul.project-edit-tools
// Edit Mode // Edit Mode
li.button-cancel li.button-cancel
a#item_cancel.project-mode-edit( a#item_cancel.project-mode-edit.btn.btn-sm.btn-link(
href="{{url_for('projects.view', project_url=project.url, _external=True)}}", href="{{url_for('projects.view', project_url=project.url, _external=True)}}",
title="Cancel changes") title="Cancel changes")
i.button-cancel-icon.pi-back i.button-cancel-icon.pi-angle-left
| Go to Project | Go to Project
li.button-save li.button-save
a#item_save.project-mode-edit( a#item_save.project-mode-edit.btn.btn-sm.btn-outline-success.mx-2(
href="#", href="#",
title="Save changes") title="Save changes")
i.button-save-icon.pi-check i.button-save-icon.pi-check
@ -80,16 +79,18 @@ ul.project-edit-tools
| {% endfor %} | {% endfor %}
ul.project-edit-tools.bottom hr
ul.project-edit-tools.justify-content-end.h-auto
li.button-cancel li.button-cancel
a#item_cancel.project-mode-edit( a#item_cancel.project-mode-edit.btn.btn-link(
href="{{url_for('projects.view', project_url=project.url, _external=True)}}", href="{{url_for('projects.view', project_url=project.url, _external=True)}}",
title="Cancel changes") title="Cancel changes")
i.button-cancel-icon.pi-back i.button-cancel-icon.pi-angle-left
| Go to Project | Go to Project
li.button-save li.button-save
a#item_save.project-mode-edit( a#item_save.project-mode-edit.btn.btn-outline-success.ml-2(
href="#", href="#",
title="Save changes") title="Save changes")
i.button-save-icon.pi-check i.button-save-icon.pi-check
@ -97,6 +98,8 @@ ul.project-edit-tools
| {% endblock %} | {% endblock %}
| {% block footer_container %}{% endblock %}
| {% block footer_scripts %} | {% block footer_scripts %}
script(type='text/javascript', src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.ui.widget.min.js') }}") script(type='text/javascript', src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.ui.widget.min.js') }}")
script(type='text/javascript', src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.iframe-transport.min.js') }}") script(type='text/javascript', src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.iframe-transport.min.js') }}")
@ -105,8 +108,8 @@ script(type='text/javascript', src="{{ url_for('static_pillar', filename='assets
script(type="text/javascript"). script(type="text/javascript").
// Show view mode buttons. // Show edit mode buttons (save, cancel).
$('.project-mode-view').displayAs('inline-block'); $('.project-mode-edit').displayAs('inline-block');
ProjectUtils.setProjectAttributes({projectId: "{{project._id}}", isProject: true, nodeId: ''}); ProjectUtils.setProjectAttributes({projectId: "{{project._id}}", isProject: true, nodeId: ''});
var convert = new Markdown.getSanitizingConverter().makeHtml; var convert = new Markdown.getSanitizingConverter().makeHtml;

15
src/templates/projects/edit_layout.pug
View File

@ -5,7 +5,7 @@
#project-container #project-container
#project-side-container #project-side-container
#project_sidebar #project_sidebar
ul.project-tabs ul.project-tabs.p-0
li.tabs-thumbnail( li.tabs-thumbnail(
title="About", title="About",
data-toggle="tooltip", data-toggle="tooltip",
@ -51,13 +51,13 @@
#project_nav #project_nav
#project_nav-container #project_nav-container
#project_nav-header #project_nav-header.bg-white
.project-title a.project-title.p-2.font-weight-bold.text-dark(
a(href="{{url_for('projects.view', project_url=project.url, _external=True)}}") href="{{url_for('projects.view', project_url=project.url, _external=True)}}")
| {{ project.name }} | {{ project.name }}
// TODO - make list a macro // TODO - make list a macro
#project_tree.edit #project_tree.edit.bg-white
ul.project_nav-edit-list ul.project_nav-edit-list
li(class="{% if title == 'edit' %}active{% endif %}") li(class="{% if title == 'edit' %}active{% endif %}")
a(href="{{ url_for('projects.edit', project_url=project.url) }}") a(href="{{ url_for('projects.edit', project_url=project.url) }}")
@ -77,10 +77,9 @@
i(class="pi-{{ext.icon}}") i(class="pi-{{ext.icon}}")
| {{ext.name | title}} | {{ext.name | title}}
| {% endfor %} | {% endfor %}
.project_split(title="Toggle Navigation [T]")
#project_context-container #project_context-container
#project_context-header #project_context-header.bg-white
span#status-bar span#status-bar
| {% block project_context_header %} | {% block project_context_header %}
| {% endblock %} | {% endblock %}

4
src/templates/projects/edit_node_type_embed.pug
View File

@ -19,7 +19,7 @@ form(
.col-md-9 .col-md-9
h3 Editing: {{ node_type['name'] }} h3 Editing: {{ node_type['name'] }}
.col-md-3 .col-md-3
button.js-form-save.btn.btn-success.pull-right(style="margin-top: 15px;") button.js-form-save.btn.btn-outline-success.pull-right(style="margin-top: 15px;")
| Save Changes | Save Changes
.row .row
@ -46,7 +46,7 @@ form(
| {% endif %} | {% endif %}
| {% endfor %} | {% endfor %}
button.js-form-save.btn.btn-success.pull-right button.js-form-save.btn.btn-outline-success.pull-right
| Save Changes | Save Changes

2
src/templates/projects/home_images.pug
View File

@ -80,7 +80,7 @@ section.nav-tabs__tab.active#tab-images
Image Sharing requires a Blender Cloud subscription. Image Sharing requires a Blender Cloud subscription.
.buttons .buttons
a.btn.btn-default.btn-outline.green(href="https://store.blender.org/product/membership/") a.btn.btn-outline-primary(href="https://store.blender.org/product/membership/")
| Join Now | Join Now
| {% endif %} | {% endif %}
| {% endblock %} | {% endblock %}

34
src/templates/projects/home_layout.pug
View File

@ -38,29 +38,35 @@ meta(name="twitter:image", content="{{ url_for('static', filename='assets/img/ba
section.dashboard-secondary section.dashboard-secondary
section.announcement section.announcement
img.header( a(href="https://cloud.blender.org/blog/introducing-blender-sync")
src="{{ url_for('static', filename='assets/img/blender_sync_header.jpg') }}") img.header(
src="{{ url_for('static', filename='assets/img/blender_sync_header.jpg') }}")
.text .text
| {% block side_announcement %} | {% block side_announcement %}
.title h5
a(href="https://cloud.blender.org/blog/introducing-blender-sync") Blender Sync a.text-muted(href="https://cloud.blender.org/blog/introducing-blender-sync")
| Blender Sync
.lead .lead
span. p.
Save your settings once. Use them anywhere. Save your settings once. Use them anywhere.
Carry your Blender configuration with you, use our free add-on to sync your keymaps and preferences. Carry your Blender configuration with you, use our free add-on to sync your keymaps and preferences.
<hr/> #[hr]
Syncing is free for everyone. No subscription required. Syncing is free for everyone. No subscription required.
| {% endblock %} | {% endblock %}
| {% if show_addon_download_buttons %} | {% if show_addon_download_buttons %}
.buttons .row
a.btn.btn-default.btn-outline.orange( .col-md-8
href="https://cloud.blender.org/r/downloads/blender_cloud-latest-bundle.zip") a.btn.btn-block.btn-outline-success(
i.pi-download href="https://cloud.blender.org/r/downloads/blender_cloud-latest-bundle.zip")
| Download <small>v</small>{{ config.BLENDER_CLOUD_ADDON_VERSION }} i.pi-download
a.btn.btn-default.btn-outline.blue( | Download <small>v</small>{{ config.BLENDER_CLOUD_ADDON_VERSION }}
href="{{ learn_more_btn_url }}") .col-md-4
| Learn More a.btn.btn-link(
href="{{ learn_more_btn_url }}")
| Learn More
i.pi-angle-right
| {% endif %} | {% endif %}
| {% endblock %} | {% endblock %}

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

@ -59,15 +59,15 @@ style.
| {% endif %} | {% endif %}
| {% if current_user.has_cap('subscriber') %} | {% if current_user.has_cap('subscriber') %}
li.create#project-create( li#project-create(
data-url="{{ url_for('projects.create') }}") data-url="{{ url_for('projects.create') }}")
a.btn.btn-success( a.btn.btn-success(
href="{{ url_for('projects.create') }}") href="{{ url_for('projects.create') }}")
i.pi-plus i.pi-plus
| Create Project | Create Project
| {% elif current_user.has_cap('can-renew-subscription') %} | {% elif current_user.has_cap('can-renew-subscription') %}
li.create li
a.btn(href="/renew", target="_blank") a.btn.btn-outline-success(href="/renew", target="_blank")
i.pi-heart i.pi-heart
| Renew subscription to create a project | Renew subscription to create a project
| {% endif %} | {% endif %}
@ -210,44 +210,52 @@ style.
section.dashboard-secondary section.dashboard-secondary
section.announcement section.announcement
img.header( a(href="https://cloud.blender.org/blog/introducing-private-projects")
src="{{ url_for('static', filename='assets/img/backgrounds/services_projects.jpg')}}") img.header(
src="{{ url_for('static', filename='assets/img/backgrounds/services_projects.jpg')}}")
.text .text
h5 Projects h5
a.text-muted(href="https://cloud.blender.org/blog/introducing-private-projects")
| Projects
.lead .lead
span. p.
Create and manage your own personal projects. Create and manage your own personal projects.
Upload assets and collaborate with other Blender Cloud members. Upload assets and collaborate with other Blender Cloud members.
.buttons
a.btn.btn-default.btn-outline.blue( a.btn.btn-link.btn-block(
href="https://cloud.blender.org/blog/introducing-private-projects") href="https://cloud.blender.org/blog/introducing-private-projects")
| Learn More | Learn More
i.pi-angle-right
section.announcement.mt-3 section.announcement.mt-3
a(href="https://cloud.blender.org/blog/introducing-blender-sync") a(href="https://cloud.blender.org/blog/introducing-blender-sync")
img.header( img.header(
src="{{ url_for('static', filename='assets/img/blender_sync_header.jpg') }}") src="{{ url_for('static', filename='assets/img/blender_sync_header.jpg') }}")
.text .text
h5 h5
a.text-muted(href="https://cloud.blender.org/blog/introducing-blender-sync") a.text-muted(href="https://cloud.blender.org/blog/introducing-blender-sync")
| Textures Browser & Settings Sync | Textures Browser & Settings Sync
.lead .lead
span. p.
Get the official Blender Cloud add-on: Get the official Blender Cloud add-on:
ul ul
li Save your Blender settings online, use them anywhere li Save your Blender settings online, use them anywhere
li Browse over 800 textures & HDRIs within Blender li Browse over 800 textures & HDRIs within Blender
li Share Screenshots & Renders directly to Blender Cloud li Share Screenshots & Renders directly to Blender Cloud
.buttons .row
a.btn.btn-default.btn-outline.orange( .col-md-8
href="https://cloud.blender.org/r/downloads/blender_cloud-latest-bundle.zip") a.btn.btn-outline-success.btn-block(
i.pi-download href="https://cloud.blender.org/r/downloads/blender_cloud-latest-bundle.zip")
| Download Add-on <small>v</small> {{ config.BLENDER_CLOUD_ADDON_VERSION }} i.pi-download
a.btn.btn-default.btn-outline.blue( | Download Add-on <small>v</small> {{ config.BLENDER_CLOUD_ADDON_VERSION }}
href="https://cloud.blender.org/blog/introducing-blender-sync") .col-md-4
| Learn More a.btn.btn-link(
href="https://cloud.blender.org/blog/introducing-blender-sync")
| Learn More
i.pi-angle-right
| {% endblock %} | {% endblock %}

64
src/templates/projects/view.pug
View File

@ -2,6 +2,7 @@
| {% from '_macros/_add_new_menu.html' import add_new_menu %} | {% from '_macros/_add_new_menu.html' import add_new_menu %}
| {% block page_title %}{{ project.name }}{% endblock%} | {% block page_title %}{{ project.name }}{% endblock%}
| {% set title = 'project' %}
| {% block og %} | {% block og %}
meta(property="og:type", content="website") meta(property="og:type", content="website")
@ -78,15 +79,14 @@ script(src="{{ url_for('static_pillar', filename='assets/js/vendor/videojs-hotke
| {% block css %} | {% block css %}
link(href="{{ url_for('static_pillar', filename='assets/css/font-pillar.css') }}", rel="stylesheet") 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/project-main.css') }}", rel="stylesheet") link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css') }}", rel="stylesheet")
| {% endblock %} | {% endblock %}
| {% block body %} | {% block body %}
#project-container #project-container
#project-side-container #project-side-container
#project_sidebar #project_sidebar.bg-white
ul.project-tabs ul.project-tabs.p-0
li.tabs-thumbnail(class="{% if project.picture_square %}image{% endif %}") li.tabs-thumbnail(class="{% if project.picture_square %}image{% endif %}")
a(href="{{url_for('projects.view', project_url=project.url)}}") a(href="{{url_for('projects.view', project_url=project.url)}}")
#project-loading #project-loading
@ -96,6 +96,7 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css') }
| {% else %} | {% else %}
i.pi-home i.pi-home
| {% endif %} | {% endif %}
li.tabs-browse( li.tabs-browse(
title="Browse", title="Browse",
data-toggle="tooltip", data-toggle="tooltip",
@ -103,6 +104,7 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css') }
class="active") class="active")
a(href="{{url_for('projects.view', project_url=project.url, _external=True)}}") a(href="{{url_for('projects.view', project_url=project.url, _external=True)}}")
i.pi-folder i.pi-folder
| {% if not project.is_private %} | {% if not project.is_private %}
| {% if current_user_is_subscriber %} | {% if current_user_is_subscriber %}
li.tabs-search( li.tabs-search(
@ -135,29 +137,29 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css') }
#project_nav(class="{{ title }}") #project_nav(class="{{ title }}")
#project_nav-container #project_nav-container
| {% if title != 'about' %} | {% if title != 'about' %}
#project_nav-header #project_nav-header.bg-white
.project-title a.project-title.p-2.font-weight-bold.text-dark(
a(href="{{url_for('projects.view', project_url=project.url, _external=True)}}") href="{{url_for('projects.view', project_url=project.url, _external=True)}}")
| {{ project.name }} | {{ project.name }}
| {% block project_tree %} | {% block project_tree %}
#project_tree #project_tree.bg-white
| {% endblock project_tree %} | {% endblock project_tree %}
| {% endif %} | {% endif %}
#project_context-container #project_context-container
| {% if project.has_method('PUT') %} | {% if project.has_method('PUT') %}
#project_context-header #project_context-header.bg-white
span#status-bar span#status-bar
ul.project-edit-tools.disabled ul.project-edit-tools.disabled
li.button-dropdown li.dropdown
a#item_add.dropdown-toggle.project-mode-view( button#item_add.project-mode-view.btn.btn-sm.btn-outline-secondary.dropdown-toggle(
type="button", type="button",
data-toggle="dropdown", data-toggle="dropdown",
aria-haspopup="true", aria-haspopup="true",
aria-expanded="false") aria-expanded="false")
i.button-add-icon.pi-collection-plus i.button-add-icon.pi-collection-plus
| New... | New...
@ -165,52 +167,52 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css') }
| {{ add_new_menu(project.node_types) }} | {{ add_new_menu(project.node_types) }}
li.button-edit li.button-edit
a#item_edit.project-mode-view( a#item_edit.project-mode-view.btn.btn-sm.btn-outline-secondary.ml-2(
href="javascript:void(0);", href="javascript:void(0);",
title="Edit", title="Edit",
data-project_id="{{project._id}}") data-project_id="{{project._id}}")
i.button-edit-icon.pi-edit i.button-edit-icon.pi-edit
| Edit Project | Edit Project
li.button-dropdown li.dropdown
a.dropdown-toggle.project-mode-view( button.dropdown-toggle.project-mode-view.btn.btn-sm.btn-outline-secondary.mx-2(
type="button", type="button",
data-toggle="dropdown", data-toggle="dropdown",
aria-haspopup="true", aria-haspopup="true",
aria-expanded="false") aria-expanded="false")
i.pi-more-vertical i.pi-more-vertical.p-0
ul.dropdown-menu ul.dropdown-menu
| {% if current_user.has_cap('admin') %} | {% if current_user.has_cap('admin') %}
li.button-featured li.dropdown-item
a#item_featured( a#item_featured(
href="javascript:void(0);", href="javascript:void(0);",
title="Feature on project's homepage", title="Feature on project's homepage",
data-toggle="tooltip", data-toggle="tooltip",
data-placement="left") data-placement="left")
i.button-featured-icon.pi-star i.pi-star
| Toggle Featured | Toggle Featured
li.button-toggle-public li.dropdown-item
a#item_toggle_public( a#item_toggle_public(
href="javascript:void(0);", href="javascript:void(0);",
title="Make it accessible to anyone", title="Make it accessible to anyone",
data-toggle="tooltip", data-toggle="tooltip",
data-placement="left") data-placement="left")
i.pi-lock-open i.pi-lock-open
| Toggle public | Toggle Public
| {% endif %} | {% endif %}
li.button-toggle-projheader li.dropdown-item
a#item_toggle_projheader( a#item_toggle_projheader(
href="javascript:void(0);", href="javascript:void(0);",
title="Feature as project's header", title="Feature as project's header",
data-toggle="tooltip", data-toggle="tooltip",
data-placement="left") data-placement="left")
i.button-featured-icon.pi-star i.pi-star
| Toggle Project Header video | Toggle Project Header video
li.button-move li.dropdown-item.button-move
a#item_move( a#item_move(
href="javascript:void(0);", href="javascript:void(0);",
title="Move into a folder...", title="Move into a folder...",
@ -219,7 +221,7 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css') }
i.button-move-icon.pi-move i.button-move-icon.pi-move
| Move | Move
li.button-delete li.dropdown-item.button-delete
a#item_delete( a#item_delete(
href="javascript:void(0);", href="javascript:void(0);",
title="Can be undone within a month", title="Can be undone within a month",
@ -230,14 +232,14 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css') }
// Edit Mode // Edit Mode
li.button-cancel li.button-cancel
a#item_cancel.project-mode-edit( a#item_cancel.project-mode-edit.btn.btn-outline-secondary(
href="javascript:void(0);", href="javascript:void(0);",
title="Cancel changes") title="Cancel changes")
i.button-cancel-icon.pi-cancel i.button-cancel-icon.pi-cancel
| Cancel | Cancel
li.button-save li.button-save
a#item_save.project-mode-edit( a#item_save.project-mode-edit.btn.btn-outline-success.mx-2(
href="javascript:void(0);", href="javascript:void(0);",
title="Save changes") title="Save changes")
i.button-save-icon.pi-check i.button-save-icon.pi-check
@ -272,9 +274,7 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css') }
| {% endblock %} | {% endblock %}
| {% block footer_navigation %}{% endblock %} | {% block footer_container %}{% endblock %}
| {% block footer %}{% endblock %}
| {% block footer_scripts_pre %} | {% block footer_scripts_pre %}

5
src/templates/projects/view_embed.pug
View File

@ -22,9 +22,8 @@
| {% endif %} | {% endif %}
section.node-details-container.project section.node-details-container.project
.node-details-title h2.px-3.pt-3
h1 a(href="{{ url_for( 'projects.view', project_url=project.url) }}") {{ project.name }}
a(href="{{ url_for( 'projects.view', project_url=project.url) }}") {{ project.name }}
| {% if project.description %} | {% if project.description %}
.node-details-description .node-details-description

2
src/templates/stats.pug
View File

@ -49,7 +49,7 @@
h3. h3.
Now only &dollar;10 per month Now only &dollar;10 per month
.btn.btn-default .btn.btn-outline-primary
| Join the Cloud | Join the Cloud
hr hr

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

@ -72,9 +72,9 @@
| none | none
| {% endif %} | {% endif %}
a.btn.btn-default(href="javascript:update_from_bid()") Update from Blender ID a.btn.btn-outline-secondary(href="javascript:update_from_bid()") Update from Blender ID
input#submit_edit_user.btn.btn-default( input#submit_edit_user.btn.btn-outline-success(
data-user-id="{{user.user_id}}", data-user-id="{{user.user_id}}",
type="submit" value="Submit") type="submit" value="Submit")

4
src/templates/users/login.pug
View File

@ -18,11 +18,11 @@
.buttons .buttons
.login-button-container .login-button-container
//a.forgot(href="https://blender.org/id/reset") forgot your password? //a.forgot(href="https://blender.org/id/reset") forgot your password?
button.btn.btn-success.btn-block.button-login(type="submit") button.btn.btn-outline-success.btn-block.button-login(type="submit")
i.pi-log-in i.pi-log-in
| Login | Login
//a.btn.btn-default.button-register(href="https://blender.org/id/register", target="_blank") //a.btn.btn-outline-secondary.button-register(href="https://blender.org/id/register", target="_blank")
// i.pi-star-outline // i.pi-star-outline
// | Create Account // | Create Account

2
src/templates/users/settings/base.pug
View File

@ -3,7 +3,7 @@
//- can provide overrides. //- can provide overrides.
| {% block body %} | {% block body %}
.container .container
#settings #settings.d-flex.py-4.flex-xs-column
#settings-sidebar #settings-sidebar
| {% block settings_sidebar %} | {% block settings_sidebar %}
.settings-header .settings-header

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

@ -28,7 +28,7 @@
span {{ _("Change Gravatar") }} span {{ _("Change Gravatar") }}
.buttons .buttons
button.btn.btn-default.button-submit(type='submit') button.btn.btn-outline-success.button-submit(type='submit')
i.pi-check i.pi-check
| {{ _("Save Changes") }} | {{ _("Save Changes") }}
| {% endblock %} | {% endblock %}

2
src/templates/users/tasks.pug
View File

@ -137,7 +137,7 @@ script().
$('td', row).eq(4).html(render_timing(data.timing)); $('td', row).eq(4).html(render_timing(data.timing));
$('td', row).eq(5).html(render_status_label(data, data.name)); $('td', row).eq(5).html(render_status_label(data, data.name));
var view_tag = '<span class="btn btn-default btn-xs load-shot-view" shot-view-url="' + data.url_edit + '"><i class="glyphicon glyphicon-edit"></i> View</span>'; var view_tag = '<span class="btn btn-outline-secondary btn-xs load-shot-view" shot-view-url="' + data.url_edit + '"><i class="glyphicon glyphicon-edit"></i> View</span>';
$('td', row).eq(6).html(view_tag); $('td', row).eq(6).html(view_tag);
} }
}); });