From 56920888372e2c2bba27b886812542ab498c7cdf Mon Sep 17 00:00:00 2001 From: Montana Date: Wed, 1 May 2019 16:37:37 -0400 Subject: [PATCH] Add Save Button to edit version of team table -adds base form component -Save button does not function properly yet -alphabetizes imports on base-form --- js/components/forms/base_form.js | 24 +++--- templates/portfolios/applications/team.html | 94 +++++++++++---------- 2 files changed, 63 insertions(+), 55 deletions(-) diff --git a/js/components/forms/base_form.js b/js/components/forms/base_form.js index 535a098d..a7259eae 100644 --- a/js/components/forms/base_form.js +++ b/js/components/forms/base_form.js @@ -1,26 +1,28 @@ import ally from 'ally.js' -import FormMixin from '../../mixins/form' -import textinput from '../text_input' -import optionsinput from '../options_input' -import DateSelector from '../date_selector' -import MultiStepModalForm from './multi_step_modal_form' -import multicheckboxinput from '../multi_checkbox_input' import checkboxinput from '../checkbox_input' +import DateSelector from '../date_selector' +import FormMixin from '../../mixins/form' import levelofwarrant from '../levelofwarrant' import Modal from '../../mixins/modal' +import multicheckboxinput from '../multi_checkbox_input' +import MultiStepModalForm from './multi_step_modal_form' +import optionsinput from '../options_input' +import textinput from '../text_input' +import toggler from '../toggler' export default { name: 'base-form', components: { - textinput, - optionsinput, - DateSelector, - MultiStepModalForm, - multicheckboxinput, checkboxinput, + DateSelector, levelofwarrant, Modal, + multicheckboxinput, + MultiStepModalForm, + optionsinput, + textinput, + toggler, }, mixins: [FormMixin], } diff --git a/templates/portfolios/applications/team.html b/templates/portfolios/applications/team.html index 9449ff6d..992ef782 100644 --- a/templates/portfolios/applications/team.html +++ b/templates/portfolios/applications/team.html @@ -2,6 +2,7 @@ {% from "components/empty_state.html" import EmptyState %} {% from "components/icon.html" import Icon %} +{% from 'components/save_button.html' import SaveButton %} {% from "components/toggle_list.html" import ToggleButton, ToggleSection %} {% set secondary_breadcrumb = 'portfolios.applications.team_settings.title' | translate({ "application_name": application.name }) %} @@ -24,60 +25,65 @@
-
- {% if g.matchesPath("application-members") %} - {% include "fragments/flash.html" %} - {% endif %} -
-
-
-
- {{ "portfolios.applications.team_settings.section.title" | translate({ "application_name": application.name }) }} + +
+ {% if g.matchesPath("application-members") %} + {% include "fragments/flash.html" %} + {% endif %} +
+
+
+
+ {{ "portfolios.applications.team_settings.section.title" | translate({ "application_name": application.name }) }} +
+ + {{ Icon('info') }} + {{ "portfolios.admin.settings_info" | 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 }} +
+
+  
- - {{ Icon('info') }} - {{ "portfolios.admin.settings_info" | translate }} - +
    + {% if user_can(permissions.EDIT_APPLICATION_MEMBER) %} + {% include "fragments/applications/edit_team.html" %} + {% elif user_can(permissions.VIEW_APPLICATION_MEMBER) %} + {% include "fragments/applications/read_only_team.html" %} + {% endif %} +
-
-
-
-
- {{ "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 }} -
-
-   -
-
-
    - {% if user_can(permissions.EDIT_APPLICATION_MEMBER) %} - {% include "fragments/applications/edit_team.html" %} - {% elif user_can(permissions.VIEW_APPLICATION_MEMBER) %} - {% include "fragments/applications/read_only_team.html" %} - {% endif %} -
-
- - + +
+
{% endif %} {% endblock %}