-
Notifications
You must be signed in to change notification settings - Fork 33
feature/api-settings-export-fixes #1497
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
Merged
Merged
Changes from all commits
Commits
Show all changes
25 commits
Select commit
Hold shift + click to select a range
7119cc4
hide export tab for not admins or owners
ceb5cc7
Merge branch 'develop' into feature/api-settings-export-fixes
c07c919
added missing if
3b68412
Merge branch 'develop' into feature/api-settings-export-fixes
639a175
changed tab id
815f1e6
added button for proxy export; new layout
474ed85
Merge branch 'develop' into feature/api-settings-export-fixes
bd8dc79
Merge branch 'develop' into feature/api-settings-export-fixes
0c5f1db
import; subscription to proxy settings
56d1be1
helper to export proxy settings JSON
9e09d31
helper to export proxy settings YAML
430655f
comments
279889f
i18n strings
4efcf42
updated i18n strings
316ddb4
Proper nesting; to improve readability
brylie acfa75b
i18n strings changes
dbc860c
getting API id from ID from data context
ae387ba
Normalize api template/i18n usage
brylie 80a2585
Rename apiDocumentation template
brylie 7bb8232
Add editMetadataForm button text; fix class
brylie 5ded85a
Alphabetize apiDocumentation keys
brylie c5fa523
Rename 'view_ApiBackend' to 'viewApi'
brylie 93a005f
Cleaner nesting
brylie b581e86
Alphabetize apiExport keys
brylie 8e810a6
Add editApiMetadata submit button text
brylie File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,36 @@ | ||
| <template name="viewApiBackendExport"> | ||
| <template name="apiExport"> | ||
| <div class="panel panel-default"> | ||
| <div class="panel-heading"> | ||
| <h2 class="panel-title"> | ||
| {{_ "view_ApiBackend_Export_Title"}} | ||
| {{_ "apiExport_title"}} | ||
| </h2> | ||
| </div> | ||
| <div class="panel-body"> | ||
| <a class="btn btn-lg btn-success" id="exportJSONConfig">{{_ "view_ApiBackend_ExportJson"}}</a> | ||
| <a class="btn btn-lg btn-success" id="exportYAMLConfig">{{_ "view_ApiBackend_ExportYaml"}}</a> | ||
| <h3> | ||
| {{_ "apiExport_api_title"}} | ||
| </h3> | ||
| <p> | ||
| {{_ "apiExport_api_description"}} | ||
| </p> | ||
| <a class="btn btn-success" id="exportJSONConfig"> | ||
| {{_ "apiExport_json_button"}} | ||
| </a> | ||
| <a class="btn btn-success" id="exportYAMLConfig"> | ||
| {{_ "apiExport_yaml_button"}} | ||
| </a> | ||
| <hr class="panel-hr" /> | ||
| <h3> | ||
| {{_ "apiExport_proxy_title"}} | ||
| </h3> | ||
| <p> | ||
| {{_ "apiExport_proxy_description"}} | ||
| </p> | ||
| <a class="btn btn-success" id="exportJSONProxyConfig"> | ||
| {{_ "apiExport_json_button"}} | ||
| </a> | ||
| <a class="btn btn-success" id="exportYAMLProxyConfig"> | ||
| {{_ "apiExport_yaml_button"}} | ||
| </a> | ||
| </div> | ||
| </div> | ||
| </template> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Small detail, but the word 'backend' was removed on purpose, please revert -- and if possible, remove Backend from the template name too.
Basically, the word 'backend' is appearing in our code quite a lot, and is not really helping improve readability. We have been removing 'backend' and 'frontend' from our user interface and code, to the extent possible.
I can remove the 'backend' from
viewApiBackendand all related i18n strings, if you will just clean up this part of the code.