From 2bf95223b71f5c6db9ffa081b3a4478fb66acbd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Wed, 23 Aug 2017 16:26:44 +0200 Subject: [PATCH] Orgs: layout tweaks --- src/templates/organizations/index.jade | 93 +++++++------- src/templates/organizations/view_embed.jade | 131 ++++++++++---------- 2 files changed, 111 insertions(+), 113 deletions(-) diff --git a/src/templates/organizations/index.jade b/src/templates/organizations/index.jade index 59c8acf9..580b5ac6 100644 --- a/src/templates/organizations/index.jade +++ b/src/templates/organizations/index.jade @@ -3,56 +3,57 @@ | {% block page_title %}Organizations{% endblock %} | {% block body %} -#col_main.organization-index - #col_main-content - .col_header.item-list-header - i.pi-cloud - | Your organizations +#app-main + #col_main.organization-index + #col_main-content + .col_header.item-list-header + i.pi-cloud + | Your organizations - .item-list.col-scrollable - .table - .table-head - .table-row - .table-cell.item-name - span.collapser(title="Collapse name column") Name - .table-cell.item-priority - span.collapser(title="Collapse priority column") Members - .table-cell.item-priority - span.collapser(title="Collapse priority column") Unknown Members + .item-list.col-scrollable + .table + .table-head + .table-row + .table-cell.item-name + span.collapser(title="Collapse name column") Name + .table-cell.item-priority + span.collapser(title="Collapse priority column") Members + .table-cell.item-priority + span.collapser(title="Collapse priority column") Pending Members - .table-body - | {% for organization in organizations['_items'] %} - | {% set link_url = url_for('pillar.web.organizations.view_embed', organization_id=organization._id) %} - .table-row(id="organization-{{ organization._id }}") - .table-cell.item-name - a(data-organization-id="{{ organization._id }}", - href="{{ link_url }}", - class="organization-link") - span(class="organization-name-{{ organization._id }}") {{ organization.name }} - .table-cell.item-members - a(data-organization-id="{{ organization._id }}", - href="{{ link_url }}", - class="organization-link") - span(class="organization-projects-{{ organization._id }}") {{ organization.members|hide_none|count }} - .table-cell.item-unknown-members - a(data-organization-id="{{ organization._id }}", - href="{{ link_url }}", - class="organization-link") - span(class="organization-projects-{{ organization._id }}") {{ organization.unknown_members|hide_none|count }} - | {% endfor %} + .table-body + | {% for organization in organizations['_items'] %} + | {% set link_url = url_for('pillar.web.organizations.view_embed', organization_id=organization._id) %} + .table-row(id="organization-{{ organization._id }}") + .table-cell.item-name + a(data-organization-id="{{ organization._id }}", + href="{{ link_url }}", + class="organization-link") + span(class="organization-name-{{ organization._id }}") {{ organization.name }} + .table-cell.item-members + a(data-organization-id="{{ organization._id }}", + href="{{ link_url }}", + class="organization-link") + span(class="organization-projects-{{ organization._id }}") {{ organization.members|hide_none|count }} + .table-cell.item-pending-members + a(data-organization-id="{{ organization._id }}", + href="{{ link_url }}", + class="organization-link") + span(class="organization-projects-{{ organization._id }}") {{ organization.unknown_members|hide_none|count }} + | {% endfor %} - #item-action-panel - | {% if can_create_organization %} - button.btn(onclick='createNewOrganization(this)') Create new organization - #create_organization_result_panel - | {% endif %} + #item-action-panel + | {% if can_create_organization %} + button.btn(onclick='createNewOrganization(this)') Create new organization + #create_organization_result_panel + | {% endif %} -#col_right - .col_header - span.header_text - #item-details.col-scrollable - .item-details-empty - | Select an organization + #col_right + .col_header + span.header_text + #item-details.col-scrollable + .item-details-empty + | Select an organization | {% endblock %} diff --git a/src/templates/organizations/view_embed.jade b/src/templates/organizations/view_embed.jade index 47beba86..7042514a 100644 --- a/src/templates/organizations/view_embed.jade +++ b/src/templates/organizations/view_embed.jade @@ -1,4 +1,4 @@ -.flamenco-box.organization +.organization form#item_form(onsubmit="return editOrganization()") | {% if can_edit %} .input-group @@ -27,13 +27,13 @@ value="{{ organization.location | hide_none }}") | {% if can_super_edit %} .input-group - input.item-location.input-transparent( + input.item-location.input-transparent.text-danger( name="seat_count", type="text", placeholder="Seat count", value="{{ organization.seat_count | hide_none }}") .input-group - input.item-location.input-transparent( + input.item-location.input-transparent.text-danger( name="org_roles", type="text", placeholder="Organization roles", @@ -68,76 +68,73 @@ .table-cell(title='Unable to edit, determined by subscription') | {{ organization.org_roles | hide_none | sort | join(', ') }} -.flamenco-box.manager +.members h4 Organization members | {% if can_edit %} - .row - .sharing-users-search - .form-group - input#user-select.form-control( - name='contacts', - type='text', - placeholder='Add member by name') + .sharing-users-search + .form-group + input#user-select.form-control( + name='contacts', + type='text', + placeholder='Add member by name') | {% endif %} - .row - ul.sharing-users-list - | {% for member in members %} - li.sharing-users-item( - data-user-id="{{ member['_id'] }}", - class="{% if current_user.objectid == member['_id'] %}self{% endif %}") - .sharing-users-avatar - img(src="{{ member['avatar'] }}") - .sharing-users-details - span.sharing-users-name - | {{ member['full_name'] }} - | {% if current_user.objectid == member['_id'] %} - small (You) - | {% endif %} - | {% if organization['admin_uid'] == member['_id'] %} - small (admin) - | {% endif %} - span.sharing-users-extra {{ member['username'] }} - .sharing-users-action - | {% if can_edit %} - | {% if current_user.objectid == member['_id'] %} - button.user-remove(title="Leave as member of this organization") - i.pi-trash - | {% else %} - button.user-remove(title="Remove this user from this organization") - i.pi-trash - | {% endif %} + ul.sharing-users-list + | {% for member in members %} + li.sharing-users-item( + data-user-id="{{ member['_id'] }}", + class="{% if current_user.objectid == member['_id'] %}self{% endif %}") + .sharing-users-avatar + img(src="{{ member['avatar'] }}") + .sharing-users-details + span.sharing-users-name + | {{ member['full_name'] }} + | {% if current_user.objectid == member['_id'] %} + small (You) | {% endif %} - | {% endfor %} - .row - h5 Users without Blender Cloud account - ul.sharing-users-list.unknown-members - | {% for email in organization.unknown_members %} - li.sharing-users-item.unknown-member(data-user-email='{{ email }}') - .sharing-users-avatar - img(src="{{ email | gravatar }}") - .sharing-users-details - span.sharing-users-email {{ email }} - .sharing-users-action - | {% if can_edit %} - button.user-remove(title="Remove this user from this organization") - i.pi-trash + | {% if organization['admin_uid'] == member['_id'] %} + small (admin) | {% endif %} - | {% endfor %} + span.sharing-users-extra {{ member['username'] }} + .sharing-users-action + | {% if can_edit %} + | {% if current_user.objectid == member['_id'] %} + button.user-remove(title="Leave as member of this organization") + i.pi-trash + | {% else %} + button.user-remove(title="Remove this user from this organization") + i.pi-trash + | {% endif %} + | {% endif %} + | {% endfor %} + h5 Pending members (i.e. without Blender Cloud account) + ul.sharing-users-list.unknown-members + | {% for email in organization.unknown_members %} + li.sharing-users-item.unknown-member(data-user-email='{{ email }}') + .sharing-users-avatar + img(src="{{ email | gravatar }}") + .sharing-users-details + span.sharing-users-email {{ email }} + .sharing-users-action + | {% if can_edit %} + button.user-remove(title="Remove this user from this organization") + i.pi-trash + | {% endif %} + | {% endfor %} - | {% if can_edit %} - h5 Batch-add members by email address - form#batch_add_form(onsubmit="return batchAddUsers()") - .input-group - textarea.item-description.input-transparent( - name="emails", - type="text", - rows=1, - placeholder="Email addresses, separated by space/enter") - .input-group - button.btn.btn-default.btn-block(type='submit') - i.pi-check - | Add members - | {% endif %} + | {% if can_edit %} + h5 Batch-add members by email address + form#batch_add_form(onsubmit="return batchAddUsers()") + .input-group + textarea.item-description.input-transparent( + name="emails", + type="text", + rows=1, + placeholder="Email addresses, separated by space/enter") + .input-group + button.btn.btn-default.btn-block(type='submit') + i.pi-check + | Add members + | {% endif %} .action-result-panel