Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

re #1169 Switch to UI-Bootstrap Modals #490

Merged
merged 1 commit into from Jun 16, 2016

Conversation

kahboom
Copy link
Member

@kahboom kahboom commented Jun 16, 2016

Changes:

  • The goal was to switch from custom modals to UI-Bootstrap modals. Add 3 different controllers to new Modals module.
  • Move existing ClientAppDeleteModalCtrl to new module.
  • Some minor cleanup.
  • Update the scope that creates the modal instance to use UI-Bootstrap modals, and include the template in each of the HTML files, for each of the following directives and/or controllers:
    • New contract page
    • Client contracts entity
    • Client view
    • Client policies and contracts
    • API entity
    • API policies
    • Admin plugins
    • Admin gateways
    • Admin edit role
    • Admin edit gateway
    • Admin edit plugin
    • Admin manage members
    • Plan policies

Screenshots:

Confirm Upgrade Plugin:
screen shot 2016-06-13 at 11 17 48 am

JIRA: https://issues.jboss.org/browse/APIMAN-1169

cc @EricWittmann - If possible, please test prior to merging. I manually tested as I went along, but there are a lot of pages with a lot of changes. Apologies for some of the reformatting (yes, again); I remembered afterward and stopped doing it lol.

Please note that there is a ton of HTML that is repeated -- namely the modal templates -- but I couldn't get the path working properly to reference a single HTML file, so I had to add the template to each page that needed it. This can be improved by either resolving the path issue or possibly by using ng-include (which may or may not cause issues, but worth a try).

Switch to UI bootstrap for New Contract page

Fix for opening modal

Switch to UI Bootstrap modal for Client Contracts entity ctrl

Fix for Client view

Client policies and contracts UI-bootstrap modal

re apiman#1107 API Entity UI-bootstrap modal

re apiman#1107 API Policies UI-bootstrap modal

Admin Plugins UI-bootstrap modal

Admin gateways, edit role, edit gateway, edit plugin page updates for UI-bootstrap modals

Admin manage members UI-bootstrap modals

Plan policies UI-bootstrap modals
@EricWittmann EricWittmann merged commit 8fa35ef into apiman:master Jun 16, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants