Changeset 6663

Timestamp:

10/12/15 13:06:30 (9 years ago)

Author:

Twan Goosen

Message:

First step towards #800 (wait indicator on search)

Location:

vlo/branches/vlo-3.3/vlo-web-app/src/main

Files:

• java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchFormPanel.java (modified) (4 diffs)
• less/eu/clarin/cmdi/vlo/wicket/pages/inc/vlo-search.less (modified) (1 diff)

vlo/branches/vlo-3.3/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchFormPanel.java

@@ -20 +20 @@
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.service.solr.AutoCompleteService;
+import eu.clarin.cmdi.vlo.wicket.components.IndicatingAjaxFallbackButton;
 import java.util.Iterator;
 import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.IAjaxIndicatorAware;
 import org.apache.wicket.ajax.markup.html.form.AjaxFallbackButton;
+import org.apache.wicket.extensions.ajax.markup.html.AjaxIndicatorAppender;
+import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
 import org.apache.wicket.extensions.ajax.markup.html.autocomplete.AutoCompleteTextField;
 import org.apache.wicket.markup.head.CssHeaderItem;
@@ -43 +47 @@
     private AutoCompleteService autoCompleteDao;
 
+    //private final AjaxIndicatorAppender indicatorAppender = new AjaxIndicatorAppender();
     public SearchFormPanel(String id, IModel<QueryFacetsSelection> model) {
         super(id, model);
@@ -58 +63 @@
 
         // Button allows partial updates but can fall back to a full (non-JS) refresh
-        form.add(new AjaxFallbackButton("searchSubmit", form) {
+        form.add(new IndicatingAjaxFallbackButton("searchSubmit", form) {
 
             @Override
@@ -69 +74 @@
         add(form);
     }
+//
+//    /**
+//     * @see
+//     * org.apache.wicket.ajax.IAjaxIndicatorAware#getAjaxIndicatorMarkupId()
+//     */
+//    @Override
+//    public String getAjaxIndicatorMarkupId() {
+//        return indicatorAppender.getMarkupId();
+//    }
 
     protected abstract void onSubmit(AjaxRequestTarget target);

vlo/branches/vlo-3.3/vlo-web-app/src/main/less/eu/clarin/cmdi/vlo/wicket/pages/inc/vlo-search.less

@@ -68 +68 @@
     text-align: center;
 }
+
+/*#searchcontrols .wicket-ajax-indicator {
+    float: right;
+}*/
 
 .resultpagination {