[GEOS-8510] Show feedback messages both at top and bottom of the page

geoserver · Jan 3, 2018 · 4bf8018 · 4bf8018
1 parent 0d7a327
commit 4bf8018
Show file tree

Hide file tree

Showing 31 changed files with 87 additions and 79 deletions.
diff --git a/...ckup-restore/web/src/main/java/org/geoserver/backuprestore/web/BackupRestoreDataPage.java b/...ckup-restore/web/src/main/java/org/geoserver/backuprestore/web/BackupRestoreDataPage.java
@@ -182,7 +182,7 @@ protected void disableLink(ComponentTag tag) {
             }
 
             protected void onError(AjaxRequestTarget target, Form<?> form) {
-                target.add(feedbackPanel);
+                addFeedbackPanels(target);
             }
 
             protected void onSubmit(AjaxRequestTarget target, final Form<?> form) {
@@ -213,7 +213,7 @@ protected void onSubmit(AjaxRequestTarget target, final Form<?> form) {
                     //update the button back to original state
                     resetButtons(form, target, "newBackupStart");
 
-                    target.add(feedbackPanel);
+                    addFeedbackPanels(target);
                 }
 
                 cancel.setDefaultModelObject(jobid);
@@ -251,7 +251,7 @@ else if (exec.isStopping()) {
                                //update the button back to original state
                                resetButtons(form, target, "newBackupStart");
 
-                               target.add(feedbackPanel);
+                               addFeedbackPanels(target);
                            }
                            return;
                        }
@@ -373,7 +373,7 @@ protected void disableLink(ComponentTag tag) {
             }
 
             protected void onError(AjaxRequestTarget target, Form<?> form) {
-                target.add(feedbackPanel);
+                addFeedbackPanels(target);
             }
 
             protected void onSubmit(AjaxRequestTarget target, final Form<?> form) {
@@ -404,7 +404,7 @@ protected void onSubmit(AjaxRequestTarget target, final Form<?> form) {
                     //update the button back to original state
                     resetButtons(form, target, "newRestoreStart");
 
-                    target.add(feedbackPanel);
+                    addFeedbackPanels(target);
                 }
 
                 cancel.setDefaultModelObject(jobid);
@@ -442,7 +442,7 @@ else if (exec.isStopping()) {
                                //update the button back to original state
                                resetButtons(form, target, "newRestoreStart");
 
-                               target.add(feedbackPanel);
+                               addFeedbackPanels(target);
                            }
                            return;
                        }

diff --git a/src/community/geogig/src/main/java/org/geogig/geoserver/web/GeoGigSettingsPage.java b/src/community/geogig/src/main/java/org/geogig/geoserver/web/GeoGigSettingsPage.java
@@ -17,10 +17,7 @@ public class GeoGigSettingsPage extends GeoServerSecuredPage {
 
     protected AjaxTabbedPanel<ITab> tabbedPanel;
 
-    protected FeedbackPanel feedbackPanel;
-
     public GeoGigSettingsPage() {
-        this.feedbackPanel = super.feedbackPanel;
         initUI();
     }
 

diff --git a/src/community/wms-eo/src/main/java/org/geoserver/wms/eo/web/EoCoverageSelectorPage.java b/src/community/wms-eo/src/main/java/org/geoserver/wms/eo/web/EoCoverageSelectorPage.java
@@ -123,7 +123,7 @@ protected Component getComponentForProperty(String id, IModel<EoCoverageSelectio
             protected void onUpdate(AjaxRequestTarget target) {
                 updateCoveragesList(true);
                 target.add(coveragesContainer);
-                target.add(feedbackPanel);
+                addFeedbackPanels(target);
             }
 
         });

diff --git a/src/community/wms-eo/src/main/java/org/geoserver/wms/eo/web/EoLayerGroupAbstractPage.java b/src/community/wms-eo/src/main/java/org/geoserver/wms/eo/web/EoLayerGroupAbstractPage.java
@@ -264,7 +264,7 @@ protected void onUpdate(AjaxRequestTarget target) {
                     outlinesEntryChooser.setDefaultModelObject(null);
                 }
                 target.add(lgEntryPanel);
-                target.add(getFeedbackPanel());
+                addFeedbackPanels(target);
                 target.add(outlinesEntryChooser);
             }
 
@@ -298,7 +298,7 @@ protected void onUpdate(AjaxRequestTarget target) {
                 }
                 target.add(createStoreLink);
                 target.add(addFromStoreLink);
-                target.add(getFeedbackPanel());
+                addFeedbackPanels(target);
             }
 
         });

diff --git a/src/extension/importer/web/src/main/java/org/geoserver/importer/web/ImportDataPage.java b/src/extension/importer/web/src/main/java/org/geoserver/importer/web/ImportDataPage.java
@@ -171,7 +171,7 @@ protected void disableLink(ComponentTag tag) {
             }
 
             protected void onError(AjaxRequestTarget target, Form<?> form) {
-                target.add(feedbackPanel);
+                addFeedbackPanels(target);
             }
 
             protected void onSubmit(AjaxRequestTarget target, final Form<?> form) {
@@ -247,7 +247,7 @@ else if (t.isCancelled()) {
                                //update the button back to original state
                                resetButtons(form, target);
 
-                               target.add(feedbackPanel);
+                               addFeedbackPanels(target);
                            }
                            return;
                        }

diff --git a/src/extension/importer/web/src/main/java/org/geoserver/importer/web/ImportPage.java b/src/extension/importer/web/src/main/java/org/geoserver/importer/web/ImportPage.java
@@ -132,7 +132,7 @@ protected boolean onSubmit(AjaxRequestTarget target,
             protected void onSelectionUpdate(AjaxRequestTarget target) {
                 updateImportLink((AjaxLink) ImportPage.this.get("import"), this, target);
             }
-        }.setFeedbackPanel(feedbackPanel);
+        }.setFeedbackPanel(topFeedbackPanel);
         taskTable.setOutputMarkupId(true);
         taskTable.setFilterable(false);
         add(taskTable);

diff --git a/...security/web/web-cas/src/main/java/org/geoserver/security/web/cas/CasAuthFilterPanel.java b/...security/web/web-cas/src/main/java/org/geoserver/security/web/cas/CasAuthFilterPanel.java
@@ -10,7 +10,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.wicket.Session;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
 import org.apache.wicket.markup.html.form.CheckBox;
@@ -64,9 +63,8 @@ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
                     info(new StringResourceModel("casConnectionSuccessful",CasAuthFilterPanel.this, null).getObject());
                 }
                 catch(Exception e) {
-                    //getSession().error(e);
                     error(e);
-                    target.add( ((GeoServerBasePage)getPage()).getFeedbackPanel() ); // to display message
+                    ((GeoServerBasePage) getPage()).addFeedbackPanels(target); // to display message
                     LOGGER.log(Level.WARNING, "CAS connection error ", e);
                 }
             }
@@ -83,7 +81,7 @@ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
                 }
                 catch(Exception e) {
                     error(e);
-                    target.add( ((GeoServerBasePage)getPage()).getFeedbackPanel() ); // to display message
+                    ((GeoServerBasePage) getPage()).addFeedbackPanels(target); // to display message
                     LOGGER.log(Level.WARNING, "CAS proxy callback  error ", e);
                 }
             }
@@ -102,7 +100,7 @@ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
                 }
                 catch(Exception e) {
                     error(e);
-                    target.add( ((GeoServerBasePage)getPage()).getFeedbackPanel() ); // to display message
+                    ((GeoServerBasePage) getPage()).addFeedbackPanels(target); // to display message
                     LOGGER.log(Level.WARNING, "CAs url in logout page error ", e);
                 }
             }

diff --git a/src/extension/wps/web-wps/src/main/java/org/geoserver/wps/web/WPSRequestBuilder.java b/src/extension/wps/web-wps/src/main/java/org/geoserver/wps/web/WPSRequestBuilder.java
@@ -18,7 +18,6 @@
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.model.Model;
-import org.apache.wicket.request.http.WebRequest;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.geoserver.ows.URLMangler.URLType;
 import org.geoserver.ows.util.ResponseUtils;
@@ -126,13 +125,13 @@ protected void onSubmit(AjaxRequestTarget target, Form form) {
                     xmlWindow.show(target);
                 } catch (Exception e) {
                     error(e.getMessage());
-                    target.add(getFeedbackPanel());
+                    addFeedbackPanels(target);
                 }
             }
 
             @Override
             protected void onError(AjaxRequestTarget target, Form form) {
-                target.add(getFeedbackPanel());
+                addFeedbackPanels(target);
             }
         });
     }

diff --git a/src/extension/wps/web-wps/src/main/java/org/geoserver/wps/web/WPSRequestBuilderPanel.java b/src/extension/wps/web-wps/src/main/java/org/geoserver/wps/web/WPSRequestBuilderPanel.java
@@ -235,7 +235,7 @@ protected void onUpdate(AjaxRequestTarget target) {
                 // check for GeoServerBasePage, because parent page can also be a SubProcessBuilder
                 WebPage page = getWebPage();
                 if (page instanceof GeoServerBasePage) {
-                    target.add(((GeoServerBasePage) page).getFeedbackPanel());
+                    ((GeoServerBasePage) page).addFeedbackPanels(target);
                 }
             }
         });

diff --git a/src/web/core/src/main/java/org/geoserver/web/GeoServerBasePage.html b/src/web/core/src/main/java/org/geoserver/web/GeoServerBasePage.html
@@ -79,14 +79,17 @@ <h2><a wicket:id="home" class="pngfix" href="#"><span wicket:id="label">GeoServe
     </div><!-- /#sidebar -->
     <div id="page" class="selfclear">
       <div class="page-header">
-        <div id="feedback" wicket:id="feedback"></div>
+        <div id="topFeedback" wicket:id="topFeedback"></div>
         <h1 wicket:id="gbpTitle"></h1>
         <p wicket:id="gbpDescription"></p>
         <div wicket:id="headerPanel" class="header-panel"></div>
       </div>
       <div class="page-pane selfclear">
         <wicket:child></wicket:child>
       </div>
+      <div class="page-footer">
+        <div id="bottomFeedback" wicket:id="bottomFeedback"></div>
+      </div>
     </div><!-- /#page -->
     </div><!-- /.wrap> -->
   </div><!-- /#main -->

diff --git a/src/web/core/src/main/java/org/geoserver/web/GeoServerBasePage.java b/src/web/core/src/main/java/org/geoserver/web/GeoServerBasePage.java
@@ -17,6 +17,7 @@
 import org.apache.wicket.Component;
 import org.apache.wicket.Page;
 import org.apache.wicket.RuntimeConfigurationType;
+import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.IAjaxIndicatorAware;
 import org.apache.wicket.markup.head.CssReferenceHeaderItem;
 import org.apache.wicket.markup.head.IHeaderResponse;
@@ -68,9 +69,10 @@ public class GeoServerBasePage extends WebPage implements IAjaxIndicatorAware {
     protected static volatile GeoServerNodeInfo NODE_INFO;
 
     /**
-     * feedback panel for subclasses to report errors and information.
+     * feedback panels to report errors and information.
      */
-    protected FeedbackPanel feedbackPanel;
+    protected FeedbackPanel topFeedbackPanel;
+    protected FeedbackPanel bottomFeedbackPanel;
 
     /**
      * page for this page to return to when the page is finished, could be null.
@@ -310,8 +312,10 @@ public void populateItem(ListItem<MenuPageInfo> item) {
             }
         });
 
-        add(feedbackPanel = new FeedbackPanel("feedback"));
-        feedbackPanel.setOutputMarkupId( true );
+        add(topFeedbackPanel = new FeedbackPanel("topFeedback"));
+        topFeedbackPanel.setOutputMarkupId( true );
+        add(bottomFeedbackPanel = new FeedbackPanel("bottomFeedback"));
+        bottomFeedbackPanel.setOutputMarkupId( true );
 
         // ajax feedback image
         add(new Image("ajaxFeedbackImage", 
@@ -511,11 +515,12 @@ public String getAjaxIndicatorMarkupId() {
    }
 
    /**
-    * Returns the feedback panel included in the GeoServer base page
-    *
+    * Returns the top feedback panel included in the GeoServer base page
+    * @deprecated Use {@link #addFeedbackPanels(AjaxRequestTarget)} instead
     */
+   @Deprecated
    public FeedbackPanel getFeedbackPanel() {
-       return feedbackPanel;
+       return topFeedbackPanel;
    }
 
    /**
@@ -576,4 +581,10 @@ protected void doReturn(Class<? extends Page> defaultPageClass) {
        defaultPageClass = defaultPageClass != null ? defaultPageClass : GeoServerHomePage.class;
        setResponsePage(defaultPageClass);
    }
+
+    public void addFeedbackPanels(AjaxRequestTarget target) {
+        target.add(topFeedbackPanel);
+        target.add(bottomFeedbackPanel);
+    }
+
 }
diff --git a/src/web/core/src/main/java/org/geoserver/web/admin/AbstractStatusPage.java b/src/web/core/src/main/java/org/geoserver/web/admin/AbstractStatusPage.java
@@ -30,10 +30,7 @@ public abstract class AbstractStatusPage extends ServerAdminPage {
 
     protected AjaxTabbedPanel<ITab> tabbedPanel;
 
-    protected FeedbackPanel feedbackPanel;
-
     public AbstractStatusPage() {
-        this.feedbackPanel = super.feedbackPanel;
         initUI();
     }
 

diff --git a/src/web/core/src/main/java/org/geoserver/web/admin/StatusPanel.java b/src/web/core/src/main/java/org/geoserver/web/admin/StatusPanel.java
@@ -164,7 +164,7 @@ public void onClick(AjaxRequestTarget target) {
                     LOGGER.log(Level.SEVERE, "Error resetting resource caches", t);
                     error(t);
                 }
-                target.add(parent.feedbackPanel);
+                parent.addFeedbackPanels(target);
             }
         });
 
@@ -180,7 +180,7 @@ public void onClick(AjaxRequestTarget target) {
                     LOGGER.log(Level.SEVERE, "An error occurred while reloading the catalog", t);
                     error(t);
                 }
-                target.add(parent.feedbackPanel);
+                parent.addFeedbackPanels(target);
             }
         });
     }

diff --git a/src/web/core/src/main/java/org/geoserver/web/css/geoserver.css b/src/web/core/src/main/java/org/geoserver/web/css/geoserver.css
@@ -856,6 +856,11 @@ margin-bottom: 1em;
 padding-top: 18px;
 }
 
+.page-footer {
+padding-top: 1em;
+}
+
+
 * html .page-header { /* IE6 */
 background-position: 0 -2px;
 }
@@ -1217,6 +1222,12 @@ margin: 0.2em; /* override blueprint's settings for unordered lists */
 list-style-type: none;
 }
 
+.page-footer ul {
+margin: 0.2em; /* override blueprint's settings for unordered lists */
+list-style-type: none;
+}
+
+
 /*-------------
   Customize Wicket's autocomplete
   -------------*/

diff --git a/src/web/core/src/main/java/org/geoserver/web/data/importer/WMSLayerImporterPage.java b/src/web/core/src/main/java/org/geoserver/web/data/importer/WMSLayerImporterPage.java
@@ -159,7 +159,7 @@ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
                     LOGGER.log(Level.SEVERE, "Error while setting up mass import", e);
                 }
                 target.add(form);
-                target.add(feedbackPanel);
+                addFeedbackPanels(target);
             }
 
         };
@@ -198,7 +198,7 @@ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
                     LOGGER.log(Level.SEVERE, "Error while setting up mass import", e);
                 }
                 target.add(form);
-                target.add(feedbackPanel);
+                addFeedbackPanels(target);
             }
         };
     }

diff --git a/src/web/core/src/main/java/org/geoserver/web/data/importer/WMTSLayerImporterPage.java b/src/web/core/src/main/java/org/geoserver/web/data/importer/WMTSLayerImporterPage.java
@@ -158,7 +158,7 @@ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
                     LOGGER.log(Level.SEVERE, "Error while setting up mass import", e);
                 }
                 target.add(form);
-                target.add(feedbackPanel);
+                addFeedbackPanels(target);
             }
 
         };
@@ -197,7 +197,7 @@ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
                     LOGGER.log(Level.SEVERE, "Error while setting up mass import", e);
                 }
                 target.add(form);
-                target.add(feedbackPanel);
+                addFeedbackPanels(target);
             }
         };
     }

diff --git a/src/web/core/src/main/java/org/geoserver/web/data/layer/AttributeEditPage.java b/src/web/core/src/main/java/org/geoserver/web/data/layer/AttributeEditPage.java
@@ -77,7 +77,7 @@ private void updateVisibility(AjaxRequestTarget target) {
                 crsContainer.setVisible(attribute.getBinding() != null
                         && Geometry.class.isAssignableFrom(attribute.getBinding()));
 
-                target.add(getFeedbackPanel());
+                addFeedbackPanels(target);
                 target.add(form);
             }
 

diff --git a/src/web/core/src/main/java/org/geoserver/web/data/layer/NewLayerPage.java b/src/web/core/src/main/java/org/geoserver/web/data/layer/NewLayerPage.java
@@ -6,7 +6,7 @@
 package org.geoserver.web.data.layer;
 
 import java.io.IOException;
-import java.sql.SQLException;
+
 import org.geotools.decorate.Wrapper;
 import java.util.logging.Level;
 
@@ -283,7 +283,7 @@ protected void onUpdate(AjaxRequestTarget target) {
                     createTypeContainer.setVisible(false);
                 }
                 target.add(selectLayersContainer);
-                target.add(feedbackPanel);
+                addFeedbackPanels(target);
 
             }
 

diff --git a/src/web/core/src/main/java/org/geoserver/web/wicket/GeoServerAjaxFormLink.java b/src/web/core/src/main/java/org/geoserver/web/wicket/GeoServerAjaxFormLink.java
@@ -41,7 +41,7 @@ public boolean getDefaultFormProcessing() {
     protected final void onSubmit(AjaxRequestTarget target, Form<?> form) {
         onClick(target, form);
         if(getPage() instanceof GeoServerBasePage) {
-            target.add(((GeoServerBasePage) getPage()).getFeedbackPanel());
+            ((GeoServerBasePage) getPage()).addFeedbackPanels(target);
         }
     }