Changeset 5505

Timestamp:

07/31/14 10:03:59 (10 years ago)

Author:

Twan Goosen

Message:

Added a feedback panel to the base page, removed it from the filter form. Improved feedback (now via panel) when editing/creation of a VC fails

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main

Files:

• java/eu/clarin/cmdi/virtualcollectionregistry/VirtualCollectionRegistry.java (modified) (1 diff)
• java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BasePage.html (modified) (1 diff)
• java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BasePage.java (modified) (2 diffs)
• java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/CreateVirtualCollectionPage.java (modified) (1 diff)
• java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/FilterForm.html (modified) (1 diff)
• java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/FilterForm.java (modified) (1 diff)
• webapp/css/vcr.css (modified) (1 diff)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/VirtualCollectionRegistry.java

@@ -182 +182 @@
             return c.getId();
         } catch (VirtualCollectionRegistryException e) {
-            logger.debug("failed updating virtual collecion (id={}): {}", id,
+            logger.warn("failed updating virtual collecion (id={}): {}", id,
                     e.getMessage());
             throw e;

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BasePage.html

@@ -27 +27 @@
         </div>
       </div>
+      <div id="feedback" wicket:id="feedback">[Feedback]</div>
       <div id="content"><wicket:child /></div>
       <div class="push"></div>

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BasePage.java

@@ -8 +8 @@
 import org.apache.wicket.WicketRuntimeException;
 import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.panel.FeedbackPanel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
@@ -33 +34 @@
                 AdminPage.class));
         add(menu);
+        
+        add(new FeedbackPanel("feedback"));
     }
 

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/CreateVirtualCollectionPage.java

@@ -72 +72 @@
                     }
                 } catch (VirtualCollectionRegistryException e) {
-                    // FIXME: handle error
-                    e.printStackTrace();
+                    getSession().error(e.getMessage());
                 }
 

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/FilterForm.html

@@ -37 +37 @@
     <input wicket:id="clear" type="submit" class="clear" value="clear" />
     </fieldset>
-    <div wicket:id="feedback" class="collectionsTableFeedback"></div>
   </form>
 </wicket:panel>

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/FilterForm.java

@@ -113 +113 @@
         };
         form.add(clearButton);
-
-        form.add(new FeedbackPanel("feedback"));
         add(form);
     }

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/webapp/css/vcr.css

@@ -332 +332 @@
 }
 
+#feedback ul {
+    padding-left: 0px;
+}
+
+#feedback ul li {
+    font-weight: bold;
+    padding: 5px;
+    list-style: none;    
+}
+
+#feedback ul li.feedbackPanelERROR {
+    background: red;
+}
 
 /*