diff --git a/static/icons/edit.svg b/static/icons/edit.svg index 66a02956..e757323b 100644 --- a/static/icons/edit.svg +++ b/static/icons/edit.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/static/icons/help.svg b/static/icons/help.svg index 1e669549..a7c51850 100644 --- a/static/icons/help.svg +++ b/static/icons/help.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/static/icons/info.svg b/static/icons/info.svg index 828ebbe6..9e86172e 100644 --- a/static/icons/info.svg +++ b/static/icons/info.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/static/icons/plus-circle-solid.svg b/static/icons/plus-circle-solid.svg deleted file mode 100644 index 67441e7f..00000000 --- a/static/icons/plus-circle-solid.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/static/icons/plus.svg b/static/icons/plus.svg index c43ad77a..67441e7f 100644 --- a/static/icons/plus.svg +++ b/static/icons/plus.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/static/icons/trash.svg b/static/icons/trash.svg index 950c23d2..34730835 100644 --- a/static/icons/trash.svg +++ b/static/icons/trash.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/styles/components/_accordion_table.scss b/styles/components/_accordion_table.scss index 1e4a23e6..41c115dd 100644 --- a/styles/components/_accordion_table.scss +++ b/styles/components/_accordion_table.scss @@ -12,11 +12,6 @@ padding-left: 0; } - &.accordion-table-list { - display: table; - width: 100%; - } - .accordion-table__head { padding: $gap ($gap * 2); font-size: $small-font-size; @@ -42,10 +37,7 @@ } .accordion-table__item-content { - padding-top: $gap * 2; - padding-right: $gap; - padding-left: $gap * 2; - padding-bottom: $gap * 3; + padding: ($gap * 2); } .accordion-table__items { @@ -128,29 +120,27 @@ } } -#application-members { +.application-list { .accordion-table { - .accordion-table__item-content, .accordion-table__head { - display: flex; - - & > span { - flex-grow: 3; - display: flex; - flex-basis: 0; - - &.icon-link { - flex-grow: 1; - } - } - } - - span { - flex-grow: 1; - flex-basis: 0; - } - .accordion-table__item__toggler { text-align: right; + padding-right: 0; + padding-left: 0; + } + + .accordion-table__item-content { + .icon-link { + padding-right: 0; + padding-left: 0; + } + } + } +} + +#application-environments { + .row { + & > .col:first-child { + flex-grow: 5; } } } diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss index 83e4d37a..bed2eb07 100644 --- a/styles/components/_portfolio_layout.scss +++ b/styles/components/_portfolio_layout.scss @@ -32,6 +32,7 @@ .icon { @include icon-color($color-blue); + margin: 0 ($gap * 0.5) 0 0; } .portfolio-breadcrumbs__home { diff --git a/styles/sections/_application_edit.scss b/styles/sections/_application_edit.scss index 45a5ad12..a24d9373 100644 --- a/styles/sections/_application_edit.scss +++ b/styles/sections/_application_edit.scss @@ -5,6 +5,10 @@ .usa-input { margin: 0 ($gap * 4) 0 0; + flex-grow: 2; + } + + .application-edit__env-list-item-block { flex-grow: 1; } diff --git a/templates/fragments/admin/add_new_portfolio_member.html b/templates/fragments/admin/add_new_portfolio_member.html index 2fd166e9..aaab74db 100644 --- a/templates/fragments/admin/add_new_portfolio_member.html +++ b/templates/fragments/admin/add_new_portfolio_member.html @@ -81,5 +81,5 @@ url_for("portfolios.create_member", portfolio_id=portfolio.id), [step_one, step_two], button_text=("portfolios.admin.add_new_member" | translate), - button_icon="plus-circle-solid", + button_icon="plus", ) }} diff --git a/templates/fragments/applications/add_new_application_member.html b/templates/fragments/applications/add_new_application_member.html index cbe18c9a..99f8f99a 100644 --- a/templates/fragments/applications/add_new_application_member.html +++ b/templates/fragments/applications/add_new_application_member.html @@ -132,5 +132,5 @@ url_for("applications.create_member", application_id=application.id), [step_one, step_two], button_text=("portfolios.admin.add_new_member" | translate), - button_icon="plus-circle-solid", + button_icon="plus", ) }} diff --git a/templates/fragments/applications/edit_application_form.html b/templates/fragments/applications/edit_application_form.html deleted file mode 100644 index ef5dd455..00000000 --- a/templates/fragments/applications/edit_application_form.html +++ /dev/null @@ -1,8 +0,0 @@ -{% from "components/text_input.html" import TextInput %} - -{{ form.csrf_token }} -

- {{ "fragments.edit_application_form.explain" | translate }} -

-{{ TextInput(form.name) }} -{{ TextInput(form.description, paragraph=True) }} diff --git a/templates/fragments/applications/edit_environments.html b/templates/fragments/applications/edit_environments.html index 3532ff1e..cd27c2d3 100644 --- a/templates/fragments/applications/edit_environments.html +++ b/templates/fragments/applications/edit_environments.html @@ -25,7 +25,7 @@ {% endmacro %} -
+
@@ -39,8 +39,11 @@
-
- {{ "portfolios.applications.environments.name" | translate }} +
+
{{ "portfolios.applications.environments.name" | translate }}
+
{{ "portfolios.applications.environments.edit_name" | translate }}
+
{{ "common.delete" | translate }}
+
{{ "common.members" | translate }}
    @@ -51,40 +54,47 @@
  • -
    - +
    +
    {{ env['name'] }} - - - {% set edit_environment_button %} +
    +
    + + {% set edit_environment_button %} {{ Icon('edit') }} - {% endset %} + {% endset %} - {{ + {{ ToggleButton( - open_html=edit_environment_button, - close_html=edit_environment_button, - section_name="edit" + open_html=edit_environment_button, + close_html=edit_environment_button, + section_name="edit" ) - }} - - + }} + +
    +
    + + {{ Icon('trash') }} + +
    +
    {% set open_members_button %} - {{ "common.members" | translate }} ({{ member_count }}) {{ Icon('caret_down') }} + {{ "common.members" | translate }} ({{ member_count }}) {{ Icon('caret_down') }} {% endset %} {% set close_members_button %} - {{ "common.members" | translate }} ({{ member_count }}) {{ Icon('caret_up') }} + {{ "common.members" | translate }} ({{ member_count }}) {{ Icon('caret_up') }} {% endset %} {{ - ToggleButton( - open_html=open_members_button, - close_html=close_members_button, - section_name="members" - ) + ToggleButton( + open_html=open_members_button, + close_html=close_members_button, + section_name="members" + ) }} - +
    {% call ToggleSection(section_name="members") %} diff --git a/templates/navigation/global_sidenav.html b/templates/navigation/global_sidenav.html index c494622f..555b7fdd 100644 --- a/templates/navigation/global_sidenav.html +++ b/templates/navigation/global_sidenav.html @@ -32,7 +32,7 @@
    Fund a new portfolio - {{ Icon("plus", classes="sidenav__link-icon icon--circle") }} + {{ Icon("plus", classes="sidenav__link-icon") }}
diff --git a/templates/portfolios/applications/index.html b/templates/portfolios/applications/index.html index ab364b64..b7c47315 100644 --- a/templates/portfolios/applications/index.html +++ b/templates/portfolios/applications/index.html @@ -15,7 +15,7 @@ {% if can_create_applications %} {{ 'portfolios.applications.add_application_text' | translate }} - {{ Icon("plus", classes="sidenav__link-icon icon--circle") }} + {{ Icon("plus", classes="sidenav__link-icon") }} {% endif %}
diff --git a/templates/portfolios/applications/members.html b/templates/portfolios/applications/members.html index cbe648bb..8bb3c3b4 100644 --- a/templates/portfolios/applications/members.html +++ b/templates/portfolios/applications/members.html @@ -65,7 +65,7 @@ Add A New Member - {{ Icon('plus', classes='icon--circle') }} + {{ Icon('plus') }} diff --git a/templates/portfolios/applications/new.html b/templates/portfolios/applications/new.html index 4740fc56..2399b637 100644 --- a/templates/portfolios/applications/new.html +++ b/templates/portfolios/applications/new.html @@ -37,7 +37,26 @@
{% endcall %} - {% include "fragments/applications/edit_application_form.html" %} + {{ form.csrf_token }} +

+ {{ "fragments.edit_application_form.explain" | translate }} +

+
+
+ {{ TextInput(form.name) }} +
+
+   +
+
+
+
+ {{ TextInput(form.description, paragraph=True) }} +
+
+   +
+
{# this extra div prevents this bug: https://www.pivotaltracker.com/story/show/160768940 #}
@@ -57,22 +76,29 @@
  • - - + +
    +
    +
    -
    • - +
    -
    diff --git a/templates/portfolios/applications/settings.html b/templates/portfolios/applications/settings.html index 6570ccc1..49739d2f 100644 --- a/templates/portfolios/applications/settings.html +++ b/templates/portfolios/applications/settings.html @@ -72,7 +72,7 @@ {{ "portfolios.applications.add_environment" | translate }} - {{ Icon('plus-circle-solid') }} + {{ Icon('plus') }} diff --git a/templates/portfolios/applications/team.html b/templates/portfolios/applications/team.html index c6e07f07..e02a5459 100644 --- a/templates/portfolios/applications/team.html +++ b/templates/portfolios/applications/team.html @@ -23,7 +23,7 @@ {{ 'portfolios.applications.team_settings.subheading' | translate }} -
    +
    {% if g.matchesPath("application-members") %} {% include "fragments/flash.html" %} @@ -43,22 +43,22 @@
    -
    - - - {{ "common.name" | translate }} - - - {{ "portfolios.applications.team_settings.section.table.delete_access" | translate }} - - - {{ "portfolios.applications.team_settings.section.table.environment_management" | translate }} - - - {{ "portfolios.applications.team_settings.section.table.team_management" | translate }} - - - +
    +
    + {{ "common.name" | translate }} +
    +
    + {{ "portfolios.applications.team_settings.section.table.delete_access" | translate }} +
    +
    + {{ "portfolios.applications.team_settings.section.table.environment_management" | translate }} +
    +
    + {{ "portfolios.applications.team_settings.section.table.team_management" | translate }} +
    +
    +   +
      {% for member in application.members %} @@ -67,20 +67,17 @@ {% set user_permissions = user_info["permissions"] %} {% macro PermissionField(value) %} - {{ value }} +
      {{ value }}
      {% endmacro %}
    • -
      - - {{ name }} - {{ user.full_name }} - {{ PermissionField(user_permissions["delete_access"]) }} - {{ PermissionField(user_permissions["environment_management"]) }} - {{ PermissionField(user_permissions["team_management"]) }} - - +
      +
      {{ user.full_name }}
      + {{ PermissionField(user_permissions["delete_access"]) }} + {{ PermissionField(user_permissions["environment_management"]) }} + {{ PermissionField(user_permissions["team_management"]) }} +
      {% set open_html %} {{ "portfolios.applications.team_settings.environments" | translate }} ({{ user_info['environments'] | length }}) {{ Icon('caret_down') }} {% endset %} @@ -89,14 +86,14 @@ {{ "portfolios.applications.team_settings.environments" | translate }} ({{ user_info['environments'] | length }}) {{ Icon('caret_up') }} {% endset %} - {{ - ToggleButton( - open_html=open_html, - close_html=close_html, - section_name="environments" - ) - }} - + {{ + ToggleButton( + open_html=open_html, + close_html=close_html, + section_name="environments" + ) + }} +
      {% call ToggleSection(section_name="environments") %}
        diff --git a/translations.yaml b/translations.yaml index 6299ca0e..4a74c9fd 100644 --- a/translations.yaml +++ b/translations.yaml @@ -22,6 +22,7 @@ common: cancel: Cancel confirm: Confirm continue: Continue + delete: Delete delete_confirm: 'Please type the word DELETE to confirm:' edit: Edit hide: Hide @@ -400,6 +401,7 @@ portfolios: applications: add_application_text: Add a new application add_environment: Add new environment + add_another_environment: Add another environment app_settings_text: App settings create_button_text: Create csp_console_text: CSP console @@ -411,6 +413,7 @@ portfolios: header: Are you sure you want to delete this application? environments: name: Name + edit_name: Edit name environments_description: Each environment created within an application is logically separated from one another for easier management and security. environments_heading: Application environments existing_application_title: '{application_name} Application Settings'