You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2020/02/10 16:15:38 UTC
[syncope] branch master updated: Improving edit User's group search
bar
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 1ca5d0b Improving edit User's group search bar
1ca5d0b is described below
commit 1ca5d0ba8a3c1b1daca66bb7487d1581295fe07c
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon Feb 10 17:12:50 2020 +0100
Improving edit User's group search bar
---
.../commons/markup/html/form/AjaxPalettePanel.java | 20 ++++++++++----------
.../commons/markup/html/form/AjaxPalettePanel.html | 8 +++++---
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxPalettePanel.java b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxPalettePanel.java
index abaf193..4b8c1f5 100644
--- a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxPalettePanel.java
+++ b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxPalettePanel.java
@@ -32,7 +32,7 @@ import org.apache.syncope.client.ui.commons.Constants;
import org.apache.syncope.client.ui.commons.ajax.form.IndicatorAjaxFormComponentUpdatingBehavior;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.extensions.markup.html.form.palette.Palette;
import org.apache.wicket.extensions.markup.html.form.palette.component.Recorder;
import org.apache.wicket.markup.html.basic.Label;
@@ -173,23 +173,23 @@ public class AjaxPalettePanel<T extends Serializable> extends AbstractFieldPanel
add(palette.setLabel(new ResourceModel(name)).setOutputMarkupId(true));
- final Form<?> form = new Form<>("form");
+ Form<?> form = new Form<>("form");
add(form.setEnabled(builder.filtered).setVisible(builder.filtered));
- final AjaxTextFieldPanel filter = new AjaxTextFieldPanel("filter", "filter", queryFilter, false);
- filter.hideLabel().setOutputMarkupId(true);
- form.add(filter);
+ AjaxTextFieldPanel filter = new AjaxTextFieldPanel("filter", "filter", queryFilter, false);
+ form.add(filter.hideLabel().setOutputMarkupId(true));
- form.add(new AjaxSubmitLink("search") {
+ AjaxButton search = new AjaxButton("search") {
- private static final long serialVersionUID = -1765773642975892072L;
+ private static final long serialVersionUID = 8390605330558248736L;
@Override
- protected void onAfterSubmit(final AjaxRequestTarget target) {
- super.onAfterSubmit(target);
+ protected void onSubmit(final AjaxRequestTarget target) {
target.add(palette);
}
- });
+ };
+ search.setOutputMarkupId(true);
+ form.add(search);
}
public LoadableDetachableModel<List<T>> getChoicesModel() {
diff --git a/client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/markup/html/form/AjaxPalettePanel.html b/client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/markup/html/form/AjaxPalettePanel.html
index 633a310..e6b2d84 100644
--- a/client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/markup/html/form/AjaxPalettePanel.html
+++ b/client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/markup/html/form/AjaxPalettePanel.html
@@ -20,10 +20,12 @@ under the License.
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
<form wicket:id="form">
- <div class="form-group input-group">
+ <div class="input-group margin-bottom">
<span wicket:id="filter">[FILTER]</span>
- <span class="input-group-addon">
- <a href="#" wicket:id="search"><i class="glyphicon glyphicon-search"></i></a>
+ <span class="input-group-btn">
+ <button type="button" class="btn btn-default btn-flat" wicket:id="search">
+ <span class="glyphicon glyphicon-search" aria-hidden="true"></span>
+ </button>
</span>
</div>
</form>