[portal-commits] JBoss Portal SVN: r9204 - in branches/JBoss_Portal_Branch_2_6: core-admin/src/resources/portal-admin-war/WEB-INF/jsf and 11 other directories.

Thursday, 29 November 2007


Author: wesleyhales
Date: 2007-11-29 13:46:29 -0500 (Thu, 29 Nov 2007)
New Revision: 9204

Added:
  
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/border-dotted-blue.gif
  
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/border-dotted-vert.gif
Modified:
   branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css
  
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml
  
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml
  
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml
   branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/style.css
  
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml
  
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml
  
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml
  
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml
  
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml
  
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml
  
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml
  
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml
  
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml
  
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/tabContainer.xhtml
  
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml
  
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml
  
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml
  
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml
  
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml
Log:
JBPORTAL-1798  Cleanup nested tables and other UI elements in core adminlocation

Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css	2007-11-29
17:49:34 UTC (rev 9203)
+++
branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css	2007-11-29
18:46:29 UTC (rev 9204)
@@ -62,7 +62,8 @@
 /* Pagination. */
 
 .admin-ui ul.pagination {
-   margin: 0;
+   margin: 0 auto 0 auto;
+   width:98%;
    padding: .2em;
 }
 

Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml	2007-11-29
17:49:34 UTC (rev 9203)
+++
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml	2007-11-29
18:46:29 UTC (rev 9204)
@@ -55,7 +55,7 @@
             </c:forEach>
          </tbody>
       </table>
-      <ul class="pagination">
+      <ul class="pagination property-container">
          <c:if test="#{instancemgr.instanceCount >
instancemgr.paginationSize}">
             <c:forEach begin="0" end="#{(instancemgr.instanceCount -
1)/ instancemgr.paginationSize}" step="1"
                        var="index">

Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml	2007-11-29
17:49:34 UTC (rev 9203)
+++
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml	2007-11-29
18:46:29 UTC (rev 9204)
@@ -72,7 +72,7 @@
             </c:forEach>
          </tbody>
       </table>
-      <ul class="pagination">
+      <ul class="pagination property-container">
          <c:if test="#{portletmgr.portletCount >
portletmgr.paginationSize}">
             <c:forEach begin="0" end="#{(portletmgr.portletCount - 1) /
portletmgr.paginationSize}" step="1"
                        var="index">

Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml	2007-11-29
17:49:34 UTC (rev 9203)
+++
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml	2007-11-29
18:46:29 UTC (rev 9204)
@@ -37,7 +37,7 @@
                   </c:forEach>
                </tbody>
             </table>
-            <ul class="pagination">
+            <ul class="pagination property-container">
                <c:forEach begin="0" end="#{(portletmgr.portletCount -
1)/portletmgr.paginationSize}" step="1"
                           var="index">
                   <li class="#{index == portletmgr.selectedFrom ?
'selected' : ''}">

Copied:
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/border-dotted-blue.gif
(from rev 9201,
branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/border-dotted-blue.gif)
===================================================================
(Binary files differ)

Copied:
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/border-dotted-vert.gif
(from rev 9203,
branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/border-dotted-vert.gif)
===================================================================
(Binary files differ)

Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/style.css
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/style.css	2007-11-29
17:49:34 UTC (rev 9203)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/style.css	2007-11-29
18:46:29 UTC (rev 9204)
@@ -17,8 +17,20 @@
 
 .identity-ui table {
    border: 0;
+   border-collapse:collapse;
 }
 
+hr {
+   display:none;
+   visibility:hidden;
+}
+
+table.datatable{
+   border-right: 1px solid #B3C0C7;
+   border-left: 1px solid #B3C0C7;
+   border-bottom: 1px solid #B3C0C7;
+}
+
 div.identity-ui div.tab-container{
    border-bottom:1px solid #B3C0C7;
    border-right:1px solid #B3C0C7;
@@ -29,7 +41,6 @@
 .identity-ui th {
    text-align: left;
    border: 0;
-   border-bottom: 1px solid;
    padding-bottom: 2px;
    padding-top: 2px;
    font-size: 11px;
@@ -210,21 +221,31 @@
 
 .identity-ui th.portlet-section-title {
    font-weight: bold;
-   color: #656565;
+   color: #31587f;
    font-size: 11px;
-   border: 1px solid #999;
-   background-color: #ebf2f5;
-   padding-left: 6px;
+   padding-bottom: 5px;
 }
 
-.identity-ui h3.sectionTitle {
+.identity-ui h3.sectionTitle,
+table th.sectionTitle {
    font-weight: bold;
-   color: #656565;
+   color: #31587f;
    font-size: 11px;
-   border-top: 1px solid #999;
+   padding-bottom: 5px;
+   background-image:url(img/border-dotted-blue.gif);
+   background-position:left bottom;
+   background-repeat:repeat-x;
+   background-color:#fafafa;
+}
+
+.sectionTitle-blue {
+   font-weight: bold;
+   color: #5986b3;
+   font-size: 13px;
    background-color: #ebf2f5;
-   padding: 2px;
-   padding-left: 4px;
+   padding: 2px 2px 2px 4px;
+   margin: 0;
+   border:1px solid #B3C0C7;
 }
 
 .identity-ui .portlet-section-header {
@@ -257,6 +278,11 @@
    border-top: 0px;
 }
 
+.identity-ui .line-item {
+   color: #656565;
+   border-bottom: 1px solid #d5d5d5;
+}
+
 .identity-ui .portlet-section-alternate {
    background-color: #F2F2F2;
    border: 1px solid #d5d5d5;
@@ -499,3 +525,8 @@
    display: inline-block;
    vertical-align: middle;
 }
+
+.content-container {
+   width: 98%;
+   margin: 0 auto 0 auto;
+}

Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml	2007-11-29
17:49:34 UTC (rev 9203)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml	2007-11-29
18:46:29 UTC (rev 9204)
@@ -8,86 +8,89 @@
 
 <ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
 <ui:define name="title">
-	<li class="selected">
-		<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
-	</li>
+   <li class="selected">
+      <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}"
/>
+   </li>
 </ui:define>
 
 <ui:define name="content">
-	<h:messages id="status" for="status"
infoClass="portlet-msg-success" errorClass="portlet-msg-error"
+   <h:messages id="status" for="status"
infoClass="portlet-msg-success" errorClass="portlet-msg-error"
               fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
-	<h:form>
-	<h:panelGrid>
-			<h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"
action="searchUsers"
-						styleClass="actionDetails"/>
-		
-		<c:if test="#{useradministrationbean.pendingCount > 0}">
-			<h:commandLink value="Show pending registrations"
action="showPendingUsers" styleClass="actionPreferences"/>
-		</c:if>
-		
-		<h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_CREATE_USER}"
action="createUser" styleClass="actionCreateInstance"/>
-	</h:panelGrid>
-	</h:form>
-	<br/>
-	<table style="width: 100%;">
-		<tr>
-			<th colspan="2"
class="portlet-section-header"><h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_MATRIX}" /></th>
-		</tr>
-		<tr class="portlet-section-body">
-			<td><h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS}"/></td>
-			<td>
-				<h:outputText value="#{useradministrationbean.userCount}" />
-			</td>
-		</tr>
-		<c:if test="#{useradministrationbean.pendingCount > 0}">
-			<tr class="portlet-section-body">
-				<td> <h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_COUNT_PENDING_USERS}" /></td>
-				<td><h:outputText value="#{useradministrationbean.pendingCount}"
/></td>
-			</tr>
-		</c:if>
-		<tr>
-			<th colspan="2"
class="portlet-section-header"><h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_MODES}" /></th>
-		</tr>
-		<tr class="portlet-section-body">
-			<td><h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_MODE}" /></td>
-			<td>
-			<c:choose>
-				<c:when test="#{useradministrationbean.subscriptionMode ==
'automatic'}">
-					<h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC}" />
-				</c:when>
-				<c:when test="#{useradministrationbean.subscriptionMode ==
'jbp_identity_validation_approval_workflow'}">
-					<h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN}"
/>
-				</c:when>
-				<c:when test="#{useradministrationbean.subscriptionMode ==
'jbp_identity_validation_workflow'}">
-					<h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL}" />
-				</c:when>
-				<c:otherwise>
-					<h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM}" />		
-				</c:otherwise>
-			</c:choose>
-			</td>
-		</tr>
-		<tr class="portlet-section-body">
-			<td><h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_ADMIN_MODE}" /></td>
-			<td>
-			<c:choose>
-				<c:when test="#{useradministrationbean.adminSubscriptionMode ==
'automatic'}">
-					<h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC}" />
-				</c:when>
-				<c:when test="#{useradministrationbean.adminSubscriptionMode ==
'jbp_identity_validation_approval_workflow'}">
-					<h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN}"
/>
-				</c:when>
-				<c:when test="#{useradministrationbean.adminSubscriptionMode ==
'jbp_identity_validation_workflow'}">
-					<h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL}" />
-				</c:when>
-				<c:otherwise>
-					<h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM}" />		
-				</c:otherwise>
-			</c:choose>
-			</td>
-		</tr>
-	</table>
+   <h:form>
+   <h:panelGrid>
+         <h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"
action="searchUsers"
+                  styleClass="actionDetails"/>
 
+      <c:if test="#{useradministrationbean.pendingCount > 0}">
+         <h:commandLink value="Show pending registrations"
action="showPendingUsers" styleClass="actionPreferences"/>
+      </c:if>
+
+      <h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_CREATE_USER}"
action="createUser" styleClass="actionCreateInstance"/>
+   </h:panelGrid>
+   </h:form>
+   <br/>
+   <table style="width: 100%;">
+      <tr>
+         <th colspan="2" class="sectionTitle"><h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_MATRIX}" /></th>
+      </tr>
+      <tr class="line-item">
+         <td><h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS}"/></td>
+         <td>
+            <h:outputText value="#{useradministrationbean.userCount}" />
+         </td>
+      </tr>
+      <c:if test="#{useradministrationbean.pendingCount > 0}">
+         <tr class="portlet-section-body">
+            <td> <h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_COUNT_PENDING_USERS}" /></td>
+            <td><h:outputText
value="#{useradministrationbean.pendingCount}" /></td>
+         </tr>
+      </c:if>
+      </table>
+   <br/>
+   <table style="width: 100%;">
+      <tr>
+         <th colspan="2" class="sectionTitle"><h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_MODES}" /></th>
+      </tr>
+      <tr class="line-item">
+         <td><h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_MODE}" /></td>
+         <td>
+         <c:choose>
+            <c:when test="#{useradministrationbean.subscriptionMode ==
'automatic'}">
+               <h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC}" />
+            </c:when>
+            <c:when test="#{useradministrationbean.subscriptionMode ==
'jbp_identity_validation_approval_workflow'}">
+               <h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN}"
/>
+            </c:when>
+            <c:when test="#{useradministrationbean.subscriptionMode ==
'jbp_identity_validation_workflow'}">
+               <h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL}" />
+            </c:when>
+            <c:otherwise>
+               <h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM}" />
+            </c:otherwise>
+         </c:choose>
+         </td>
+      </tr>
+      <tr class="line-item">
+         <td><h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_ADMIN_MODE}" /></td>
+         <td>
+         <c:choose>
+            <c:when test="#{useradministrationbean.adminSubscriptionMode ==
'automatic'}">
+               <h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC}" />
+            </c:when>
+            <c:when test="#{useradministrationbean.adminSubscriptionMode ==
'jbp_identity_validation_approval_workflow'}">
+               <h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN}"
/>
+            </c:when>
+            <c:when test="#{useradministrationbean.adminSubscriptionMode ==
'jbp_identity_validation_workflow'}">
+               <h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL}" />
+            </c:when>
+            <c:otherwise>
+               <h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM}" />
+            </c:otherwise>
+         </c:choose>
+         </td>
+      </tr>
+   </table>
+
 </ui:define>
 
 </ui:composition>

Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml	2007-11-29
17:49:34 UTC (rev 9203)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml	2007-11-29
18:46:29 UTC (rev 9204)
@@ -25,7 +25,7 @@
 <ui:define name="content">
 
 <h:form>
-	<h:dataTable value="#{rolemanagementbean.roleMembers}"
var="uiUser" rows="#{rolemanagementbean.limit}"
rendered="#{rolemanagementbean.roleMembers.rowCount > 0}"
rowClasses="portlet-section-body,portlet-section-alternate"
headerClass="portlet-section-header" width="100%">
+	<h:dataTable value="#{rolemanagementbean.roleMembers}"
var="uiUser" rows="#{rolemanagementbean.limit}"
rendered="#{rolemanagementbean.roleMembers.rowCount > 0}"
rowClasses="portlet-section-body,portlet-section-alternate"
headerClass="portlet-section-header" styleClass="datatable"
width="100%">
 		<h:column>
 			<f:facet name="header">
 				<h:outputText value="#{bundle.IDENTITY_USERNAME}"/>

Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml	2007-11-29
17:49:34 UTC (rev 9203)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml	2007-11-29
18:46:29 UTC (rev 9204)
@@ -19,14 +19,15 @@
    </h:form>
 
 <ui:decorate template="/WEB-INF/jsf/common/tabContainer.xhtml">
-	<ui:define name="tab-container-content">
-	<!-- Title -->
+
+	<ui:define name="tab-object-path"><!-- Title -->
 	<h:form>
 	<ul class="objectpath">
 		<ui:insert name="title">Title</ui:insert>
 	</ul>
 	</h:form>
-
+   </ui:define>
+   <ui:define name="tab-container-content">
 	<br/>
    <!-- Content -->
    <ui:insert name="content">Content</ui:insert>

Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml	2007-11-29
17:49:34 UTC (rev 9203)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml	2007-11-29
18:46:29 UTC (rev 9204)
@@ -19,7 +19,7 @@
     <br/>
              
 <h:form>
-	<h:dataTable id="userlist" value="#{rolemanagementbean.roleList}"
var="role" rowClasses="portlet-section-body,portlet-section-alternate"
headerClass="portlet-section-header" width="100%">
+	<h:dataTable id="userlist" value="#{rolemanagementbean.roleList}"
var="role" rowClasses="portlet-section-body,portlet-section-alternate"
headerClass="portlet-section-header" styleClass="datatable"
width="100%">
 	<h:column>
 		<f:facet name="header">
 			<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE}" />

Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml	2007-11-29
17:49:34 UTC (rev 9203)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml	2007-11-29
18:46:29 UTC (rev 9204)
@@ -26,7 +26,7 @@
 <ui:define name="content">
 <br/>
 <h:form>
-<h:dataTable value="#{useradministrationbean.pendingActionList}"
var="user" rowClasses="portlet-section-body,portlet-section-alternate"
headerClass="portlet-section-header" width="100%">
+<h:dataTable value="#{useradministrationbean.pendingActionList}"
var="user" rowClasses="portlet-section-body,portlet-section-alternate"
headerClass="portlet-section-header" styleClass="datatable"
width="100%">
 	<h:column>
 		<h:selectBooleanCheckbox value="#{user.selected}"
disabled="true" />
 	</h:column>

Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml	2007-11-29
17:49:34 UTC (rev 9203)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml	2007-11-29
18:46:29 UTC (rev 9204)
@@ -41,7 +41,7 @@
 </f:verbatim>
 <br/>
 <h:form id="pending">
-<h:dataTable value="#{useradministrationbean.pendingUsers}"
var="user" rowClasses="portlet-section-body,portlet-section-alternate"
headerClass="portlet-section-header" width="100%">
+<h:dataTable value="#{useradministrationbean.pendingUsers}"
var="user" rowClasses="portlet-section-body,portlet-section-alternate"
headerClass="portlet-section-header" styleClass="datatable"
width="100%">
 	<h:column>
 		<h:selectBooleanCheckbox id="selected" value="#{user.selected}"
/>
 	</h:column>

Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml	2007-11-29
17:49:34 UTC (rev 9203)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml	2007-11-29
18:46:29 UTC (rev 9204)
@@ -35,7 +35,7 @@
 	</h:form>
 	<br/>
 	<h:form>
-	<h:dataTable id="userlist"
value="#{useradministrationbean.userList}" var="uiUser"
rendered="#{useradministrationbean.userList.rowCount > 0}"
rows="#{useradministrationbean.limit}"
rowClasses="portlet-section-body,portlet-section-alternate"
headerClass="portlet-section-header" width="100%">
+	<h:dataTable id="userlist"
value="#{useradministrationbean.userList}" var="uiUser"
rendered="#{useradministrationbean.userList.rowCount > 0}"
rows="#{useradministrationbean.limit}"
rowClasses="portlet-section-body,portlet-section-alternate"
headerClass="portlet-section-header" styleClass="datatable"
width="100%">
 	<h:column>
 		<f:facet name="header">
 			<h:outputText value="#{bundle.IDENTITY_USERNAME}"/>

Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml	2007-11-29
17:49:34 UTC (rev 9203)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml	2007-11-29
18:46:29 UTC (rev 9204)
@@ -6,10 +6,10 @@
    xmlns:c="http://java.sun.com/jstl/core"
    class="identity-ui">
 
-	<f:loadBundle var="bundle" basename="conf.bundles.Identity"
/>
+   <f:loadBundle var="bundle" basename="conf.bundles.Identity"
/>
 <c:choose>
-	<c:when test="#{configurationbean.validConfiguration}">
-	<h:form>
+   <c:when test="#{configurationbean.validConfiguration}">
+   <h:form>
       <ul class="topnav">
          <li id="currentTab"><h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}"/></li>
          <li>
@@ -17,24 +17,28 @@
          </li>
       </ul>
    </h:form>
-   
+
+
 <ui:decorate template="/WEB-INF/jsf/common/tabContainer.xhtml">
-	<ui:define name="tab-container-content">
-	<!-- Title -->
-	<h:form>
-	<ul class="objectpath">
-		<ui:insert name="title"><li>Title</li></ui:insert>
-	</ul>
-	</h:form>
-	<br/>
+
+   <ui:define name="tab-object-path">
+   <!-- Title -->
+   <h:form>
+   <ul class="objectpath">
+      <ui:insert
name="title"><li>Title</li></ui:insert>
+   </ul>
+   </h:form>
+   </ui:define>
+   <ui:define name="tab-container-content">
+   <br/>
    <!-- Content -->
    <ui:insert name="content">Content</ui:insert>
-   
+
    </ui:define>
 </ui:decorate>
-	</c:when>
-	<c:otherwise>
-		<span class="portlet-msg-error"><h:outputText
value="#{bundle.IDENTITY_APPLICATION_NOT_AVAILABLE}" /></span>
-   	</c:otherwise>
+   </c:when>
+   <c:otherwise>
+      <span class="portlet-msg-error"><h:outputText
value="#{bundle.IDENTITY_APPLICATION_NOT_AVAILABLE}" /></span>
+      </c:otherwise>
 </c:choose>
 </div>

Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml	2007-11-29
17:49:34 UTC (rev 9203)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml	2007-11-29
18:46:29 UTC (rev 9204)
@@ -21,7 +21,7 @@
 	<c:if test="#{show_roles == true}">
 	<!-- assigned roles -->
 	<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_ASSIGNED}" />
-	<h:dataTable id="roleslist" value="#{manager.roles}"
var="role">
+	<h:dataTable id="roleslist" value="#{manager.roles}"
var="role" styleClass="datatable">
 		<h:column>
 			<h:outputText value="#{role}"/>
 		</h:column>

Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/tabContainer.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/tabContainer.xhtml	2007-11-29
17:49:34 UTC (rev 9203)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/tabContainer.xhtml	2007-11-29
18:46:29 UTC (rev 9204)
@@ -4,7 +4,10 @@
    xmlns:ui="http://java.sun.com/jsf/facelets">
 
    <div class="tab-container">
+      <ui:insert name="tab-object-path"/>
+      <div class="content-container">
       <ui:insert name="tab-container-content"/>
+      </div>
    </div>
 
 </ui:composition>
\ No newline at end of file

Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml	2007-11-29
17:49:34 UTC (rev 9203)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml	2007-11-29
18:46:29 UTC (rev 9204)
@@ -23,14 +23,16 @@
       </ul>
    </h:form>
 	<ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml">
-	<ui:define name="tab-container-content">
-	<!-- Title -->
+
+	<ui:define name="tab-object-path"><!-- Title -->
 	<ul class="objectpath">
 		<li class="selected">
 			<ui:insert name="title">Title</ui:insert>
 		</li>
 	</ul>
-	<br/>
+      </ui:define>
+      <ui:define name="tab-container-content">
+   <br/>
    <!-- Content -->
    <ui:insert name="content">Content</ui:insert>
    	</ui:define>

Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml	2007-11-29
17:49:34 UTC (rev 9203)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml	2007-11-29
18:46:29 UTC (rev 9204)
@@ -19,14 +19,16 @@
 		</ul>
 	</h:form>
 	<ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml">
-		<ui:define name="tab-container-content">
+		<ui:define name="tab-object-path">
 		<!-- Title -->
 		<h:form>
 		<ul class="objectpath">
 			<ui:insert name="title">Title</ui:insert>
 		</ul>
 		</h:form>
-		<br/>
+      </ui:define>
+         <ui:define name="tab-container-content">
+      <br/>
 		<!-- Content -->
 		<ui:insert name="content">Content</ui:insert>
 		</ui:define>

Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml	2007-11-29
17:49:34 UTC (rev 9203)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml	2007-11-29
18:46:29 UTC (rev 9204)
@@ -18,14 +18,16 @@
       </ul>
    </h:form>
 	<ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml">
-	<ui:define name="tab-container-content">
+	<ui:define name="tab-object-path">
 	<!-- Title -->
 	<ul class="objectpath">
 		<li class="selected">
 			<ui:insert name="title">Title</ui:insert>
 		</li>
 	</ul>
-	<br/>
+      </ui:define>
+      <ui:define name="tab-container-content">
+   <br/>
    <!-- Content -->
    <ui:insert name="content">Content</ui:insert>
    	</ui:define>

Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml	2007-11-29
17:49:34 UTC (rev 9203)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml	2007-11-29
18:46:29 UTC (rev 9204)
@@ -27,14 +27,16 @@
       </ul>
    </h:form>
 	<ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml">
-	<ui:define name="tab-container-content">
+	<ui:define name="tab-object-path">
 	<!-- Title -->
 	<ul class="objectpath">
 		<li class="selected">
 			<ui:insert name="title">Title</ui:insert>
 		</li>
 	</ul>
-	<br/>
+      </ui:define>
+      <ui:define name="tab-container-content">
+   <br/>
    <!-- Content -->
    <ui:insert name="content">Content</ui:insert>
    	</ui:define>

Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml	2007-11-29
17:49:34 UTC (rev 9203)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml	2007-11-29
18:46:29 UTC (rev 9204)
@@ -27,15 +27,18 @@
 			</ul>
 		</h:form>
 	<ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml">
-	<ui:define name="tab-container-content">
-		<!-- Title -->
+
+      <ui:define name="tab-object-path">
+      <!-- Title -->
 		<ul class="objectpath">
 			<li class="selected">
 				<ui:insert name="title">Title</ui:insert>
 			</li>
 		</ul>
-		<br/>
-		<!-- Content -->
+
+      </ui:define>
+      <ui:define name="tab-container-content"><br/>
+      <!-- Content -->
 		<ui:insert name="content">Content</ui:insert>
    	</ui:define>
    	</ui:decorate>


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

[portal-commits] JBoss Portal SVN: r9204 - in branches/JBoss_Portal_Branch_2_6: core-admin/src/resources/portal-admin-war/WEB-INF/jsf and 11 other directories.