diff options
author | Petr Vobornik <pvoborni@redhat.com> | 2014-05-13 15:24:18 +0200 |
---|---|---|
committer | Petr Vobornik <pvoborni@redhat.com> | 2014-06-10 10:23:29 +0200 |
commit | 29f60931e2bee750e5acdf7bead5ed3b21d7e4d5 (patch) | |
tree | b3f97c2bd400d58f55e01268163a2eb646350eba | |
parent | 05a917eb17d7c99338dcb972470f15d9d83b37b4 (diff) | |
download | freeipa-29f60931e2bee750e5acdf7bead5ed3b21d7e4d5.tar.gz freeipa-29f60931e2bee750e5acdf7bead5ed3b21d7e4d5.tar.xz freeipa-29f60931e2bee750e5acdf7bead5ed3b21d7e4d5.zip |
webui: association adder dialog - change find label to filter
also add filter placeholder
Reviewed-By: Endi Sukma Dewata <edewata@redhat.com>
-rw-r--r-- | install/ui/src/freeipa/dialog.js | 7 | ||||
-rw-r--r-- | install/ui/test/data/ipa_init.json | 2 | ||||
-rw-r--r-- | ipalib/plugins/internal.py | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/install/ui/src/freeipa/dialog.js b/install/ui/src/freeipa/dialog.js index 7b156cfdf..f71f23bb0 100644 --- a/install/ui/src/freeipa/dialog.js +++ b/install/ui/src/freeipa/dialog.js @@ -763,10 +763,15 @@ IPA.adder_dialog = function(spec) { 'class': 'input-group col-md-12 adder-dialog-top' }).appendTo(container); + var filter_placeholder = text.get('@i18n:association.filter_placeholder'); + filter_placeholder = filter_placeholder.replace('${other_entity}', + that.other_entity.metadata.label); + that.filter_field = $('<input/>', { type: 'text', name: 'filter', 'class': 'form-control', + 'placeholder': filter_placeholder, keyup: function(event) { if (event.keyCode === keys.ENTER) { that.search(); @@ -781,7 +786,7 @@ IPA.adder_dialog = function(spec) { that.find_button = IPA.button({ name: 'find', - label: '@i18n:buttons.find', + label: '@i18n:buttons.filter', click: function() { that.search(); return false; diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index 233218c38..5fa8b3e6f 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -36,6 +36,7 @@ }, "added": "${count} item(s) added", "direct_membership": "Direct Membership", + "filter_placeholder": "Filter available ${other_entity}", "indirect_membership": "Indirect Membership", "no_entries": "No entries.", "paging": "Showing ${start} to ${end} of ${total} entries.", @@ -65,6 +66,7 @@ "disable": "Disable", "edit": "Edit", "enable": "Enable", + "filter": "Filter", "find": "Find", "get": "Get", "issue": "Issue", diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py index 886d3f6f9..e89c99d9d 100644 --- a/ipalib/plugins/internal.py +++ b/ipalib/plugins/internal.py @@ -170,6 +170,7 @@ class i18n_messages(Command): }, "added": _("${count} item(s) added"), "direct_membership": _("Direct Membership"), + "filter_placeholder": _("Filter available ${other_entity}"), "indirect_membership": _("Indirect Membership"), "no_entries": _("No entries."), "paging": _("Showing ${start} to ${end} of ${total} entries."), @@ -198,6 +199,7 @@ class i18n_messages(Command): "disable": _("Disable"), "edit": _("Edit"), "enable": _("Enable"), + "filter": _("Filter"), "find": _("Find"), "get": _("Get"), "issue": _("Issue"), |