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/04/24 18:56:48 UTC

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

Author: vkumar
Date: Fri Apr 24 16:56:47 2009
New Revision: 768369

URL: http://svn.apache.org/viewvc?rev=768369&view=rev
Log:
Issue fixes in Portal Site Manager portlet
Adding Resource bundle for all labels and buttons

Added:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/resources/SiteResources.properties   (contents, props changed)
      - copied, changed from r767156, portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/resources/PortalSiteManager.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/resources/SiteResources_en.properties   (contents, props changed)
      - copied, changed from r767156, portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/resources/PortalSiteManager_en.properties
Removed:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/resources/PortalSiteManager.properties
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/resources/PortalSiteManager_en.properties
Modified:
    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$CopyMoveWindow.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$DocumentOrderingTabPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$ExcludesWindow.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$IncludesWindow.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$MenuExlcudesPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuIncludesPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuInfoPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuSeparatorPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuTabPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuWindow.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataTab.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$OptionsWindow.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTab.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTabWindowPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SeparatorWindow.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/PortalSiteManagerApplication.java

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=768369&r1=768368&r2=768369&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 Apr 24 16:56:47 2009
@@ -37,8 +37,8 @@
 				wicket:id="shortTitleField" /></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 Folder"  /></td>
+			<td><input type="button" class="medium" wicket:id="close" /></td>
+			<td><input type="button" class="medium" wicket:id="new" /></td>
 		</tr>
 	</table>
 	</form>

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=768369&r1=768368&r2=768369&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 Apr 24 16:56:47 2009
@@ -51,8 +51,8 @@
 			<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>
+			<td><input type="button" class="medium" wicket:id="close"/></td>
+			<td><input type="button" class="medium" wicket:id="new" /></td>
 		</tr>
 	</table>
 	</form>

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=768369&r1=768368&r2=768369&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 Apr 24 16:56:47 2009
@@ -56,8 +56,8 @@
 			<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>
+			<td><input type="button" class="medium" wicket:id="close" /></td>
+			<td><input type="button" class="medium" wicket:id="new" /></td>
 		</tr>
 	</table>
 	</form>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$CopyMoveWindow.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24CopyMoveWindow.html?rev=768369&r1=768368&r2=768369&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$CopyMoveWindow.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$CopyMoveWindow.html Fri Apr 24 16:56:47 2009
@@ -41,8 +41,8 @@
 					</tr>
 					<tr>
 						<td>
-							<input type="button" wicket:id="copy" value="Copy" />
-							<input type="button" wicket:id="move" value="Move" />
+							<input type="button" wicket:id="copy"/>
+							<input type="button" wicket:id="move"/>
 						</td>
 					</tr>
 				</table>

Modified: 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=768369&r1=768368&r2=768369&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$DocumentOrderingTabPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$DocumentOrderingTabPanel.html Fri Apr 24 16:56:47 2009
@@ -36,7 +36,7 @@
 			</td>
 		</tr>
 		<tr>
-			<td colspan="3"><input type="button" wicket:id="save" value="Save"/></td>
+			<td colspan="3"><input type="button" wicket:id="save"/></td>
 		</tr>
 	</table>
 		<input type="hidden" wicket:id="pageOrder" id="pageOrder"/>

Modified: 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=768369&r1=768368&r2=768369&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$ExcludesWindow.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$ExcludesWindow.html Fri Apr 24 16:56:47 2009
@@ -24,11 +24,11 @@
 	<form wicket:id="menuForm">
 		<table>
 			<tr>
-				<td>Name</td>
+				<td><span wicket:id="namelabel"/></td>
 				<td><input type="text "wicket:id="nameField" /></td>
 			</tr>
 			<tr>
-				<td colspan="2"><input type="submit "wicket:id="save" value="Save"/></td>
+				<td colspan="2"><input type="submit "wicket:id="save"/></td>
 			</tr>
 		</table>
 	</form>

Modified: 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=768369&r1=768368&r2=768369&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$IncludesWindow.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$IncludesWindow.html Fri Apr 24 16:56:47 2009
@@ -24,15 +24,15 @@
 	<form wicket:id="menuForm">
 		<table>
 			<tr>
-				<td>Name</td>
+				<td><span wicket:id="namelabel"/></td>
 				<td><input type="text "wicket:id="nameField" /></td>
 			</tr>
 			<tr>
-				<td>Next</td>
+				<td><span wicket:id="nestlabel"/></td>
 				<td><input type="checkbox "wicket:id="nestField" /></td>
 			</tr>
 			<tr>
-				<td colspan="2"><input type="submit "wicket:id="save" value="Save"/></td>
+				<td colspan="2"><input type="submit "wicket:id="save"/></td>
 			</tr>
 		</table>
 	</form>

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=768369&r1=768368&r2=768369&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 Apr 24 16:56:47 2009
@@ -73,30 +73,30 @@
 	</table>
 	<table>
 		<tr>
-		    <td><input type="button" wicket:id="view" value="View" /></td>
-		    <td><input type="button" wicket:id="remove" value="Remove" /></td>
-		    <td><input type="button" wicket:id="save" value="Save" /></td>
+		    <td><input type="button" wicket:id="view" /></td>
+		    <td><input type="button" wicket:id="remove" /></td>
+		    <td><input type="button" wicket:id="save" /></td>
 		</tr>
 	</table>
 </form>
 	<table>
 		<tr>
 			<td>
-				<input type="button" wicket:id="addFolder" value="Add Folder" />
+				<input type="button" wicket:id="addFolder" />
 			</td>
 			<td>
-				<input type="button" wicket:id="addPage" value="Add Page" />
+				<input type="button" wicket:id="addPage" />
 			</td>
 			<td>
-				<input type="button" wicket:id="addLink" value="Add Link" />
+				<input type="button" wicket:id="addLink" />
 			</td>
 		</tr>
 		<tr>
 			<td>
-				<input type="button" wicket:id="copy" value="Copy" />
+				<input type="button" wicket:id="copy" />
 			</td>
 			<td>
-				<input type="button" wicket:id="move" value="Move" />
+				<input type="button" wicket:id="move" />
 			</td>
 			<td>&nbsp;</td>
 		</tr>

Modified: 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=768369&r1=768368&r2=768369&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuExlcudesPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuExlcudesPanel.html Fri Apr 24 16:56:47 2009
@@ -24,15 +24,15 @@
 		<table cellpadding="2">
 			<thead>
 				<tr>
-					<th class="portlet-section-header">Name</th>
+					<th class="portlet-section-header"><span wicked:id="nameLabel"/></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>
+				<td><a href="" wicket:id="edit"><span wicked:id="editLabel"/></a></td>
+				<td>&nbsp;<a href="" wicket:id="delete"><span wicked:id="deleteLabel"/></a></td>
 			</tr>
 		</table>
 	</span>

Modified: 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=768369&r1=768368&r2=768369&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuIncludesPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuIncludesPanel.html Fri Apr 24 16:56:47 2009
@@ -24,8 +24,8 @@
 		<table cellpadding="2">
 			<thead>
 				<tr>
-					<th class="portlet-section-header">Name</th>
-					<th class="portlet-section-header">Nest</th>
+					<th class="portlet-section-header"><span wicket:id="nameLabel" /></th>
+					<th class="portlet-section-header"><span wicket:id="nestedLabel"/></th>
 					<th>&nbsp;</th>
 					<th>&nbsp;</th>
 				</tr>
@@ -33,8 +33,8 @@
 			<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>
+				<td><a href="" wicket:id="edit"><span wicket:id="editLabel" /></a></td>
+				<td>&nbsp;<a href="" wicket:id="delete"><span wicket:id="deleteLabel" /></a></td>
 			</tr>
 		</table>
 	</span>

Modified: 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=768369&r1=768368&r2=768369&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuInfoPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuInfoPanel.html Fri Apr 24 16:56:47 2009
@@ -20,6 +20,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <wicket:panel>
 &nbsp;
+	<div wicket:id="feedback"></div>
 	<span wicket:id="ajaxPanel">	
 	<form wicket:id="menuForm">
 		<table>
@@ -61,7 +62,7 @@
 			</tr>
 
 			<tr>
-				<td colspan="2"><input type="submit "wicket:id="save" value="Save"/></td>
+				<td colspan="2"><input type="button "wicket:id="save" value="Save"/></td>
 			</tr>
 		</table>
 	</form>

Modified: 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=768369&r1=768368&r2=768369&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuSeparatorPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuSeparatorPanel.html Fri Apr 24 16:56:47 2009
@@ -24,7 +24,7 @@
 		<table cellpadding="2">
 			<thead>
 				<tr>
-					<th class="portlet-section-header">Text</th>
+					<th class="portlet-section-header"><span wicket:id="textLabel"/></th>
 					<th class="portlet-section-header">Title</th>
 					<th>&nbsp;</th>
 					<th>&nbsp;</th>
@@ -38,7 +38,7 @@
 			</tr>
 		</table>
 	</span>
-	<input type="button" wicket:id="new" value="New" />
+	<input type="button" wicket:id="new"/>
 	<div wicket:id="modalwindow">[modal window goes here]</div>	
 </wicket:panel>
 </html>

Modified: 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=768369&r1=768368&r2=768369&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuTabPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuTabPanel.html Fri Apr 24 16:56:47 2009
@@ -27,7 +27,7 @@
 			<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>
+			<td colspan="2"><input type="submit "wicket:id="newsave" />&nbsp;<input type="submit "wicket:id="remove"/></td>
 		</tr>
 	</table>
 	<div wicket:id="modalwindow">[modal window goes here]</div>	

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuWindow.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24MenuWindow.html?rev=768369&r1=768368&r2=768369&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuWindow.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuWindow.html Fri Apr 24 16:56:47 2009
@@ -24,45 +24,44 @@
 	<form wicket:id="menuForm">
 		<table>
 			<tr>
-				<td>Name</td>
+				<td><span wicket:id="nameLabel"/></td>
 				<td><input type="text "wicket:id="nameField" /></td>
 			</tr>
 			<tr>
-				<td>Title</td>
+				<td><span wicket:id="titleLabel"/></td>
 				<td><input type="text "wicket:id="titleField" /></td>
 			</tr>
 			<tr>
-				<td>Profile</td>
+				<td><span wicket:id="optionLabel"/></td>
+				<td><input type="text "wicket:id="optionsField" /></td>
+			</tr>
+			<tr>
+				<td><span wicket:id="profileLabel"/></td>
 				<td><input type="text "wicket:id="profileField" /></td>
 			</tr>
 			<tr>
-				<td>Skin</td>
+				<td><span wicket:id="skinLabel"/></td>
 				<td><input type="text "wicket:id="skinField" /></td>
 			</tr>
 			<tr>
-				<td>Reg Expression</td>
+				<td><span wicket:id="regExpLabel"/></td>
 				<td><input type="checkbox "wicket:id="regExpField" /></td>
 			</tr>
 			<tr>
-				<td>Path</td>
+				<td><span wicket:id="pathLabel"/></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><span wicket:id="depthLabel"/></td>
 				<td><input type="text "wicket:id="depthField" /></td>
 			</tr>
 			<tr>
-				<td>Order</td>
+				<td><span wicket:id="orderLabel"/></td>
 				<td><input type="text "wicket:id="orderField" /></td>
 			</tr>
-
 			<tr>
-				<td colspan="2"><input type="submit "wicket:id="save" value="Save"/></td>
-			</tr>
+				<td colspan="2"><input type="submit "wicket:id="save"/></td>
+			</tr>			
 		</table>
 	</form>
 </wicket:panel>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24MetaDataPanel.html?rev=768369&r1=768368&r2=768369&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataPanel.html Fri Apr 24 16:56:47 2009
@@ -39,7 +39,7 @@
 		</tr>
 		<tr>
 			<td>
-				<input type="button" wicket:id="save" value="Save" class="portlet-form-button"/>
+				<input type="button" wicket:id="save" class="portlet-form-button"/>
 			</td>
 		</tr>
 	</table>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataTab.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24MetaDataTab.html?rev=768369&r1=768368&r2=768369&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataTab.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataTab.html Fri Apr 24 16:56:47 2009
@@ -41,7 +41,7 @@
 			</tr>
 		</table>
 	</span>
-	<input type="button" wicket:id="new" value="New" />
+	<input type="button" wicket:id="new" />
 	<div wicket:id="modalwindow">[modal window goes here]</div>	
 </wicket:panel>
 </html>

Modified: 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=768369&r1=768368&r2=768369&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$OptionsWindow.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$OptionsWindow.html Fri Apr 24 16:56:47 2009
@@ -23,36 +23,36 @@
 	<form wicket:id="menuForm">
 		<table>
 			<tr>
-				<td>Options</td>
+				<td><span wicket:id="optionLabel"/></td>
 				<td><input type="text "wicket:id="optionsField" /></td>
 			</tr>
 			<tr>
-				<td>Profile</td>
+				<td><span wicket:id="profileLabel"/></td>
 				<td><input type="text "wicket:id="profileField" /></td>
 			</tr>
 			<tr>
-				<td>Skin</td>
+				<td><span wicket:id="skinLabel"/></td>
 				<td><input type="text "wicket:id="skinField" /></td>
 			</tr>
 			<tr>
-				<td>Reg Expression</td>
+				<td><span wicket:id="regExpLabel"/></td>
 				<td><input type="checkbox "wicket:id="regExpField" /></td>
 			</tr>
 			<tr>
-				<td>Path</td>
+				<td><span wicket:id="pathLabel"/></td>
 				<td><input type="checkbox "wicket:id="pathField" /></td>
 			</tr>
 			<tr>
-				<td>Depth</td>
+				<td><span wicket:id="depthLabel"/></td>
 				<td><input type="text "wicket:id="depthField" /></td>
 			</tr>
 			<tr>
-				<td>Order</td>
+				<td><span wicket:id="orderLabel"/></td>
 				<td><input type="text "wicket:id="orderField" /></td>
 			</tr>
 
 			<tr>
-				<td colspan="2"><input type="submit "wicket:id="save" value="Save"/></td>
+				<td colspan="2"><input type="submit "wicket:id="save"/></td>
 			</tr>
 		</table>
 	</form>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTab.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24SecurityTab.html?rev=768369&r1=768368&r2=768369&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTab.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTab.html Fri Apr 24 16:56:47 2009
@@ -26,8 +26,8 @@
 		<table cellpadding="2">
 			<thead>
 				<tr>
-					<th class="portlet-section-header">Security Constraint</th>
-					<th class="portlet-section-header">Constraint Type</th>
+					<th class="portlet-section-header"><span wicket:id="constraintLabel"/></th>
+					<th class="portlet-section-header"><span wicket:id="constraintTypeLabel"/></th>
 					<th>&nbsp;</th>
 					<th>&nbsp;</th>
 				</tr>
@@ -35,12 +35,12 @@
 			<tr class="even" wicket:id="metaData">
 				<td><span wicket:id="name" /></td>
 				<td><span wicket:id="type" /></td>
-				<td><a href="" wicket:id="edit">Edit</a></td>
-				<td>&nbsp;<a href="" wicket:id="delete">Delete</a></td>
+				<td><a href="" wicket:id="edit"><span wicket:id="editLabel"/></a></td>
+				<td>&nbsp;<a href="" wicket:id="delete"><span wicket:id="deleteLabel"/></a></td>
 			</tr>
 		</table>
 	</span>
-	<input type="button" wicket:id="new" value="New" />
+	<input type="button" wicket:id="new"/>
 	<div wicket:id="modalwindow">[modal window goes here]</div>	
 </wicket:panel>
 </html>
\ No newline at end of file

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTabWindowPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24SecurityTabWindowPanel.html?rev=768369&r1=768368&r2=768369&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTabWindowPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTabWindowPanel.html Fri Apr 24 16:56:47 2009
@@ -20,6 +20,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <wicket:panel>
+	<div wicket:id="feedback"></div>
 	<form wicket:id="securityDataForm">
 	<table>
 		<tr>
@@ -27,7 +28,7 @@
 			label]</label>: <select wicket:id="constraints"></select></td>
 		</tr>
 		<tr>
-			<td><input type="button" wicket:id="save" value="Save" /></td>
+			<td><input type="button" wicket:id="save"/></td>
 		</tr>
 	</table>
 	</form>

Modified: 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=768369&r1=768368&r2=768369&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SeparatorWindow.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SeparatorWindow.html Fri Apr 24 16:56:47 2009
@@ -24,15 +24,15 @@
 	<form wicket:id="separatorDataForm">
 		<table>
 			<tr>
-				<td>Text</td>
+				<td><span wicket:id="textLabel" /></td>
 				<td><input type="text "wicket:id="separatorText" /></td>
 			</tr>
 			<tr>
-				<td>Title</td>
+				<td><span wicket:id="titleLabel" /></td>
 				<td><input type="text "wicket:id="separatorTitle" /></td>
 			</tr>
 			<tr>
-				<td colspan="2"><input type="submit "wicket:id="save" value="Save"/></td>
+				<td colspan="2"><input type="submit "wicket:id="save"/></td>
 			</tr>
 		</table>
 	</form>



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