Changeset 1015

Timestamp:

12/22/10 17:43:46 (13 years ago)

Author:

oschonef

Message:

• CSS tweaks
• hide popup-menu and details for deleted virtual collections

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main

Files:

• java/eu/clarin/cmdi/virtualcollectionregistry/gui/menu/AjaxPopupMenu.java (modified) (1 diff)
• java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BrowsePrivateCollectionsPage.java (modified) (1 diff)
• java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/ColumnName.java (modified) (2 diffs)
• java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/ColumnName.js (modified) (1 diff)
• webapp/css/vcr.css (modified) (2 diffs)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/menu/AjaxPopupMenu.java

@@ -67 +67 @@
     }
 
+    @Override
+    protected void onBeforeRender() {
+        super.onBeforeRender();
+        boolean anyVisible = false;
+        for (MenuItem item : items) {
+            if (item.isVisible()) {
+                anyVisible = true;
+                break;
+            }
+        }
+        if (!anyVisible) {
+            setVisible(false);
+        }
+    }
+
 } // class PopupMenu

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

@@ -142 +142 @@
                 deleteLink.setVisible(false).setEnabled(false);
             }
+            boolean isVisible = detailsLink.isVisible() ||
+                    editLink.isVisible() || publishLink.isVisible() ||
+                    deleteLink.isVisible();
+            setVisible(isVisible);
         }
     } // class BrowsePrivateCollectionsPage.ActionsPanel

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

@@ -1 +1 @@
 package eu.clarin.cmdi.virtualcollectionregistry.gui.table;
 
+import org.apache.wicket.Component;
 import org.apache.wicket.ResourceReference;
+import org.apache.wicket.behavior.AbstractBehavior;
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
@@ -45 +47 @@
             }
             details.add(descLabel);
-            details.add(table.createActionPanel("actionsPanel", model));
+            final Panel actionsPanel =
+                table.createActionPanel("actionsPanel", model);
+            details.add(actionsPanel);
+            details.add(new AbstractBehavior() {
+
+                @Override
+                public void bind(Component component) {
+                    component.setVisible(actionsPanel.isVisible());
+                }
+            });
 
             // move to css?

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

@@ -7 +7 @@
                         var name = $(this).children('div.name');
                         var details = $(this).children('div.details');
-                        name.bind('click.detailsToggle', function() {
-                                details.slideToggle(o.speed, function() {
-                                        name.toggleClass('detailsShown');
+                        if (details.length > 0) {
+                                name.bind('click.detailsToggle', function() {
+                                        details.slideToggle(o.speed, function() {
+                                                name.toggleClass('detailsShown');
+                                        });
                                 });
-                        });
+                        } else {
+                                name.addClass('noDetails');
+                        }
                         return $(this);
                 }

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

@@ -695 +695 @@
 }
 
-table.collectionsTable td.name div.details {
-        margin-right: -188px;
-}
-
 table.collectionsTable td.name div.name {
         padding-left: 16px;
@@ -719 +715 @@
 }
 
+table.collectionsTable td.name div.name.noDetails{
+    background-image: none;
+}
+
 table.collectionsTable td.name div.details {
-    padding: 2px 2px 2px 16px;
+        margin-left: 16px;
+    margin-right: -248px;
+    width: 964px;
 }
 
 table.collectionsTable td.name div.desc {
     text-align: justify;
-    padding-bottom: 2px;
+    padding: 4px 0 0 0;
 }
 
 table.collectionsTable td.name div.actions {
-        margin-top: 4px;
+        margin: 4px 0;
 }