Skip to content

Feature/visibility checks2 #1718

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
marla-singer merged 21 commits into from
Oct 10, 2016
Merged

Feature/visibility checks2 #1718

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
dafd385
Header tag check, show quick tour for all
Oct 7, 2016
1a6c496
Show forbidden if no permissions
Oct 7, 2016
c5d7e19
Add forbidden template
Oct 7, 2016
615d004
Update collection helpers
Oct 7, 2016
c4fa3d6
Tag for grid
Oct 7, 2016
8e2e008
Tag for table
Oct 7, 2016
adddb64
Checks for catalogue publication, lint lint
Oct 7, 2016
9575c84
Add route for forbidden
Oct 7, 2016
9fb7031
Move to error_templates
Oct 7, 2016
d720009
ProxyBackend info required for all users
Oct 7, 2016
3d312f0
Adjust monitoring status dot
Oct 7, 2016
eeb1810
update currentusercanview helper
Oct 10, 2016
47a5531
Add space
Oct 10, 2016
dc101bc
Add i18n
Oct 10, 2016
d595672
Add help text for authorized users
Oct 10, 2016
8162c51
Align status indicator
Oct 10, 2016
3e67c23
Switch to camelCase
Oct 10, 2016
fdf3a72
Fix to previous
Oct 10, 2016
1dd2bf9
show helptext as paragraph
Oct 10, 2016
0dd5e87
Remove pull-right class
Oct 10, 2016
6d2b23b
Fix icon-indicator style
Oct 10, 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
1 change: 1 addition & 0 deletions apis_authorization/client/list/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<template name="apiAuthorizedUsersList">
<h3>
{{_ 'apiAuthorizedUsersList_ header_text' }}
<span class="helptext">{{> showHelp 'api_settings_visibility_authorizedUsers' }}</span>
</h3>

<ul class="list-group">
Expand Down
6 changes: 6 additions & 0 deletions apis_authorization/client/list/list.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.helptext {
float: right;
position: relative;
top: -0.4em;
right: 59em;
}
12 changes: 11 additions & 1 deletion core/client/form_hints/form_hints.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
import { TAPi18n } from 'meteor/tap:i18n';
import { InlineHelp } from 'meteor/pahans:inline-help';


// Initialize help texts
const formHints = {
documentation_link: {
Expand Down Expand Up @@ -29,7 +33,13 @@ const formHints = {
options: {
placement: 'left',
},
}
},
api_settings_visibility_authorizedUsers: {
message: TAPi18n.__('api_settings_visibility_authorizedUsers'),
options: {
placement: 'left',
},
},
};

InlineHelp.initHelp(formHints);
1 change: 1 addition & 0 deletions core/lib/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
"apiSettings_visibilityPanel_title": "Visibility",
"apiSettings_visibility_heading": "Change API visibility",
"apiSettings_visibility_text": "Make this API private or public",
"api_settings_visibility_authorizedUsers": "Give single users permissions to view API even when API is globally marked Private.",
Copy link
Copy Markdown
Contributor

@marla-singer marla-singer Oct 10, 2016

Choose a reason for hiding this comment

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

Rename api_settings to apiSettings as above

Copy link
Copy Markdown
Contributor Author

@jykae jykae Oct 10, 2016

Choose a reason for hiding this comment

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

@marla-singer done

"api_backend_rating_anonymous": "Please log in to vote.",
"apinf_usernotloggedin_error": "Could not find logged in user.",
"apiMonitoring_panelTitle_Monitoring": "API Monitoring",
Expand Down