Changeset 1011

Timestamp:

12/22/10 15:21:43 (13 years ago)

Author:

oschonef

Message:

• add popup actions menu to private virtual collections table
• CSS updates

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main

Files:

• java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BrowsePrivateCollectionsPage$ActionsColumn.html (added)
• java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BrowsePrivateCollectionsPage.java (modified) (4 diffs)
• java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BrowsePublicCollectionsPage.java (modified) (1 diff)
• java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/ColumnActions.java (modified) (1 diff)
• java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/ColumnName$ItemCell.html (modified) (1 diff)
• java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/ColumnName.java (modified) (3 diffs)
• java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/VirtualCollectionTable.java (modified) (5 diffs)
• webapp/css/vcr.css (modified) (5 diffs)
• webapp/icons/wrench.png (added)

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

@@ -18 +18 @@
 import eu.clarin.cmdi.virtualcollectionregistry.gui.ApplicationSession;
 import eu.clarin.cmdi.virtualcollectionregistry.gui.dialog.ConfirmationDialog;
+import eu.clarin.cmdi.virtualcollectionregistry.gui.menu.AjaxLinkMenuItem;
+import eu.clarin.cmdi.virtualcollectionregistry.gui.menu.AjaxPopupMenu;
 import eu.clarin.cmdi.virtualcollectionregistry.gui.table.VirtualCollectionTable;
 import eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection;
@@ -25 +27 @@
 @SuppressWarnings("serial")
 public class BrowsePrivateCollectionsPage extends BasePage {
+    private class ActionsColumn extends Panel {
+        public ActionsColumn(String id, IModel<VirtualCollection> model) {
+            super(id, model);
+            setRenderBodyOnly(true);
+
+            final AjaxPopupMenu menu =
+                new AjaxPopupMenu("menu", new Model<String>("[actions]"));
+
+            final AjaxLinkMenuItem<VirtualCollection> publishItem =
+                new AjaxLinkMenuItem<VirtualCollection>(
+                    new Model<String>("Publish"), model, "publish") {
+                @Override
+                protected void onClick(AjaxRequestTarget target,
+                        IModel<VirtualCollection> model) {
+                    doPublish(target, model.getObject());
+                }
+            };
+            menu.add(publishItem);
+
+            final AjaxLinkMenuItem<VirtualCollection> editItem =
+                new AjaxLinkMenuItem<VirtualCollection>(
+                    new Model<String>("Edit"), model, "edit") {
+                @Override
+                protected void onClick(AjaxRequestTarget target,
+                        IModel<VirtualCollection> model) {
+                    doEdit(target, model.getObject());
+                }
+            };
+            menu.add(editItem);
+
+            final AjaxLinkMenuItem<VirtualCollection> deleteItem =
+                new AjaxLinkMenuItem<VirtualCollection>(
+                    new Model<String>("Delete"), model, "delete") {
+                @Override
+                protected void onClick(AjaxRequestTarget target,
+                        IModel<VirtualCollection> model) {
+                    doDelete(target, model.getObject());
+                }
+            };
+            menu.add(deleteItem);
+
+            final AjaxLinkMenuItem<VirtualCollection> detailsItem =
+                new AjaxLinkMenuItem<VirtualCollection>(
+                    new Model<String>("Details"), model, "details") {
+                @Override
+                protected void onClick(AjaxRequestTarget target,
+                        IModel<VirtualCollection> model) {
+                    doDetails(target, model);
+                }
+            };
+            menu.add(detailsItem);
+            add(menu);
+            
+            final VirtualCollection vc = model.getObject();
+            if (vc.isDeleted()) {
+                detailsItem.setVisible(false).setEnabled(false);
+            }
+            if (!vc.isPrivate()) {
+                editItem.setVisible(false).setEnabled(false);
+                publishItem.setVisible(false).setEnabled(false);
+                deleteItem.setVisible(false).setEnabled(false);
+            }
+        }
+    }
+
     private class ActionsPanel extends Panel {
         public ActionsPanel(String id, IModel<VirtualCollection> model) {
@@ -66 +133 @@
             add(detailsLink);
 
-            VirtualCollection vc = model.getObject();
+            final VirtualCollection vc = model.getObject();
             if (vc.isDeleted()) {
                 detailsLink.setVisible(false).setEnabled(false);
@@ -142 +209 @@
         final VirtualCollectionTable table =
             new VirtualCollectionTable("collectionsTable", true) {
-                @Override
-                protected Panel createActionPanel(String componentId,
-                        IModel<VirtualCollection> model) {
-                    return new ActionsPanel(componentId, model);
-                }
+            @Override
+            protected Panel createActionColumn(String componentId,
+                    IModel<VirtualCollection> model) {
+                return new ActionsColumn(componentId, model);
+            }
+
+            @Override
+            protected Panel createActionPanel(String componentId,
+                    IModel<VirtualCollection> model) {
+                return new ActionsPanel(componentId, model);
+            }
         };
         add(table);

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

@@ -32 +32 @@
             new VirtualCollectionTable("collectionsTable", false) {
                 @Override
+                protected Panel createActionColumn(String componentId,
+                        IModel<VirtualCollection> model) {
+                    return new ActionsPanel(componentId, model);
+                }
+
+                @Override
                 protected Panel createActionPanel(String componentId,
                         IModel<VirtualCollection> model) {

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

@@ -20 +20 @@
     public void populateItem(Item<ICellPopulator<VirtualCollection>> item,
             String componentId, IModel<VirtualCollection> model) {
-        item.add(table.createActionPanel(componentId, model));
+        item.add(table.createActionColumn(componentId, model));
     }
 

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

@@ -10 +10 @@
     <div wicket:id="details" class="details">
       <div wicket:id="desc" class="desc"></div>
-      <ul style="list-style: none; margin: 0; padding: 0;">
-        <li style="display: inline"><a href="#">[Display]</a></li>
-        <li style="display: inline"><a href="#">[Action1]</a></li>
-        <li style="display: inline"><a href="#">[Action2]</a></li>
-      </ul>
+      <div class="actions">
+        <div wicket:id="actionsPanel"></div>
+      </div>
     </div>
   </div>

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

@@ -23 +23 @@
     private static final ResourceReference JAVASCRIPT_RESOURCE = 
         new ResourceReference(ColumnName.class, "ColumnName.js");
-
+    private final VirtualCollectionTable table;
+    
     private final class ItemCell extends Panel implements IWiQueryPlugin {
         private final WebMarkupContainer nameColumn;
@@ -44 +45 @@
             }
             details.add(descLabel);
+            details.add(table.createActionPanel("actionsPanel", model));
+
             // move to css?
             details.add(new AttributeAppender("style",
@@ -65 +68 @@
     ColumnName(VirtualCollectionTable table) {
         super(new ResourceModel("column.name", "Name"), "name");
+        this.table = table;
     }
 

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

@@ -4 +4 @@
 import java.util.List;
 
+import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
 import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxNavigationToolbar;
@@ -9 +10 @@
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
 import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
@@ -18 +20 @@
 public abstract class VirtualCollectionTable extends Panel {
 
-    public VirtualCollectionTable(String id, boolean privateMode) {
+    public VirtualCollectionTable(String id, final boolean privateMode) {
         super(id);
         setOutputMarkupId(true);
@@ -38 +40 @@
             new AjaxFallbackDefaultDataTable<VirtualCollection>("table",
                 columns, provider, 30);
+        table.add(new AttributeAppender("class",
+                new AbstractReadOnlyModel<String>() {
+                    @Override
+                    public String getObject() {
+                        return privateMode ? "private" : "public";
+                    }
+                }, " "));
         table.addBottomToolbar(new AjaxNavigationToolbar(table));
 
@@ -50 +59 @@
     }
 
+    protected abstract Panel createActionColumn(String componentId,
+            IModel<VirtualCollection> model);
+
     protected abstract Panel createActionPanel(String componentId,
             IModel<VirtualCollection> model);

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

@@ -685 +685 @@
 }
 
-table.collectionsTable th.name,
-table.collectionsTable td.name {
-        width: 670px;
+table.collectionsTable.public th.name,
+table.collectionsTable.public td.name {
+        width: 796px;
+}
+
+table.collectionsTable.private th.name,
+table.collectionsTable.private td.name {
+    width: 736px;
 }
 
@@ -699 +704 @@
     background-repeat: no-repeat;
     background-position: center left;
+    cursor: pointer;
 }
 
@@ -722 +728 @@
 }
 
+table.collectionsTable td.name div.actions {
+        margin-top: 4px;
+}
+
+table.collectionsTable th.state,
+table.collectionsTable td.state {
+    width: 60px;
+}
+
+table.collectionsTable th.type,
+table.collectionsTable td.type {
+    width: 80px;
+}
+
 table.collectionsTable th.created,
 table.collectionsTable td.created {
-    width: 100px;
-}
-
-table.collectionsTable th.type,
-table.collectionsTable td.type {
-    width: 100px;
+    width: 80px;
 }
 
 table.collectionsTable td.action,
 table.collectionsTable th.action {
-        width: 100px;
+        width: 12px;
+}
+
+table.collectionsTable.public td.action span,
+table.collectionsTable.private td.action div.popupTrigger span {
+    display: none;
+}
+
+table.collectionsTable.public td.action a {
+    display: block;
+    width: 12px;
+    height: 12px;
+    margin-right: 2px;
+    background: transparent url('../icons/magnifier.png') no-repeat center center;
+}
+
+table.collectionsTable.private td.action div.popupTrigger {
+    display: block;
+    width: 12px;
+    height: 12px;
+    margin-right: 2px;
+    background: transparent url('../icons/wrench.png') no-repeat center center;
 }
 
@@ -765 +801 @@
     background-repeat: no-repeat;
     background-position: center left;
+    cursor: pointer;
 }
 
@@ -805 +842 @@
         width: 790px;
 }
+
+div.popupMenu {
+    -moz-box-shadow: 3px 3px 3px #888;
+    -webkit-box-shadow: 3px 3px 3px #888;
+    box-shadow: 3px 3px 3px #888;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+}
+
+div.popupMenu li a {
+        color: #000000;
+}
+
+div.popupMenu li a:hover {
+    color: #AE0000;
+}
+
+div.popupTrigger span.title {
+    color: #AE0000;
+}