Author: woonsan
Date: Mon Mar 29 13:19:56 2010
New Revision: 928765
URL: http://svn.apache.org/viewvc?rev=928765&view=rev
Log:
JS2-1163: Removes place holder text of wicket tabbed pane and removes link on
the root menu node.
Added:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/wicket/
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/wicket/extensions/
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/wicket/extensions/markup/
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/wicket/extensions/markup/html/
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/wicket/extensions/markup/html/tabs/
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.html
(with props)
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$MenuTabPanel.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=928765&r1=928764&r2=928765&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 13:19:56 2010
@@ -112,6 +112,7 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.form.upload.FileUpload;
import org.apache.wicket.markup.html.form.upload.FileUploadField;
+import org.apache.wicket.markup.html.image.ContextImage;
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.link.ExternalLink;
import org.apache.wicket.markup.html.link.PopupSettings;
@@ -1601,51 +1602,53 @@ public class PortalSiteManager extends A
{
super(id, document);
ITab tab = null;
- DefaultMutableTreeNode rootNode = new
DefaultMutableTreeNode("root");
- rootNode.add(new DefaultMutableTreeNode(new
MenuTreeNode("Menus",null)));
+ DefaultMutableTreeNode rootNode = new
DefaultMutableTreeNode("_MenusRootNode_");
final ModalWindow metaDataModalWindow;
add(metaDataModalWindow = new ModalWindow("modalwindow"));
// Adding menu tree node
menuTreeRoot = new DefaultTreeModel(rootNode);
- // controlMenuTabs(false);
- final AjaxTabbedPanel menusTab = new AjaxTabbedPanel("menuTabs",
- menuTabs);
- menuTree = new LinkTree("menuTree", new PropertyModel(this,
- "menuTreeRoot"))
+ controlMenuTabs(false);
+ final AjaxTabbedPanel menusTab = new AjaxTabbedPanel("menuTabs",
menuTabs);
+ menuTree = new LinkTree("menuTree", new PropertyModel(this,
"menuTreeRoot"))
{
-
@Override
protected void onNodeLinkClicked(Object node, BaseTree tree,
AjaxRequestTarget target)
{
- MenuTreeNode menuNode = (MenuTreeNode)
((DefaultMutableTreeNode) node)
- .getUserObject();
- if (menuNode.getName() != null)
+ Object userObject = ((DefaultMutableTreeNode)
node).getUserObject();
+
+ if (!(userObject instanceof MenuTreeNode))
{
- if (!menuNode.getName().equalsIgnoreCase("Menus"))
- {
- setMenuDefinition(menuNode.getDefinition());
- controlMenuTabs(true);
- menusTab.setSelectedTab(0);
- target.addComponent(menusTab);
- }
+ return;
+ }
+
+ MenuTreeNode menuNode = (MenuTreeNode) userObject;
+
+ if (menuNode.getName() != null &&
!menuNode.getName().equalsIgnoreCase("_MenusRootNode_"))
+ {
+ setMenuDefinition(menuNode.getDefinition());
+ controlMenuTabs(true);
+ menusTab.setSelectedTab(0);
+ target.addComponent(menusTab);
}
}
};
+
if (getNodeType().equals(FOLDER_NODE_TYPE))
{
- setMenuDefinition(getServiceLocator().getPageManager()
- .newFolderMenuDefinition());
- } else
+
setMenuDefinition(getServiceLocator().getPageManager().newFolderMenuDefinition());
+ }
+ else
{
- setMenuDefinition(getServiceLocator().getPageManager()
- .newPageMenuDefinition());
+
setMenuDefinition(getServiceLocator().getPageManager().newPageMenuDefinition());
}
+
getServiceLocator().getPageManager().newFolderMenuDefinition();
// menusTab.setSelectedTab(0);
getMenus(getDocument(), rootNode);
menuTree.getTreeState().expandNode(rootNode);
menuTree.setRootLess(true);
+ add(new ContextImage("menusRootIcon", "images/tree/folder.gif"));
add(menuTree);
Form menuForm = new Form("menuForm");
add(menuForm);
@@ -4679,6 +4682,7 @@ public class PortalSiteManager extends A
{
ITab tab = null;
menuTabs.clear();
+
if (nodeSelected)
{
tab = new AbstractTab(new Model("Info"))
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuTabPanel.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24MenuTabPanel.html?rev=928765&r1=928764&r2=928765&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuTabPanel.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuTabPanel.html
Mon Mar 29 13:19:56 2010
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -20,20 +20,34 @@
Version $Id$
-->
<html xmlns="http://www.w3.org/1999/xhtml";>
-<wicket:panel>
-<div wicket:id="feedback"></div>
-
- <table>
- <tr>
- <td class="portlet-section-body"><span
wicket:id="menuTree"></span></td>
- <td class="portlet-section-body"><span
wicket:id="menuTabs"></span></td>
- </tr>
- <tr>
- <td colspan="2"><input type="button"
wicket:id="newsave" /> <input type="button" wicket:id="remove"></td>
- </tr>
- </table>
- <div wicket:id="modalwindow">[modal window goes here]</div>
- <form wicket:id="menuForm"></form>
-</wicket:panel>
+ <wicket:panel>
+ <div wicket:id="feedback"></div>
+
+ <table>
+ <tr>
+ <td class="portlet-section-body">
+ <div>
+ <table class="icon-panel">
+ <tr>
+ <td><img wicket:id="menusRootIcon" class="icon"/></td>
+ <td class="content"><wicket:message key="menus" /></td>
+ </tr>
+ </table>
+ </div>
+ <div wicket:id="menuTree"></div>
+ </td>
+ <td class="portlet-section-body">
+ <div wicket:id="menuTabs"></div>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <input type="button" wicket:id="newsave" />
+ <input type="button" wicket:id="remove" />
+ </td>
+ </tr>
+ </table>
+ <div wicket:id="modalwindow">[modal window goes here]</div>
+ <form wicket:id="menuForm"></form>
+ </wicket:panel>
</html>
-
Added:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.html?rev=928765&view=auto
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.html
(added)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.html
Mon Mar 29 13:19:56 2010
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<wicket:panel>
+<div wicket:id="tabs-container" class="tab-row">
+<ul>
+ <li wicket:id="tabs">
+ <a href="#" wicket:id="link"><span wicket:id="title">[[tab
title]]</span></a>
+ </li>
+</ul>
+</div>
+<div wicket:id="panel" class="tab-panel"> </div>
+</wicket:panel>
\ No newline at end of file
Propchange:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.html
------------------------------------------------------------------------------
svn:keywords = Id
Propchange:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.html
------------------------------------------------------------------------------
svn:mime-type = text/plain
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
