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

Orgs: layout tweaks

Browse Source
This commit is contained in:
Sybren A. Stüvel
2017-08-23 16:26:44 +02:00
parent 08294e2f14
commit 2bf95223b7
2 changed files with 111 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/templates/organizations/index.jade
View File

@@ -3,7 +3,8 @@
| {% block page_title %}Organizations{% endblock %} | {% block page_title %}Organizations{% endblock %}
| {% block body %} | {% block body %}
#col_main.organization-index #app-main
#col_main.organization-index
#col_main-content #col_main-content
.col_header.item-list-header .col_header.item-list-header
i.pi-cloud i.pi-cloud
@@ -18,7 +19,7 @@
.table-cell.item-priority .table-cell.item-priority
span.collapser(title="Collapse priority column") Members span.collapser(title="Collapse priority column") Members
.table-cell.item-priority .table-cell.item-priority
span.collapser(title="Collapse priority column") Unknown Members span.collapser(title="Collapse priority column") Pending Members
.table-body .table-body
| {% for organization in organizations['_items'] %} | {% for organization in organizations['_items'] %}
@@ -34,7 +35,7 @@
href="{{ link_url }}", href="{{ link_url }}",
class="organization-link") class="organization-link")
span(class="organization-projects-{{ organization._id }}") {{ organization.members|hide_none|count }} span(class="organization-projects-{{ organization._id }}") {{ organization.members|hide_none|count }}
.table-cell.item-unknown-members .table-cell.item-pending-members
a(data-organization-id="{{ organization._id }}", a(data-organization-id="{{ organization._id }}",
href="{{ link_url }}", href="{{ link_url }}",
class="organization-link") class="organization-link")
@@ -47,7 +48,7 @@
#create_organization_result_panel #create_organization_result_panel
| {% endif %} | {% endif %}
#col_right #col_right
.col_header .col_header
span.header_text span.header_text
#item-details.col-scrollable #item-details.col-scrollable

13
src/templates/organizations/view_embed.jade
View File

@@ -1,4 +1,4 @@
.flamenco-box.organization .organization
form#item_form(onsubmit="return editOrganization()") form#item_form(onsubmit="return editOrganization()")
| {% if can_edit %} | {% if can_edit %}
.input-group .input-group
@@ -27,13 +27,13 @@
value="{{ organization.location | hide_none }}") value="{{ organization.location | hide_none }}")
| {% if can_super_edit %} | {% if can_super_edit %}
.input-group .input-group
input.item-location.input-transparent( input.item-location.input-transparent.text-danger(
name="seat_count", name="seat_count",
type="text", type="text",
placeholder="Seat count", placeholder="Seat count",
value="{{ organization.seat_count | hide_none }}") value="{{ organization.seat_count | hide_none }}")
.input-group .input-group
input.item-location.input-transparent( input.item-location.input-transparent.text-danger(
name="org_roles", name="org_roles",
type="text", type="text",
placeholder="Organization roles", placeholder="Organization roles",
@@ -68,10 +68,9 @@
.table-cell(title='Unable to edit, determined by subscription') .table-cell(title='Unable to edit, determined by subscription')
| {{ organization.org_roles | hide_none | sort | join(', ') }} | {{ organization.org_roles | hide_none | sort | join(', ') }}
.flamenco-box.manager .members
h4 Organization members h4 Organization members
| {% if can_edit %} | {% if can_edit %}
.row
.sharing-users-search .sharing-users-search
.form-group .form-group
input#user-select.form-control( input#user-select.form-control(
@@ -79,7 +78,6 @@
type='text', type='text',
placeholder='Add member by name') placeholder='Add member by name')
| {% endif %} | {% endif %}
.row
ul.sharing-users-list ul.sharing-users-list
| {% for member in members %} | {% for member in members %}
li.sharing-users-item( li.sharing-users-item(
@@ -108,8 +106,7 @@
| {% endif %} | {% endif %}
| {% endif %} | {% endif %}
| {% endfor %} | {% endfor %}
.row h5 Pending members (i.e. without Blender Cloud account)
h5 Users without Blender Cloud account
ul.sharing-users-list.unknown-members ul.sharing-users-list.unknown-members
| {% for email in organization.unknown_members %} | {% for email in organization.unknown_members %}
li.sharing-users-item.unknown-member(data-user-email='{{ email }}') li.sharing-users-item.unknown-member(data-user-email='{{ email }}')