Skip to content

Org filter via label less helpers #2219

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 8 commits into from
Mar 3, 2017
Merged

Org filter via label less helpers #2219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
84e6c39
Remove APIs count from Filtered By template
brylie Mar 3, 2017
610b774
Pluralize apisCount strings; Add apiCatalog apisCount
brylie Mar 3, 2017
5ebbe36
brylie Mar 3, 2017
e497034
Pass in named count for pluralization
brylie Mar 3, 2017
f2239d3
Capitalize 'Filtered by' text
brylie Mar 3, 2017
94aacf8
Clean up unused string
brylie Mar 3, 2017
24d63f0
Remove unneeded space
brylie Mar 3, 2017
0b74948
Ensure apisCount exists before rendering
brylie Mar 3, 2017
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
5 changes: 5 additions & 0 deletions api_catalog/client/api_catalog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
<div class="container">
<h1 class="page-header">
{{_ "catalogue_Title" }}
{{# if apisCount }}
<small>
{{_ 'apiCatalog_apisCount' count=apisCount }}
</small>
{{/ if }}
</h1>
{{> apiCatalogToolbar apis=apis }}

Expand Down
5 changes: 0 additions & 5 deletions api_filter/client/filtered_by/filtered_by.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
<template name="apiFilteredBy">
{{# if selectedOption }}
<span>
{{# if showApisCount }}
<strong>
{{_ 'apiFilteredBy_text.apiCount' count=apisCount }}&nbsp;
</strong>
{{/ if }}
<i>
{{_ 'apiFilteredBy_text_filteredBy' tag=selectedOption }}
</i>
Copy link
Copy Markdown
Contributor

@marla-singer marla-singer Mar 3, 2017

Choose a reason for hiding this comment

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

Don't forget to delete useless i18n tags

Copy link
Copy Markdown
Contributor Author

@brylie brylie Mar 3, 2017

Choose a reason for hiding this comment

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

I can't find that tag in the en.i18n.js file.

Copy link
Copy Markdown
Contributor

@marla-singer marla-singer Mar 3, 2017

Choose a reason for hiding this comment

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

https://github.com/apinf/platform/blob/develop/core/lib/i18n/en.i18n.json#L91-L94

Expand Down
5 changes: 0 additions & 5 deletions api_filter/client/filtered_by/filtered_by.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ Template.apiFilteredBy.helpers({

return instance.selectedOption.get();
},
showApisCount () {
const apisCount = Template.instance().data.apisCount;
// Return true if apisCount was set
return apisCount > -1;
},
});

Template.apiFilteredBy.events({
Expand Down
8 changes: 5 additions & 3 deletions core/lib/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@
"apiBacklogItems_priorityText_None": "None",
"apiCard_labelText_private": "private",
"apiCard_tooltipTitle_averageRating": "Average Rating",
"apiCatalog_apisCount": "(__count__ api)",
"apiCatalog_apisCount_plural": "(__count__ apis)",
"apiSettingsDelete_deleteButton": "Delete",
"apiDetails_baseUrl_headingText": "API URL",
"apiDetails_description_headingText": "Description",
Expand Down Expand Up @@ -92,7 +94,7 @@
"apiCount": " __count__ API",
"apiCount_plural": "__count__ APIs"
},
"apiFilteredBy_text_filteredBy": "filtered by \"__tag__\"",
"apiFilteredBy_text_filteredBy": "Filtered by \"__tag__\"",
"apiFilteredBy_buttonText_clear": "Clear all",
"apisFilterForm_buttonText_filter": "Filter",
"apisFilterForm_buttonText_clear": "Clear",
Expand Down Expand Up @@ -439,11 +441,11 @@
"organizationProfileHeader_editButton_text": "Edit",
"organizationProfileHeader_tabs_apis": "APIs",
"organizationProfileHeader_tabs_settings": "Settings",
"organizationProfile_smallText_apisCount": "(%s apis)",
"organizationProfile_smallText_apisCount": "(__count__ api)",
"organizationProfile_smallText_apisCount_plural": "(__count__ apis)",
"organizationProfile_buttonText_connectApi": "Connect API to organization",
"organizationProfile_buttonText_clear": "Clear all",
"organizationProfile_text_error": "Connection button doesn't work. Please inform administrator about the problem",
"organizationProfile_text_filteredBy": "Filtered by",
"organizationRemoveManagers_cancelButton": "Cancel",
"organizationRemoveManagers_description": "Are you sure you want to remove this user as a manager?",
"organizationRemoveManagers_removeButton": "Remove",
Expand Down
2 changes: 1 addition & 1 deletion organizations/client/profile/apis/show_apis/show_apis.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<h3 class="apis-block-title">
{{_ 'organizationProfile_bigText_apisCount' }}
<small>
{{_ 'organizationProfile_smallText_apisCount' apis.length }}
{{_ 'organizationProfile_smallText_apisCount' count=apis.length }}
</small>
</h3>
{{> apiFilteredBy }}
Expand Down