|
From: <rob...@us...> - 2011-07-21 11:46:40
|
Revision: 15696
http://dcm4che.svn.sourceforge.net/dcm4che/?rev=15696&view=rev
Author: robertdavid
Date: 2011-07-21 11:46:33 +0000 (Thu, 21 Jul 2011)
Log Message:
-----------
[#WEB-414] Do not display details link on file level in folder
Modified Paths:
--------------
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/StudyListPage.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/StudyListPage.html
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/StudyListPage.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/StudyListPage.java 2011-07-20 12:12:22 UTC (rev 15695)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/StudyListPage.java 2011-07-21 11:46:33 UTC (rev 15696)
@@ -2059,21 +2059,6 @@
item.add(new Label("fileObject.fileSystem.directoryPath").add(tooltip));
item.add(new Label("fileObject.filePath").add(tooltip));
item.add(new Label("fileObject.fileSystem.availability").add(tooltip));
- item.add(new AjaxFallbackLink<Object>("toggledetails") {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- fileModel.setDetails(!fileModel.isDetails());
- if (target != null) {
- target.addComponent(patientListItem);
- }
- }
-
- }.add(new Image("detailImg",ImageManager.IMAGE_COMMON_DICOM_DETAILS)
- .add(new ImageSizeBehaviour())
- .add(tooltip)));
item.add(getFileDisplayLink(modalWindow, fileModel, tooltip));
item.add(new AjaxCheckBox("selected") {
private static final long serialVersionUID = 1L;
@@ -2087,17 +2072,6 @@
target.addComponent(this);
}}.setOutputMarkupId(true)
.add(tooltip));
- WebMarkupContainer details = new WebMarkupContainer("details") {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public boolean isVisible() {
- return fileModel.isDetails();
- }
- };
- item.add(details);
- details.add(new FilePanel("file", fileModel));
}
}
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/StudyListPage.html
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/StudyListPage.html 2011-07-20 12:12:22 UTC (rev 15695)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/StudyListPage.html 2011-07-21 11:46:33 UTC (rev 15696)
@@ -492,7 +492,6 @@
</td>
<td wicket:id="fileObject.fileSystem.availability">[Availability]</td>
<td>
- <a wicket:id="toggledetails" href="#"><img wicket:id="detailImg" alt="D" /></a>
</td>
<td>
</td>
@@ -507,11 +506,6 @@
</td>
<td><input wicket:id="selected" type="checkbox" /></td>
</tr>
- <tr wicket:id="details" class="file" style="border-top-style: none;">
- <td colspan="15">
- <div wicket:id="file"></div>
- </td>
- </tr>
</wicket:container>
</wicket:container>
</wicket:container>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|