From d5b4566b15ed523fd7019ac8c2ae62561d09f775 Mon Sep 17 00:00:00 2001 From: Montana Date: Thu, 25 Apr 2019 14:03:06 -0400 Subject: [PATCH 1/4] Improve accordion table styles --- styles/components/_accordion_table.scss | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/styles/components/_accordion_table.scss b/styles/components/_accordion_table.scss index 271e85d9..5ee20a09 100644 --- a/styles/components/_accordion_table.scss +++ b/styles/components/_accordion_table.scss @@ -39,8 +39,8 @@ .accordion-table__item-content { padding-top: $gap*2; padding-right: $gap; - padding-bottom: $gap*2; padding-left: $gap*2; + padding-bottom: $gap*3; } .accordion-table__items { @@ -49,10 +49,15 @@ li { list-style-type: none; - + font-weight: $font-bold; border-bottom: 1px solid $color-gray-lightest; margin: 0; + .icon-link--large { + padding-top: $gap*.5; + padding-bottom: $gap*.5; + } + ul { margin-top: 0; margin-bottom: 0; @@ -111,8 +116,9 @@ font-weight: bold; } + font-size: $small-font-size; background-color: $color-gray-lightest; - padding: $gap $gap * 5 $gap * 4 $gap * 5; + padding: $gap*2.5 $gap*7 $gap*5 $gap*7; } } } From 0371ecbd99ace484dca00ba2497b2b86e3986492 Mon Sep 17 00:00:00 2001 From: Montana Date: Thu, 25 Apr 2019 14:47:18 -0400 Subject: [PATCH 2/4] Add Read Only version of Application Environments table --- ...vironments.html => edit_environments.html} | 0 .../applications/read_only_environments.html | 77 +++++++++++++++++++ .../portfolios/applications/settings.html | 25 +++--- 3 files changed, 92 insertions(+), 10 deletions(-) rename templates/fragments/applications/{environments.html => edit_environments.html} (100%) create mode 100644 templates/fragments/applications/read_only_environments.html diff --git a/templates/fragments/applications/environments.html b/templates/fragments/applications/edit_environments.html similarity index 100% rename from templates/fragments/applications/environments.html rename to templates/fragments/applications/edit_environments.html diff --git a/templates/fragments/applications/read_only_environments.html b/templates/fragments/applications/read_only_environments.html new file mode 100644 index 00000000..f38ed58c --- /dev/null +++ b/templates/fragments/applications/read_only_environments.html @@ -0,0 +1,77 @@ +{% from "components/icon.html" import Icon %} +{% from "components/toggle_list.html" import ToggleButton, ToggleSection %} + +
+
+
+
+
{{ 'portfolios.applications.environments_heading' | translate }}
+
+
+
+ +
+
+ {{ "portfolios.applications.environments.name" | translate }} + {{ "portfolios.applications.environments.members" | translate }} +
+ +
    + {% for name, members_list in environments_obj.items() %} + +
  • +
    + + {{ name }} + + + + {% set open_environments_button %} + {{ "common.show" | translate }} Environments ({{ members_list | length }}) {{ Icon('caret_down') }} + {% endset %} + + {% set close_environments_button %} + {{ "common.hide" | translate }} Environments ({{ members_list | length }}) {{ Icon('caret_up') }} + {% endset %} + + {{ + ToggleButton( + open_html=open_environments_button, + close_html=close_environments_button, + section_name="environments" + ) + }} + +
    + + {% call ToggleSection(section_name="environments") %} +
      + {% for member in members_list %} +
    • +
      {{ member.name }}
      +
      • + {% endfor %} +
    + {% endcall %} + + {% call ToggleSection(section_name="edit") %} +
      +
    • +
      +
      +
      +
      + Row here +
      +
      +
      +
      +
      • +
    + {% endcall %} +
    • +     + {% endfor %} +
+
+
diff --git a/templates/portfolios/applications/settings.html b/templates/portfolios/applications/settings.html index 24c8b5fb..d6abf274 100644 --- a/templates/portfolios/applications/settings.html +++ b/templates/portfolios/applications/settings.html @@ -78,16 +78,21 @@
- {% include "fragments/applications/environments.html" %} -
-
- - - {{ "portfolios.applications.add_environment" | translate }} - {{ Icon('plus-circle-solid') }} - -
-
+ {% if user_can(permissions.EDIT_APPLICATION) %} + {% include "fragments/applications/edit_environments.html" %} +
+
+ + + {{ "portfolios.applications.add_environment" | translate }} + {{ Icon('plus-circle-solid') }} + +
+
+ {% elif user_can(permissions.VIEW_ENVIRONMENT) %} + {% include "fragments/applications/read_only_environments.html" %} + {% endif %} +
{% if user_can(permissions.DELETE_APPLICATION) %} {% call Modal(name="delete-application") %} From 6e1eac8560c1d1730645f12a7ff51391cc027c17 Mon Sep 17 00:00:00 2001 From: Montana Date: Thu, 25 Apr 2019 14:52:57 -0400 Subject: [PATCH 3/4] Fix toggle link name on app env table --- .../applications/edit_environments.html | 16 ++++++++-------- .../applications/read_only_environments.html | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/templates/fragments/applications/edit_environments.html b/templates/fragments/applications/edit_environments.html index 470aa10b..32e1993c 100644 --- a/templates/fragments/applications/edit_environments.html +++ b/templates/fragments/applications/edit_environments.html @@ -42,25 +42,25 @@ }} - {% set open_environments_button %} - {{ "common.show" | translate }} Environments ({{ members_list | length }}) {{ Icon('caret_down') }} + {% set open_members_button %} + Members ({{ members_list | length }}) {{ Icon('caret_down') }} {% endset %} - {% set close_environments_button %} - {{ "common.hide" | translate }} Environments ({{ members_list | length }}) {{ Icon('caret_up') }} + {% set close_members_button %} + Members ({{ members_list | length }}) {{ Icon('caret_up') }} {% endset %} {{ ToggleButton( - open_html=open_environments_button, - close_html=close_environments_button, - section_name="environments" + open_html=open_members_button, + close_html=close_members_button, + section_name="members" ) }} - {% call ToggleSection(section_name="environments") %} + {% call ToggleSection(section_name="members") %}
    {% for member in members_list %}
  • diff --git a/templates/fragments/applications/read_only_environments.html b/templates/fragments/applications/read_only_environments.html index f38ed58c..7d0a8ebf 100644 --- a/templates/fragments/applications/read_only_environments.html +++ b/templates/fragments/applications/read_only_environments.html @@ -26,25 +26,25 @@ - {% set open_environments_button %} - {{ "common.show" | translate }} Environments ({{ members_list | length }}) {{ Icon('caret_down') }} + {% set open_members_button %} + Members ({{ members_list | length }}) {{ Icon('caret_down') }} {% endset %} - {% set close_environments_button %} - {{ "common.hide" | translate }} Environments ({{ members_list | length }}) {{ Icon('caret_up') }} + {% set close_members_button %} + Members ({{ members_list | length }}) {{ Icon('caret_up') }} {% endset %} {{ ToggleButton( - open_html=open_environments_button, - close_html=close_environments_button, - section_name="environments" + open_html=open_members_button, + close_html=close_members_button, + section_name="members" ) }} - {% call ToggleSection(section_name="environments") %} + {% call ToggleSection(section_name="members") %}
      {% for member in members_list %}
    • From a97c87dca1fedfd115fe75bea8796f7bd8dd7d9d Mon Sep 17 00:00:00 2001 From: Montana Date: Fri, 26 Apr 2019 09:35:21 -0400 Subject: [PATCH 4/4] Omit Members on App Env table header --- templates/fragments/applications/edit_environments.html | 5 ++--- templates/fragments/applications/read_only_environments.html | 5 ++--- translations.yaml | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/templates/fragments/applications/edit_environments.html b/templates/fragments/applications/edit_environments.html index 32e1993c..5660fcb6 100644 --- a/templates/fragments/applications/edit_environments.html +++ b/templates/fragments/applications/edit_environments.html @@ -17,7 +17,6 @@
      {{ "portfolios.applications.environments.name" | translate }} - {{ "portfolios.applications.environments.members" | translate }}
        @@ -43,11 +42,11 @@ {% set open_members_button %} - Members ({{ members_list | length }}) {{ Icon('caret_down') }} + {{ "common.members" | translate }} ({{ members_list | length }}) {{ Icon('caret_down') }} {% endset %} {% set close_members_button %} - Members ({{ members_list | length }}) {{ Icon('caret_up') }} + {{ "common.members" | translate }} ({{ members_list | length }}) {{ Icon('caret_up') }} {% endset %} {{ diff --git a/templates/fragments/applications/read_only_environments.html b/templates/fragments/applications/read_only_environments.html index 7d0a8ebf..6cd9ed8d 100644 --- a/templates/fragments/applications/read_only_environments.html +++ b/templates/fragments/applications/read_only_environments.html @@ -13,7 +13,6 @@
        {{ "portfolios.applications.environments.name" | translate }} - {{ "portfolios.applications.environments.members" | translate }}
          @@ -27,11 +26,11 @@ {% set open_members_button %} - Members ({{ members_list | length }}) {{ Icon('caret_down') }} + {{ "common.members" | translate }} ({{ members_list | length }}) {{ Icon('caret_down') }} {% endset %} {% set close_members_button %} - Members ({{ members_list | length }}) {{ Icon('caret_up') }} + {{ "common.members" | translate }} ({{ members_list | length }}) {{ Icon('caret_up') }} {% endset %} {{ diff --git a/translations.yaml b/translations.yaml index 048b858b..c4fd2835 100644 --- a/translations.yaml +++ b/translations.yaml @@ -25,6 +25,7 @@ common: edit: Edit hide: Hide manage: manage + members: Members officer_helpers: underscore_to_friendly: contracting_officer: Contracting Officer @@ -365,7 +366,6 @@ navigation: funding: Funding reports: Reports budget_report: Budget Report - members: Members portfolio_admin: Portfolio Administration portfolio_funding: Funding portfolio_settings: Portfolio Settings @@ -402,7 +402,6 @@ portfolios: button: Delete application header: Are you sure you want to delete this application? environments: - members: Members name: Name environments_description: Each environment created within an application is logically separated from one another for easier management and security. environments_heading: Application environments