Skip to content

Feature/disable api key bootstrap switch #1657

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.

Sign up for GitHub

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

Merged
jykae merged 7 commits into from
Sep 29, 2016
Merged

Feature/disable api key bootstrap switch #1657

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
844f694
Remove apiWizard texts
brylie Sep 29, 2016
56e1863
Render Bootstrap Switch for Disable API Key field
brylie Sep 29, 2016
c0220f4
Change API Key check text
brylie Sep 29, 2016
d648eda
Internationalize schema text; comments
brylie Sep 29, 2016
3dc58c7
Attach i18n to all schemas; comments
brylie Sep 29, 2016
756f87d
Smaller API key check button
brylie Sep 29, 2016
0da9a2f
Change API key check button state order
brylie Sep 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions proxy_backends/client/form/form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ import { Proxies } from '/proxies/collection';
// NPM import
import 'urijs';

Template.proxyBackend.onRendered(() => {
// Make Disable API Key field easier to use
// Fixes browser rendering issue
$("[name='apiUmbrella.settings.disable_api_key']").bootstrapSwitch();
Copy link
Copy Markdown
Contributor

@55 55 Sep 29, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that simple check / uncheck works much better here. bootstrapSwitch may work as a single element, but not as a part of a form.

Copy link
Copy Markdown
Contributor Author

@brylie brylie Sep 29, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The checkbox is not working, for some reason, in Firefox 50.

The Bootstrap Switch allows the form to submit, and gives explicit text to let the user know about the field state:

screenshot from 2016-09-29 12-52-44

screenshot from 2016-09-29 12-53-39

Copy link
Copy Markdown
Contributor Author

@brylie brylie Sep 29, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can also refine the display of Bootstrap Switch as an enhancement.

Copy link
Copy Markdown
Contributor Author

@brylie brylie Sep 29, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made the button smaller.
screenshot from 2016-09-29 13-01-18
screenshot from 2016-09-29 13-01-29

Copy link
Copy Markdown
Contributor Author

@brylie brylie Sep 29, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We disagree as to whether the button 'works' in the form, both literally and aesthetically.

Copy link
Copy Markdown
Contributor

@55 55 Sep 29, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That looks good.

});

Template.proxyBackend.helpers({
apiHost () {
// Get one proxy from the Proxies collection
Expand Down