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
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@@ -19,7 +19,7 @@ form(
.col-md-9
h3 Editing: {{ node_type['name'] }}
.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
.row
@@ -46,7 +46,7 @@ form(
| {% endif %}
| {% endfor %}
button.js-form-save.btn.btn-success.pull-right
button.js-form-save.btn.btn-outline-success.pull-right
| 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.
.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
| {% endif %}
| {% 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.announcement
img.header(
src="{{ url_for('static', filename='assets/img/blender_sync_header.jpg') }}")
a(href="https://cloud.blender.org/blog/introducing-blender-sync")
img.header(
src="{{ url_for('static', filename='assets/img/blender_sync_header.jpg') }}")
.text
| {% block side_announcement %}
.title
a(href="https://cloud.blender.org/blog/introducing-blender-sync") Blender Sync
h5
a.text-muted(href="https://cloud.blender.org/blog/introducing-blender-sync")
| Blender Sync
.lead
span.
p.
Save your settings once. Use them anywhere.
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.
| {% endblock %}
| {% if show_addon_download_buttons %}
.buttons
a.btn.btn-default.btn-outline.orange(
href="https://cloud.blender.org/r/downloads/blender_cloud-latest-bundle.zip")
i.pi-download
| Download <small>v</small>{{ config.BLENDER_CLOUD_ADDON_VERSION }}
a.btn.btn-default.btn-outline.blue(
href="{{ learn_more_btn_url }}")
| Learn More
.row
.col-md-8
a.btn.btn-block.btn-outline-success(
href="https://cloud.blender.org/r/downloads/blender_cloud-latest-bundle.zip")
i.pi-download
| Download <small>v</small>{{ config.BLENDER_CLOUD_ADDON_VERSION }}
.col-md-4
a.btn.btn-link(
href="{{ learn_more_btn_url }}")
| Learn More
i.pi-angle-right
| {% endif %}
| {% endblock %}

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

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

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

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

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

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