Menu
▾
▴
[dcm4che-commits] SF.net SVN: dcm4che:[13251] dcm4chee/dcm4chee-web/trunk
|
From: <rob...@us...> - 2010-04-28 14:49:15
|
Revision: 13251
http://dcm4che.svn.sourceforge.net/dcm4che/?rev=13251&view=rev
Author: robertdavid
Date: 2010-04-28 14:49:08 +0000 (Wed, 28 Apr 2010)
Log Message:
-----------
[#WEB-18] Add AE Management - added icons for edit, delete, echo
Modified Paths:
--------------
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/ae/AEListPanel.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/common/EditDicomObjectPanel.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/ae/AEListPanel.html
Added Paths:
-----------
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-common/src/main/resources/org/dcm4chee/web/common/base/images/echo.gif
Added: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-common/src/main/resources/org/dcm4chee/web/common/base/images/echo.gif
===================================================================
(Binary files differ)
Property changes on: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-common/src/main/resources/org/dcm4chee/web/common/base/images/echo.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/ae/AEListPanel.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/ae/AEListPanel.java 2010-04-28 14:23:31 UTC (rev 13250)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/ae/AEListPanel.java 2010-04-28 14:49:08 UTC (rev 13251)
@@ -38,12 +38,14 @@
package org.dcm4chee.web.war.ae;
+import org.apache.wicket.ResourceReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow.WindowClosedCallback;
import org.apache.wicket.markup.html.CSSPackageResource;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
@@ -53,6 +55,7 @@
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.model.StringResourceModel;
import org.dcm4chee.archive.entity.AE;
+import org.dcm4chee.web.common.base.ImageAnchor;
import org.dcm4chee.web.common.markup.modal.ConfirmationWindow;
/**
@@ -148,6 +151,7 @@
page.setEditPage(item.getModelObject());
}
};
+ editAET.add(new Image("img-editAET", new ResourceReference(ImageAnchor.class, "images/edit.gif")));
item.add(editAET);
MetaDataRoleAuthorizationStrategy.authorize(editAET, RENDER, "WebAdmin");
AjaxLink<?> removeAET = new AjaxLink<Object>("removeAET") {
@@ -160,6 +164,7 @@
confirm.confirm(target, new StringResourceModel("aet.confirmDelete",AEListPanel.this, null,new Object[]{ae}), ae);
}
};
+ removeAET.add(new Image("img-removeAET", new ResourceReference(ImageAnchor.class, "images/delete.gif")));
item.add(removeAET);
MetaDataRoleAuthorizationStrategy.authorize(removeAET, RENDER, "WebAdmin");
item.add(new AjaxLink<Object>("echo") {
@@ -169,7 +174,9 @@
@Override
public void onClick(AjaxRequestTarget target) {
mw.show(target, item.getModelObject());
- }});
+ }
+ }.add(new Image("img-echoAET", new ResourceReference(ImageAnchor.class, "images/echo.gif")))
+ );
}
});
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/common/EditDicomObjectPanel.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/common/EditDicomObjectPanel.java 2010-04-28 14:23:31 UTC (rev 13250)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/common/EditDicomObjectPanel.java 2010-04-28 14:49:08 UTC (rev 13251)
@@ -44,7 +44,6 @@
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
-import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Button;
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/ae/AEListPanel.html
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/ae/AEListPanel.html 2010-04-28 14:23:31 UTC (rev 13250)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/ae/AEListPanel.html 2010-04-28 14:49:08 UTC (rev 13251)
@@ -25,7 +25,9 @@
<th wicket:id="institutionHdrLabel">Institution</th>
<th wicket:id="departmentHdrLabel">Department</th>
<th wicket:id="installedHdrLabel">Installed</th>
- <th><a wicket:id="newAET" href="#">new</a></th>
+ <th><a wicket:id="newAET" href="#">new</a></th>
+ <th></th>
+ <th></th>
</tr>
<tr wicket:id="list">
<td title="Application Entity Title" wicket:id="title">[Title]</td>
@@ -45,10 +47,20 @@
<td wicket:id="institution">[Institution]</td>
<td wicket:id="department">[Department]</td>
<td wicket:id="installed">[Installed]</td>
- <td>
- <a wicket:id="editAET" href="#">edit</a>
- <a wicket:id="removeAET" href="#">del</a>
- <a wicket:id="echo" href="#">echo</a>
+ <td align="center">
+ <a wicket:id="editAET" href="#">
+ <img wicket:id="img-editAET" />
+ </a>
+ </td>
+ <td align="center">
+ <a wicket:id="removeAET" href="#">
+ <img wicket:id="img-removeAET" />
+ </a>
+ </td>
+ <td align="center">
+ <a wicket:id="echo" href="#">
+ <img wicket:id="img-echoAET" />
+ </a>
</td>
</tr>
</table>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|