portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r911391 - in /portals/jetspeed-2/applications/j2-admin/trunk/src/main: java/org/apache/jetspeed/portlets/custom/ resources/org/apache/jetspeed/portlets/site/
Date Thu, 18 Feb 2010 13:33:30 GMT
Author: woonsan
Date: Thu Feb 18 13:33:29 2010
New Revision: 911391

URL: http://svn.apache.org/viewvc?rev=911391&view=rev
Log:
JS2-1108: Fixing styles to comply the standard portlet css names and also fixing the xml declaration usages in wicket html templates. (The xml declaration must be at the top if used.)

Modified:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/custom/CustomConfigModePortlet.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$AddFolderPanel.html
    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$CopyMoveWindow.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$ExcludesWindow.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$IncludesWindow.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$MenuInfoPanel.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$MenuTabPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuWindow.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$OptionsWindow.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTab.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTabWindowPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$SeparatorWindow.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManagerEdit.html

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/custom/CustomConfigModePortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/custom/CustomConfigModePortlet.java?rev=911391&r1=911390&r2=911391&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/custom/CustomConfigModePortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/custom/CustomConfigModePortlet.java Thu Feb 18 13:33:29 2010
@@ -18,6 +18,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -33,6 +34,8 @@
 import javax.portlet.RenderResponse;
 import javax.portlet.WindowState;
 
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.jetspeed.CommonPortletServices;
 import org.apache.jetspeed.om.common.SecurityConstraint;
 import org.apache.jetspeed.om.common.SecurityConstraints;
@@ -40,7 +43,6 @@
 import org.apache.jetspeed.om.page.Page;
 import org.apache.jetspeed.page.PageManager;
 import org.apache.portals.bridges.velocity.GenericVelocityPortlet;
-import org.springframework.util.StringUtils;
 
 /**
  * Common Custom Config Mode Portlet
@@ -50,7 +52,7 @@
 public class CustomConfigModePortlet extends GenericVelocityPortlet
 {
     private static final PortletMode CONFIG_MODE = new PortletMode("config");
-    private static final String DELIMITERS = "[],; ";
+    private static final String DELIMITERS = "[],; \t\r\n";
     
     private PageManager pageManager;
     private String configPage;
@@ -128,11 +130,6 @@
         {
             String path = request.getParameter("path");
             String fragmentId = request.getParameter("fragment");
-            String type = request.getParameter("type");
-            String roles = request.getParameter("roles");
-            String groups = request.getParameter("groups");
-            String users = request.getParameter("users");
-            String permissions = request.getParameter("permissions");
             
             Page page = this.pageManager.getPage(path);
             BaseFragmentElement fragment = page.getFragmentById(fragmentId);
@@ -150,37 +147,44 @@
             }
             
             SecurityConstraint constraint = fragment.newSecurityConstraint();
-            Set roleSet = convertToSet(roles, DELIMITERS);
-            Set groupSet = convertToSet(groups, DELIMITERS);
-            Set userSet = convertToSet(users, DELIMITERS);
+            String [] rolesArray = StringUtils.split(request.getParameter("roles"), DELIMITERS);
+            String [] groupsArray = StringUtils.split(request.getParameter("groups"), DELIMITERS);
+            String [] usersArray = StringUtils.split(request.getParameter("users"), DELIMITERS);
             
-            if (!roleSet.isEmpty())
+            if (!ArrayUtils.isEmpty(rolesArray))
             {
-                constraint.setRoles(new ArrayList(roleSet));
+                constraint.setRoles(Arrays.asList(rolesArray));
             }
-            if (!groupSet.isEmpty())
+            
+            if (!ArrayUtils.isEmpty(groupsArray))
             {
-                constraint.setGroups(new ArrayList(groupSet));
+                constraint.setGroups(Arrays.asList(groupsArray));
             }
-            if (!userSet.isEmpty())
+            
+            if (!ArrayUtils.isEmpty(usersArray))
             {
-                constraint.setUsers(new ArrayList(userSet));
+                constraint.setUsers(Arrays.asList(usersArray));
             }
             
-            Set permissionSet = convertToSet(permissions, DELIMITERS);
+            String [] permissionArray = StringUtils.split(StringUtils.defaultString(request.getParameter("permissions")), DELIMITERS);
+            
+            if (!ArrayUtils.isEmpty(permissionArray))
+            {
+                constraint.setPermissions(Arrays.asList(permissionArray));
+            }
             
-            constraint.setPermissions(new ArrayList(permissionSet));
-            List constraintList = constraints.getSecurityConstraints();
+            List<SecurityConstraint> constraintList = constraints.getSecurityConstraints();
             
             if (constraintList == null)
             {
-                constraintList = new ArrayList();
+                constraintList = new ArrayList<SecurityConstraint>();
             }
             
             constraintList.add(constraint);
-            
             constraints.setSecurityConstraints(constraintList);
+            
             fragment.setSecurityConstraints(constraints);
+            
             this.pageManager.updatePage(page);
         }
         catch (Exception e)
@@ -222,17 +226,17 @@
                     {
                         SecurityConstraint constraint = (SecurityConstraint) it.next();
                         
-                        Set removeRoleSet = convertToSet(roles, DELIMITERS);
-                        Set removeGroupSet = convertToSet(groups, DELIMITERS);
-                        Set removeUserSet = convertToSet(users, DELIMITERS);
+                        String [] removeRoleArray = StringUtils.split(roles, DELIMITERS);
+                        String [] removeGroupArray = StringUtils.split(groups, DELIMITERS);
+                        String [] removeUserArray = StringUtils.split(users, DELIMITERS);
                         
-                        List roleList = constraint.getRoles();
-                        List groupList = constraint.getGroups();
-                        List userList = constraint.getUsers();
+                        List<String> roleList = constraint.getRoles();
+                        List<String> groupList = constraint.getGroups();
+                        List<String> userList = constraint.getUsers();
                         
-                        if (equalsSetAndList(removeRoleSet, roleList) &&
-                            equalsSetAndList(removeGroupSet, groupList) &&
-                            equalsSetAndList(removeUserSet, userList))
+                        if (hasEqualItems(removeRoleArray, roleList) &&
+                            hasEqualItems(removeGroupArray, groupList) &&
+                            hasEqualItems(removeUserArray, userList))
                         {
                             it.remove();
                             break;
@@ -247,6 +251,7 @@
             }
             
             fragment.setSecurityConstraints(constraints.isEmpty() ? null : constraints);
+            
             this.pageManager.updatePage(page);
         }
         catch (Exception e)
@@ -278,7 +283,7 @@
                 constraints = fragment.newSecurityConstraints();
             }
             
-            Set constraintRefSet = new HashSet();
+            Set<String> constraintRefSet = new HashSet<String>();
             
             if (securityConstraintRefs != null)
             {
@@ -291,8 +296,10 @@
                 }
             }
             
-            constraints.setSecurityConstraintsRefs(constraintRefSet.isEmpty() ? null : new ArrayList(constraintRefSet));
+            constraints.setSecurityConstraintsRefs(constraintRefSet.isEmpty() ? null : new ArrayList<String>(constraintRefSet));
+            
             fragment.setSecurityConstraints(constraints.isEmpty() ? null : constraints);
+            
             this.pageManager.updatePage(page);
         }
         catch (Exception e)
@@ -301,37 +308,30 @@
         }
     }
     
-    private Set convertToSet(String s, String delimiters)
+    private boolean hasEqualItems(String [] array, List<String> list)
     {
-        Set set = new HashSet();
-        
-        String [] tokens = StringUtils.tokenizeToStringArray(s, delimiters, true, true);
-            
-        if (tokens != null)
-        {
-            for (int i = 0; i < tokens.length; i++)
-            {
-                set.add(tokens[i]);
-            }
-        }
-        
-        return set;
-    }
-    
-    private boolean equalsSetAndList(Set set, List list)
-    {
-        if (set == null)
+        if (ArrayUtils.isEmpty(array))
         {
             return (list == null || list.isEmpty());
         }
         else if (list == null)
         {
-            return set.isEmpty();
+            return ArrayUtils.isEmpty(array);
         }
-        else
+        else if (ArrayUtils.getLength(array) == list.size())
         {
-            return set.equals(new HashSet(list));
+            for (String item : array)
+            {
+                if (!list.contains(item))
+                {
+                    return false;
+                }
+            }
+            
+            return true;
         }
+        
+        return false;
     }
     
 }
\ No newline at end of file

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$AddFolderPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24AddFolderPanel.html?rev=911391&r1=911390&r2=911391&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$AddFolderPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$AddFolderPanel.html Thu Feb 18 13:33:29 2010
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">   
 <!-- 
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,29 +17,29 @@
   limitations under the License.
   
   Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+  Version $Id$
  -->
-<?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"
+			<td class="portlet-section-header"><span wicket:id="name"></span></td>
+			<td class="portlet-section-body" 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>
+			<td class="portlet-section-header"><span wicket:id="title"></span></td>
+			<td class="portlet-section-body" 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"
+			<td class="portlet-section-header"><span wicket:id="shortTitle"></span></td>
+			<td class="portlet-section-body"><input type="text" class="medium"
 				wicket:id="shortTitleField" /></td>
 		</tr>
 		<tr>
-			<td colspan="2"><input type="button" class="medium" wicket:id="new" /></td>
+			<td colspan="2" class="portlet-section-body"><input type="button" class="medium" wicket:id="new" /></td>
 		</tr>
 	</table>
 	</form>

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=911391&r1=911390&r2=911391&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 Feb 18 13:33:29 2010
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">   
 <!-- 
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,43 +17,43 @@
   limitations under the License.
   
   Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+  Version $Id$
  -->
-<?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 width="110px" class="emphasise"><span wicket:id="name"></span></td>
-			<td><input type="text"
+			<td width="110px" class="portlet-section-header"><span wicket:id="name"></span></td>
+			<td class="portlet-section-body"><input type="text"
 				wicket:id="nameField" /></td>
 		</tr>
 		<tr>
-			<td class="emphasise"><span wicket:id="title"></span></td>
-			<td><input type="text" wicket:id="titleField" /></td>
+			<td class="portlet-section-header"><span wicket:id="title"></span></td>
+			<td class="portlet-section-body"><input type="text" wicket:id="titleField" /></td>
 		</tr>
 		<tr>
-			<td class="emphasise"><span wicket:id="shortTitle"></span></td>
-			<td><input type="text" class="medium"
+			<td class="portlet-section-header"><span wicket:id="shortTitle"></span></td>
+			<td class="portlet-section-body"><input type="text" class="medium"
 				wicket:id="shortTitleField" /></td>
 		</tr>
 		<tr>
-			<td><span wicket:id="urlLabel"></span></td>
-			<td><input type="text" class="medium"
+			<td class="portlet-section-header"><span wicket:id="urlLabel"></span></td>
+			<td class="portlet-section-body"><input type="text" class="medium"
 				wicket:id="urlField" /></td>
 		</tr>		
 		<tr>
-			<td><span wicket:id="targetLabel"></span></td>
-			<td><select wicket:id="target">
+			<td class="portlet-section-header"><span wicket:id="targetLabel"></span></td>
+			<td class="portlet-section-body"><select wicket:id="target">
 			</select></td>
 		</tr>
 		<tr>
-			<td><span wicket:id="visible"></span></td>
-			<td><input type="checkbox" wicket:id="visibleCheck" /></td>
+			<td class="portlet-section-header"><span wicket:id="visible"></span></td>
+			<td class="portlet-section-body"><input type="checkbox" wicket:id="visibleCheck" /></td>
 		</tr>
 		<tr>
-			<td colspan="2"><input type="button" class="medium" wicket:id="new" /></td>
+			<td class="portlet-section-body" colspan="2"><input type="button" class="medium" wicket:id="new" /></td>
 		</tr>
 	</table>
 	</form>

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=911391&r1=911390&r2=911391&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 Feb 18 13:33:29 2010
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">   
 <!-- 
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,48 +17,48 @@
   limitations under the License.
   
   Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+  Version $Id$
  -->
-<?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 width="110px"class="emphasise"><span wicket:id="name"></span></td>
-			<td ><input type="text"
+			<td width="110px" class="portlet-section-header"><span wicket:id="name"></span></td>
+			<td class="portlet-section-body"><input type="text"
 				wicket:id="nameField" /></td>
 		</tr>
 		<tr>
-			<td class="emphasise"><span wicket:id="title"></span></td>
-			<td ><input type="text" wicket:id="titleField" /></td>
+			<td class="portlet-section-header"><span wicket:id="title"></span></td>
+			<td class="portlet-section-body"><input type="text" wicket:id="titleField" /></td>
 		</tr>
 		<tr>
-			<td class="emphasise"><span wicket:id="shortTitle"></span></td>
-			<td><input type="text" class="medium"
+			<td class="portlet-section-header"><span wicket:id="shortTitle"></span></td>
+			<td class="portlet-section-body"><input type="text" class="medium"
 				wicket:id="shortTitleField" /></td>
 		</tr>
 		<tr>
-			<td><span wicket:id="pageDecorator"></span></td>
-			<td><select wicket:id="decoratorsList">
+			<td class="portlet-section-header"><span wicket:id="pageDecorator"></span></td>
+			<td class="portlet-section-body"><select wicket:id="decoratorsList">
 			</select></td>
 		</tr>
 		<tr>
-			<td><span wicket:id="portletDecorator"></span></td>
-			<td><select wicket:id="portletDecoratorsList">
+			<td class="portlet-section-header"><span wicket:id="portletDecorator"></span></td>
+			<td class="portlet-section-body"><select wicket:id="portletDecoratorsList">
 			</select></td>
 		</tr>
 		<tr>
-			<td><span wicket:id="theme"></span></td>
-			<td><select wicket:id="themeList">
+			<td class="portlet-section-header"><span wicket:id="theme"></span></td>
+			<td class="portlet-section-body"><select wicket:id="themeList">
 			</select></td>
 		</tr>
 		<tr>
-			<td><span wicket:id="visible"></span></td>
-			<td><input type="checkbox" wicket:id="visibleCheck" /></td>
+			<td class="portlet-section-header"><span wicket:id="visible"></span></td>
+			<td class="portlet-section-body"><input type="checkbox" wicket:id="visibleCheck" /></td>
 		</tr>
 		<tr>
-			<td colspan="2"><input type="button" class="medium" wicket:id="new" /></td>
+			<td class="portlet-section-body" colspan="2"><input type="button" class="medium" wicket:id="new" /></td>
 		</tr>
 	</table>
 	</form>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$CopyMoveWindow.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24CopyMoveWindow.html?rev=911391&r1=911390&r2=911391&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$CopyMoveWindow.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$CopyMoveWindow.html Thu Feb 18 13:33:29 2010
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">   
 <!-- 
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,9 +17,8 @@
   limitations under the License.
   
   Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+  Version $Id$
  -->
-<?xml version="1.0" encoding="UTF-8"?>
-
 <html xmlns="http://www.w3.org/1999/xhtml">
 <wicket:panel>
 &nbsp;
@@ -25,22 +26,22 @@
 	&nbsp;
 	<table style="width:100%;">
 		<tr>
-			<td align="left" valign="top">
+			<td class="portlet-section-body" align="left" valign="top">
 				<div wicket:id="copyTree" class="my-tree">[Tree goes here]</div>
 			</td>
-			<td align="left" valign="top">
+			<td class="portlet-section-body" align="left" valign="top">
 				<form wicket:id="copyForm">
 				<table>
 					<tr>
-						<td><label wicket:id="docType-label">[document Type]</label>:
-							<input type="text" wicket:id="docType" readonly/></td>
+						<td class="portlet-section-header"><label wicket:id="docType-label">[document Type]</label></td>
+                        <td class="portlet-section-body"><input type="text" wicket:id="docType" readonly/></td>
 					</tr>
 					<tr>
-						<td><label wicket:id="docName-label">[Docment Name]</label>: <input
-							type="text" wicket:id="docName"/></td>
+						<td class="portlet-section-header"><label wicket:id="docName-label">[Docment Name]</label></td>
+						<td class="portlet-section-body"><input type="text" wicket:id="docName"/></td>
 					</tr>
 					<tr>
-						<td>
+						<td class="portlet-section-body" colspan="2">
 							<input type="button" wicket:id="copy"/>
 							<input type="button" wicket:id="move"/>
 						</td>

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=911391&r1=911390&r2=911391&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 Feb 18 13:33:29 2010
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">   
 <!-- 
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,9 +17,8 @@
   limitations under the License.
   
   Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+  Version $Id$
  -->
-<?xml version="1.0" encoding="UTF-8"?>
-
 <html xmlns="http://www.w3.org/1999/xhtml">
 <wicket:panel>
 &nbsp;
@@ -25,13 +26,13 @@
 	<form wicket:id="docuOrderingForm">
 	<table style="width:100%;">
 		<tr>
-			<td width="20%"><span  class="portlet-section-subheader" wicket:id="doucmentOrderLabel"></span></td>
-			<td width="20%">
+			<td width="20%" class="portlet-section-header"><span wicket:id="doucmentOrderLabel"></span></td>
+			<td width="20%" class="portlet-section-body">
 				<select id="docOrders" wicket:id="docOrders">
 					<option>sammple option comes here</option>
 				</select>
 			</td>
-			<td  width="60%">&nbsp;&nbsp;
+			<td width="60%" class="portlet-section-body">&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>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$ExcludesWindow.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24ExcludesWindow.html?rev=911391&r1=911390&r2=911391&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$ExcludesWindow.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$ExcludesWindow.html Thu Feb 18 13:33:29 2010
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">   
 <!-- 
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +17,8 @@
   limitations under the License.
   
   Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+  Version $Id$
  -->
-<?xml version="1.0" encoding="UTF-8"?>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <wicket:panel>
 
@@ -24,11 +26,11 @@
 	<form wicket:id="menuForm">
 		<table>
 			<tr>
-				<td><span wicket:id="namelabel"/></td>
-				<td><input type="text "wicket:id="nameField" /></td>
+				<td class="portlet-section-header"><span wicket:id="namelabel"/></td>
+				<td class="portlet-section-body"><input type="text "wicket:id="nameField" /></td>
 			</tr>
 			<tr>
-				<td colspan="2"><input type="submit "wicket:id="save"/></td>
+				<td colspan="2" class="portlet-section-body"><input type="submit "wicket:id="save"/></td>
 			</tr>
 		</table>
 	</form>

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=911391&r1=911390&r2=911391&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 Feb 18 13:33:29 2010
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">   
 <!-- 
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,9 +17,8 @@
   limitations under the License.
   
   Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+  Version $Id$
  -->
-<?xml version="1.0" encoding="UTF-8"?>
-
 <html xmlns="http://www.w3.org/1999/xhtml">
 <wicket:panel>
 &nbsp;
@@ -25,22 +26,22 @@
 	<form wicket:id="exportForm" target="_blank">
 	<table style="width:100%;">
 		<tr>
-			<td width="20%" class="portlet-section-body"><span wicket:id="expLabel"></span></td>
+			<td width="20%" class="portlet-section-header"><span wicket:id="expLabel"></span></td>
 			<td class="portlet-section-body"><input type="text" wicket:id="expName" readonly/></td>
 		</tr>
 		<tr>
-			<td class="portlet-section-body"><span wicket:id="exportName"></span></td>
+			<td class="portlet-section-header"><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>
+			<td colspan="2" class="portlet-section-body"><input type="button" wicket:id="exprtButton" value="Export"/></td>
 		</tr>
 	</table>
 	</form>
 	<form wicket:id="uploadForm">
 	<table style="width:100%;">		
 		<tr>
-			<td width="20%" class="portlet-section-body"><span>Import File</span></td>
+			<td width="20%" class="portlet-section-header"><span>Import File</span></td>
 			<td class="portlet-section-body"><input type="file" wicket:id="fileInput"/></td>
 		</tr>
 		<tr>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$IncludesWindow.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24IncludesWindow.html?rev=911391&r1=911390&r2=911391&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$IncludesWindow.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$IncludesWindow.html Thu Feb 18 13:33:29 2010
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">   
 <!-- 
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +17,8 @@
   limitations under the License.
   
   Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+  Version $Id$
  -->
-<?xml version="1.0" encoding="UTF-8"?>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <wicket:panel>
 
@@ -24,15 +26,15 @@
 	<form wicket:id="menuForm">
 		<table>
 			<tr>
-				<td><span wicket:id="namelabel"/></td>
-				<td><input type="text "wicket:id="nameField" /></td>
+				<td class="portlet-section-header"><span wicket:id="namelabel"/></td>
+				<td class="portlet-section-body"><input type="text "wicket:id="nameField" /></td>
 			</tr>
 			<tr>
-				<td><span wicket:id="nestlabel"/></td>
-				<td><input type="checkbox "wicket:id="nestField" /></td>
+				<td class="portlet-section-header"><span wicket:id="nestlabel"/></td>
+				<td class="portlet-section-body"><input type="checkbox "wicket:id="nestField" /></td>
 			</tr>
 			<tr>
-				<td colspan="2"><input type="submit "wicket:id="save"/></td>
+				<td colspan="2" class="portlet-section-body"><input type="submit "wicket:id="save"/></td>
 			</tr>
 		</table>
 	</form>

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=911391&r1=911390&r2=911391&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 Feb 18 13:33:29 2010
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">   
 <!-- 
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,62 +17,62 @@
   limitations under the License.
   
   Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+  Version $Id$
  -->
-<?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="infoForm">&nbsp;
 	<table cellpadding="0" cellspacing="1" border="1" width="100%">
 		<tr>
-			<td width="15%" class="portlet-section-body"><span wicket:id="name"></span></td>
-			<td><input readonly type="text" wicket:id="nameField" /></td>
+			<td width="15%" class="portlet-section-header"><span wicket:id="name"></span></td>
+			<td class="portlet-section-body"><input readonly type="text" wicket:id="nameField" /></td>
 		</tr>
 		<tr>
-			<td class="portlet-section-body" wicket:id="title"></td>
-			<td width="100%"><input type="text" wicket:id="titleField" /></td>
+			<td class="portlet-section-header" wicket:id="title"></td>
+			<td width="100%" class="portlet-section-body"><input type="text" wicket:id="titleField" /></td>
 		</tr>
 		<tr>
-			<td class="portlet-section-body" wicket:id="shortTitle"></td>
-			<td><input type="text" class="medium"
+			<td class="portlet-section-header" wicket:id="shortTitle"></td>
+			<td class="portlet-section-body"><input type="text" class="medium"
 				wicket:id="shortTitleField" /></td>
 		</tr>
 		<tr>
-			<td class="portlet-section-body" wicket:id="defaultPage"></td>
-			<td><input type="text" class="medium"
+			<td class="portlet-section-header" wicket:id="defaultPage"></td>
+			<td class="portlet-section-body"><input type="text" class="medium"
 				wicket:id="defaultPageField" /></td>
 		</tr>
 		<tr>
-			<td class="portlet-section-body" wicket:id="urlLabel"></td>
-			<td><input type="text" class="medium"
+			<td class="portlet-section-header" wicket:id="urlLabel"></td>
+			<td class="portlet-section-body"><input type="text" class="medium"
 				wicket:id="urlField" /></td>
 		</tr>		
 		<tr>
-			<td class="portlet-section-body" wicket:id="targetLabel"></td>
-			<td><select wicket:id="target">
+			<td class="portlet-section-header" wicket:id="targetLabel"></td>
+			<td class="portlet-section-body"><select wicket:id="target">
 			</select></td>
 		</tr>
 		<tr>
-			<td class="portlet-section-body" wicket:id="pageDecorator"></td>
-			<td><select wicket:id="decoratorsList">
+			<td class="portlet-section-header" wicket:id="pageDecorator"></td>
+			<td class="portlet-section-body"><select wicket:id="decoratorsList">
 			</select></td>
 		</tr>
 		<tr>
-			<td class="portlet-section-body" wicket:id="portletDecorator"></td>
-			<td><select wicket:id="portletDecoratorsList">
+			<td class="portlet-section-header" wicket:id="portletDecorator"></td>
+			<td class="portlet-section-body"><select wicket:id="portletDecoratorsList">
 			</select></td>
 		</tr>
 		<tr>
-			<td class="portlet-section-body" wicket:id="theme"></td>
-			<td><select wicket:id="themeList">
+			<td class="portlet-section-header" wicket:id="theme"></td>
+			<td class="portlet-section-body"><select wicket:id="themeList">
 			</select></td>
 		</tr>
 		<tr>
-			<td class="portlet-section-body" wicket:id="visible"></td>
-			<td><input type="checkbox" wicket:id="visibleCheck" /></td>
+			<td class="portlet-section-header" wicket:id="visible"></td>
+			<td class="portlet-section-body"><input type="checkbox" wicket:id="visibleCheck" /></td>
 		</tr>
 		<tr>
-		    <td class="portlet-section-body"><a wicket:id="view" ></a>&nbsp;</td>
+		    <td class="portlet-section-header"><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>
 

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=911391&r1=911390&r2=911391&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 Feb 18 13:33:29 2010
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">   
 <!-- 
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +17,8 @@
   limitations under the License.
   
   Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+  Version $Id$
  -->
-<?xml version="1.0" encoding="UTF-8"?>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <wicket:panel>
 	&nbsp;
@@ -24,9 +26,9 @@
 		<table cellpadding="2">
 			<thead>
 				<tr>
-					<th class="portlet-section-subheader"><span wicket:id="nameLabel"/></th>
-					<th>&nbsp;</th>
-					<th>&nbsp;</th>
+					<th class="portlet-section-header"><span wicket:id="nameLabel"/></th>
+					<th class="portlet-section-header">&nbsp;</th>
+					<th class="portlet-section-header">&nbsp;</th>
 				</tr>
 			</thead>
 			<tr wicket:id="menuData">

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=911391&r1=911390&r2=911391&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 Feb 18 13:33:29 2010
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">   
 <!-- 
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +17,8 @@
   limitations under the License.
   
   Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+  Version $Id$
  -->
-<?xml version="1.0" encoding="UTF-8"?>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <wicket:panel>
 	&nbsp;
@@ -24,10 +26,10 @@
 		<table cellpadding="2">
 			<thead>
 				<tr>
-					<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>
+					<th class="portlet-section-header"><span wicket:id="nameLabel" /></th>
+					<th class="portlet-section-header"><span wicket:id="nestedLabel"/></th>
+					<th class="portlet-section-header">&nbsp;</th>
+					<th class="portlet-section-header">&nbsp;</th>
 				</tr>
 			</thead>
 			<tr wicket:id="menuData">

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuInfoPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24MenuInfoPanel.html?rev=911391&r1=911390&r2=911391&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuInfoPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuInfoPanel.html Thu Feb 18 13:33:29 2010
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">   
 <!-- 
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +17,8 @@
   limitations under the License.
   
   Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+  Version $Id$
  -->
-<?xml version="1.0" encoding="UTF-8"?>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <wicket:panel>
 &nbsp;
@@ -25,44 +27,44 @@
 	<form wicket:id="menuForm">
 		<table>
 			<tr>
-				<td>Name</td>
-				<td><input type="text "wicket:id="nameField" /></td>
+				<td class="portlet-section-header">Name</td>
+				<td class="portlet-section-body"><input type="text "wicket:id="nameField" /></td>
 			</tr>
 			<tr>
-				<td>Title</td>
-				<td><input type="text "wicket:id="titleField" /></td>
+				<td class="portlet-section-header">Title</td>
+				<td class="portlet-section-body"><input type="text "wicket:id="titleField" /></td>
 			</tr>
 			<tr>
-				<td>Profile</td>
-				<td><input type="text "wicket:id="profileField" /></td>
+				<td class="portlet-section-header">Profile</td>
+				<td class="portlet-section-body"><input type="text "wicket:id="profileField" /></td>
 			</tr>
 			<tr>
-				<td>Skin</td>
-				<td><input type="text "wicket:id="skinField" /></td>
+				<td class="portlet-section-header">Skin</td>
+				<td class="portlet-section-body"><input type="text "wicket:id="skinField" /></td>
 			</tr>
 			<tr>
-				<td>Reg Expression</td>
-				<td><input type="checkbox "wicket:id="regExpField" /></td>
+				<td class="portlet-section-header">Reg Expression</td>
+				<td class="portlet-section-body"><input type="checkbox "wicket:id="regExpField" /></td>
 			</tr>
 			<tr>
-				<td>Path</td>
-				<td><input type="checkbox "wicket:id="pathField" /></td>
+				<td class="portlet-section-header">Path</td>
+				<td class="portlet-section-body"><input type="checkbox "wicket:id="pathField" /></td>
 			</tr>
 			<tr>
-				<td>Options</td>
-				<td><input type="text "wicket:id="optionsField" /></td>
+				<td class="portlet-section-header">Options</td>
+				<td class="portlet-section-body"><input type="text "wicket:id="optionsField" /></td>
 			</tr>
 			<tr>
-				<td>Depth</td>
-				<td><input type="text "wicket:id="depthField" /></td>
+				<td class="portlet-section-header">Depth</td>
+				<td class="portlet-section-body"><input type="text "wicket:id="depthField" /></td>
 			</tr>
 			<tr>
-				<td>Order</td>
-				<td><input type="text "wicket:id="orderField" /></td>
+				<td class="portlet-section-header">Order</td>
+				<td class="portlet-section-body"><input type="text "wicket:id="orderField" /></td>
 			</tr>
 
 			<tr>
-				<td colspan="2"><input type="button "wicket:id="save" value="Save"/></td>
+				<td colspan="2" class="portlet-section-body"><input type="button "wicket:id="save" value="Save"/></td>
 			</tr>
 		</table>
 	</form>

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=911391&r1=911390&r2=911391&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 Feb 18 13:33:29 2010
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">   
 <!-- 
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +17,8 @@
   limitations under the License.
   
   Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+  Version $Id$
  -->
-<?xml version="1.0" encoding="UTF-8"?>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <wicket:panel>
 	&nbsp;
@@ -24,12 +26,12 @@
 		<table cellpadding="2">
 			<thead>
 				<tr>
-					<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>
+					<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-header">&nbsp;</th>
+					<th class="portlet-section-header">&nbsp;</th>
 				</tr>
 			</thead>
 			<tr wicket:id="menuData">

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=911391&r1=911390&r2=911391&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 Feb 18 13:33:29 2010
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">   
 <!-- 
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +17,8 @@
   limitations under the License.
   
   Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+  Version $Id$
  -->
-<?xml version="1.0" encoding="UTF-8"?>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <wicket:panel>
 	&nbsp;
@@ -24,10 +26,10 @@
 		<table cellpadding="2">
 			<thead>
 				<tr>
-					<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>
+					<th class="portlet-section-header"><span wicket:id="textLabel"/></th>
+					<th class="portlet-section-header"><span wicket:id="titleLabel"/></th>
+					<th class="portlet-section-header">&nbsp;</th>
+					<th class="portlet-section-header">&nbsp;</th>
 				</tr>
 			</thead>
 			<tr wicket:id="separator">

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuTabPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24MenuTabPanel.html?rev=911391&r1=911390&r2=911391&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuTabPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuTabPanel.html Thu Feb 18 13:33:29 2010
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">   
 <!-- 
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,16 +17,16 @@
   limitations under the License.
   
   Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+  Version $Id$
  -->
-<?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>
+			<td class="portlet-section-body"><span wicket:id="menuTree"></span></td>
+			<td class="portlet-section-body"><span wicket:id="menuTabs"></span></td>
 		</tr>
 		<tr>
 			<td colspan="2"><input type="button" wicket:id="newsave" />&nbsp;<input type="button" wicket:id="remove"></td>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuWindow.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24MenuWindow.html?rev=911391&r1=911390&r2=911391&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuWindow.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuWindow.html Thu Feb 18 13:33:29 2010
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">   
 <!-- 
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +17,8 @@
   limitations under the License.
   
   Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+  Version $Id$
  -->
-<?xml version="1.0" encoding="UTF-8"?>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <wicket:panel>
 &nbsp;
@@ -24,43 +26,43 @@
 	<form wicket:id="menuForm">
 		<table>
 			<tr>
-				<td><span wicket:id="nameLabel"/></td>
-				<td><input type="text "wicket:id="nameField" /></td>
+				<td class="portlet-section-header"><span wicket:id="nameLabel"/></td>
+				<td class="portlet-section-body"><input type="text "wicket:id="nameField" /></td>
 			</tr>
 			<tr>
-				<td><span wicket:id="titleLabel"/></td>
-				<td><input type="text "wicket:id="titleField" /></td>
+				<td class="portlet-section-header"><span wicket:id="titleLabel"/></td>
+				<td class="portlet-section-body"><input type="text "wicket:id="titleField" /></td>
 			</tr>
 			<tr>
-				<td><span wicket:id="optionLabel"/></td>
-				<td><input type="text "wicket:id="optionsField" /></td>
+				<td class="portlet-section-header"><span wicket:id="optionLabel"/></td>
+				<td class="portlet-section-body"><input type="text "wicket:id="optionsField" /></td>
 			</tr>
 			<tr>
-				<td><span wicket:id="profileLabel"/></td>
-				<td><input type="text "wicket:id="profileField" /></td>
+				<td class="portlet-section-header"><span wicket:id="profileLabel"/></td>
+				<td class="portlet-section-body"><input type="text "wicket:id="profileField" /></td>
 			</tr>
 			<tr>
-				<td><span wicket:id="skinLabel"/></td>
-				<td><input type="text "wicket:id="skinField" /></td>
+				<td class="portlet-section-header"><span wicket:id="skinLabel"/></td>
+				<td class="portlet-section-body"><input type="text "wicket:id="skinField" /></td>
 			</tr>
 			<tr>
-				<td><span wicket:id="regExpLabel"/></td>
-				<td><input type="checkbox "wicket:id="regExpField" /></td>
+				<td class="portlet-section-header"><span wicket:id="regExpLabel"/></td>
+				<td class="portlet-section-body"><input type="checkbox "wicket:id="regExpField" /></td>
 			</tr>
 			<tr>
-				<td><span wicket:id="pathLabel"/></td>
-				<td><input type="checkbox "wicket:id="pathField" /></td>
+				<td class="portlet-section-header"><span wicket:id="pathLabel"/></td>
+				<td class="portlet-section-body"><input type="checkbox "wicket:id="pathField" /></td>
 			</tr>
 			<tr>
-				<td><span wicket:id="depthLabel"/></td>
-				<td><input type="text "wicket:id="depthField" /></td>
+				<td class="portlet-section-header"><span wicket:id="depthLabel"/></td>
+				<td class="portlet-section-body"><input type="text "wicket:id="depthField" /></td>
 			</tr>
 			<tr>
-				<td><span wicket:id="orderLabel"/></td>
-				<td><input type="text "wicket:id="orderField" /></td>
+				<td class="portlet-section-header"><span wicket:id="orderLabel"/></td>
+				<td class="portlet-section-body"><input type="text "wicket:id="orderField" /></td>
 			</tr>
 			<tr>
-				<td colspan="2"><input type="submit "wicket:id="save"/></td>
+				<td colspan="2" class="portlet-section-body"><input type="submit "wicket:id="save"/></td>
 			</tr>			
 		</table>
 	</form>

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=911391&r1=911390&r2=911391&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 Feb 18 13:33:29 2010
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">   
 <!-- 
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,9 +17,8 @@
   limitations under the License.
   
   Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+  Version $Id$
  -->
-<?xml version="1.0" encoding="UTF-8"?>
-
 <html xmlns="http://www.w3.org/1999/xhtml">
 <wicket:panel>
 &nbsp;
@@ -26,20 +27,20 @@
 	&nbsp;
 	<table style="width:100%;">
 		<tr>
-			<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>
+			<td width="60px" class="portlet-section-header"><label wicket:id="name-label" for="name" class="portlet-form-field-label">[name label]</label>:</td>
+			<td class="portlet-section-body"><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>:</td>
-			<td><input type="text" wicket:id="language" id="language" class="portlet-form-field"/></td>
+			<td class="portlet-section-header"><label wicket:id="language-label" for="language" class="portlet-form-field-label">[language label]</label>:</td>
+			<td class="portlet-section-body"><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>:</td>
-			<td><input type="text" wicket:id="metaValue" id="metaValue" class="portlet-form-field"/></td>
+			<td class="portlet-section-header"><label wicket:id="value-label" for="metaValue" class="portlet-form-field-label">[value label]</label>:</td>
+			<td class="portlet-section-body"><input type="text" wicket:id="metaValue" id="metaValue" class="portlet-form-field"/></td>
 		</tr>
 		<tr>
-			<td colspan="2">
+			<td colspan="2" class="portlet-section-body">
 				<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=911391&r1=911390&r2=911391&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 Feb 18 13:33:29 2010
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">   
 <!-- 
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,9 +17,8 @@
   limitations under the License.
   
   Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+  Version $Id$
  -->
-<?xml version="1.0" encoding="UTF-8"?>
-
 <html xmlns="http://www.w3.org/1999/xhtml">
 <wicket:panel>
 	&nbsp;
@@ -26,10 +27,11 @@
 		<table cellpadding="2">
 			<thead>
 				<tr>
-					<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>
+					<th class="portlet-section-header"><span wicket:id="nameLabel" /></th>
+					<th class="portlet-section-header"><span wicket:id="languageLabel" /></th>
+					<th class="portlet-section-header">&nbsp;</th>
+					<th class="portlet-section-header">&nbsp;</th>
+                    <th class="portlet-section-header">&nbsp;</th>
 				</tr>
 			</thead>
 			<tr wicket:id="metaData">

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$OptionsWindow.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24OptionsWindow.html?rev=911391&r1=911390&r2=911391&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$OptionsWindow.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$OptionsWindow.html Thu Feb 18 13:33:29 2010
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">   
 <!-- 
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,44 +17,44 @@
   limitations under the License.
   
   Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+  Version $Id$
  -->
-<?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><span wicket:id="optionLabel"/></td>
-				<td><input type="text "wicket:id="optionsField" /></td>
+				<td class="portlet-section-header"><span wicket:id="optionLabel"/></td>
+				<td class="portlet-section-body"><input type="text "wicket:id="optionsField" /></td>
 			</tr>
 			<tr>
-				<td><span wicket:id="profileLabel"/></td>
-				<td><input type="text "wicket:id="profileField" /></td>
+				<td class="portlet-section-header"><span wicket:id="profileLabel"/></td>
+				<td class="portlet-section-body"><input type="text "wicket:id="profileField" /></td>
 			</tr>
 			<tr>
-				<td><span wicket:id="skinLabel"/></td>
-				<td><input type="text "wicket:id="skinField" /></td>
+				<td class="portlet-section-header"><span wicket:id="skinLabel"/></td>
+				<td class="portlet-section-body"><input type="text "wicket:id="skinField" /></td>
 			</tr>
 			<tr>
-				<td><span wicket:id="regExpLabel"/></td>
-				<td><input type="checkbox "wicket:id="regExpField" /></td>
+				<td class="portlet-section-header"><span wicket:id="regExpLabel"/></td>
+				<td class="portlet-section-body"><input type="checkbox "wicket:id="regExpField" /></td>
 			</tr>
 			<tr>
-				<td><span wicket:id="pathLabel"/></td>
-				<td><input type="checkbox "wicket:id="pathField" /></td>
+				<td class="portlet-section-header"><span wicket:id="pathLabel"/></td>
+				<td class="portlet-section-body"><input type="checkbox "wicket:id="pathField" /></td>
 			</tr>
 			<tr>
-				<td><span wicket:id="depthLabel"/></td>
-				<td><input type="text "wicket:id="depthField" /></td>
+				<td class="portlet-section-header"><span wicket:id="depthLabel"/></td>
+				<td class="portlet-section-body"><input type="text "wicket:id="depthField" /></td>
 			</tr>
 			<tr>
-				<td><span wicket:id="orderLabel"/></td>
-				<td><input type="text "wicket:id="orderField" /></td>
+				<td class="portlet-section-header"><span wicket:id="orderLabel"/></td>
+				<td class="portlet-section-body"><input type="text "wicket:id="orderField" /></td>
 			</tr>
 
 			<tr>
-				<td colspan="2"><input type="submit "wicket:id="save"/></td>
+				<td colspan="2" class="portlet-section-body"><input type="submit "wicket:id="save"/></td>
 			</tr>
 		</table>
 	</form>

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=911391&r1=911390&r2=911391&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 Feb 18 13:33:29 2010
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">   
 <!-- 
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,9 +17,8 @@
   limitations under the License.
   
   Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+  Version $Id$
  -->
-<?xml version="1.0" encoding="UTF-8"?>
-
 <html xmlns="http://www.w3.org/1999/xhtml">
 <wicket:panel>
 	&nbsp;
@@ -26,10 +27,10 @@
 		<table cellpadding="2">
 			<thead>
 				<tr>
-					<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>
+					<th class="portlet-section-header"><span wicket:id="constraintLabel"/></th>
+					<th class="portlet-section-header"><span wicket:id="constraintTypeLabel"/></th>
+					<th class="portlet-section-header">&nbsp;</th>
+					<th class="portlet-section-header">&nbsp;</th>
 				</tr>
 			</thead>
 			<tr wicket:id="metaData">

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTabWindowPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24SecurityTabWindowPanel.html?rev=911391&r1=911390&r2=911391&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTabWindowPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTabWindowPanel.html Thu Feb 18 13:33:29 2010
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">   
 <!-- 
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,20 +17,20 @@
   limitations under the License.
   
   Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+  Version $Id$
  -->
-<?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="securityDataForm">
 	<table>
 		<tr>
-			<td><label wicket:id="securityConstraintLabel">[name
-			label]</label>: <select wicket:id="constraints"></select></td>
+			<td class="portlet-section-header"><label wicket:id="securityConstraintLabel">[name
+			label]</label></td>
+			<td class="portlet-section-body"><select wicket:id="constraints"></select></td>
 		</tr>
 		<tr>
-			<td><input type="button" wicket:id="save"/></td>
+			<td class="portlet-section-body" colspan="2"><input type="button" wicket:id="save"/></td>
 		</tr>
 	</table>
 	</form>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$SeparatorWindow.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24SeparatorWindow.html?rev=911391&r1=911390&r2=911391&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$SeparatorWindow.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$SeparatorWindow.html Thu Feb 18 13:33:29 2010
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">   
 <!-- 
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +17,8 @@
   limitations under the License.
   
   Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+  Version $Id$
  -->
-<?xml version="1.0" encoding="UTF-8"?>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <wicket:panel>
 
@@ -24,15 +26,15 @@
 	<form wicket:id="separatorDataForm">
 		<table>
 			<tr>
-				<td><span wicket:id="nameLabel" /></td>
-				<td><input type="text "wicket:id="separatorText" /></td>
+				<td class="portlet-section-header"><span wicket:id="nameLabel" /></td>
+				<td class="portlet-section-body"><input type="text "wicket:id="separatorText" /></td>
 			</tr>
 			<tr>
-				<td><span wicket:id="titleLabel" /></td>
-				<td><input type="text "wicket:id="separatorTitle" /></td>
+				<td class="portlet-section-header"><span wicket:id="titleLabel" /></td>
+				<td class="portlet-section-body"><input type="text "wicket:id="separatorTitle" /></td>
 			</tr>
 			<tr>
-				<td colspan="2"><input type="submit "wicket:id="save"/></td>
+				<td colspan="2" class="portlet-section-body"><input type="submit "wicket:id="save"/></td>
 			</tr>
 		</table>
 	</form>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager.html?rev=911391&r1=911390&r2=911391&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager.html Thu Feb 18 13:33:29 2010
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">   
 <!-- 
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,12 +17,11 @@
   limitations under the License.
   
   Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+  Version $Id$
  -->
-<?xml version="1.0" encoding="UTF-8"?>
-
 <html xmlns="http://www.w3.org/1999/xhtml">
 <wicket:head>
-	<style>
+<style>
 table.wicket-tree-content {
 	width: 100%;
 }
@@ -58,39 +59,43 @@
 }
 </style>
 </wicket:head>
-<table>
-	<tr>
-		<td>
-		<div wicket:id="feedback" />
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2"
-			style="border: 1px solid black; margin: 4px; padding: 4px;">
-		<div wicket:id="siteTree" class="my-tree">[Tree goes here]</div>
-		</td>
-		<td width="700px"
-			style="border: 1px solid black; margin: 4px; padding: 4px;">
-		<div wicket:id="tabs" class="tabpanel">[panel goes here]</div>
-		</td>
-	</tr>
-	<form wicket:id="treeForm">
-	<tr>
-		<td><input type="text" wicket:id="userFolder" /></td>
-		<td><input type="submit" wicket:id="userFolderButton"
-			value="Show User Folder" /></td>
-		<td></td>
-	</tr>
-	<tr>
-		<td>&nbsp;</td>
-		<td align="left"><input type="submit"
-			wicket:id="portalFolderButton" value="Show Portal Tree" /></td>
-		<td>&nbsp;</td>
-	</tr>
-	</form>
+
+<table width="100%">
+  <tr>
+    <td colspan="2" class="portlet-section-body">
+      <div wicket:id="feedback" />
+    </td>
+  </tr>
+  <tr>
+    <td colspan="2" class="portlet-section-header"></td>
+  </tr>
+  <tr>
+    <td class="portlet-section-body">
+      <div wicket:id="siteTree" class="my-tree">[Tree goes here]</div>
+    </td>
+    <td class="portlet-section-body">
+      <div wicket:id="tabs" class="tabpanel">[panel goes here]</div>
+    </td>
+  </tr>
+  <tr>
+    <td colspan="2" class="portlet-section-header"></td>
+  </tr>
+  <tr>
+    <td colspan="2" class="portlet-section-body">
+      <form wicket:id="treeForm">
+        <input type="text" wicket:id="userFolder" />
+        <input type="submit" wicket:id="userFolderButton" value="Show User Folder" />
+        <input type="submit" wicket:id="portalFolderButton" value="Show Portal Tree" />
+      </form>
+    </td>
+  </tr>
+  <tr>
+    <td colspan="2" class="portlet-section-header"></td>
+  </tr>
 </table>
 
 <div id="bysy_indicator">Loading ...</div>
+
 <script type="text/javascript">
  window.onload = setupFunc;
 

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManagerEdit.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManagerEdit.html?rev=911391&r1=911390&r2=911391&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManagerEdit.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManagerEdit.html Thu Feb 18 13:33:29 2010
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">   
 <!-- 
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,19 +17,18 @@
   limitations under the License.
   
   Author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
+  Version $Id$
  -->
-<?xml version="1.0" encoding="UTF-8"?>
-
-<html xmlns="http://www.w3.org/1999/xhtml" >
+<html xmlns="http://www.w3.org/1999/xhtml">
 	<div wicket:id="feedback"></div>
     <form wicket:id="userPrefernces">
         <table  cellpadding="0" cellspacing="1" border="1" width="300px">
             <tr>
-                <td><span wicket:id="treerootLabel"/></td>
-                <td><input type="text" wicket:id="treeroot" class="portlet-form-field-label" /></td>				            
+                <td class="portlet-section-header"><span wicket:id="treerootLabel"/></td>
+                <td class="portlet-section-body"><input type="text" wicket:id="treeroot" class="portlet-form-field-label" /></td>				            
             </tr>
             <tr>
-                <td colspan="2"><input type="submit" wicket:id="addUserPrefernces" /></td>			
+                <td colspan="2" class="portlet-section-body"><input type="submit" wicket:id="addUserPrefernces" /></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


Mime
View raw message