portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vku...@apache.org
Subject svn commit: r772647 - in /portals/jetspeed-2/applications/j2-admin/trunk/src/main: java/org/apache/jetspeed/portlets/site/ resources/org/apache/jetspeed/portlets/site/
Date Thu, 07 May 2009 13:34:28 GMT
Author: vkumar
Date: Thu May  7 13:34:27 2009
New Revision: 772647

URL: http://svn.apache.org/viewvc?rev=772647&view=rev
Log:
Improving CSS in Portal Site manager

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.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$AddLinkPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$AddPagePanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$DocumentOrderingTabPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$ImportDataTab.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$InformationTab.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuExlcudesPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuIncludesPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuOptionsPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuSeparatorPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataTab.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTab.html

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=772647&r1=772646&r2=772647&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
Thu May  7 13:34:27 2009
@@ -70,6 +70,8 @@
         this.shortTitle = folder.getTitle();
         this.hidden = folder.isHidden();
         this.page = folder.getDefaultPage();
+        this.pageDecorator = folder.getDefaultDecorator(Fragment.LAYOUT);
+        this.portletDecorator = folder.getDefaultDecorator(Fragment.PORTLET); 
         loadMetaData(folder.getMetadata());
         loadSecurityData(folder.getSecurityConstraints());
         this.documentOrder = folder.getDocumentOrder();

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=772647&r1=772646&r2=772647&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
Thu May  7 13:34:27 2009
@@ -1356,6 +1356,7 @@
                             {
                                 log.error("Unexpected error during uploading page(s) or folder(s).",
e);
                             }
+                            getUserSelectedNode().setLoaded(false);
                         }
                     }
                 });
@@ -1905,10 +1906,10 @@
                                     metaDataModalWindow.getContentId(), def,
                                     option, ajaxPanel));
                             metaDataModalWindow.show(target);
-                            target.addComponent(ajaxPanel);
                         }
                     };
                     editLink.add(new Label("editLabel",new ResourceModel("common.edit")));
+                    listItem.add(editLink);
                     AjaxLink deleteLink = new AjaxLink("delete")
                     {
 
@@ -2669,7 +2670,7 @@
                         {
                             retrieveCopyFolders(siteNode.getNodePath(),
                                     treeNode);
-                            siteNode.setLoaded(true);
+                            siteNode.setLoaded(false);
                             this.updateTree();
                         }
                         this.getTreeState().expandNode(treeNode);
@@ -3431,6 +3432,7 @@
                 {
                     folder.setTitle(document.getTitle());
                     folder.setShortTitle(document.getShortTitle());
+                    folder.setDefaultPage(document.getPage());
                     folder.setDefaultDecorator(document.getPageDecorator(),
                             Fragment.LAYOUT);
                     folder.setDefaultDecorator(document.getPortletDecorator(),

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$AddLinkPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24AddLinkPanel.html?rev=772647&r1=772646&r2=772647&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$AddLinkPanel.html
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$AddLinkPanel.html
Thu May  7 13:34:27 2009
@@ -23,13 +23,13 @@
 	<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"
+			<td width="110px" class="emphasise"><span wicket:id="name"></span></td>
+			<td><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>
+			<td><input type="text" wicket:id="titleField" /></td>
 		</tr>
 		<tr>
 			<td class="emphasise"><span wicket:id="shortTitle"></span></td>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$AddPagePanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24AddPagePanel.html?rev=772647&r1=772646&r2=772647&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$AddPagePanel.html
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$AddPagePanel.html
Thu May  7 13:34:27 2009
@@ -23,13 +23,13 @@
 	<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"
+			<td width="110px"class="emphasise"><span wicket:id="name"></span></td>
+			<td ><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>
+			<td ><input type="text" wicket:id="titleField" /></td>
 		</tr>
 		<tr>
 			<td class="emphasise"><span wicket:id="shortTitle"></span></td>
@@ -61,4 +61,4 @@
 	</table>
 	</form>
 </wicket:panel>
-</html>
+</html>
\ No newline at end of file

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$DocumentOrderingTabPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24DocumentOrderingTabPanel.html?rev=772647&r1=772646&r2=772647&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$DocumentOrderingTabPanel.html
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$DocumentOrderingTabPanel.html
Thu May  7 13:34:27 2009
@@ -25,18 +25,18 @@
 	<form wicket:id="docuOrderingForm">
 	<table style="width:100%;">
 		<tr>
-			<td><span wicket:id="doucmentOrderLabel"></span></td>
-			<td>
+			<td width="20%"><span  class="portlet-section-subheader" wicket:id="doucmentOrderLabel"></span></td>
+			<td width="20%">
 				<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  width="60%">&nbsp;&nbsp;
+				<input type="button" onClick="javascript:moveUpList();" value="Move Up" /><br/>&nbsp;&nbsp;<input
type="button" onClick="javascript:moveDownList();" value="Move Down" />
 			</td>
 		</tr>
 		<tr>
-			<td colspan="3"><input type="button" wicket:id="save"/></td>
+			<td class="portlet-section-body" colspan="3"><input type="button" wicket:id="save"/></td>
 		</tr>
 	</table>
 		<input type="hidden" wicket:id="pageOrder" id="pageOrder"/>
@@ -118,4 +118,4 @@
 	}
 </script>
 </wicket:panel>
-</html>
+</html>
\ No newline at end of file

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$ImportDataTab.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24ImportDataTab.html?rev=772647&r1=772646&r2=772647&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$ImportDataTab.html
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$ImportDataTab.html
Thu May  7 13:34:27 2009
@@ -25,12 +25,12 @@
 	<form wicket:id="exportForm" target="_blank">
 	<table style="width:100%;">
 		<tr>
-			<td><span wicket:id="expLabel"></span></td>
-			<td><input type="text" wicket:id="expName" readonly/></td>
+			<td width="20%" class="portlet-section-body"><span wicket:id="expLabel"></span></td>
+			<td class="portlet-section-body"><input type="text" wicket:id="expName" readonly/></td>
 		</tr>
 		<tr>
-			<td><span wicket:id="exportName"></span></td>
-			<td><input type="checkbox" wicket:id="recursively" readonly/></td>
+			<td class="portlet-section-body"><span wicket:id="exportName"></span></td>
+			<td class="portlet-section-body"><input type="checkbox" wicket:id="recursively"
readonly/></td>
 		</tr>
 		<tr>
 			<td colspan="2"><input type="button" wicket:id="exprtButton" value="Export"/></td>
@@ -40,13 +40,13 @@
 	<form wicket:id="uploadForm">
 	<table style="width:100%;">		
 		<tr>
-			<td><span>Import File</span></td>
-			<td><input type="file" wicket:id="fileInput"/></td>
+			<td width="20%" class="portlet-section-body"><span>Import File</span></td>
+			<td class="portlet-section-body"><input type="file" wicket:id="fileInput"/></td>
 		</tr>
 		<tr>
-			<td colspan="2"><input type="submit" wicket:id="uploadFile" value="Import"/></td>
+			<td  class="portlet-section-body" colspan="2"><input type="submit" wicket:id="uploadFile"
value="Import"/></td>
 		</tr>
 	</table>
 	</form>
 </wicket:panel>
-</html>
+</html>
\ No newline at end of file

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$InformationTab.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24InformationTab.html?rev=772647&r1=772646&r2=772647&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$InformationTab.html
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$InformationTab.html
Thu May  7 13:34:27 2009
@@ -21,86 +21,68 @@
 <wicket:panel>
 <div wicket:id="feedback"></div>
 <form wicket:id="infoForm">&nbsp;
-	<table>
+	<table cellpadding="0" cellspacing="1" border="1" width="100%">
 		<tr>
-			<td><span wicket:id="name"></span></td>
+			<td width="15%" class="portlet-section-body"><span wicket:id="name"></span></td>
 			<td><input readonly type="text" wicket:id="nameField" /></td>
 		</tr>
 		<tr>
-			<td><span wicket:id="title"></span></td>
+			<td class="portlet-section-body" wicket:id="title"></td>
 			<td width="100%"><input type="text" wicket:id="titleField" /></td>
 		</tr>
 		<tr>
-			<td><span wicket:id="shortTitle"></span></td>
+			<td class="portlet-section-body" wicket:id="shortTitle"></td>
 			<td><input type="text" class="medium"
 				wicket:id="shortTitleField" /></td>
 		</tr>
 		<tr>
-			<td><span wicket:id="defaultPage"></span></td>
+			<td class="portlet-section-body" wicket:id="defaultPage"></td>
 			<td><input type="text" class="medium"
 				wicket:id="defaultPageField" /></td>
 		</tr>
 		<tr>
-			<td><span wicket:id="urlLabel"></span></td>
+			<td class="portlet-section-body" wicket:id="urlLabel"></td>
 			<td><input type="text" class="medium"
 				wicket:id="urlField" /></td>
 		</tr>		
 		<tr>
-			<td><span wicket:id="targetLabel"></span></td>
+			<td class="portlet-section-body" wicket:id="targetLabel"></td>
 			<td><select wicket:id="target">
 			</select></td>
 		</tr>
 		<tr>
-			<td><span wicket:id="pageDecorator"></span></td>
+			<td class="portlet-section-body" wicket:id="pageDecorator"></td>
 			<td><select wicket:id="decoratorsList">
 			</select></td>
 		</tr>
 		<tr>
-			<td><span wicket:id="portletDecorator"></span></td>
+			<td class="portlet-section-body" wicket:id="portletDecorator"></td>
 			<td><select wicket:id="portletDecoratorsList">
 			</select></td>
 		</tr>
 		<tr>
-			<td><span wicket:id="theme"></span></td>
+			<td class="portlet-section-body" wicket:id="theme"></td>
 			<td><select wicket:id="themeList">
 			</select></td>
 		</tr>
 		<tr>
-			<td><span wicket:id="visible"></span></td>
+			<td class="portlet-section-body" wicket:id="visible"></td>
 			<td><input type="checkbox" wicket:id="visibleCheck" /></td>
 		</tr>
-
-	</table>
-	<table>
 		<tr>
-		    <td><input type="button" wicket:id="view" /></td>
-		    <td><input type="button" wicket:id="remove" /></td>
-		    <td><input type="button" wicket:id="save" /></td>
+		    <td class="portlet-section-body"><a wicket:id="view" ></a>&nbsp;</td>
+		    <td colspan="2" class="portlet-section-body"><input type="button" wicket:id="remove"
/>&nbsp;<input type="button" wicket:id="save" /></td>
 		</tr>
+
 	</table>
 </form>
-	<table>
-		<tr>
-			<td>
-				<input type="button" wicket:id="addFolder"/>
-			</td>
-			<td>
-				<input type="button" wicket:id="addPage"/>
-			</td>
-			<td>
-				<input type="button" wicket:id="addLink"/>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<input type="button" wicket:id="copy" />
-			</td>
-			<td>
-				<input type="button" wicket:id="move" />
-			</td>
-			<td>&nbsp;</td>
-		</tr>
-	</table>
+	<div>
+		<br/>		
+		<input type="button" wicket:id="addFolder"/>&nbsp;<input type="button" wicket:id="addPage"/>&nbsp;<input
type="button" wicket:id="addLink"/>
+		<br/>
+		<br/>
+		<input type="button" wicket:id="copy" />&nbsp;<input type="button" wicket:id="move"
/>
+	</div>
 <div wicket:id="modalwindow"></div>
 </wicket:panel>
-</html>
+</html>
\ No newline at end of file

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuExlcudesPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24MenuExlcudesPanel.html?rev=772647&r1=772646&r2=772647&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuExlcudesPanel.html
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuExlcudesPanel.html
Thu May  7 13:34:27 2009
@@ -24,15 +24,15 @@
 		<table cellpadding="2">
 			<thead>
 				<tr>
-					<th class="portlet-section-header"><span wicket:id="nameLabel"/></th>
+					<th class="portlet-section-subheader"><span wicket: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"><span wicket:id="editLabel"/></a></td>
-				<td>&nbsp;<a href="" wicket:id="delete"><span wicket:id="deleteLabel"/></a></td>
+			<tr wicket:id="menuData">
+				<td class="portlet-section-body"><span wicket:id="name" /></td>			

+				<td class="portlet-section-body"><a href="" wicket:id="edit"><span wicket:id="editLabel"/></a></td>
+				<td class="portlet-section-body">&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/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuIncludesPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24MenuIncludesPanel.html?rev=772647&r1=772646&r2=772647&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuIncludesPanel.html
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuIncludesPanel.html
Thu May  7 13:34:27 2009
@@ -24,21 +24,21 @@
 		<table cellpadding="2">
 			<thead>
 				<tr>
-					<th class="portlet-section-header"><span wicket:id="nameLabel" /></th>
-					<th class="portlet-section-header"><span wicket:id="nestedLabel"/></th>
+					<th class="portlet-section-subheader"><span wicket:id="nameLabel" /></th>
+					<th class="portlet-section-subheader"><span wicket:id="nestedLabel"/></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"><span wicket:id="editLabel" /></a></td>
-				<td>&nbsp;<a href="" wicket:id="delete"><span wicket:id="deleteLabel"
/></a></td>
+			<tr wicket:id="menuData">
+				<td class="portlet-section-body"><span wicket:id="name" /></td>			

+				<td class="portlet-section-body"><span wicket:id="nest" /></td>			

+				<td class="portlet-section-body"><a href="" wicket:id="edit"><span wicket:id="editLabel"
/></a></td>
+				<td class="portlet-section-body">&nbsp;<a href="" wicket:id="delete"><span
wicket:id="deleteLabel" /></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>
+</html>
\ No newline at end of file

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuOptionsPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24MenuOptionsPanel.html?rev=772647&r1=772646&r2=772647&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuOptionsPanel.html
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuOptionsPanel.html
Thu May  7 13:34:27 2009
@@ -24,25 +24,25 @@
 		<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 class="portlet-section-subheader">Option Text</th>
+					<th class="portlet-section-subheader">Order</th>
+					<th class="portlet-section-subheader">Path</th>
+					<th class="portlet-section-subheader">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 wicket:id="menuData">
+				<td class="portlet-section-body"><span wicket:id="option" /></td>	
+				<td class="portlet-section-body"><span wicket:id="order" /></td>	
+				<td class="portlet-section-body"><span wicket:id="path" /></td>	
+				<td class="portlet-section-body"><span wicket:id="regexp" /></td>	
		
+				<td class="portlet-section-body"><a href="" wicket:id="edit">Edit</a></td>
+				<td class="portlet-section-body">&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>
+</html>
\ No newline at end of file

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuSeparatorPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24MenuSeparatorPanel.html?rev=772647&r1=772646&r2=772647&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuSeparatorPanel.html
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuSeparatorPanel.html
Thu May  7 13:34:27 2009
@@ -24,17 +24,17 @@
 		<table cellpadding="2">
 			<thead>
 				<tr>
-					<th class="portlet-section-header"><span wicket:id="textLabel"/></th>
-					<th class="portlet-section-header"><span wicket:id="titleLabel"/></th>
+					<th class="portlet-section-subheader"><span wicket:id="textLabel"/></th>
+					<th class="portlet-section-subheader"><span wicket:id="titleLabel"/></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"><span wicket:id="editLabel"/></a></td>
-				<td>&nbsp;<a href="" wicket:id="delete"><span wicket:id="deleteLabel"/></a></td>
+			<tr wicket:id="separator">
+				<td class="portlet-section-body"><span wicket:id="text" /></td>			

+				<td class="portlet-section-body"><span wicket:id="title" /></td>		
	
+				<td class="portlet-section-body"><a href="" wicket:id="edit"><span wicket:id="editLabel"/></a></td>
+				<td class="portlet-section-body">&nbsp;<a href="" wicket:id="delete"><span
wicket:id="deleteLabel"/></a></td>
 			</tr>
 		</table>
 	</span>
@@ -42,4 +42,4 @@
 	<div wicket:id="modalwindow">[modal window goes here]</div>
 	<form wicket:id="sepForm"></form>	
 </wicket:panel>
-</html>
+</html>
\ No newline at end of file

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24MetaDataPanel.html?rev=772647&r1=772646&r2=772647&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataPanel.html
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataPanel.html
Thu May  7 13:34:27 2009
@@ -26,19 +26,20 @@
 	&nbsp;
 	<table style="width:100%;">
 		<tr>
-			<td width="80px"> <label wicket:id="name-label" for="name" class="portlet-form-field-label">[name
label]</label>: <input
-				type="text" wicket:id="name" id="name" class="portlet-form-field"/></td>
+			<td width="60px"> <label wicket:id="name-label" for="name" class="portlet-form-field-label">[name
label]</label>:</td>
+			<td><input type="text" wicket:id="name" id="name" class="portlet-form-field"/></td>
+
 		</tr>
 		<tr>
-			<td><label wicket:id="language-label" for="language" class="portlet-form-field-label">[language
label]</label>:
-			<input type="text" wicket:id="language" id="language" class="portlet-form-field"/></td>
+			<td><label wicket:id="language-label" for="language" class="portlet-form-field-label">[language
label]</label>:</td>
+			<td><input type="text" wicket:id="language" id="language" class="portlet-form-field"/></td>
 		</tr>
 		<tr>
-			<td><label wicket:id="value-label" for="metaValue" class="portlet-form-field-label">[value
label]</label>: <input
-				type="text" wicket:id="metaValue" id="metaValue" class="portlet-form-field"/></td>
+			<td><label wicket:id="value-label" for="metaValue" class="portlet-form-field-label">[value
label]</label>:</td>
+			<td><input type="text" wicket:id="metaValue" id="metaValue" class="portlet-form-field"/></td>
 		</tr>
 		<tr>
-			<td>
+			<td colspan="2">
 				<input type="button" wicket:id="save" class="portlet-form-button"/>
 			</td>
 		</tr>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataTab.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24MetaDataTab.html?rev=772647&r1=772646&r2=772647&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataTab.html
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataTab.html
Thu May  7 13:34:27 2009
@@ -26,18 +26,18 @@
 		<table cellpadding="2">
 			<thead>
 				<tr>
-					<th class="portlet-section-header"><span wicket:id="nameLabel" /></th>
-					<th class="portlet-section-header"><span wicket:id="languageLabel" /></th>
+					<th class="portlet-section-subheader"><span wicket:id="nameLabel" /></th>
+					<th class="portlet-section-subheader"><span wicket:id="languageLabel" /></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" ><span wicket:id="editLabel" /></a></td>
-				<td>&nbsp;<a href wicket:id="delete"><span wicket:id="deleteLabel"
/></a></td>
+			<tr wicket:id="metaData">
+				<td class="portlet-section-body"><span wicket:id="name" /></td>
+				<td class="portlet-section-body"><span wicket:id="language" /></td>
+				<td class="portlet-section-body"><span wicket:id="value" /></td>
+				<td class="portlet-section-body"><a href wicket:id="edit" ><span wicket:id="editLabel"
/></a></td>
+				<td class="portlet-section-body">&nbsp;<a href wicket:id="delete"><span
wicket:id="deleteLabel" /></a></td>
 			</tr>
 		</table>
 	</span>
@@ -46,4 +46,4 @@
 	<form wicket:id="metaForm">
 	</form>
 </wicket:panel>
-</html>
+</html>
\ No newline at end of file

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTab.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24SecurityTab.html?rev=772647&r1=772646&r2=772647&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTab.html
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTab.html
Thu May  7 13:34:27 2009
@@ -26,17 +26,17 @@
 		<table cellpadding="2">
 			<thead>
 				<tr>
-					<th class="portlet-section-header"><span wicket:id="constraintLabel"/></th>
-					<th class="portlet-section-header"><span wicket:id="constraintTypeLabel"/></th>
+					<th class="portlet-section-subheader"><span wicket:id="constraintLabel"/></th>
+					<th class="portlet-section-subheader"><span wicket:id="constraintTypeLabel"/></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="type" /></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 wicket:id="metaData">
+				<td class="portlet-section-body"><span wicket:id="name" /></td>
+				<td class="portlet-section-body"><span wicket:id="type" /></td>
+				<td class="portlet-section-body"><a href="" wicket:id="edit"><span wicket:id="editLabel"/></a></td>
+				<td class="portlet-section-body">&nbsp;<a href="" wicket:id="delete"><span
wicket:id="deleteLabel"/></a></td>
 			</tr>
 		</table>
 	</span>



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


Mime
View raw message