Author: woonsan
Date: Mon Mar 29 09:07:55 2010
New Revision: 928656
URL: http://svn.apache.org/viewvc?rev=928656&view=rev
Log:
JS2-1163: Replacing view link by a button
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$InformationTab.html
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java?rev=928656&r1=928655&r2=928656&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
Mon Mar 29 09:07:55 2010
@@ -98,6 +98,7 @@ import org.apache.wicket.extensions.ajax
import org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
import org.apache.wicket.extensions.markup.html.tabs.ITab;
import org.apache.wicket.extensions.markup.html.tabs.TabbedPanel;
+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;
@@ -487,6 +488,7 @@ public class PortalSiteManager extends A
addPage.setVisibilityAllowed(true);
addLink.setVisibilityAllowed(true);
SiteTreeNode node = getUserSelectedNode();
+
if (node.getDocType() == SiteTreeNode.FileType.Folder)
{
urlLabel.setVisible(false);
@@ -496,7 +498,8 @@ public class PortalSiteManager extends A
addFolder.setVisible(true);
addPage.setVisible(true);
addLink.setVisible(true);
- } else if (node.getDocType() == SiteTreeNode.FileType.Page)
+ }
+ else if (node.getDocType() == SiteTreeNode.FileType.Page)
{
defaultPageLabel.setVisible(false);
defaultPageField.setVisible(false);
@@ -507,7 +510,8 @@ public class PortalSiteManager extends A
addFolder.setVisible(false);
addPage.setVisible(false);
addLink.setVisible(false);
- } else if (node.getDocType() == SiteTreeNode.FileType.Link)
+ }
+ else if (node.getDocType() == SiteTreeNode.FileType.Link)
{
defaultPageLabel.setVisible(false);
defaultPageField.setVisible(false);
@@ -523,18 +527,30 @@ public class PortalSiteManager extends A
addPage.setVisible(false);
addLink.setVisible(false);
}
+
if (node.getDocType() == SiteTreeNode.FileType.Link)
{
infoForm.add(new ExternalLink("view", new
Model(getDocument().getUrl()),new
ResourceModel("common.view")).setPopupSettings(new PopupSettings()));
- } else
+ }
+ else
{
- RequestContext context = (RequestContext) getPortletRequest()
- .getAttribute(
-
PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
- String basePath = context.getPortalURL().getBasePath().replace(
- "portal", "configure");
- infoForm.add(new ExternalLink("view", new Model(basePath
- + getDocument().getPath()),new
ResourceModel("common.view")).setPopupSettings(new PopupSettings()));
+ RequestContext context = (RequestContext)
getPortletRequest().getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
+ String basePath =
context.getPortalURL().getBasePath().replace("portal", "configure");
+ ExternalLink viewLink = new ExternalLink("view", new
Model(basePath + getDocument().getPath()), new ResourceModel("common.view"))
+ {
+ @Override
+ protected void onComponentTag(ComponentTag tag)
+ {
+ super.onComponentTag(tag);
+
+ if (tag.getName().equalsIgnoreCase("input") &&
((getLabel() != null) && (getLabel().getObject() != null)))
+ {
+ tag.put("value",
getDefaultModelObjectAsString(getLabel().getObject()));
+ }
+ }
+ };
+ viewLink.setPopupSettings(new PopupSettings());
+ infoForm.add(viewLink);
}
infoForm.add(new AjaxButton("remove",new
ResourceModel("common.remove"),infoForm)
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$InformationTab.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24InformationTab.html?rev=928656&r1=928655&r2=928656&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$InformationTab.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$InformationTab.html
Mon Mar 29 09:07:55 2010
@@ -74,7 +74,7 @@
</table>
<div>
<br/>
- <a wicket:id="view" ></a> <input type="button"
wicket:id="save" /> <input type="button" wicket:id="copy" /> <input
type="button" wicket:id="move" /> <input type="button" wicket:id="remove"
/>
+ <input type="button" wicket:id="view" /> <input
type="button" wicket:id="save" /> <input type="button" wicket:id="copy"
/> <input type="button" wicket:id="move" /> <input type="button"
wicket:id="remove" />
<br/>
<br/>
<input type="button" wicket:id="addFolder"/> <input
type="button" wicket:id="addPage"/> <input type="button"
wicket:id="addLink"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
