You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by vk...@apache.org on 2009/03/27 01:15:59 UTC

svn commit: r758939 [1/3] - in /portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets: site/ wicket/component/

Author: vkumar
Date: Fri Mar 27 00:15:58 2009
New Revision: 758939

URL: http://svn.apache.org/viewvc?rev=758939&view=rev
Log:
Adding Menu & Document ordering tab
Work in progress.
http://issues.apache.org/jira/browse/JS2-880

Added:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/MenuTreeNode.java   (with props)
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$DocumentOrderingTabPanel.html   (with props)
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$ExcludesWindow.html   (with props)
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$IncludesWindow.html   (with props)
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuExlcudesPanel.html   (with props)
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuIncludesPanel.html   (with props)
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuInfoPanel.html   (with props)
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuOptionsPanel.html   (with props)
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuSeparatorPanel.html   (with props)
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuTabPanel.html   (with props)
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataPanel$1.html   (with props)
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$OptionsWindow.html   (with props)
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SeparatorWindow.html   (with props)
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/DynamicResourceLink.java   (with props)
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/component/ResourceProvider.java   (with props)
Modified:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/JetspeedDocument.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$AddFolderPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$AddLinkPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$AddPagePanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$ImportDataTab.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$InformationTab.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.html
    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/java/org/apache/jetspeed/portlets/site/PortalSiteManagerUtil.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/SiteTreeNode.java

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/JetspeedDocument.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/JetspeedDocument.java?rev=758939&r1=758938&r2=758939&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/JetspeedDocument.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/JetspeedDocument.java Fri Mar 27 00:15:58 2009
@@ -47,7 +47,9 @@
     private String page;
     private String target;
     private String url;
+    private String path;
     private List<JetspeedDocumentMetaData> metaData;
+    private List<String> documentOrder;
 
     public JetspeedDocument()
     {
@@ -55,6 +57,7 @@
     }
     public JetspeedDocument(Folder folder)
     {
+        this.path = folder.getPath();
         this.name = folder.getName();
         this.title = folder.getTitle();
         this.shortTitle = folder.getTitle();
@@ -62,10 +65,12 @@
         this.page = folder.getDefaultPage();
         loadMetaData(folder.getMetadata());
         loadSecurityData(folder.getSecurityConstraints());
+        this.documentOrder = folder.getDocumentOrder();
     }
 
     public JetspeedDocument(Page page)
     {
+        this.path = page.getPath();
         this.name = page.getName();
         this.title = page.getTitle();
         this.shortTitle = page.getShortTitle();
@@ -79,6 +84,7 @@
 
     public JetspeedDocument(Link link)
     {
+        this.path = link.getPath();
         this.name = link.getName();
         this.title = link.getTitle();
         this.shortTitle = link.getShortTitle();
@@ -291,7 +297,29 @@
     {
         this.url = url;
     }
-
+        
+    /**
+     * @return the documentOrder
+     */
+    public List<String> getDocumentOrder()
+    {
+        return documentOrder;
+    }
+    /**
+     * @param documentOrder the documentOrder to set
+     */
+    public void setDocumentOrder(List<String> documentOrder)
+    {
+        this.documentOrder = documentOrder;
+    }
+    
+    /**
+     * @return the path
+     */
+    public String getPath()
+    {
+        return path;
+    }
     private void loadSecurityData(SecurityConstraints constraints)
     {
         this.securityConstraints = new ArrayList();

Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/MenuTreeNode.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/MenuTreeNode.java?rev=758939&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/MenuTreeNode.java (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/MenuTreeNode.java Fri Mar 27 00:15:58 2009
@@ -0,0 +1,60 @@
+/*
+ * contributor license agreements.  See the NOTICE file distributed with
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * 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.
+ */
+package org.apache.jetspeed.portlets.site;
+
+import java.io.Serializable;
+
+import org.apache.jetspeed.om.folder.MenuDefinition;
+
+/**
+ * @author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+ * @version $Id:
+ */
+public class MenuTreeNode implements Serializable
+{
+
+    private static final long serialVersionUID = 1L;
+    private MenuDefinition definition = null;
+    private String name;
+    public MenuTreeNode(MenuDefinition definition)
+    {
+        this.definition = definition;
+    }
+    public MenuTreeNode(String name)
+    {
+        this.name = name;
+    }
+    
+    /**
+     * @return the name
+     */
+    public String getName()
+    {
+        return name;
+    }
+    @Override
+    public String toString()
+    {
+        return definition!=null?definition.getName():name!=null?name:super.toString();
+    }
+    
+    public MenuDefinition getDefinition()
+    {
+        return this.definition;
+    }
+    
+}

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/MenuTreeNode.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$AddFolderPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24AddFolderPanel.html?rev=758939&r1=758938&r2=758939&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$AddFolderPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$AddFolderPanel.html Fri Mar 27 00:15:58 2009
@@ -19,6 +19,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <wicket:panel>
+	<div wicket:id='feedback'></div>
 	<form wicket:id="newForm">
 	<table class="formAnswer" style="width: 100%;">
 		<tr>
@@ -42,4 +43,4 @@
 	</table>
 	</form>
 </wicket:panel>
-</html>
\ No newline at end of file
+</html>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$AddLinkPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24AddLinkPanel.html?rev=758939&r1=758938&r2=758939&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$AddLinkPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$AddLinkPanel.html Fri Mar 27 00:15:58 2009
@@ -19,5 +19,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <wicket:panel>
+	<div wicket:id='feedback'></div>
+	<form wicket:id="newForm">
+	<table class="formAnswer" style="width: 100%;">
+		<tr>
+			<td class="emphasise"><span wicket:id="name"></span></td>
+			<td width="100%"><input type="text"
+				wicket:id="nameField" /></td>
+		</tr>
+		<tr>
+			<td class="emphasise"><span wicket:id="title"></span></td>
+			<td width="100%"><input type="text" wicket:id="titleField" /></td>
+		</tr>
+		<tr>
+			<td class="emphasise"><span wicket:id="shortTitle"></span></td>
+			<td><input type="text" class="medium"
+				wicket:id="shortTitleField" /></td>
+		</tr>
+		<tr>
+			<td><span wicket:id="urlLabel"></span></td>
+			<td><input type="text" class="medium"
+				wicket:id="urlField" /></td>
+		</tr>		
+		<tr>
+			<td><span wicket:id="targetLabel"></span></td>
+			<td><select wicket:id="target">
+			</select></td>
+		</tr>
+		<tr>
+			<td><span wicket:id="visible"></span></td>
+			<td><input type="checkbox" wicket:id="visibleCheck" /></td>
+		</tr>
+		<tr>
+			<td><input type="button" class="medium" wicket:id="close" value="Close" /></td>
+			<td><input type="button" class="medium" wicket:id="new" value="Add Link"  /></td>
+		</tr>
+	</table>
+	</form>
 </wicket:panel>
-</html>
\ No newline at end of file
+</html>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$AddPagePanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24AddPagePanel.html?rev=758939&r1=758938&r2=758939&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$AddPagePanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$AddPagePanel.html Fri Mar 27 00:15:58 2009
@@ -19,6 +19,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <wicket:panel>
-	<div wicket:id="siteTree" class="my-tree"></div>
+	<div wicket:id='feedback'></div>
+	<form wicket:id="newForm">
+	<table class="formAnswer" style="width: 100%;">
+		<tr>
+			<td class="emphasise"><span wicket:id="name"></span></td>
+			<td width="100%"><input type="text"
+				wicket:id="nameField" /></td>
+		</tr>
+		<tr>
+			<td class="emphasise"><span wicket:id="title"></span></td>
+			<td width="100%"><input type="text" wicket:id="titleField" /></td>
+		</tr>
+		<tr>
+			<td class="emphasise"><span wicket:id="shortTitle"></span></td>
+			<td><input type="text" class="medium"
+				wicket:id="shortTitleField" /></td>
+		</tr>
+		<tr>
+			<td><span wicket:id="pageDecorator"></span></td>
+			<td><select wicket:id="decoratorsList">
+			</select></td>
+		</tr>
+		<tr>
+			<td><span wicket:id="portletDecorator"></span></td>
+			<td><select wicket:id="portletDecoratorsList">
+			</select></td>
+		</tr>
+		<tr>
+			<td><span wicket:id="theme"></span></td>
+			<td><select wicket:id="themeList">
+			</select></td>
+		</tr>
+		<tr>
+			<td><span wicket:id="visible"></span></td>
+			<td><input type="checkbox" wicket:id="visibleCheck" /></td>
+		</tr>
+		<tr>
+			<td><input type="button" class="medium" wicket:id="close" value="Close" /></td>
+			<td><input type="button" class="medium" wicket:id="new" value="Add Page"  /></td>
+		</tr>
+	</table>
+	</form>
 </wicket:panel>
-</html>
\ No newline at end of file
+</html>

Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$DocumentOrderingTabPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24DocumentOrderingTabPanel.html?rev=758939&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$DocumentOrderingTabPanel.html (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$DocumentOrderingTabPanel.html Fri Mar 27 00:15:58 2009
@@ -0,0 +1,121 @@
+<!-- 
+  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.
+  
+  Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+ -->
+<?xml version="1.0" encoding="UTF-8"?>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<wicket:panel>
+&nbsp;
+	<div wicket:id='feedback'></div>
+	<form wicket:id="docuOrderingForm">
+	<table style="width:100%;">
+		<tr>
+			<td><span wicket:id="doucmentOrderLabel"></span></td>
+			<td>
+				<select id="docOrders" wicket:id="docOrders">
+					<option>sammple option comes here</option>
+				</select>
+			</td>
+			<td>
+				<input type="button" onClick="javascript:moveUpList();" value="Move Up" /><br/><input type="button" onClick="javascript:moveDownList();" value="Move Down" />
+			</td>
+		</tr>
+		<tr>
+			<td colspan="3"><input type="button" wicket:id="save" value="Save"/></td>
+		</tr>
+	</table>
+		<input type="hidden" wicket:id="pageOrder" id="pageOrder"/>
+	</form>
+<script language="JavaScript">
+function moveUpList() {
+   var listField = document.getElementById('docOrders');
+   if ( listField.length == -1) {  // If the list is empty
+      alert("There are no values which can be moved!");
+   } else {
+      var selected = listField.selectedIndex;
+      if (selected == -1) {
+         alert("You must select an entry to be moved!");
+      } else {  // Something is selected
+         if ( listField.length == 0 ) {  // If there's only one in the list
+            alert("There is only one entry!\nThe one entry will remain in place.");
+         } else {  // There's more than one in the list, rearrange the list order
+            if ( selected == 0 ) {
+               alert("The first entry in the list cannot be moved up.");
+            } else {
+               // Get the text/value of the one directly above the hightlighted entry as
+               // well as the highlighted entry; then flip them
+               var moveText1 = listField[selected-1].text;
+               var moveText2 = listField[selected].text;
+               var moveValue1 = listField[selected-1].value;
+               var moveValue2 = listField[selected].value;
+               listField[selected].text = moveText1;
+               listField[selected].value = moveValue1;
+               listField[selected-1].text = moveText2;
+               listField[selected-1].value = moveValue2;
+               listField.selectedIndex = selected-1; // Select the one that was selected before
+            }  // Ends the check for selecting one which can be moved
+         }  // Ends the check for there only being one in the list to begin with
+      }  // Ends the check for there being something selected
+   }  // Ends the check for there being none in the list
+  }
+  
+  function moveDownList() {
+  var listField = document.getElementById('docOrders');
+	   if ( listField.length == -1) {  // If the list is empty
+	      alert("There are no values which can be moved!");
+	   } else {
+	      var selected = listField.selectedIndex;
+	      if (selected == -1) {
+	         alert("You must select an entry to be moved!");
+	      } else {  // Something is selected
+	         if ( listField.length == 0 ) {  // If there's only one in the list
+	            alert("There is only one entry!\nThe one entry will remain in place.");
+	         } else {  // There's more than one in the list, rearrange the list order
+	            if ( selected == listField.length-1 ) {
+	               alert("The last entry in the list cannot be moved down.");
+	            } else {
+	               // Get the text/value of the one directly below the hightlighted entry as
+	               // well as the highlighted entry; then flip them
+	               var moveText1 = listField[selected+1].text;
+	               var moveText2 = listField[selected].text;
+	               var moveValue1 = listField[selected+1].value;
+	               var moveValue2 = listField[selected].value;
+	               listField[selected].text = moveText1;
+	               listField[selected].value = moveValue1;
+	               listField[selected+1].text = moveText2;
+	               listField[selected+1].value = moveValue2;
+	               listField.selectedIndex = selected+1; // Select the one that was selected before
+	            }  // Ends the check for selecting one which can be moved
+	         }  // Ends the check for there only being one in the list to begin with
+	      }  // Ends the check for there being something selected
+	   }  // Ends the check for there being none in the list
+  }
+function convertToString()
+	{
+		var columns = document.getElementById('docOrders');
+		var len = columns.length;
+		var tempValue = '';
+		for(var j=0; j<len; j++)
+		{
+			tempValue = tempValue + "," + columns.options[j].text;
+		}
+		document.getElementById('pageOrder').value = tempValue.substring(1);
+	}
+</script>
+</wicket:panel>
+</html>

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$DocumentOrderingTabPanel.html
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$ExcludesWindow.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24ExcludesWindow.html?rev=758939&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$ExcludesWindow.html (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$ExcludesWindow.html Fri Mar 27 00:15:58 2009
@@ -0,0 +1,36 @@
+<!-- 
+  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.
+  
+  Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<wicket:panel>
+
+&nbsp;
+	<form wicket:id="menuForm">
+		<table>
+			<tr>
+				<td>Name</td>
+				<td><input type="text "wicket:id="nameField" /></td>
+			</tr>
+			<tr>
+				<td colspan="2"><input type="submit "wicket:id="save" value="Save"/></td>
+			</tr>
+		</table>
+	</form>
+</wicket:panel>
+</html>

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$ExcludesWindow.html
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$ImportDataTab.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24ImportDataTab.html?rev=758939&r1=758938&r2=758939&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$ImportDataTab.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$ImportDataTab.html Fri Mar 27 00:15:58 2009
@@ -22,7 +22,7 @@
 <wicket:panel>
 &nbsp;
 	<div wicket:id="feedback"></div>
-	<form wicket:id="exportForm">
+	<form wicket:id="exportForm" TARGET="_blank">
 	<table style="width:100%;">
 		<tr>
 			<td><span wicket:id="expLabel"></span></td>
@@ -35,10 +35,18 @@
 		<tr>
 			<td colspan="2"><input type="button" wicket:id="exprtButton" value="Export"/></td>
 		</tr>
+	</table>
+	</form>
+	<form wicket:id="uploadForm">
+	<table style="width:100%;">		
 		<tr>
-			<td colspan="2"><a href="#" wicket:id="downLoad">Download</a></td>
-		</tr>		
+			<td><span>Import File</span></td>
+			<td><input type="file" wicket:id="fileInput"/></td>
+		</tr>
+		<tr>
+			<td colspan="2"><input type="submit" wicket:id="uploadFile" value="Import"/></td>
+		</tr>
 	</table>
 	</form>
 </wicket:panel>
-</html>
\ No newline at end of file
+</html>

Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$IncludesWindow.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24IncludesWindow.html?rev=758939&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$IncludesWindow.html (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$IncludesWindow.html Fri Mar 27 00:15:58 2009
@@ -0,0 +1,40 @@
+<!-- 
+  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.
+  
+  Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<wicket:panel>
+
+&nbsp;
+	<form wicket:id="menuForm">
+		<table>
+			<tr>
+				<td>Name</td>
+				<td><input type="text "wicket:id="nameField" /></td>
+			</tr>
+			<tr>
+				<td>Next</td>
+				<td><input type="checkbox "wicket:id="nestField" /></td>
+			</tr>
+			<tr>
+				<td colspan="2"><input type="submit "wicket:id="save" value="Save"/></td>
+			</tr>
+		</table>
+	</form>
+</wicket:panel>
+</html>

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$IncludesWindow.html
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$InformationTab.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24InformationTab.html?rev=758939&r1=758938&r2=758939&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$InformationTab.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$InformationTab.html Fri Mar 27 00:15:58 2009
@@ -79,5 +79,28 @@
 		</tr>
 	</table>
 </form>
+	<table>
+		<tr>
+			<td>
+				<input type="button" wicket:id="addFolder" value="Add Folder" />
+			</td>
+			<td>
+				<input type="button" wicket:id="addPage" value="Add Page" />
+			</td>
+			<td>
+				<input type="button" wicket:id="addLink" value="Add Link" />
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<input type="button" wicket:id="copy" value="Copy" />
+			</td>
+			<td>
+				<input type="button" wicket:id="move" value="Move" />
+			</td>
+			<td>&nbsp;</td>
+		</tr>
+	</table>
+<div wicket:id="modalwindow"></div>
 </wicket:panel>
-</html>
\ No newline at end of file
+</html>

Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuExlcudesPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24MenuExlcudesPanel.html?rev=758939&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuExlcudesPanel.html (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuExlcudesPanel.html Fri Mar 27 00:15:58 2009
@@ -0,0 +1,42 @@
+<!-- 
+  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.
+  
+  Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<wicket:panel>
+	&nbsp;
+	<span wicket:id="basePanel">
+		<table cellpadding="2">
+			<thead>
+				<tr>
+					<th class="portlet-section-header">Name</th>
+					<th>&nbsp;</th>
+					<th>&nbsp;</th>
+				</tr>
+			</thead>
+			<tr class="even" wicket:id="menuData">
+				<td><span wicket:id="name" /></td>				
+				<td><a href="" wicket:id="edit">Edit</a></td>
+				<td>&nbsp;<a href="" wicket:id="delete">Delete</a></td>
+			</tr>
+		</table>
+	</span>
+	<input type="button" wicket:id="new" value="New" />
+	<div wicket:id="modalwindow">[modal window goes here]</div>	
+</wicket:panel>
+</html>

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuExlcudesPanel.html
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuIncludesPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24MenuIncludesPanel.html?rev=758939&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuIncludesPanel.html (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuIncludesPanel.html Fri Mar 27 00:15:58 2009
@@ -0,0 +1,44 @@
+<!-- 
+  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.
+  
+  Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<wicket:panel>
+	&nbsp;
+	<span wicket:id="basePanel">
+		<table cellpadding="2">
+			<thead>
+				<tr>
+					<th class="portlet-section-header">Name</th>
+					<th class="portlet-section-header">Nest</th>
+					<th>&nbsp;</th>
+					<th>&nbsp;</th>
+				</tr>
+			</thead>
+			<tr class="even" wicket:id="menuData">
+				<td><span wicket:id="name" /></td>				
+				<td><span wicket:id="nest" /></td>				
+				<td><a href="" wicket:id="edit">Edit</a></td>
+				<td>&nbsp;<a href="" wicket:id="delete">Delete</a></td>
+			</tr>
+		</table>
+	</span>
+	<input type="button" wicket:id="new" value="New" />
+	<div wicket:id="modalwindow">[modal window goes here]</div>	
+</wicket:panel>
+</html>

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuIncludesPanel.html
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuInfoPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24MenuInfoPanel.html?rev=758939&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuInfoPanel.html (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuInfoPanel.html Fri Mar 27 00:15:58 2009
@@ -0,0 +1,70 @@
+<!-- 
+  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.
+  
+  Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<wicket:panel>
+&nbsp;
+	<span wicket:id="ajaxPanel">	
+	<form wicket:id="menuForm">
+		<table>
+			<tr>
+				<td>Name</td>
+				<td><input type="text "wicket:id="nameField" /></td>
+			</tr>
+			<tr>
+				<td>Title</td>
+				<td><input type="text "wicket:id="titleField" /></td>
+			</tr>
+			<tr>
+				<td>Profile</td>
+				<td><input type="text "wicket:id="profileField" /></td>
+			</tr>
+			<tr>
+				<td>Skin</td>
+				<td><input type="text "wicket:id="skinField" /></td>
+			</tr>
+			<tr>
+				<td>Reg Expression</td>
+				<td><input type="checkbox "wicket:id="regExpField" /></td>
+			</tr>
+			<tr>
+				<td>Path</td>
+				<td><input type="checkbox "wicket:id="pathField" /></td>
+			</tr>
+			<tr>
+				<td>Options</td>
+				<td><input type="text "wicket:id="optionsField" /></td>
+			</tr>
+			<tr>
+				<td>Depth</td>
+				<td><input type="text "wicket:id="depthField" /></td>
+			</tr>
+			<tr>
+				<td>Order</td>
+				<td><input type="text "wicket:id="orderField" /></td>
+			</tr>
+
+			<tr>
+				<td colspan="2"><input type="submit "wicket:id="save" value="Save"/></td>
+			</tr>
+		</table>
+	</form>
+	</span>
+</wicket:panel>
+</html>

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuInfoPanel.html
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuOptionsPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24MenuOptionsPanel.html?rev=758939&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuOptionsPanel.html (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuOptionsPanel.html Fri Mar 27 00:15:58 2009
@@ -0,0 +1,48 @@
+<!-- 
+  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.
+  
+  Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<wicket:panel>
+	&nbsp;
+	<span wicket:id="basePanel">
+		<table cellpadding="2">
+			<thead>
+				<tr>
+					<th class="portlet-section-header">Option Text</th>
+					<th class="portlet-section-header">Order</th>
+					<th class="portlet-section-header">Path</th>
+					<th class="portlet-section-header">Regular Exp</th>
+					<th>&nbsp;</th>
+					<th>&nbsp;</th>
+				</tr>
+			</thead>
+			<tr class="even" wicket:id="menuData">
+				<td><span wicket:id="option" /></td>	
+				<td><span wicket:id="order" /></td>	
+				<td><span wicket:id="path" /></td>	
+				<td><span wicket:id="regexp" /></td>				
+				<td><a href="" wicket:id="edit">Edit</a></td>
+				<td>&nbsp;<a href="" wicket:id="delete">Delete</a></td>
+			</tr>
+		</table>
+	</span>
+	<input type="button" wicket:id="new" value="New" />
+	<div wicket:id="modalwindow">[modal window goes here]</div>	
+</wicket:panel>
+</html>

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuOptionsPanel.html
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuSeparatorPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24MenuSeparatorPanel.html?rev=758939&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuSeparatorPanel.html (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuSeparatorPanel.html Fri Mar 27 00:15:58 2009
@@ -0,0 +1,44 @@
+<!-- 
+  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.
+  
+  Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<wicket:panel>
+	&nbsp;
+	<span wicket:id="basePanel">
+		<table cellpadding="2">
+			<thead>
+				<tr>
+					<th class="portlet-section-header">Text</th>
+					<th class="portlet-section-header">Title</th>
+					<th>&nbsp;</th>
+					<th>&nbsp;</th>
+				</tr>
+			</thead>
+			<tr class="even" wicket:id="separator">
+				<td><span wicket:id="text" /></td>				
+				<td><span wicket:id="title" /></td>				
+				<td><a href="" wicket:id="edit">Edit</a></td>
+				<td>&nbsp;<a href="" wicket:id="delete">Delete</a></td>
+			</tr>
+		</table>
+	</span>
+	<input type="button" wicket:id="new" value="New" />
+	<div wicket:id="modalwindow">[modal window goes here]</div>	
+</wicket:panel>
+</html>

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuSeparatorPanel.html
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuTabPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24MenuTabPanel.html?rev=758939&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuTabPanel.html (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuTabPanel.html Fri Mar 27 00:15:58 2009
@@ -0,0 +1,35 @@
+<!-- 
+  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.
+  
+  Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<wicket:panel>
+<div wicket:id="feedback"></div>
+&nbsp;
+	<table>
+		<tr>
+			<td><span wicket:id="menuTree"></span></td>
+			<td><span wicket:id="menuTabs"></span></td>
+		</tr>
+		<tr>
+			<td colspan="2"><input type="submit "wicket:id="newsave" value="Add Menu"/>&nbsp;<input type="submit "wicket:id="remove" value="Remove"/></td>
+		</tr>
+	</table>
+</wicket:panel>
+</html>
+

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuTabPanel.html
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataPanel$1.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24MetaDataPanel%241.html?rev=758939&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataPanel$1.html (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataPanel$1.html Fri Mar 27 00:15:58 2009
@@ -0,0 +1,42 @@
+<!-- 
+  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.
+  
+  Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+ -->
+<?xml version="1.0" encoding="UTF-8"?>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<wicket:panel wicket:id="basePanel"">
+	<table cellpadding="2">
+		<thead>
+			<tr>
+				<th class="portlet-section-header">Name</th>
+				<th class="portlet-section-header">Language</th>
+				<th class="portlet-section-header">Value</th>
+				<th>&nbsp;</th>
+				<th>&nbsp;</th>						
+			</tr>
+		</thead>
+		<tr class="even" wicket:id="metaData">
+			<td><span wicket:id="name" /></td>
+			<td><span wicket:id="language" /></td>
+			<td><span wicket:id="value" /></td>
+			<td><a href wicket:id="edit" >Edit</a></td>
+			<td>&nbsp;<a href wicket:id="delete">Delete</a></td>
+		</tr>
+	</table>
+</wicket:panel>
+</html>

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataPanel$1.html
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$OptionsWindow.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24OptionsWindow.html?rev=758939&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$OptionsWindow.html (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$OptionsWindow.html Fri Mar 27 00:15:58 2009
@@ -0,0 +1,60 @@
+<!-- 
+  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.
+  
+  Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<wicket:panel>
+&nbsp;
+	<form wicket:id="menuForm">
+		<table>
+			<tr>
+				<td>Options</td>
+				<td><input type="text "wicket:id="optionsField" /></td>
+			</tr>
+			<tr>
+				<td>Profile</td>
+				<td><input type="text "wicket:id="profileField" /></td>
+			</tr>
+			<tr>
+				<td>Skin</td>
+				<td><input type="text "wicket:id="skinField" /></td>
+			</tr>
+			<tr>
+				<td>Reg Expression</td>
+				<td><input type="checkbox "wicket:id="regExpField" /></td>
+			</tr>
+			<tr>
+				<td>Path</td>
+				<td><input type="checkbox "wicket:id="pathField" /></td>
+			</tr>
+			<tr>
+				<td>Depth</td>
+				<td><input type="text "wicket:id="depthField" /></td>
+			</tr>
+			<tr>
+				<td>Order</td>
+				<td><input type="text "wicket:id="orderField" /></td>
+			</tr>
+
+			<tr>
+				<td colspan="2"><input type="submit "wicket:id="save" value="Save"/></td>
+			</tr>
+		</table>
+	</form>
+</wicket:panel>
+</html>

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$OptionsWindow.html
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SeparatorWindow.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24SeparatorWindow.html?rev=758939&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SeparatorWindow.html (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SeparatorWindow.html Fri Mar 27 00:15:58 2009
@@ -0,0 +1,40 @@
+<!-- 
+  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.
+  
+  Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<wicket:panel>
+
+&nbsp;
+	<form wicket:id="separatorDataForm">
+		<table>
+			<tr>
+				<td>Text</td>
+				<td><input type="text "wicket:id="separatorText" /></td>
+			</tr>
+			<tr>
+				<td>Title</td>
+				<td><input type="text "wicket:id="separatorTitle" /></td>
+			</tr>
+			<tr>
+				<td colspan="2"><input type="submit "wicket:id="save" value="Save"/></td>
+			</tr>
+		</table>
+	</form>
+</wicket:panel>
+</html>

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SeparatorWindow.html
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.html?rev=758939&r1=758938&r2=758939&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.html Fri Mar 27 00:15:58 2009
@@ -42,7 +42,7 @@
 		<td colspan="2" style="border:1px solid black; margin:4px; padding: 4px;width=200px">
 			<div wicket:id="siteTree" class="my-tree">[Tree goes here]</div>
 		</td>
-		<td width="600px" style="border:1px solid black; margin:4px; padding: 4px;">
+		<td width="700px" style="border:1px solid black; margin:4px; padding: 4px;">
 			<div wicket:id="tabs" class="tabpanel">[panel goes here]</div>
 		</td>
 	</tr>
@@ -55,19 +55,7 @@
 			<input type="submit" wicket:id="userFolderButton" value="Show User Folder" />
 		</td>
 		<td>
-			<table>
-				<tr>
-					<td>
-						<input type="button" wicket:id="addFolder" value="Add Folder" />
-					</td>
-					<td>
-						<input type="button" wicket:id="addPage" value="Add Page" />
-					</td>
-					<td>
-						<input type="button" wicket:id="addLink" value="Add Link" />
-					</td>
-				</tr>
-			</table>
+
 		</td>
 	</tr>
 	<tr>
@@ -79,7 +67,7 @@
 	</tr>
 	</form>
 </table>
-<div wicket:id="modalwindow"></div>
+
 <div id="bysy_indicator">Loading ...</div>
 <script type="text/javascript">
  window.onload = setupFunc;
@@ -108,4 +96,4 @@
    } 
  }
  </script>
-</html>
\ No newline at end of file
+</html>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org