JBoss Portal SVN: r8345 - in branches/JBoss_Portal_Branch_2_6/core-identity/src: bin/portal-identity-war/img and 12 other directories.
by portal-commits@lists.jboss.org
Author: emuckenhuber
Date: 2007-09-18 18:59:23 -0400 (Tue, 18 Sep 2007)
New Revision: 8345
Added:
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Add.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_CreateInstance.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Delete.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Details.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_IsDefault.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Layout.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_MakeDefault.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_MoveDown.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_MoveUp.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Properties.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Rename.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Security.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Theme.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/msgIcon_Warning.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/objectPath_Arrow.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/pathBackground.png
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/pathSeparator.png
Removed:
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Add.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_CreateInstance.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Delete.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Details.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_IsDefault.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Layout.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_MakeDefault.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_MoveDown.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_MoveUp.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Properties.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Rename.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Security.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Theme.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/msgIcon_Warning.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/objectPath_Arrow.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/pathBackground.png
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/pathSeparator.png
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/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml
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/createRole.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/deleteRole.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.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/changePassword.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/createUser.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.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/registerConfirm.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.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/lostPassword/lostTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.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/overview.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:
- updated UI regarding core-admin css changes
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img (from rev 8342, trunk/core-identity/src/bin/portal-identity-war/img)
Deleted: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Add.gif
===================================================================
(Binary files differ)
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Add.gif (from rev 8342, trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Add.gif)
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_CreateInstance.gif
===================================================================
(Binary files differ)
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_CreateInstance.gif (from rev 8342, trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_CreateInstance.gif)
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Delete.gif
===================================================================
(Binary files differ)
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Delete.gif (from rev 8342, trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Delete.gif)
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Details.gif
===================================================================
(Binary files differ)
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Details.gif (from rev 8342, trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Details.gif)
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_IsDefault.gif
===================================================================
(Binary files differ)
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_IsDefault.gif (from rev 8342, trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_IsDefault.gif)
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Layout.gif
===================================================================
(Binary files differ)
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Layout.gif (from rev 8342, trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Layout.gif)
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_MakeDefault.gif
===================================================================
(Binary files differ)
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_MakeDefault.gif (from rev 8342, trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_MakeDefault.gif)
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_MoveDown.gif
===================================================================
(Binary files differ)
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_MoveDown.gif (from rev 8342, trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_MoveDown.gif)
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_MoveUp.gif
===================================================================
(Binary files differ)
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_MoveUp.gif (from rev 8342, trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_MoveUp.gif)
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Properties.gif
===================================================================
(Binary files differ)
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Properties.gif (from rev 8342, trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Properties.gif)
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Rename.gif
===================================================================
(Binary files differ)
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Rename.gif (from rev 8342, trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Rename.gif)
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Security.gif
===================================================================
(Binary files differ)
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Security.gif (from rev 8342, trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Security.gif)
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Theme.gif
===================================================================
(Binary files differ)
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/actionIcon_Theme.gif (from rev 8342, trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Theme.gif)
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/msgIcon_Warning.gif
===================================================================
(Binary files differ)
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/msgIcon_Warning.gif (from rev 8342, trunk/core-identity/src/bin/portal-identity-war/img/msgIcon_Warning.gif)
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/objectPath_Arrow.gif
===================================================================
(Binary files differ)
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/objectPath_Arrow.gif (from rev 8342, trunk/core-identity/src/bin/portal-identity-war/img/objectPath_Arrow.gif)
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/pathBackground.png
===================================================================
(Binary files differ)
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/pathBackground.png (from rev 8342, trunk/core-identity/src/bin/portal-identity-war/img/pathBackground.png)
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/pathSeparator.png
===================================================================
(Binary files differ)
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/pathSeparator.png (from rev 8342, trunk/core-identity/src/bin/portal-identity-war/img/pathSeparator.png)
===================================================================
(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-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/style.css 2007-09-18 22:59:23 UTC (rev 8345)
@@ -1,5 +1,15 @@
/* Redefine spacing for tables. */
+a {
+ color: #446688;
+ text-decoration: none;
+}
+
+a:hover {
+ color: #5078aa;
+ text-decoration: underline;
+}
+
.identity-ui table {
border: 0;
}
@@ -30,14 +40,12 @@
list-style-type: none;
display: inline;
margin-right: 2px;
- border: 1px solid;
}
.identity-ui ul.pagination li.selected {
font-weight: bold;
background-color: #eef;
- border: 1px solid black;
- border-bottom: 3px solid black;
+ border-bottom: 2px solid #656565;
}
.pagination a, .pagination a:visited, .pagination a:hover {
@@ -78,20 +86,59 @@
/* Object path. */
.identity-ui ul.objectpath {
- margin: 0;
- padding: 5px 0px 5px 0px;
+ list-style-type: none;
+ font-size: 11px;
+ border: solid 1px #bbb;
+ border-left: solid 1px #eee;
+ border-right: solid 1px #eee;
+ background-color: #d5d5d5;
+ background-image: url( img/pathBackground.png );
+ background-position: left;
+ background-repeat: repeat-x;
+ height: 21px;
+ margin: 0px;
+ padding: 0px;
+ padding-left: 2px;
}
.identity-ui ul.objectpath li {
list-style-type: none;
- display: inline;
- margin-right: 3px;
+ display: block;
+ float: left;
}
+.identity-ui ul li.pathItem {
+ padding-top: 4px;
+ padding-left: 3px;
+ padding-right: 2px;
+}
+
+/*
+.identity-ui ul.li.pathSeparator {
+ background-image: url(img/pathSeparator.png);
+ background-position: center center;
+ background-repeat: no-repeat;
+ width: 7px;
+}
+*/
+
.identity-ui ul.objectpath li.selected {
font-weight: bold;
+ padding-top: 4px;
+ padding-left: 3px;
+ padding-right: 2px;
}
+.identity-ui ul.objectpath a {
+ color: #333333;
+ text-decoration: none;
+}
+
+.identity-ui ul.objectpath a:hover {
+ color: #5078aa;
+ text-decoration: none;
+}
+
/* Resize combo lists */
.identity-ui select {
padding: 2px 4px 2px 1px;
@@ -140,7 +187,7 @@
.identity-ui .portlet-area-body {
border: 1px solid #d5d5d5;
- border-top: 0;
+ border-top: 0px;
background-color: #fff;
padding: 4px;
margin: 0;
@@ -157,6 +204,170 @@
padding-left: 6px;
}
+.identity-ui h3.sectionTitle {
+ font-weight: bold;
+ color: #656565;
+ font-size: 11px;
+ border-top: 1px solid #999;
+ background-color: #ebf2f5;
+ padding: 2px;
+ padding-left: 4px;
+}
+
+.identity-ui .portlet-section-header {
+ background-image: url( img/pathBackground.png );
+ background-position: left;
+ background-repeat: repeat-x;
+ font-weight: bold;
+ color: #656565;
+ font-size: 10px;
+ border-top: 1px solid #ddd;
+ border-bottom: 1px solid #999;
+ padding-left: 4px;
+}
+
+.identity-ui .portlet-section-header th {
+ background-image: url( img/pathBackground.png );
+ background-position: left;
+ background-repeat: repeat-x;
+ font-weight: bold;
+ color: #656565;
+ font-size: 10px;
+ border-top: 1px solid #ddd;
+ border-bottom: 1px solid #999;
+ padding-left: 4px;
+}
+
+.identity-ui .portlet-section-body {
+ color: #656565;
+ border: 1px solid #d5d5d5;
+ border-top: 0px;
+}
+
+.identity-ui .portlet-section-alternate {
+ background-color: #F2F2F2;
+ border: 1px solid #d5d5d5;
+}
+
+.identity-ui .portlet-section-selected {
+ background-color: #CBD4E6;
+}
+
+.identity-ui .actionDetails {
+ background-image: url( img/actionIcon_Details.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ line-height: 14px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.identity-ui .actionLayout {
+ background-image: url( img/actionIcon_Layout.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ line-height: 14px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.identity-ui .actionSecurity {
+ background-image: url( img/actionIcon_Security.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ line-height: 14px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.identity-ui .actionProperties {
+ background-image: url( img/actionIcon_Properties.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ padding-left: 18px;
+ white-space: nowrap;
+ height: 22px;
+}
+
+.identity-ui .actionTheme {
+ background-image: url( img/actionIcon_Theme.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.identity-ui .actionRename {
+ background-image: url( img/actionIcon_Rename.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.identity-ui .actionDelete {
+ background-image: url( img/actionIcon_Delete.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.identity-ui .actionMakeDefault {
+ background-image: url( img/actionIcon_MakeDefault.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.identity-ui .actionDefault {
+ background-image: url( img/actionIcon_IsDefault.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.identity-ui .actionPreferences {
+ background-image: url( img/actionIcon_Properties.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.identity-ui .actionCreateInstance {
+ background-image: url( img/actionIcon_CreateInstance.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
.identity-ui .portlet-content-center {
padding: 0;
margin: 0;
@@ -211,6 +422,11 @@
clear: both;
}
+.identity-ui form {
+ padding: 0;
+ margin: 0;
+}
+
.identity-ui #selected.wizardStepBox {
background-color: #C8DCC4;
border: 1px solid black;
@@ -233,3 +449,40 @@
margin: 2px;
padding: 2px;
}
+
+.identity-ui .createObjectForm {
+ display: block;
+ padding: 1em 0 0 0;
+}
+
+.identity-ui .objectList {
+ width: 100%;
+}
+
+.identity-ui .objectList .objectNameColumn {
+ width: 25%;
+}
+
+.identity-ui .objectList .objectActionColumn {
+ width: 75%;
+}
+
+.identity-ui .portlet-msg {
+ border: 1px solid #bbb;
+ margin: 2em auto;
+ padding: 1em;
+ width: 60%;
+}
+
+.identity-ui .portlet-msg-body {
+ position: relative;
+ top: -3em;
+ left: 3em;
+ width: 95%;
+}
+
+.identity-label {
+ padding: 0 4px 3px 0;
+ display: inline-block;
+ vertical-align: middle;
+}
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java 2007-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java 2007-09-18 22:59:23 UTC (rev 8345)
@@ -88,12 +88,13 @@
if (this.configuration.enableWorkflow())
{
this.workflowService = this.getWorkflowService();
+ if (this.workflowService == null)
+ throw new CoreIdentityConfigurationException("Workflowservice must not be null.");
String subscriptionMode = this.configuration.getSubscriptionMode();
String adminSubscriptionMode = this.configuration.getAdminSubscriptionMode();
String emailValidationProcess = IdentityConstants.jbp_identity_validate_email_process_name;
- if ( workflowService != null
- && subscriptionMode != null
+ if ( subscriptionMode != null
&& adminSubscriptionMode != null
&& emailValidationProcess != null)
{
@@ -106,7 +107,7 @@
}
else
{
- throw new CoreIdentityConfigurationException("WorkflowService or processName must not be null.");
+ throw new CoreIdentityConfigurationException("processName must not be null.");
}
}
else
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java 2007-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java 2007-09-18 22:59:23 UTC (rev 8345)
@@ -208,8 +208,6 @@
String hash = (String) processInstance.getContextInstance().getVariable(IdentityConstants.VALIDATION_HASH);
if (registrationHash.equals(hash) && ! processInstance.hasEnded())
{
- String action = (String) processInstance.getContextInstance().getVariable(IdentityConstants.ACTION);
-
token.signal(IdentityConstants.JBPM_TRANSITION_VALIDATED);
success = processInstance.getProcessDefinition().getName();
}
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java 2007-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java 2007-09-18 22:59:23 UTC (rev 8345)
@@ -27,12 +27,15 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.ResourceBundle;
import java.util.Set;
+import javax.faces.application.FacesMessage;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.model.ListDataModel;
+import org.jboss.logging.Logger;
import org.jboss.portal.core.identity.ui.IdentityUIUser;
import org.jboss.portal.core.identity.ui.UIRole;
import org.jboss.portal.core.identity.ui.common.IdentityRoleBean;
@@ -66,6 +69,9 @@
/** . */
private IdentityRoleBean identityRoleBean;
+
+ /** The logger */
+ private static final Logger log = Logger.getLogger(RoleManagementBean.class);
public IdentityRoleBean getIdentityRoleBean()
{
@@ -127,8 +133,7 @@
}
catch (IdentityException e)
{
- // FIXME
- e.printStackTrace();
+ log.error("", e);
}
Iterator i = set.iterator();
while (i.hasNext())
@@ -153,8 +158,10 @@
}
catch ( Exception e)
{
- e.printStackTrace();
- // FacesMessage
+ log.error("", e);
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
+ ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE")));
+ return "roleAdmin";
}
return "viewMembers";
}
@@ -163,6 +170,7 @@
{
Set members = new HashSet();
List roleMembers = new ArrayList();
+ FacesContext ctx = FacesContext.getCurrentInstance();
try
{
int intLimit = Integer.valueOf(limit).intValue();
@@ -172,7 +180,9 @@
}
catch (Exception e)
{
- e.printStackTrace();
+ log.error("", e);
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
+ ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE")));
}
Iterator i = members.iterator();
while (i.hasNext())
@@ -184,7 +194,9 @@
}
catch (Exception e)
{
- e.printStackTrace();
+ log.error("", e);
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
+ ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ERROR_ACTION_USER")));
}
}
return new ListDataModel(roleMembers);
@@ -205,8 +217,10 @@
}
catch (Exception e)
{
- e.printStackTrace();
- // FacesMessage
+ log.error("", e);
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
+ ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE")));
+ return "roleAdmin";
}
}
@@ -224,7 +238,10 @@
}
catch (Exception e)
{
- e.printStackTrace();
+ log.error("", e);
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale());
+ FacesContext.getCurrentInstance().addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE")));
+ return "roleAdmin";
}
return "roleAdmin";
}
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-09-18 22:59:23 UTC (rev 8345)
@@ -27,12 +27,14 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.ResourceBundle;
+import javax.faces.application.FacesMessage;
+import javax.faces.application.FacesMessage.Severity;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.model.DataModel;
import javax.faces.model.ListDataModel;
-import javax.portlet.PortletException;
import org.jboss.logging.Logger;
import org.jboss.portal.core.identity.services.IdentityConstants;
@@ -41,8 +43,6 @@
import org.jboss.portal.core.identity.ui.IdentityUIUser;
import org.jboss.portal.core.identity.ui.common.IdentityRoleBean;
import org.jboss.portal.core.identity.ui.common.IdentityUserBean;
-import org.jboss.portal.identity.IdentityException;
-import org.jboss.portal.identity.NoSuchUserException;
import org.jboss.portal.identity.User;
/**
@@ -74,6 +74,12 @@
private String displayNode = IdentityConstants.JBPM_NODE_APPROVAL;
/** . */
+ private String subscriptionMode;
+
+ /** . */
+ private String adminSubscriptionMode;
+
+ /** . */
private List pendingUsers = null;
/** . */
@@ -159,7 +165,27 @@
{
this.uiUser = uiUser;
}
-
+
+ public String getSubscriptionMode()
+ {
+ return subscriptionMode;
+ }
+
+ public void setSubscriptionMode(String subscriptionMode)
+ {
+ this.subscriptionMode = subscriptionMode;
+ }
+
+ public String getAdminSubscriptionMode()
+ {
+ return adminSubscriptionMode;
+ }
+
+ public void setAdminSubscriptionMode(String adminSubscriptionMode)
+ {
+ this.adminSubscriptionMode = adminSubscriptionMode;
+ }
+
public IdentityUserBean getIdentityUserBean()
{
return identityUserBean;
@@ -211,21 +237,12 @@
int limit1 = intLimit + 1;
this.userList = new ListDataModel(identityUserBean.findUsersFilteredByUserName(searchString, offset, limit1));
}
- catch (IllegalArgumentException e)
+ catch (Exception e)
{
- // FIXME
- e.printStackTrace();
+ log.error("",e);
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale());
+ FacesContext.getCurrentInstance().addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ERROR_ACTION_USER")));
}
- catch (NoSuchUserException e)
- {
- // FIXME
- e.printStackTrace();
- }
- catch (IdentityException e)
- {
- // FIXME
- e.printStackTrace();
- }
}
return "searchUsers";
}
@@ -262,9 +279,12 @@
catch (Exception e)
{
log.error("unable to get user: " + this.currentUser, e);
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
+ ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ERROR_ACTION_USER")));
return "userAdmin";
}
// Updating search
+ ctx.addMessage("status", new FacesMessage("user enabled"));
return this.searchUsers();
}
return "searchUsers";
@@ -286,6 +306,8 @@
catch (Exception e)
{
log.error("", e);
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale());
+ FacesContext.getCurrentInstance().addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ERROR_ACTION_USER")));
}
}
return userCount;
@@ -323,6 +345,8 @@
catch (Exception e)
{
log.error("unable delete user.", e);
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale());
+ FacesContext.getCurrentInstance().addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ERROR_ACTION_USER")));
}
return "userAdmin";
}
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-18 22:59:23 UTC (rev 8345)
@@ -128,14 +128,26 @@
IDENTITY_MANAGEMENT_PENDING_APPROVE=approve
IDENTITY_MANAGEMENT_PENDING_REJECT=reject
+IDENTITY_MANAGEMENT_SUBSCRIPTION_MODE=Subscription mode
+IDENTITY_MANAGEMENT_SUBSCRIPTION_ADMIN_MODE=Admin subscription mode
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM=Custom subscription mode.
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC=Automatic - no e-mail validation, no admin approval.
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL=E-Mail validation, no admin approval.
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN= E-Mail validation and admin approval.
+
IDENTITY_REGISTER_VERIFY_CAPTCHA=Verify captcha
-IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=Confirmation: Delete
+IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=Confirmation: Delete
+IDENTITY_WARNING_CONFIRM_DELETE_USER=Warning! You are about to delete the user
+IDENTITY_WARNING_CONFIRM_DELETE_ROLE=Warning! You are about to delete the role
IDENTITY_REGISTER_CONFIRMATIONEMAIL=Confirm your subscription
IDENTITY_MAIL_SUBJECT_LOST_PASSWORD=Reset your password
IDENTITY_MAIL_SUBJECT_REGISTER=Confirm registration
IDENTITY_MAIL_SUBJECT_CHANGE_EMAIL=Confirm email address
+IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE=Unable to perform action on role. Please take a look at the logfile for further information.
+IDENTITY_MANAGEMENT_ERROR_ACTION_USER=Unable to perform action on user. Please take a look at the logfile for further information.
+
IDENTITY_VERIFICATION_RETURN=Return to portal
IDENTITY_VERIFICATION_LOGIN=Login
IDENTITY_VERIFICATION_STATUS_FAILED=Can not validate the e-mail address.
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -117,6 +117,14 @@
<managed-bean-class>org.jboss.portal.core.identity.ui.admin.UserAdministrationBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
+ <property-name>subscriptionMode</property-name>
+ <value>#{applicationScope.IdentityUIConfigurationService.configuration.subscriptionMode}</value>
+ </managed-property>
+ <managed-property>
+ <property-name>adminSubscriptionMode</property-name>
+ <value>#{applicationScope.IdentityUIConfigurationService.configuration.adminSubscriptionMode}</value>
+ </managed-property>
+ <managed-property>
<property-name>identityUserBean</property-name>
<value>#{identityusermgr}</value>
</managed-property>
@@ -305,7 +313,7 @@
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/admin/index.xhtml</from-view-id>
+ <from-view-id>/WEB-INF/jsf/admin/*</from-view-id>
<navigation-case>
<from-outcome>searchUsers</from-outcome>
<to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2007-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -9,17 +9,14 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" />
- <h:outputText value="#{assignrolemgr.uiUser.username}" />
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" />
+ <h:outputText value="#{assignrolemgr.uiUser.username}" />
+ </li>
</ui:define>
<ui:define name="content">
@@ -29,7 +26,7 @@
</h:selectManyCheckbox>
<hr/>
<p style="text-align: right;">
- <h:commandButton id="cancel" action="userAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
+ <h:commandButton id="cancel" action="searchUsers" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
<h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{assignrolemgr.updateRoles}" styleClass="portlet-form-button"/>
</p>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml 2007-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -9,19 +9,17 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
- </li>
- <li>
- > <h:commandLink action="#{editprofilemgr.viewStart}" value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/>
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" />
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="pathItem">
+ <h:commandLink action="#{editprofilemgr.viewStart}" value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/>
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" />
+ </li>
</ui:define>
<ui:define name="content">
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-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -8,14 +8,14 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
- <ul class="objectpath">
- <li>
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
- </li>
- </ul>
+ <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"
+ fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
<h:form>
<ul>
<li><h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}" action="searchUsers"/></li>
@@ -27,16 +27,66 @@
<li><h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_CREATE_USER}" action="createUser"/></li>
</ul>
</h:form>
- <hr/>
- <h:panelGrid columns="2">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS}"/>
- <h:outputText value="#{useradministrationbean.userCount}" />
- <c:if test="#{useradministrationbean.pendingCount > 0}">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_COUNT_PENDING_USERS}" />
- <h:outputText value="#{useradministrationbean.pendingCount}" />
- </c:if>
- </h:panelGrid>
+ <table style="width: 100%;">
+ <tr>
+ <td colspan="2"><h3 class="sectionTitle">statistics</h3></td>
+ </tr>
+ <tr>
+ <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>
+ <td><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_COUNT_PENDING_USERS}" /></td>
+ <td><h:outputText value="#{useradministrationbean.pendingCount}" /></td>
+ </tr>
+ </c:if>
+ <tr>
+ <td colspan="2"><h3 class="sectionTitle">subscription modes</h3></td>
+ </tr>
+ <tr>
+ <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>
+ <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/createRole.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2007-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -9,16 +9,13 @@
<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml">
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_CREATE_ROLE}"/>
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_CREATE_ROLE}"/>
+ </li>
</ui:define>
<ui:define name="content">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/deleteRole.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/deleteRole.xhtml 2007-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/deleteRole.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -10,35 +10,39 @@
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM_DELETE}" />
- <h:outputText value="#{rolemanagementbean.uiRole.name}"/>
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="pathItem">
+ <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM_DELETE}" />
+ </li>
+ <li class="selected">
+ <h:outputText value="#{rolemanagementbean.uiRole.name}"/>
+ </li>
</ui:define>
<ui:define name="content">
-
-<h:form>
- <h:panelGrid columns="2">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE}"/>
- <h:outputText id="rolename" value="#{rolemanagementbean.uiRole.name}"/>
-
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_DISPLAY}"/>
- <h:outputText id="displayName" value="#{rolemanagementbean.uiRole.displayName}"/>
- </h:panelGrid>
- <h:messages />
- <hr/>
- <p style="text-align: right;">
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="roleAdmin" styleClass="portlet-form-button"/>
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{rolemanagementbean.confirmedDelete}" styleClass="portlet-form-button"/>
- </p>
-</h:form>
+ <div class="portlet-msg">
+ <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div>
+ <div class="portlet-msg-body">
+ <h3>
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_DELETE}" />
+ <h:outputText id="rolename" value="#{rolemanagementbean.uiRole.name}"/>
+ <h:outputText value="(#{rolemanagementbean.uiRole.displayName})" />
+ </h3>
+ <p class="portlet-msg-alert">
+ #{bundle.IDENTITY_WARNING_CONFIRM_DELETE_ROLE}
+ #{rolemanagementbean.uiRole.name}
+ </p>
+ <h:form>
+ <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="roleAdmin"
+ styleClass="portlet-form-button portlet-section-buttonrow" />
+
+ <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{rolemanagementbean.confirmedDelete}"
+ styleClass="portlet-form-button portlet-section-buttonrow" />
+ </h:form>
+</div>
+</div>
</ui:define>
</ui:composition>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -9,16 +9,13 @@
<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml">
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}"/>
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}"/>
+ </li>
</ui:define>
<ui:define name="content">
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-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -9,20 +9,21 @@
<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml">
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MEMBERS}"/>: <h:outputText value="#{rolemanagementbean.uiRole.name}"/>
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="pathItem">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MEMBERS}"/>
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{rolemanagementbean.uiRole.name}"/>
+ </li>
</ui:define>
<ui:define name="content">
-<hr/>
+
<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:column>
@@ -53,11 +54,11 @@
<f:facet name="header">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION}"/>
</f:facet>
- <h:commandLink action="#{editprofilemgr.adminEditProfile}">
+ <h:commandLink action="#{editprofilemgr.adminEditProfile}" styleClass="actionRename">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE}"/>
<f:param name="currentUser" value="#{uiUser.username}"/>
</h:commandLink> |
- <h:commandLink action="#{assignrolemgr.assignRoles}">
+ <h:commandLink action="#{assignrolemgr.assignRoles}" styleClass="actionDelete">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_ROLES}"/>
<f:param name="currentUser" value="#{uiUser.username}"/>
</h:commandLink>
@@ -67,6 +68,7 @@
<h:commandLink value=" < " action="#{rolemanagementbean.prevPage}" rendered="#{rolemanagementbean.page > 1}" styleClass="portlet-form-button"/>
<h:commandLink value=" > " action="#{rolemanagementbean.nextPage}" rendered="#{rolemanagementbean.roleMembers.rowCount > rolemanagementbean.limit}" styleClass="portlet-form-button"/>
<br/>
+<hr/>
<h:form>
<h4><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/></h4>
<h:panelGrid columns="3">
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-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -18,8 +18,13 @@
</h:form>
<!-- Title -->
- <h4><ui:insert name="title">Title</ui:insert></h4>
-
+ <h:form>
+ <ul class="objectpath">
+ <ui:insert name="title">Title</ui:insert>
+ </ul>
+ </h:form>
+
+ <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-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -8,14 +8,16 @@
<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml">
<ui:define name="title">
- <ul class="objectpath">
- <li>
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
- </li>
- </ul>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ </li>
</ui:define>
<ui:define name="content">
+ <h:messages id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
+ fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
+ <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:column>
@@ -35,14 +37,14 @@
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION}"/>
</f:facet>
<h:commandLink action="#{editrolemgr.editRole}">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}"/>
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}" styleClass="actionRename"/>
<f:param name="currentRole" value="#{role.name}"/>
</h:commandLink>
- | <h:commandLink action="#{rolemanagementbean.viewRoleMembers}">
+ | <h:commandLink action="#{rolemanagementbean.viewRoleMembers}" styleClass="actionPreferences">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MEMBERS}"/>
<f:param name="currentRole" value="#{role.name}"/>
</h:commandLink>
- | <h:commandLink action="#{rolemanagementbean.deleteRole}">
+ | <h:commandLink action="#{rolemanagementbean.deleteRole}" styleClass="actionDelete">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_DELETE}"/>
<f:param name="currentRole" value="#{role.name}"/>
</h:commandLink>
@@ -50,6 +52,7 @@
</h:dataTable>
</h:form>
+ <hr/>
<h:form>
<p style="text-align: right"><h:commandLink value="Create new role" action="createRole"/></p>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2007-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -10,20 +10,17 @@
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD_FOR_USER}" />
- <h:outputText value="#{editprofilemgr.currentUser}" />
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD_FOR_USER}" />
+ <h:outputText value="#{editprofilemgr.currentUser}" />
+ </li>
</ui:define>
<ui:define name="content">
-
+<br/>
<h:form>
<h:panelGrid columns="3" cellpadding="3">
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-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -9,20 +9,22 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
- </li>
- <li>
- > <h:commandLink action="revise" value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" />
- > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" rendered="#{useradministrationbean.pendingUserAction == 'approve'}" />
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" rendered="#{useradministrationbean.pendingUserAction == 'reject'}" />
- </li>
- </ul>
-</h:form>
+
+ <li class="pathItem">
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="pathItem">
+ <h:commandLink action="revise" value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" rendered="#{useradministrationbean.pendingUserAction == 'approve'}" />
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" rendered="#{useradministrationbean.pendingUserAction == 'reject'}" />
+ </li>
</ui:define>
<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:column>
@@ -55,6 +57,7 @@
</h:outputText>
</h:column>
</h:dataTable>
+<br/>
<p style="text-align: right;">
<h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="revise" styleClass="portlet-form-button"/>
<h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" action="#{useradministrationbean.confirmPendingAction}" styleClass="portlet-form-button" rendered="#{useradministrationbean.pendingUserAction == 'approve'}" />
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml 2007-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -9,16 +9,13 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE}" />
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE}" />
+ </li>
</ui:define>
<ui:define name="content">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml 2007-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -10,35 +10,39 @@
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM_DELETE}" />
- <h:outputText value="#{useradministrationbean.uiUser.username}"/>
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="pathItem">
+ <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM_DELETE}" />
+ </li>
+ <li class="selected">
+ <h:outputText value="#{useradministrationbean.uiUser.username}"/>
+ </li>
</ui:define>
<ui:define name="content">
-
-<h:form>
- <h:panelGrid columns="2">
- <h:outputText for="username" value="#{bundle.IDENTITY_USERNAME}"/>
- <h:outputText id="username" value="#{useradministrationbean.uiUser.username}"/>
-
- <h:outputText for="email" value="#{bundle.IDENTITY_EMAIL}"/>
- <h:outputText id="email" value="#{useradministrationbean.uiUser.attribute.email}"/>
- </h:panelGrid>
- <h:messages />
- <hr/>
- <p style="text-align: right;">
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="userAdmin" styleClass="portlet-form-button"/>
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{useradministrationbean.confirmedDelete}" styleClass="portlet-form-button"/>
- </p>
-</h:form>
+ <div class="portlet-msg">
+ <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div>
+ <div class="portlet-msg-body">
+ <h3>
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_DELETE}" />
+ <h:outputText value="#{useradministrationbean.uiUser.username}" />
+ <h:outputText value="(#{useradministrationbean.uiUser.attribute.email})" />
+ </h3>
+ <p class="portlet-msg-alert">
+ #{bundle.IDENTITY_WARNING_CONFIRM_DELETE_USER}
+ #{useradministrationbean.uiUser.username}
+ </p>
+ <h:form>
+ <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="searchUsers"
+ styleClass="portlet-form-button portlet-section-buttonrow" />
+
+ <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{useradministrationbean.confirmedDelete}"
+ styleClass="portlet-form-button portlet-section-buttonrow" />
+ </h:form>
+</div>
+</div>
</ui:define>
</ui:composition>
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-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -9,16 +9,13 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" />
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" />
+ </li>
</ui:define>
<ui:define name="content">
@@ -42,6 +39,7 @@
// ]]>
</script>
</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:column>
@@ -78,19 +76,20 @@
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION}"/>
</f:facet>
<h:outputText value="Pending" rendered="#{user.currentNode == 'validate_email'}"/>
- <h:commandLink action="#{useradministrationbean.approveRegistration}" rendered="#{user.currentNode == 'admin_approval'}">
+ <h:commandLink action="#{useradministrationbean.approveRegistration}" rendered="#{user.currentNode == 'admin_approval'}" styleClass="actionDefault">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_APPROVE}"/>
<f:param name="processId" value="#{user.processId}" />
<f:param name="action" value="approve" />
</h:commandLink>
<h:outputText value=" | " rendered="#{user.currentNode == 'admin_approval'}" />
- <h:commandLink action="#{useradministrationbean.approveRegistration}" rendered="#{user.currentNode == 'admin_approval'}">
+ <h:commandLink action="#{useradministrationbean.approveRegistration}" rendered="#{user.currentNode == 'admin_approval'}" styleClass="actionMakeDefault">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REJECT}"/>
<f:param name="processId" value="#{user.processId}" />
<f:param name="action" value="reject" />
</h:commandLink>
</h:column>
</h:dataTable>
+<br/>
<table border="0" cellspacing="3" style="width: 100%;" >
<tr>
<td style="text-align: left;" >
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml 2007-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -10,16 +10,13 @@
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM}" />
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM}" />
+ </li>
</ui:define>
<ui:define name="content">
<ui:decorate template="/WEB-INF/jsf/common/confirm.xhtml">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -9,20 +9,18 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" />
- <h:outputText value="#{userregistermgr.uiUser.username}" />
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" />
+ <h:outputText value="#{userregistermgr.uiUser.username}" />
+ </li>
</ui:define>
<ui:define name="content">
+<br/>
<h:form>
<h:selectManyCheckbox id="roles" value="#{userregistermgr.roles}">
<f:selectItems value="#{identityrolemgr.roleSelectItems}" />
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -9,17 +9,14 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER} " />
- <h:outoutText value="#{editprofilemgr.uiUser.username}" />
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER} " />
+ <h:outoutText value="#{editprofilemgr.uiUser.username}" />
+ </li>
</ui:define>
<ui:define name="content">
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-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -9,18 +9,17 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/>
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/>
+ </li>
</ui:define>
+
<ui:define name="content">
+ <br/>
<h:form>
<h:panelGrid columns="4">
<h:inputText id="searchString" value="#{useradministrationbean.searchString}" />
@@ -35,7 +34,7 @@
<h:message for="limit" />
</h:panelGrid>
</h:form>
- <hr/>
+ <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:column>
@@ -74,20 +73,20 @@
<f:facet name="header">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION}"/>
</f:facet>
- <h:commandLink action="#{editprofilemgr.adminEditProfile}">
+ <h:commandLink action="#{editprofilemgr.adminEditProfile}" styleClass="actionRename">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE}"/>
<f:param name="currentUser" value="#{uiUser.username}"/>
</h:commandLink> |
- <h:commandLink action="#{assignrolemgr.assignRoles}">
+ <h:commandLink action="#{assignrolemgr.assignRoles}" styleClass="actionProperties">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_ROLES}"/>
<f:param name="currentUser" value="#{uiUser.username}"/>
</h:commandLink> |
- <h:commandLink action="#{useradministrationbean.enableUser}">
+ <h:commandLink action="#{useradministrationbean.enableUser}" styleClass="#{uiUser.attribute.enabled == true ? 'actionDefault' : 'actionMakeDefault'}">
<h:outputText value="#{uiUser.attribute.enabled == true ? bundle.IDENTITY_MANAGEMENT_DISABLE : bundle.IDENTITY_MANAGEMENT_ENABLE}" />
<f:param name="currentUser" value="#{uiUser.username}"/>
<f:param name="enableAction" value="#{uiUser.attribute.enabled == true ? 'disable' : 'enable'}" />
</h:commandLink> |
- <h:commandLink action="#{useradministrationbean.deleteUser}">
+ <h:commandLink action="#{useradministrationbean.deleteUser}" styleClass="actionDelete">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_DELETE}"/>
<f:param name="currentUser" value="#{uiUser.username}"/>
</h:commandLink>
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-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -18,8 +18,12 @@
</h:form>
<!-- Title -->
- <h4><ui:insert name="title">Title</ui:insert></h4>
-
+ <h:form>
+ <ul class="objectpath">
+ <ui:insert name="title"><li>Title</li></ui:insert>
+ </ul>
+ </h:form>
+ <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/lostPassword/lostTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2007-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -23,8 +23,12 @@
</h:form>
<!-- Title -->
- <h4><ui:insert name="title">Title</ui:insert></h4>
-
+ <ul class="objectpath">
+ <li class="selected">
+ <ui:insert name="title">Title</ui:insert>
+ </li>
+ </ul>
+ <br/>
<!-- Content -->
<ui:insert name="content">Content</ui:insert>
</div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2007-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -9,7 +9,13 @@
<ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml">
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_EDIT_EMAIL_TITLE}"/>
+ <li class="pathItem">
+ <h:commandLink value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" action="editProfile" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_EDIT_EMAIL_TITLE}"/>
+ </li>
</ui:define>
<ui:define name="content">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2007-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -9,7 +9,13 @@
<ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml">
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_EDIT_PASSWORD_TITLE}" />
+ <li class="pathItem">
+ <h:commandLink value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" action="editProfile" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_EDIT_PASSWORD_TITLE}"/>
+ </li>
</ui:define>
<ui:define name="content">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml 2007-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -10,7 +10,11 @@
<ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml">
-<ui:define name="title" />
+<ui:define name="title">
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" />
+ </li>
+</ui:define>
<ui:define name="content">
<ui:decorate template="/WEB-INF/jsf/common/profile.xhtml">
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-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -18,8 +18,12 @@
</h:form>
<!-- Title -->
- <h4><ui:insert name="title">Title</ui:insert></h4>
-
+ <h:form>
+ <ul class="objectpath">
+ <ui:insert name="title">Title</ui:insert>
+ </ul>
+ </h:form>
+ <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/profile/viewProfileTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml 2007-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -18,8 +18,12 @@
</h:form>
<!-- Title -->
- <h4><ui:insert name="title">Title</ui:insert></h4>
-
+ <ul class="objectpath">
+ <li class="selected">
+ <ui:insert name="title">Title</ui:insert>
+ </li>
+ </ul>
+ <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/register/overview.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/overview.xhtml 2007-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/overview.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -13,7 +13,7 @@
</ui:define>
<ui:define name="content">
<h:form>
- <p><h:commandLink value="#{bundle.IDENTITY_CREATE_ACCOUNT}" action="register"/></p>
+ <p style="text-align:center;"><h:commandLink value="#{bundle.IDENTITY_CREATE_ACCOUNT}" action="register"/></p>
</h:form>
</ui:define>
</ui:composition>
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-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -26,8 +26,12 @@
</h:form>
<!-- Title -->
- <h4><ui:insert name="title">Title</ui:insert></h4>
-
+ <ul class="objectpath">
+ <li class="selected">
+ <ui:insert name="title">Title</ui:insert>
+ </li>
+ </ul>
+ <br/>
<!-- Content -->
<ui:insert name="content">Content</ui:insert>
</div>
\ No newline at end of file
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-09-18 22:45:41 UTC (rev 8344)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml 2007-09-18 22:59:23 UTC (rev 8345)
@@ -26,8 +26,12 @@
</h:form>
<!-- Title -->
- <h4><ui:insert name="title">Title</ui:insert></h4>
-
+ <ul class="objectpath">
+ <li class="selected">
+ <ui:insert name="title">Title</ui:insert>
+ </li>
+ </ul>
+ <br/>
<!-- Content -->
<ui:insert name="content">Content</ui:insert>
</div>
\ No newline at end of file
18 years, 7 months
JBoss Portal SVN: r8344 - branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-09-18 18:45:41 -0400 (Tue, 18 Sep 2007)
New Revision: 8344
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml
Log:
- JBPORTAL-1642: added separation between object path and content.
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-09-18 22:45:27 UTC (rev 8343)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-09-18 22:45:41 UTC (rev 8344)
@@ -5,6 +5,8 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core">
+<br/>
+
<div class="portlet-area-header">Properties</div>
<div class="portlet-area-body">
18 years, 7 months
JBoss Portal SVN: r8343 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-09-18 18:45:27 -0400 (Tue, 18 Sep 2007)
New Revision: 8343
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml
Log:
- JBPORTAL-1642: added separation between object path and content.
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-09-18 22:45:27 UTC (rev 8343)
@@ -5,6 +5,8 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core">
+<br/>
+
<div class="portlet-area-header">Properties</div>
<div class="portlet-area-body">
18 years, 7 months
JBoss Portal SVN: r8342 - in trunk/core-identity/src: bin/portal-identity-war/img and 12 other directories.
by portal-commits@lists.jboss.org
Author: emuckenhuber
Date: 2007-09-18 18:43:11 -0400 (Tue, 18 Sep 2007)
New Revision: 8342
Added:
trunk/core-identity/src/bin/portal-identity-war/img/
trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Add.gif
trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_CreateInstance.gif
trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Delete.gif
trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Details.gif
trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_IsDefault.gif
trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Layout.gif
trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_MakeDefault.gif
trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_MoveDown.gif
trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_MoveUp.gif
trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Properties.gif
trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Rename.gif
trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Security.gif
trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Theme.gif
trunk/core-identity/src/bin/portal-identity-war/img/msgIcon_Warning.gif
trunk/core-identity/src/bin/portal-identity-war/img/objectPath_Arrow.gif
trunk/core-identity/src/bin/portal-identity-war/img/pathBackground.png
trunk/core-identity/src/bin/portal-identity-war/img/pathSeparator.png
Modified:
trunk/core-identity/src/bin/portal-identity-war/style.css
trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java
trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java
trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java
trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java
trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/deleteRole.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/overview.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml
Log:
- updated UI regarding core-admin css changes
Added: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Add.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Add.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_CreateInstance.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_CreateInstance.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Delete.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Delete.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Details.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Details.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_IsDefault.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_IsDefault.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Layout.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Layout.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_MakeDefault.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_MakeDefault.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_MoveDown.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_MoveDown.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_MoveUp.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_MoveUp.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Properties.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Properties.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Rename.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Rename.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Security.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Security.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Theme.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/actionIcon_Theme.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-identity/src/bin/portal-identity-war/img/msgIcon_Warning.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/msgIcon_Warning.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-identity/src/bin/portal-identity-war/img/objectPath_Arrow.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/objectPath_Arrow.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-identity/src/bin/portal-identity-war/img/pathBackground.png
===================================================================
(Binary files differ)
Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/pathBackground.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-identity/src/bin/portal-identity-war/img/pathSeparator.png
===================================================================
(Binary files differ)
Property changes on: trunk/core-identity/src/bin/portal-identity-war/img/pathSeparator.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/core-identity/src/bin/portal-identity-war/style.css
===================================================================
--- trunk/core-identity/src/bin/portal-identity-war/style.css 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/bin/portal-identity-war/style.css 2007-09-18 22:43:11 UTC (rev 8342)
@@ -1,5 +1,15 @@
/* Redefine spacing for tables. */
+a {
+ color: #446688;
+ text-decoration: none;
+}
+
+a:hover {
+ color: #5078aa;
+ text-decoration: underline;
+}
+
.identity-ui table {
border: 0;
}
@@ -30,14 +40,12 @@
list-style-type: none;
display: inline;
margin-right: 2px;
- border: 1px solid;
}
.identity-ui ul.pagination li.selected {
font-weight: bold;
background-color: #eef;
- border: 1px solid black;
- border-bottom: 3px solid black;
+ border-bottom: 2px solid #656565;
}
.pagination a, .pagination a:visited, .pagination a:hover {
@@ -75,24 +83,62 @@
.identity-ui ul.topnav li#currentTab a:hover {
}
-
/* Object path. */
.identity-ui ul.objectpath {
- margin: 0;
- padding: 5px 0px 5px 0px;
+ list-style-type: none;
+ font-size: 11px;
+ border: solid 1px #bbb;
+ border-left: solid 1px #eee;
+ border-right: solid 1px #eee;
+ background-color: #d5d5d5;
+ background-image: url( img/pathBackground.png );
+ background-position: left;
+ background-repeat: repeat-x;
+ height: 21px;
+ margin: 0px;
+ padding: 0px;
+ padding-left: 2px;
}
.identity-ui ul.objectpath li {
list-style-type: none;
- display: inline;
- margin-right: 3px;
+ display: block;
+ float: left;
}
+.identity-ui ul li.pathItem {
+ padding-top: 4px;
+ padding-left: 3px;
+ padding-right: 2px;
+}
+
+/*
+.identity-ui ul.li.pathSeparator {
+ background-image: url(img/pathSeparator.png);
+ background-position: center center;
+ background-repeat: no-repeat;
+ width: 7px;
+}
+*/
+
.identity-ui ul.objectpath li.selected {
font-weight: bold;
+ padding-top: 4px;
+ padding-left: 3px;
+ padding-right: 2px;
}
+.identity-ui ul.objectpath a {
+ color: #333333;
+ text-decoration: none;
+}
+
+.identity-ui ul.objectpath a:hover {
+ color: #5078aa;
+ text-decoration: none;
+}
+
/* Resize combo lists */
.identity-ui select {
padding: 2px 4px 2px 1px;
@@ -141,7 +187,7 @@
.identity-ui .portlet-area-body {
border: 1px solid #d5d5d5;
- border-top: 0;
+ border-top: 0px;
background-color: #fff;
padding: 4px;
margin: 0;
@@ -158,6 +204,170 @@
padding-left: 6px;
}
+.identity-ui h3.sectionTitle {
+ font-weight: bold;
+ color: #656565;
+ font-size: 11px;
+ border-top: 1px solid #999;
+ background-color: #ebf2f5;
+ padding: 2px;
+ padding-left: 4px;
+}
+
+.identity-ui .portlet-section-header {
+ background-image: url( img/pathBackground.png );
+ background-position: left;
+ background-repeat: repeat-x;
+ font-weight: bold;
+ color: #656565;
+ font-size: 10px;
+ border-top: 1px solid #ddd;
+ border-bottom: 1px solid #999;
+ padding-left: 4px;
+}
+
+.identity-ui .portlet-section-header th {
+ background-image: url( img/pathBackground.png );
+ background-position: left;
+ background-repeat: repeat-x;
+ font-weight: bold;
+ color: #656565;
+ font-size: 10px;
+ border-top: 1px solid #ddd;
+ border-bottom: 1px solid #999;
+ padding-left: 4px;
+}
+
+.identity-ui .portlet-section-body {
+ color: #656565;
+ border: 1px solid #d5d5d5;
+ border-top: 0px;
+}
+
+.identity-ui .portlet-section-alternate {
+ background-color: #F2F2F2;
+ border: 1px solid #d5d5d5;
+}
+
+.identity-ui .portlet-section-selected {
+ background-color: #CBD4E6;
+}
+
+.identity-ui .actionDetails {
+ background-image: url( img/actionIcon_Details.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ line-height: 14px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.identity-ui .actionLayout {
+ background-image: url( img/actionIcon_Layout.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ line-height: 14px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.identity-ui .actionSecurity {
+ background-image: url( img/actionIcon_Security.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ line-height: 14px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.identity-ui .actionProperties {
+ background-image: url( img/actionIcon_Properties.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ padding-left: 18px;
+ white-space: nowrap;
+ height: 22px;
+}
+
+.identity-ui .actionTheme {
+ background-image: url( img/actionIcon_Theme.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.identity-ui .actionRename {
+ background-image: url( img/actionIcon_Rename.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.identity-ui .actionDelete {
+ background-image: url( img/actionIcon_Delete.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.identity-ui .actionMakeDefault {
+ background-image: url( img/actionIcon_MakeDefault.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.identity-ui .actionDefault {
+ background-image: url( img/actionIcon_IsDefault.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.identity-ui .actionPreferences {
+ background-image: url( img/actionIcon_Properties.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.identity-ui .actionCreateInstance {
+ background-image: url( img/actionIcon_CreateInstance.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
.identity-ui .portlet-content-center {
padding: 0;
margin: 0;
@@ -212,6 +422,11 @@
clear: both;
}
+.identity-ui form {
+ padding: 0;
+ margin: 0;
+}
+
.identity-ui #selected.wizardStepBox {
background-color: #C8DCC4;
border: 1px solid black;
@@ -234,3 +449,40 @@
margin: 2px;
padding: 2px;
}
+
+.identity-ui .createObjectForm {
+ display: block;
+ padding: 1em 0 0 0;
+}
+
+.identity-ui .objectList {
+ width: 100%;
+}
+
+.identity-ui .objectList .objectNameColumn {
+ width: 25%;
+}
+
+.identity-ui .objectList .objectActionColumn {
+ width: 75%;
+}
+
+.identity-ui .portlet-msg {
+ border: 1px solid #bbb;
+ margin: 2em auto;
+ padding: 1em;
+ width: 60%;
+}
+
+.identity-ui .portlet-msg-body {
+ position: relative;
+ top: -3em;
+ left: 3em;
+ width: 95%;
+}
+
+.identity-label {
+ padding: 0 4px 3px 0;
+ display: inline-block;
+ vertical-align: middle;
+}
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java 2007-09-18 22:43:11 UTC (rev 8342)
@@ -88,12 +88,13 @@
if (this.configuration.enableWorkflow())
{
this.workflowService = this.getWorkflowService();
+ if (this.workflowService == null)
+ throw new CoreIdentityConfigurationException("Workflowservice must not be null.");
String subscriptionMode = this.configuration.getSubscriptionMode();
String adminSubscriptionMode = this.configuration.getAdminSubscriptionMode();
String emailValidationProcess = IdentityConstants.jbp_identity_validate_email_process_name;
- if ( workflowService != null
- && subscriptionMode != null
+ if ( subscriptionMode != null
&& adminSubscriptionMode != null
&& emailValidationProcess != null)
{
@@ -106,7 +107,7 @@
}
else
{
- throw new CoreIdentityConfigurationException("WorkflowService or processName must not be null.");
+ throw new CoreIdentityConfigurationException("processName must not be null.");
}
}
else
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java 2007-09-18 22:43:11 UTC (rev 8342)
@@ -208,8 +208,6 @@
String hash = (String) processInstance.getContextInstance().getVariable(IdentityConstants.VALIDATION_HASH);
if (registrationHash.equals(hash) && ! processInstance.hasEnded())
{
- String action = (String) processInstance.getContextInstance().getVariable(IdentityConstants.ACTION);
-
token.signal(IdentityConstants.JBPM_TRANSITION_VALIDATED);
success = processInstance.getProcessDefinition().getName();
}
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java 2007-09-18 22:43:11 UTC (rev 8342)
@@ -27,12 +27,15 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.ResourceBundle;
import java.util.Set;
+import javax.faces.application.FacesMessage;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.model.ListDataModel;
+import org.jboss.logging.Logger;
import org.jboss.portal.core.identity.ui.IdentityUIUser;
import org.jboss.portal.core.identity.ui.UIRole;
import org.jboss.portal.core.identity.ui.common.IdentityRoleBean;
@@ -66,6 +69,9 @@
/** . */
private IdentityRoleBean identityRoleBean;
+
+ /** The logger */
+ private static final Logger log = Logger.getLogger(RoleManagementBean.class);
public IdentityRoleBean getIdentityRoleBean()
{
@@ -127,8 +133,7 @@
}
catch (IdentityException e)
{
- // FIXME
- e.printStackTrace();
+ log.error("", e);
}
Iterator i = set.iterator();
while (i.hasNext())
@@ -153,8 +158,10 @@
}
catch ( Exception e)
{
- e.printStackTrace();
- // FacesMessage
+ log.error("", e);
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
+ ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE")));
+ return "roleAdmin";
}
return "viewMembers";
}
@@ -163,6 +170,7 @@
{
Set members = new HashSet();
List roleMembers = new ArrayList();
+ FacesContext ctx = FacesContext.getCurrentInstance();
try
{
int intLimit = Integer.valueOf(limit).intValue();
@@ -172,7 +180,9 @@
}
catch (Exception e)
{
- e.printStackTrace();
+ log.error("", e);
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
+ ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE")));
}
Iterator i = members.iterator();
while (i.hasNext())
@@ -184,7 +194,9 @@
}
catch (Exception e)
{
- e.printStackTrace();
+ log.error("", e);
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
+ ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ERROR_ACTION_USER")));
}
}
return new ListDataModel(roleMembers);
@@ -205,8 +217,10 @@
}
catch (Exception e)
{
- e.printStackTrace();
- // FacesMessage
+ log.error("", e);
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
+ ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE")));
+ return "roleAdmin";
}
}
@@ -224,7 +238,10 @@
}
catch (Exception e)
{
- e.printStackTrace();
+ log.error("", e);
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale());
+ FacesContext.getCurrentInstance().addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE")));
+ return "roleAdmin";
}
return "roleAdmin";
}
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-09-18 22:43:11 UTC (rev 8342)
@@ -27,12 +27,14 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.ResourceBundle;
+import javax.faces.application.FacesMessage;
+import javax.faces.application.FacesMessage.Severity;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.model.DataModel;
import javax.faces.model.ListDataModel;
-import javax.portlet.PortletException;
import org.jboss.logging.Logger;
import org.jboss.portal.core.identity.services.IdentityConstants;
@@ -41,8 +43,6 @@
import org.jboss.portal.core.identity.ui.IdentityUIUser;
import org.jboss.portal.core.identity.ui.common.IdentityRoleBean;
import org.jboss.portal.core.identity.ui.common.IdentityUserBean;
-import org.jboss.portal.identity.IdentityException;
-import org.jboss.portal.identity.NoSuchUserException;
import org.jboss.portal.identity.User;
/**
@@ -74,6 +74,12 @@
private String displayNode = IdentityConstants.JBPM_NODE_APPROVAL;
/** . */
+ private String subscriptionMode;
+
+ /** . */
+ private String adminSubscriptionMode;
+
+ /** . */
private List pendingUsers = null;
/** . */
@@ -159,7 +165,27 @@
{
this.uiUser = uiUser;
}
-
+
+ public String getSubscriptionMode()
+ {
+ return subscriptionMode;
+ }
+
+ public void setSubscriptionMode(String subscriptionMode)
+ {
+ this.subscriptionMode = subscriptionMode;
+ }
+
+ public String getAdminSubscriptionMode()
+ {
+ return adminSubscriptionMode;
+ }
+
+ public void setAdminSubscriptionMode(String adminSubscriptionMode)
+ {
+ this.adminSubscriptionMode = adminSubscriptionMode;
+ }
+
public IdentityUserBean getIdentityUserBean()
{
return identityUserBean;
@@ -211,21 +237,12 @@
int limit1 = intLimit + 1;
this.userList = new ListDataModel(identityUserBean.findUsersFilteredByUserName(searchString, offset, limit1));
}
- catch (IllegalArgumentException e)
+ catch (Exception e)
{
- // FIXME
- e.printStackTrace();
+ log.error("",e);
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale());
+ FacesContext.getCurrentInstance().addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ERROR_ACTION_USER")));
}
- catch (NoSuchUserException e)
- {
- // FIXME
- e.printStackTrace();
- }
- catch (IdentityException e)
- {
- // FIXME
- e.printStackTrace();
- }
}
return "searchUsers";
}
@@ -262,9 +279,12 @@
catch (Exception e)
{
log.error("unable to get user: " + this.currentUser, e);
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
+ ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ERROR_ACTION_USER")));
return "userAdmin";
}
// Updating search
+ ctx.addMessage("status", new FacesMessage("user enabled"));
return this.searchUsers();
}
return "searchUsers";
@@ -286,6 +306,8 @@
catch (Exception e)
{
log.error("", e);
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale());
+ FacesContext.getCurrentInstance().addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ERROR_ACTION_USER")));
}
}
return userCount;
@@ -323,6 +345,8 @@
catch (Exception e)
{
log.error("unable delete user.", e);
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale());
+ FacesContext.getCurrentInstance().addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ERROR_ACTION_USER")));
}
return "userAdmin";
}
Modified: trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
--- trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-18 22:43:11 UTC (rev 8342)
@@ -129,14 +129,26 @@
IDENTITY_MANAGEMENT_PENDING_APPROVE=approve
IDENTITY_MANAGEMENT_PENDING_REJECT=reject
+IDENTITY_MANAGEMENT_SUBSCRIPTION_MODE=Subscription mode
+IDENTITY_MANAGEMENT_SUBSCRIPTION_ADMIN_MODE=Admin subscription mode
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM=Custom subscription mode.
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC=Automatic - no e-mail validation, no admin approval.
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL=E-Mail validation, no admin approval.
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN= E-Mail validation and admin approval.
+
IDENTITY_REGISTER_VERIFY_CAPTCHA=Verify captcha
-IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=Confirmation: Delete
+IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=Confirmation: Delete
+IDENTITY_WARNING_CONFIRM_DELETE_USER=Warning! You are about to delete the user
+IDENTITY_WARNING_CONFIRM_DELETE_ROLE=Warning! You are about to delete the role
IDENTITY_REGISTER_CONFIRMATIONEMAIL=Confirm your subscription
IDENTITY_MAIL_SUBJECT_LOST_PASSWORD=Reset your password
IDENTITY_MAIL_SUBJECT_REGISTER=Confirm registration
IDENTITY_MAIL_SUBJECT_CHANGE_EMAIL=Confirm email address
+IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE=Unable to perform action on role. Please take a look at the logfile for further information.
+IDENTITY_MANAGEMENT_ERROR_ACTION_USER=Unable to perform action on user. Please take a look at the logfile for further information.
+
IDENTITY_VERIFICATION_RETURN=Return to portal
IDENTITY_VERIFICATION_LOGIN=Login
IDENTITY_VERIFICATION_STATUS_FAILED=Can not validate the e-mail address.
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -117,6 +117,14 @@
<managed-bean-class>org.jboss.portal.core.identity.ui.admin.UserAdministrationBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
+ <property-name>subscriptionMode</property-name>
+ <value>#{applicationScope.IdentityUIConfigurationService.configuration.subscriptionMode}</value>
+ </managed-property>
+ <managed-property>
+ <property-name>adminSubscriptionMode</property-name>
+ <value>#{applicationScope.IdentityUIConfigurationService.configuration.adminSubscriptionMode}</value>
+ </managed-property>
+ <managed-property>
<property-name>identityUserBean</property-name>
<value>#{identityusermgr}</value>
</managed-property>
@@ -305,7 +313,7 @@
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/WEB-INF/jsf/admin/index.xhtml</from-view-id>
+ <from-view-id>/WEB-INF/jsf/admin/*</from-view-id>
<navigation-case>
<from-outcome>searchUsers</from-outcome>
<to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -9,17 +9,14 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" />
- <h:outputText value="#{assignrolemgr.uiUser.username}" />
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" />
+ <h:outputText value="#{assignrolemgr.uiUser.username}" />
+ </li>
</ui:define>
<ui:define name="content">
@@ -29,7 +26,7 @@
</h:selectManyCheckbox>
<hr/>
<p style="text-align: right;">
- <h:commandButton id="cancel" action="userAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
+ <h:commandButton id="cancel" action="searchUsers" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
<h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{assignrolemgr.updateRoles}" styleClass="portlet-form-button"/>
</p>
</h:form>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -9,19 +9,17 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
- </li>
- <li>
- > <h:commandLink action="#{editprofilemgr.viewStart}" value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/>
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" />
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="pathItem">
+ <h:commandLink action="#{editprofilemgr.viewStart}" value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/>
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" />
+ </li>
</ui:define>
<ui:define name="content">
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -8,14 +8,14 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
- <ul class="objectpath">
- <li>
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
- </li>
- </ul>
+ <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"
+ fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
<h:form>
<ul>
<li><h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}" action="searchUsers"/></li>
@@ -27,16 +27,66 @@
<li><h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_CREATE_USER}" action="createUser"/></li>
</ul>
</h:form>
- <hr/>
- <h:panelGrid columns="2">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS}"/>
- <h:outputText value="#{useradministrationbean.userCount}" />
- <c:if test="#{useradministrationbean.pendingCount > 0}">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_COUNT_PENDING_USERS}" />
- <h:outputText value="#{useradministrationbean.pendingCount}" />
- </c:if>
- </h:panelGrid>
+ <table style="width: 100%;">
+ <tr>
+ <td colspan="2"><h3 class="sectionTitle">statistics</h3></td>
+ </tr>
+ <tr>
+ <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>
+ <td><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_COUNT_PENDING_USERS}" /></td>
+ <td><h:outputText value="#{useradministrationbean.pendingCount}" /></td>
+ </tr>
+ </c:if>
+ <tr>
+ <td colspan="2"><h3 class="sectionTitle">subscription modes</h3></td>
+ </tr>
+ <tr>
+ <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>
+ <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: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -9,16 +9,13 @@
<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml">
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_CREATE_ROLE}"/>
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_CREATE_ROLE}"/>
+ </li>
</ui:define>
<ui:define name="content">
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/deleteRole.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/deleteRole.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/deleteRole.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -10,35 +10,39 @@
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM_DELETE}" />
- <h:outputText value="#{rolemanagementbean.uiRole.name}"/>
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="pathItem">
+ <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM_DELETE}" />
+ </li>
+ <li class="selected">
+ <h:outputText value="#{rolemanagementbean.uiRole.name}"/>
+ </li>
</ui:define>
<ui:define name="content">
-
-<h:form>
- <h:panelGrid columns="2">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE}"/>
- <h:outputText id="rolename" value="#{rolemanagementbean.uiRole.name}"/>
-
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_DISPLAY}"/>
- <h:outputText id="displayName" value="#{rolemanagementbean.uiRole.displayName}"/>
- </h:panelGrid>
- <h:messages />
- <hr/>
- <p style="text-align: right;">
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="roleAdmin" styleClass="portlet-form-button"/>
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{rolemanagementbean.confirmedDelete}" styleClass="portlet-form-button"/>
- </p>
-</h:form>
+ <div class="portlet-msg">
+ <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div>
+ <div class="portlet-msg-body">
+ <h3>
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_DELETE}" />
+ <h:outputText id="rolename" value="#{rolemanagementbean.uiRole.name}"/>
+ <h:outputText value="(#{rolemanagementbean.uiRole.displayName})" />
+ </h3>
+ <p class="portlet-msg-alert">
+ #{bundle.IDENTITY_WARNING_CONFIRM_DELETE_ROLE}
+ #{rolemanagementbean.uiRole.name}
+ </p>
+ <h:form>
+ <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="roleAdmin"
+ styleClass="portlet-form-button portlet-section-buttonrow" />
+
+ <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{rolemanagementbean.confirmedDelete}"
+ styleClass="portlet-form-button portlet-section-buttonrow" />
+ </h:form>
+</div>
+</div>
</ui:define>
</ui:composition>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -9,16 +9,13 @@
<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml">
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}"/>
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}"/>
+ </li>
</ui:define>
<ui:define name="content">
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -9,20 +9,21 @@
<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml">
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MEMBERS}"/>: <h:outputText value="#{rolemanagementbean.uiRole.name}"/>
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="pathItem">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MEMBERS}"/>
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{rolemanagementbean.uiRole.name}"/>
+ </li>
</ui:define>
<ui:define name="content">
-<hr/>
+
<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:column>
@@ -53,11 +54,11 @@
<f:facet name="header">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION}"/>
</f:facet>
- <h:commandLink action="#{editprofilemgr.adminEditProfile}">
+ <h:commandLink action="#{editprofilemgr.adminEditProfile}" styleClass="actionRename">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE}"/>
<f:param name="currentUser" value="#{uiUser.username}"/>
</h:commandLink> |
- <h:commandLink action="#{assignrolemgr.assignRoles}">
+ <h:commandLink action="#{assignrolemgr.assignRoles}" styleClass="actionDelete">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_ROLES}"/>
<f:param name="currentUser" value="#{uiUser.username}"/>
</h:commandLink>
@@ -67,6 +68,7 @@
<h:commandLink value=" < " action="#{rolemanagementbean.prevPage}" rendered="#{rolemanagementbean.page > 1}" styleClass="portlet-form-button"/>
<h:commandLink value=" > " action="#{rolemanagementbean.nextPage}" rendered="#{rolemanagementbean.roleMembers.rowCount > rolemanagementbean.limit}" styleClass="portlet-form-button"/>
<br/>
+<hr/>
<h:form>
<h4><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/></h4>
<h:panelGrid columns="3">
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -18,8 +18,13 @@
</h:form>
<!-- Title -->
- <h4><ui:insert name="title">Title</ui:insert></h4>
-
+ <h:form>
+ <ul class="objectpath">
+ <ui:insert name="title">Title</ui:insert>
+ </ul>
+ </h:form>
+
+ <br/>
<!-- Content -->
<ui:insert name="content">Content</ui:insert>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -8,14 +8,16 @@
<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml">
<ui:define name="title">
- <ul class="objectpath">
- <li>
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
- </li>
- </ul>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ </li>
</ui:define>
<ui:define name="content">
+ <h:messages id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
+ fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
+ <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:column>
@@ -35,14 +37,14 @@
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION}"/>
</f:facet>
<h:commandLink action="#{editrolemgr.editRole}">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}"/>
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}" styleClass="actionRename"/>
<f:param name="currentRole" value="#{role.name}"/>
</h:commandLink>
- | <h:commandLink action="#{rolemanagementbean.viewRoleMembers}">
+ | <h:commandLink action="#{rolemanagementbean.viewRoleMembers}" styleClass="actionPreferences">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MEMBERS}"/>
<f:param name="currentRole" value="#{role.name}"/>
</h:commandLink>
- | <h:commandLink action="#{rolemanagementbean.deleteRole}">
+ | <h:commandLink action="#{rolemanagementbean.deleteRole}" styleClass="actionDelete">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_DELETE}"/>
<f:param name="currentRole" value="#{role.name}"/>
</h:commandLink>
@@ -50,6 +52,7 @@
</h:dataTable>
</h:form>
+ <hr/>
<h:form>
<p style="text-align: right"><h:commandLink value="Create new role" action="createRole"/></p>
</h:form>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -10,20 +10,17 @@
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD_FOR_USER}" />
- <h:outputText value="#{editprofilemgr.currentUser}" />
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD_FOR_USER}" />
+ <h:outputText value="#{editprofilemgr.currentUser}" />
+ </li>
</ui:define>
<ui:define name="content">
-
+<br/>
<h:form>
<h:panelGrid columns="3" cellpadding="3">
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -9,20 +9,22 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
- </li>
- <li>
- > <h:commandLink action="revise" value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" />
- > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" rendered="#{useradministrationbean.pendingUserAction == 'approve'}" />
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" rendered="#{useradministrationbean.pendingUserAction == 'reject'}" />
- </li>
- </ul>
-</h:form>
+
+ <li class="pathItem">
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="pathItem">
+ <h:commandLink action="revise" value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" rendered="#{useradministrationbean.pendingUserAction == 'approve'}" />
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" rendered="#{useradministrationbean.pendingUserAction == 'reject'}" />
+ </li>
</ui:define>
<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:column>
@@ -55,6 +57,7 @@
</h:outputText>
</h:column>
</h:dataTable>
+<br/>
<p style="text-align: right;">
<h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="revise" styleClass="portlet-form-button"/>
<h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" action="#{useradministrationbean.confirmPendingAction}" styleClass="portlet-form-button" rendered="#{useradministrationbean.pendingUserAction == 'approve'}" />
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -9,16 +9,13 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE}" />
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE}" />
+ </li>
</ui:define>
<ui:define name="content">
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -10,35 +10,39 @@
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM_DELETE}" />
- <h:outputText value="#{useradministrationbean.uiUser.username}"/>
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="pathItem">
+ <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM_DELETE}" />
+ </li>
+ <li class="selected">
+ <h:outputText value="#{useradministrationbean.uiUser.username}"/>
+ </li>
</ui:define>
<ui:define name="content">
-
-<h:form>
- <h:panelGrid columns="2">
- <h:outputText for="username" value="#{bundle.IDENTITY_USERNAME}"/>
- <h:outputText id="username" value="#{useradministrationbean.uiUser.username}"/>
-
- <h:outputText for="email" value="#{bundle.IDENTITY_EMAIL}"/>
- <h:outputText id="email" value="#{useradministrationbean.uiUser.attribute.email}"/>
- </h:panelGrid>
- <h:messages />
- <hr/>
- <p style="text-align: right;">
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="userAdmin" styleClass="portlet-form-button"/>
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{useradministrationbean.confirmedDelete}" styleClass="portlet-form-button"/>
- </p>
-</h:form>
+ <div class="portlet-msg">
+ <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div>
+ <div class="portlet-msg-body">
+ <h3>
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_DELETE}" />
+ <h:outputText value="#{useradministrationbean.uiUser.username}" />
+ <h:outputText value="(#{useradministrationbean.uiUser.attribute.email})" />
+ </h3>
+ <p class="portlet-msg-alert">
+ #{bundle.IDENTITY_WARNING_CONFIRM_DELETE_USER}
+ #{useradministrationbean.uiUser.username}
+ </p>
+ <h:form>
+ <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="searchUsers"
+ styleClass="portlet-form-button portlet-section-buttonrow" />
+
+ <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{useradministrationbean.confirmedDelete}"
+ styleClass="portlet-form-button portlet-section-buttonrow" />
+ </h:form>
+</div>
+</div>
</ui:define>
</ui:composition>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -9,16 +9,13 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" />
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" />
+ </li>
</ui:define>
<ui:define name="content">
@@ -42,6 +39,7 @@
// ]]>
</script>
</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:column>
@@ -78,19 +76,20 @@
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION}"/>
</f:facet>
<h:outputText value="Pending" rendered="#{user.currentNode == 'validate_email'}"/>
- <h:commandLink action="#{useradministrationbean.approveRegistration}" rendered="#{user.currentNode == 'admin_approval'}">
+ <h:commandLink action="#{useradministrationbean.approveRegistration}" rendered="#{user.currentNode == 'admin_approval'}" styleClass="actionDefault">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_APPROVE}"/>
<f:param name="processId" value="#{user.processId}" />
<f:param name="action" value="approve" />
</h:commandLink>
<h:outputText value=" | " rendered="#{user.currentNode == 'admin_approval'}" />
- <h:commandLink action="#{useradministrationbean.approveRegistration}" rendered="#{user.currentNode == 'admin_approval'}">
+ <h:commandLink action="#{useradministrationbean.approveRegistration}" rendered="#{user.currentNode == 'admin_approval'}" styleClass="actionMakeDefault">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REJECT}"/>
<f:param name="processId" value="#{user.processId}" />
<f:param name="action" value="reject" />
</h:commandLink>
</h:column>
</h:dataTable>
+<br/>
<table border="0" cellspacing="3" style="width: 100%;" >
<tr>
<td style="text-align: left;" >
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -10,16 +10,13 @@
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM}" />
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM}" />
+ </li>
</ui:define>
<ui:define name="content">
<ui:decorate template="/WEB-INF/jsf/common/confirm.xhtml">
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -9,20 +9,18 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" />
- <h:outputText value="#{userregistermgr.uiUser.username}" />
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" />
+ <h:outputText value="#{userregistermgr.uiUser.username}" />
+ </li>
</ui:define>
<ui:define name="content">
+<br/>
<h:form>
<h:selectManyCheckbox id="roles" value="#{userregistermgr.roles}">
<f:selectItems value="#{identityrolemgr.roleSelectItems}" />
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -9,17 +9,14 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER} " />
- <h:outoutText value="#{editprofilemgr.uiUser.username}" />
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER} " />
+ <h:outoutText value="#{editprofilemgr.uiUser.username}" />
+ </li>
</ui:define>
<ui:define name="content">
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -9,18 +9,17 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
-<h:form>
- <ul class="objectpath">
- <li>
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
- </li>
- <li>
- > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/>
- </li>
- </ul>
-</h:form>
+ <li class="pathItem">
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/>
+ </li>
</ui:define>
+
<ui:define name="content">
+ <br/>
<h:form>
<h:panelGrid columns="4">
<h:inputText id="searchString" value="#{useradministrationbean.searchString}" />
@@ -35,7 +34,7 @@
<h:message for="limit" />
</h:panelGrid>
</h:form>
- <hr/>
+ <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:column>
@@ -74,20 +73,20 @@
<f:facet name="header">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION}"/>
</f:facet>
- <h:commandLink action="#{editprofilemgr.adminEditProfile}">
+ <h:commandLink action="#{editprofilemgr.adminEditProfile}" styleClass="actionRename">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE}"/>
<f:param name="currentUser" value="#{uiUser.username}"/>
</h:commandLink> |
- <h:commandLink action="#{assignrolemgr.assignRoles}">
+ <h:commandLink action="#{assignrolemgr.assignRoles}" styleClass="actionProperties">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_ROLES}"/>
<f:param name="currentUser" value="#{uiUser.username}"/>
</h:commandLink> |
- <h:commandLink action="#{useradministrationbean.enableUser}">
+ <h:commandLink action="#{useradministrationbean.enableUser}" styleClass="#{uiUser.attribute.enabled == true ? 'actionDefault' : 'actionMakeDefault'}">
<h:outputText value="#{uiUser.attribute.enabled == true ? bundle.IDENTITY_MANAGEMENT_DISABLE : bundle.IDENTITY_MANAGEMENT_ENABLE}" />
<f:param name="currentUser" value="#{uiUser.username}"/>
<f:param name="enableAction" value="#{uiUser.attribute.enabled == true ? 'disable' : 'enable'}" />
</h:commandLink> |
- <h:commandLink action="#{useradministrationbean.deleteUser}">
+ <h:commandLink action="#{useradministrationbean.deleteUser}" styleClass="actionDelete">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_DELETE}"/>
<f:param name="currentUser" value="#{uiUser.username}"/>
</h:commandLink>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -18,8 +18,12 @@
</h:form>
<!-- Title -->
- <h4><ui:insert name="title">Title</ui:insert></h4>
-
+ <h:form>
+ <ul class="objectpath">
+ <ui:insert name="title"><li>Title</li></ui:insert>
+ </ul>
+ </h:form>
+ <br/>
<!-- Content -->
<ui:insert name="content">Content</ui:insert>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -23,8 +23,12 @@
</h:form>
<!-- Title -->
- <h4><ui:insert name="title">Title</ui:insert></h4>
-
+ <ul class="objectpath">
+ <li class="selected">
+ <ui:insert name="title">Title</ui:insert>
+ </li>
+ </ul>
+ <br/>
<!-- Content -->
<ui:insert name="content">Content</ui:insert>
</div>
\ No newline at end of file
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -9,7 +9,13 @@
<ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml">
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_EDIT_EMAIL_TITLE}"/>
+ <li class="pathItem">
+ <h:commandLink value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" action="editProfile" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_EDIT_EMAIL_TITLE}"/>
+ </li>
</ui:define>
<ui:define name="content">
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -9,7 +9,13 @@
<ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml">
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_EDIT_PASSWORD_TITLE}" />
+ <li class="pathItem">
+ <h:commandLink value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" action="editProfile" />
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_EDIT_PASSWORD_TITLE}"/>
+ </li>
</ui:define>
<ui:define name="content">
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -10,7 +10,11 @@
<ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml">
-<ui:define name="title" />
+<ui:define name="title">
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" />
+ </li>
+</ui:define>
<ui:define name="content">
<ui:decorate template="/WEB-INF/jsf/common/profile.xhtml">
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -18,8 +18,12 @@
</h:form>
<!-- Title -->
- <h4><ui:insert name="title">Title</ui:insert></h4>
-
+ <h:form>
+ <ul class="objectpath">
+ <ui:insert name="title">Title</ui:insert>
+ </ul>
+ </h:form>
+ <br/>
<!-- Content -->
<ui:insert name="content">Content</ui:insert>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -18,8 +18,12 @@
</h:form>
<!-- Title -->
- <h4><ui:insert name="title">Title</ui:insert></h4>
-
+ <ul class="objectpath">
+ <li class="selected">
+ <ui:insert name="title">Title</ui:insert>
+ </li>
+ </ul>
+ <br/>
<!-- Content -->
<ui:insert name="content">Content</ui:insert>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/overview.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/overview.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/overview.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -13,7 +13,7 @@
</ui:define>
<ui:define name="content">
<h:form>
- <p><h:commandLink value="#{bundle.IDENTITY_CREATE_ACCOUNT}" action="register"/></p>
+ <p style="text-align:center;"><h:commandLink value="#{bundle.IDENTITY_CREATE_ACCOUNT}" action="register"/></p>
</h:form>
</ui:define>
</ui:composition>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -26,8 +26,12 @@
</h:form>
<!-- Title -->
- <h4><ui:insert name="title">Title</ui:insert></h4>
-
+ <ul class="objectpath">
+ <li class="selected">
+ <ui:insert name="title">Title</ui:insert>
+ </li>
+ </ul>
+ <br/>
<!-- Content -->
<ui:insert name="content">Content</ui:insert>
</div>
\ No newline at end of file
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml 2007-09-18 21:12:13 UTC (rev 8341)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml 2007-09-18 22:43:11 UTC (rev 8342)
@@ -26,8 +26,12 @@
</h:form>
<!-- Title -->
- <h4><ui:insert name="title">Title</ui:insert></h4>
-
+ <ul class="objectpath">
+ <li class="selected">
+ <ui:insert name="title">Title</ui:insert>
+ </li>
+ </ul>
+ <br/>
<!-- Content -->
<ui:insert name="content">Content</ui:insert>
</div>
\ No newline at end of file
18 years, 7 months
JBoss Portal SVN: r8341 - in modules/common/trunk: build/ide/intellij/idea60/modules and 7 other directories.
by portal-commits@lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-09-18 17:12:13 -0400 (Tue, 18 Sep 2007)
New Revision: 8341
Added:
modules/common/trunk/build/ide/intellij/idea60/modules/mc/
modules/common/trunk/build/ide/intellij/idea60/modules/mc/mc.iml
modules/common/trunk/mc/src/main/java/
modules/common/trunk/mc/src/main/java/org/
modules/common/trunk/portal/src/main/java/
modules/common/trunk/portal/src/main/java/org/
Removed:
modules/common/trunk/mc/src/main/org/
modules/common/trunk/portal/src/main/org/
Modified:
modules/common/trunk/build/ide/intellij/idea60/jboss-portal-common.ipr
modules/common/trunk/build/ide/intellij/idea60/modules/portal/portal.iml
modules/common/trunk/tools/etc/buildfragments/buildmagic.ent
Log:
update portal and mc sub modules of common module to match the directory reorg of the common/common
Modified: modules/common/trunk/build/ide/intellij/idea60/jboss-portal-common.ipr
===================================================================
--- modules/common/trunk/build/ide/intellij/idea60/jboss-portal-common.ipr 2007-09-18 19:31:58 UTC (rev 8340)
+++ modules/common/trunk/build/ide/intellij/idea60/jboss-portal-common.ipr 2007-09-18 21:12:13 UTC (rev 8341)
@@ -129,6 +129,32 @@
<option name="FILTER_INFO" value="true" />
<option name="CUSTOM_FILTER" />
</component>
+ <component name="MavenBuildProjectComponent">
+ <option name="mavenExecutable" value="" />
+ <option name="Settings File" value="" />
+ <option name="mavenCommandLineParams" value="" />
+ <option name="vmOptions" value="" />
+ <option name="useMavenEmbedder" value="false" />
+ <option name="useFilter" value="false" />
+ <option name="Batch Mode" value="false" />
+ <option name="Check Plugin Updates" value="false" />
+ <option name="Debug" value="false" />
+ <option name="Errors" value="false" />
+ <option name="Fail At End" value="false" />
+ <option name="Fail Fast" value="false" />
+ <option name="Fail Never" value="false" />
+ <option name="Lax Checksums" value="false" />
+ <option name="No Plugin Registry" value="false" />
+ <option name="No Plugin Updates" value="false" />
+ <option name="Non Recursive" value="false" />
+ <option name="Offline" value="false" />
+ <option name="Reactor" value="false" />
+ <option name="Strict Checksums" value="false" />
+ <option name="Update Plugins" value="false" />
+ <option name="Update Snapshots" value="false" />
+ <option name="Skip Tests" value="false" />
+ <pom-list />
+ </component>
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
@@ -253,6 +279,7 @@
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/common/common.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/common/common.iml" />
+ <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/mc/mc.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/mc/mc.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/portal/portal.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/portal/portal.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/testsuite/testsuite.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/testsuite/testsuite.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml" />
Added: modules/common/trunk/build/ide/intellij/idea60/modules/mc/mc.iml
===================================================================
--- modules/common/trunk/build/ide/intellij/idea60/modules/mc/mc.iml (rev 0)
+++ modules/common/trunk/build/ide/intellij/idea60/modules/mc/mc.iml 2007-09-18 21:12:13 UTC (rev 8341)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+ <component name="ModuleRootManager" />
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$/../../../../../../mc">
+ <sourceFolder url="file://$MODULE_DIR$/../../../../../../mc/src/main/java" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntryProperties />
+ </component>
+</module>
+
Modified: modules/common/trunk/build/ide/intellij/idea60/modules/portal/portal.iml
===================================================================
--- modules/common/trunk/build/ide/intellij/idea60/modules/portal/portal.iml 2007-09-18 19:31:58 UTC (rev 8340)
+++ modules/common/trunk/build/ide/intellij/idea60/modules/portal/portal.iml 2007-09-18 21:12:13 UTC (rev 8341)
@@ -4,7 +4,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$/../../../../../../portal">
- <sourceFolder url="file://$MODULE_DIR$/../../../../../../portal/src/main" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/../../../../../../portal/src/main/java" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Copied: modules/common/trunk/mc/src/main/java/org (from rev 8340, modules/common/trunk/mc/src/main/org)
Copied: modules/common/trunk/portal/src/main/java/org (from rev 8340, modules/common/trunk/portal/src/main/org)
Modified: modules/common/trunk/tools/etc/buildfragments/buildmagic.ent
===================================================================
--- modules/common/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-18 19:31:58 UTC (rev 8340)
+++ modules/common/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-18 21:12:13 UTC (rev 8341)
@@ -408,7 +408,7 @@
<mkdir dir="${build.test.classes}"/>
<!-- Hack, required to avoid duplicate javac targets -->
- <mkdir dir="${build.gen.test}"/>
+ <mkdir dir="${build.test.gen}"/>
<!-- Remove classes which depend on changed files, so they will rebuild. -->
<depend srcdir="${source.test.classes}"
18 years, 7 months
JBoss Portal SVN: r8340 - in trunk/core-admin/src: resources/portal-admin-war/WEB-INF/jsf/common and 1 other directory.
by portal-commits@lists.jboss.org
Author: wesleyhales
Date: 2007-09-18 15:31:58 -0400 (Tue, 18 Sep 2007)
New Revision: 8340
Modified:
trunk/core-admin/src/bin/portal-admin-war/style.css
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
Log:
copy over fix for JBPORTAL-1657
Modified: trunk/core-admin/src/bin/portal-admin-war/style.css
===================================================================
--- trunk/core-admin/src/bin/portal-admin-war/style.css 2007-09-18 19:25:19 UTC (rev 8339)
+++ trunk/core-admin/src/bin/portal-admin-war/style.css 2007-09-18 19:31:58 UTC (rev 8340)
@@ -480,3 +480,9 @@
left: 3em;
width: 95%;
}
+
+.admin-label {
+ padding: 0 4px 3px 0;
+ display: inline-block;
+ vertical-align: middle;
+}
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-09-18 19:25:19 UTC (rev 8339)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-09-18 19:31:58 UTC (rev 8340)
@@ -20,13 +20,13 @@
</td>
</tr>
<tr>
- <td>
- <span class="portlet-form-field-label">Window Name:</span>
- </td>
- <td width="100%">
+ <td colspan="2">
<h:form id="windowForm">
+ <label for="windowName">
+ <span class="portlet-form-field-label admin-label">Window Name:</span>
<h:inputText id="windowName" value="#{pageManager.windowName}" styleClass="portlet-form-input-field"/>
- <h:message for="windowName" errorClass="portlet-msg-error"/>
+ </label>
+ <h:message for="windowName" errorClass="portlet-msg-error"/>
</h:form>
</td>
</tr>
@@ -38,20 +38,20 @@
</tr>
<tr>
<td>
- <span class="portlet-form-field-label">Content Type:</span>
- </td>
- <td>
<h:form id="abc">
- <h:inputHidden id="windowNameCopy" value="#{pageManager.windowName}"/>
- <h:selectOneMenu
- id="instanceId"
- value="#{pageManager.selectedContentType}"
- styleClass="portlet-form-field contentType"
- onchange="document.getElementById('abc:windowNameCopy').value = document.getElementById('windowForm:windowName').value;
- document.getElementById('abc').submit(); ">
- <f:selectItems value="#{pageManager.contentTypeItems}"/>
- </h:selectOneMenu>
- <h:message for="instanceId" errorClass="portlet-msg-error"/>
+ <label for="instanceId" class="portlet-form-field-label-container">
+ <span class="portlet-form-field-label admin-label">Content Type:</span>
+ <h:inputHidden id="windowNameCopy" value="#{pageManager.windowName}"/>
+ <h:selectOneMenu
+ id="instanceId"
+ value="#{pageManager.selectedContentType}"
+ styleClass="portlet-form-field contentType"
+ onchange="document.getElementById('abc:windowNameCopy').value = document.getElementById('windowForm:windowName').value;
+ document.getElementById('abc').submit(); ">
+ <f:selectItems value="#{pageManager.contentTypeItems}"/>
+ </h:selectOneMenu>
+ </label>
+ <h:message for="instanceId" errorClass="portlet-msg-error"/>
</h:form>
</td>
</tr>
18 years, 7 months
JBoss Portal SVN: r8339 - in trunk/core-admin/src: bin/portal-admin-war/img and 3 other directories.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-09-18 15:25:19 -0400 (Tue, 18 Sep 2007)
New Revision: 8339
Added:
trunk/core-admin/src/bin/portal-admin-war/img/
trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Add.gif
trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_CreateInstance.gif
trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Delete.gif
trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Details.gif
trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_IsDefault.gif
trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Layout.gif
trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_MakeDefault.gif
trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_MoveDown.gif
trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_MoveUp.gif
trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Properties.gif
trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Rename.gif
trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Security.gif
trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Theme.gif
trunk/core-admin/src/bin/portal-admin-war/img/msgIcon_Warning.gif
trunk/core-admin/src/bin/portal-admin-war/img/objectPath_Arrow.gif
trunk/core-admin/src/bin/portal-admin-war/img/pathBackground.png
trunk/core-admin/src/bin/portal-admin-war/img/pathSeparator.png
Removed:
trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Add.gif
trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_CreateInstance.gif
trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Delete.gif
trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Details.gif
trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_IsDefault.gif
trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Layout.gif
trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_MakeDefault.gif
trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_MoveDown.gif
trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_MoveUp.gif
trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Properties.gif
trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Rename.gif
trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Security.gif
trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Theme.gif
trunk/core-admin/src/bin/portal-admin-war/img/msgIcon_Warning.gif
trunk/core-admin/src/bin/portal-admin-war/img/objectPath_Arrow.gif
trunk/core-admin/src/bin/portal-admin-war/img/pathBackground.png
trunk/core-admin/src/bin/portal-admin-war/img/pathSeparator.png
trunk/core-admin/src/resources/portal-admin-war/img/
Modified:
trunk/core-admin/src/bin/portal-admin-war/style.css
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml
Log:
- JBPORTAL-1657: Finished styling of confirmation pages.
- JBPORTAL-1704: Moved img directory.
Copied: trunk/core-admin/src/bin/portal-admin-war/img (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img)
Deleted: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Add.gif
===================================================================
(Binary files differ)
Copied: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Add.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/actionIcon_Add.gif)
===================================================================
(Binary files differ)
Deleted: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_CreateInstance.gif
===================================================================
(Binary files differ)
Copied: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_CreateInstance.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/actionIcon_CreateInstance.gif)
===================================================================
(Binary files differ)
Deleted: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Delete.gif
===================================================================
(Binary files differ)
Copied: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Delete.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/actionIcon_Delete.gif)
===================================================================
(Binary files differ)
Deleted: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Details.gif
===================================================================
(Binary files differ)
Copied: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Details.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/actionIcon_Details.gif)
===================================================================
(Binary files differ)
Deleted: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_IsDefault.gif
===================================================================
(Binary files differ)
Copied: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_IsDefault.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/actionIcon_IsDefault.gif)
===================================================================
(Binary files differ)
Deleted: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Layout.gif
===================================================================
(Binary files differ)
Copied: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Layout.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/actionIcon_Layout.gif)
===================================================================
(Binary files differ)
Deleted: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_MakeDefault.gif
===================================================================
(Binary files differ)
Copied: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_MakeDefault.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/actionIcon_MakeDefault.gif)
===================================================================
(Binary files differ)
Deleted: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_MoveDown.gif
===================================================================
(Binary files differ)
Copied: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_MoveDown.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/actionIcon_MoveDown.gif)
===================================================================
(Binary files differ)
Deleted: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_MoveUp.gif
===================================================================
(Binary files differ)
Copied: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_MoveUp.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/actionIcon_MoveUp.gif)
===================================================================
(Binary files differ)
Deleted: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Properties.gif
===================================================================
(Binary files differ)
Copied: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Properties.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/actionIcon_Properties.gif)
===================================================================
(Binary files differ)
Deleted: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Rename.gif
===================================================================
(Binary files differ)
Copied: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Rename.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/actionIcon_Rename.gif)
===================================================================
(Binary files differ)
Deleted: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Security.gif
===================================================================
(Binary files differ)
Copied: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Security.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/actionIcon_Security.gif)
===================================================================
(Binary files differ)
Deleted: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Theme.gif
===================================================================
(Binary files differ)
Copied: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Theme.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/actionIcon_Theme.gif)
===================================================================
(Binary files differ)
Deleted: trunk/core-admin/src/bin/portal-admin-war/img/msgIcon_Warning.gif
===================================================================
(Binary files differ)
Copied: trunk/core-admin/src/bin/portal-admin-war/img/msgIcon_Warning.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/msgIcon_Warning.gif)
===================================================================
(Binary files differ)
Deleted: trunk/core-admin/src/bin/portal-admin-war/img/objectPath_Arrow.gif
===================================================================
(Binary files differ)
Copied: trunk/core-admin/src/bin/portal-admin-war/img/objectPath_Arrow.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/objectPath_Arrow.gif)
===================================================================
(Binary files differ)
Deleted: trunk/core-admin/src/bin/portal-admin-war/img/pathBackground.png
===================================================================
(Binary files differ)
Copied: trunk/core-admin/src/bin/portal-admin-war/img/pathBackground.png (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/pathBackground.png)
===================================================================
(Binary files differ)
Deleted: trunk/core-admin/src/bin/portal-admin-war/img/pathSeparator.png
===================================================================
(Binary files differ)
Copied: trunk/core-admin/src/bin/portal-admin-war/img/pathSeparator.png (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/pathSeparator.png)
===================================================================
(Binary files differ)
Modified: trunk/core-admin/src/bin/portal-admin-war/style.css
===================================================================
--- trunk/core-admin/src/bin/portal-admin-war/style.css 2007-09-18 19:22:30 UTC (rev 8338)
+++ trunk/core-admin/src/bin/portal-admin-war/style.css 2007-09-18 19:25:19 UTC (rev 8339)
@@ -401,14 +401,9 @@
/* Change dashed line to solid. */
.admin-ui hr {
- border-top-style: solid;
+ border-top-style: solid;
}
-.admin-ui form {
- padding:0;
- margin:0;
-}
-
.admin-ui .wizardStepBox {
display: inline;
float: left;
@@ -427,6 +422,11 @@
clear: both;
}
+.admin-ui form {
+ padding: 0;
+ margin: 0;
+}
+
.admin-ui #selected.wizardStepBox {
background-color: #C8DCC4;
border: 1px solid black;
@@ -468,11 +468,15 @@
}
.admin-ui .portlet-msg {
- border: 1px solid #d5d5d5;
- margin: auto;
+ border: 1px solid #bbb;
+ margin: 2em auto;
+ padding: 1em;
+ width: 60%;
}
-.admin-ui .portlet-msg-icon {
- float: left;
+.admin-ui .portlet-msg-body {
+ position: relative;
+ top: -3em;
+ left: 3em;
+ width: 95%;
}
-
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-18 19:22:30 UTC (rev 8338)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-18 19:25:19 UTC (rev 8339)
@@ -13,11 +13,11 @@
<ui:define name="content">
<div class="portlet-msg">
+ <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div>
<div class="portlet-msg-body">
<h3>Delete <h:outputText value="#{portalobjectmgr.selectedObjectType}"/></h3>
<p class="portlet-msg-alert">
- <h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\" styleClass="portlet-msg-icon"/>
WARNING! You are about to delete the
<span class="objectName">#{portalobjectmgr.selectedObject.name}</span>
#{portalobjectmgr.selectedObject.typeName} from the
@@ -31,12 +31,12 @@
<h:form>
<h:commandButton value="Delete" action="objects" actionListener="#{portalobjectmgr.destroyObject}"
- styleClass="portlet-form-button">
+ styleClass="portlet-form-button portlet-section-buttonrow">
<f:attribute name="objectId" value="#{portalobjectmgr.selectedObject.id}"/>
</h:commandButton>
<h:commandButton value="Cancel" action="objects"
actionListener="#{portalobjectmgr.selectParentObject}"
- styleClass="portlet-form-button"/>
+ styleClass="portlet-form-button portlet-section-buttonrow"/>
</h:form>
</div>
</div>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2007-09-18 19:22:30 UTC (rev 8338)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2007-09-18 19:25:19 UTC (rev 8339)
@@ -24,11 +24,11 @@
<br/>
<div class="portlet-msg">
+ <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div>
<div class="portlet-msg-body">
<h3>Delete <span class="objectName">#{instancemgr.selectedInstance.id}</span></h3>
<p class="portlet-msg-alert">
- <h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\" styleClass="portlet-msg-icon"/>
WARNING! You are about to delete the
<span class="objectName">#{instancemgr.selectedInstance.id}</span> portlet instance causing windows
referencing it to not be able to display their content anymore.
@@ -38,11 +38,11 @@
<h:form>
<h:commandButton value="Delete" action="instances" actionListener="#{instancemgr.deleteInstance}"
- styleClass="portlet-form-button">
+ styleClass="portlet-form-button portlet-section-buttonrow">
<f:attribute name="instanceId" value="#{instancemgr.selectedInstance.id}"/>
</h:commandButton>
<h:commandButton value="Cancel" action="instances" actionListener="objects"
- styleClass="portlet-form-button"/>
+ styleClass="portlet-form-button portlet-section-buttonrow"/>
</h:form>
</div>
</div>
18 years, 7 months
JBoss Portal SVN: r8338 - in branches/JBoss_Portal_Branch_2_6: core-admin/src/bin/portal-admin-war and 1 other directories.
by portal-commits@lists.jboss.org
Author: wesleyhales
Date: 2007-09-18 15:22:30 -0400 (Tue, 18 Sep 2007)
New Revision: 8338
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
Log:
move css for JBPORTAL-1578 to portal admin style sheet
Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-09-18 19:13:19 UTC (rev 8337)
+++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-09-18 19:22:30 UTC (rev 8338)
@@ -911,8 +911,7 @@
}
/* Text for form field labels */
-.portlet-form-field-label,
-.portlet-form-field-admin-label,{
+.portlet-form-field-label{
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-size: 10px;
color: #000;
@@ -920,11 +919,6 @@
white-space: nowrap
}
-.portlet-form-field-admin-label {
- padding: 0 4px 3px 0;
- display: inline-block;
-}
-
/* Text for a form field */
.portlet-form-field {
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css 2007-09-18 19:13:19 UTC (rev 8337)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css 2007-09-18 19:22:30 UTC (rev 8338)
@@ -1,482 +1,488 @@
-/* Redefine spacing for tables. */
-
-a {
- color: #446688;
- text-decoration: none;
-}
-
-a:hover {
- color: #5078aa;
- text-decoration: underline;
-}
-
-.admin-ui table {
- border: 0;
-}
-
-.admin-ui th {
- text-align: left;
- border: 0;
- border-bottom: 1px solid;
- padding-bottom: 2px;
- padding-top: 2px;
- font-size: 11px;
-}
-
-.admin-ui td {
- padding-bottom: 2px;
- padding-top: 2px;
-}
-
-/* Pagination. */
-
-.admin-ui ul.pagination {
- margin: 0;
- padding: .2em;
-}
-
-.admin-ui ul.pagination li {
- text-align: center;
- list-style-type: none;
- display: inline;
- margin-right: 2px;
-}
-
-.admin-ui ul.pagination li.selected {
- font-weight: bold;
- background-color: #eef;
- border-bottom: 2px solid #656565;
-}
-
-.pagination a, .pagination a:visited, .pagination a:hover {
- text-decoration: none;
-}
-
-/* Top nav. */
-
-.admin-ui ul.topnav {
- margin-left: 0;
- padding: 4px 0px 3px;
- border-bottom: 1px solid #b3c0c7;
-}
-
-.admin-ui ul.topnav li {
- list-style-type: none;
- display: inline;
- margin: 0;
- padding: 3px 0.5em;
- margin-left: 5px;
- border: 1px solid #b3c0c7;
- border-bottom: none;
- background-color: #f2f4f5;
-}
-
-.admin-ui ul.topnav li:hover {
- background-color: #fff;
-}
-
-.admin-ui ul.topnav li#currentTab {
- background-color: white;
- border-bottom: 1px solid white;
-}
-
-.admin-ui ul.topnav li#currentTab a:hover {
-}
-
-/* Object path. */
-
-.admin-ui ul.objectpath {
- list-style-type: none;
- font-size: 11px;
- border: solid 1px #bbb;
- border-left: solid 1px #eee;
- border-right: solid 1px #eee;
- background-color: #d5d5d5;
- background-image: url( img/pathBackground.png );
- background-position: left;
- background-repeat: repeat-x;
- height: 21px;
- margin: 0px;
- padding: 0px;
- padding-left: 2px;
-}
-
-.admin-ui ul.objectpath li {
- list-style-type: none;
- display: block;
- float: left;
-}
-
-.admin-ui ul li.pathItem {
- padding-top: 4px;
- padding-left: 3px;
- padding-right: 2px;
-}
-
-/*
-.admin-ui ul.li.pathSeparator {
- background-image: url(img/pathSeparator.png);
- background-position: center center;
- background-repeat: no-repeat;
- width: 7px;
-}
-*/
-
-.admin-ui ul.objectpath li.selected {
- font-weight: bold;
- padding-top: 4px;
- padding-left: 3px;
- padding-right: 2px;
-}
-
-.admin-ui ul.objectpath a {
- color: #333333;
- text-decoration: none;
-}
-
-.admin-ui ul.objectpath a:hover {
- color: #5078aa;
- text-decoration: none;
-}
-
-/* Resize combo lists */
-.admin-ui select {
- padding: 2px 4px 2px 1px;
-}
-
-.admin-ui select.contentType {
- width: 8em;
-}
-
-.admin-ui select.instanceList {
- width: 11em;
-}
-
-.admin-ui select.windowList {
- width: 95%;
- overflow: auto;
-}
-
-/* Style a table for form layout */
-.admin-ui table form {
- margin: 0;
-}
-
-.admin-ui table form td.label {
- text-align: right;
- vertical-align: top;
- padding-top: 0.4em;
-}
-
-.admin-ui table form td.widget {
- text-align: left;
-}
-
-/* Area header. */
-
-.admin-ui .portlet-area-header {
- border: 1px solid #54708c;
- font-weight: bold;
- color: #fff;
- font-size: 11px;
- background-color: #5986b3;
- padding: 2px;
- padding-left: 4px;
- margin: 0;
-}
-
-.admin-ui .portlet-area-body {
- border: 1px solid #d5d5d5;
- border-top: 0px;
- background-color: #fff;
- padding: 4px;
- margin: 0;
-}
-
-/* Styles updated and enhanced from the main portal css */
-
-.admin-ui th.portlet-section-title {
- font-weight: bold;
- color: #656565;
- font-size: 11px;
- border: 1px solid #999;
- background-color: #ebf2f5;
- padding-left: 6px;
-}
-
-.admin-ui h3.sectionTitle {
- font-weight: bold;
- color: #656565;
- font-size: 11px;
- border-top: 1px solid #999;
- background-color: #ebf2f5;
- padding: 2px;
- padding-left: 4px;
-}
-
-.admin-ui .portlet-section-header {
- background-image: url( img/pathBackground.png );
- background-position: left;
- background-repeat: repeat-x;
- font-weight: bold;
- color: #656565;
- font-size: 10px;
- border-top: 1px solid #ddd;
- border-bottom: 1px solid #999;
- padding-left: 4px;
-}
-
-.admin-ui .portlet-section-header th {
- background-image: url( img/pathBackground.png );
- background-position: left;
- background-repeat: repeat-x;
- font-weight: bold;
- color: #656565;
- font-size: 10px;
- border-top: 1px solid #ddd;
- border-bottom: 1px solid #999;
- padding-left: 4px;
-}
-
-.admin-ui .portlet-section-body {
- color: #656565;
- border: 1px solid #d5d5d5;
- border-top: 0px;
-}
-
-.admin-ui .portlet-section-alternate {
- background-color: #F2F2F2;
- border: 1px solid #d5d5d5;
-}
-
-.admin-ui .portlet-section-selected {
- background-color: #CBD4E6;
-}
-
-.admin-ui .actionDetails {
- background-image: url( img/actionIcon_Details.gif );
- background-position: left;
- background-repeat: no-repeat;
- line-height: 14px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionLayout {
- background-image: url( img/actionIcon_Layout.gif );
- background-position: left;
- background-repeat: no-repeat;
- line-height: 14px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionSecurity {
- background-image: url( img/actionIcon_Security.gif );
- background-position: left;
- background-repeat: no-repeat;
- line-height: 14px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionProperties {
- background-image: url( img/actionIcon_Properties.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- padding-left: 18px;
- white-space: nowrap;
- height: 22px;
-}
-
-.admin-ui .actionTheme {
- background-image: url( img/actionIcon_Theme.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionRename {
- background-image: url( img/actionIcon_Rename.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionDelete {
- background-image: url( img/actionIcon_Delete.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionMakeDefault {
- background-image: url( img/actionIcon_MakeDefault.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionDefault {
- background-image: url( img/actionIcon_IsDefault.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionPreferences {
- background-image: url( img/actionIcon_Properties.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionCreateInstance {
- background-image: url( img/actionIcon_CreateInstance.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .portlet-content-center {
- padding: 0;
- margin: 0;
-}
-
-.admin-ui .portlet-body {
- padding: 0;
- margin: 0;
-}
-
-.admin-ui .portlet-content-right {
- padding: 0;
- margin: 0;
-}
-
-.admin-ui .portlet-footer-left {
- padding: 0;
- margin: 0;
-}
-
-.admin-ui .portlet-table-header {
- background-color: #eef;
-}
-
-.admin-ui .portlet-section-buttonrow {
- margin-top: 6px;
- margin-bottom: 6px;
- float: right;
-}
-
-/* Change dashed line to solid. */
-
-.admin-ui hr {
- border-top-style: solid;
-}
-
-.admin-ui .wizardStepBox {
- display: inline;
- float: left;
- border: 1px solid #98B7C6;
- height: 7em;
- width: 9em;
- background-color: #DFE8ED;
- margin: .5em;
-}
-
-.admin-ui .wizardButtonBox {
- margin: 1em;
-}
-
-.admin-ui .wizardContent {
- clear: both;
-}
-
-.admin-ui form {
- padding: 0;
- margin: 0;
-}
-
-.admin-ui #selected.wizardStepBox {
- background-color: #C8DCC4;
- border: 1px solid black;
- border-bottom: 5px solid black;
-}
-
-.admin-ui .stepNumber {
- font-size: 2em;
- text-align: center;
- margin-top: 5px;
- margin-bottom: 0;
-}
-
-.admin-ui .stepText {
- text-align: center;
-}
-
-.admin-ui .layout-button {
- width: 50px;
- margin: 2px;
- padding: 2px;
-}
-
-.admin-ui .createObjectForm {
- display: block;
- padding: 1em 0 0 0;
-}
-
-.admin-ui .objectList {
- width: 100%;
-}
-
-.admin-ui .objectList .objectNameColumn {
- width: 25%;
-}
-
-.admin-ui .objectList .objectActionColumn {
- width: 75%;
-}
-
-.admin-ui .portlet-msg {
- border: 1px solid #bbb;
- margin: 2em auto;
- padding: 1em;
- width: 60%;
-}
-
-.admin-ui .portlet-msg-body {
- position: relative;
- top: -3em;
- left: 3em;
- width: 95%;
-}
+/* Redefine spacing for tables. */
+
+a {
+ color: #446688;
+ text-decoration: none;
+}
+
+a:hover {
+ color: #5078aa;
+ text-decoration: underline;
+}
+
+.admin-ui table {
+ border: 0;
+}
+
+.admin-ui th {
+ text-align: left;
+ border: 0;
+ border-bottom: 1px solid;
+ padding-bottom: 2px;
+ padding-top: 2px;
+ font-size: 11px;
+}
+
+.admin-ui td {
+ padding-bottom: 2px;
+ padding-top: 2px;
+}
+
+/* Pagination. */
+
+.admin-ui ul.pagination {
+ margin: 0;
+ padding: .2em;
+}
+
+.admin-ui ul.pagination li {
+ text-align: center;
+ list-style-type: none;
+ display: inline;
+ margin-right: 2px;
+}
+
+.admin-ui ul.pagination li.selected {
+ font-weight: bold;
+ background-color: #eef;
+ border-bottom: 2px solid #656565;
+}
+
+.pagination a, .pagination a:visited, .pagination a:hover {
+ text-decoration: none;
+}
+
+/* Top nav. */
+
+.admin-ui ul.topnav {
+ margin-left: 0;
+ padding: 4px 0px 3px;
+ border-bottom: 1px solid #b3c0c7;
+}
+
+.admin-ui ul.topnav li {
+ list-style-type: none;
+ display: inline;
+ margin: 0;
+ padding: 3px 0.5em;
+ margin-left: 5px;
+ border: 1px solid #b3c0c7;
+ border-bottom: none;
+ background-color: #f2f4f5;
+}
+
+.admin-ui ul.topnav li:hover {
+ background-color: #fff;
+}
+
+.admin-ui ul.topnav li#currentTab {
+ background-color: white;
+ border-bottom: 1px solid white;
+}
+
+.admin-ui ul.topnav li#currentTab a:hover {
+}
+
+/* Object path. */
+
+.admin-ui ul.objectpath {
+ list-style-type: none;
+ font-size: 11px;
+ border: solid 1px #bbb;
+ border-left: solid 1px #eee;
+ border-right: solid 1px #eee;
+ background-color: #d5d5d5;
+ background-image: url( img/pathBackground.png );
+ background-position: left;
+ background-repeat: repeat-x;
+ height: 21px;
+ margin: 0px;
+ padding: 0px;
+ padding-left: 2px;
+}
+
+.admin-ui ul.objectpath li {
+ list-style-type: none;
+ display: block;
+ float: left;
+}
+
+.admin-ui ul li.pathItem {
+ padding-top: 4px;
+ padding-left: 3px;
+ padding-right: 2px;
+}
+
+/*
+.admin-ui ul.li.pathSeparator {
+ background-image: url(img/pathSeparator.png);
+ background-position: center center;
+ background-repeat: no-repeat;
+ width: 7px;
+}
+*/
+
+.admin-ui ul.objectpath li.selected {
+ font-weight: bold;
+ padding-top: 4px;
+ padding-left: 3px;
+ padding-right: 2px;
+}
+
+.admin-ui ul.objectpath a {
+ color: #333333;
+ text-decoration: none;
+}
+
+.admin-ui ul.objectpath a:hover {
+ color: #5078aa;
+ text-decoration: none;
+}
+
+/* Resize combo lists */
+.admin-ui select {
+ padding: 2px 4px 2px 1px;
+}
+
+.admin-ui select.contentType {
+ width: 8em;
+}
+
+.admin-ui select.instanceList {
+ width: 11em;
+}
+
+.admin-ui select.windowList {
+ width: 95%;
+ overflow: auto;
+}
+
+/* Style a table for form layout */
+.admin-ui table form {
+ margin: 0;
+}
+
+.admin-ui table form td.label {
+ text-align: right;
+ vertical-align: top;
+ padding-top: 0.4em;
+}
+
+.admin-ui table form td.widget {
+ text-align: left;
+}
+
+/* Area header. */
+
+.admin-ui .portlet-area-header {
+ border: 1px solid #54708c;
+ font-weight: bold;
+ color: #fff;
+ font-size: 11px;
+ background-color: #5986b3;
+ padding: 2px;
+ padding-left: 4px;
+ margin: 0;
+}
+
+.admin-ui .portlet-area-body {
+ border: 1px solid #d5d5d5;
+ border-top: 0px;
+ background-color: #fff;
+ padding: 4px;
+ margin: 0;
+}
+
+/* Styles updated and enhanced from the main portal css */
+
+.admin-ui th.portlet-section-title {
+ font-weight: bold;
+ color: #656565;
+ font-size: 11px;
+ border: 1px solid #999;
+ background-color: #ebf2f5;
+ padding-left: 6px;
+}
+
+.admin-ui h3.sectionTitle {
+ font-weight: bold;
+ color: #656565;
+ font-size: 11px;
+ border-top: 1px solid #999;
+ background-color: #ebf2f5;
+ padding: 2px;
+ padding-left: 4px;
+}
+
+.admin-ui .portlet-section-header {
+ background-image: url( img/pathBackground.png );
+ background-position: left;
+ background-repeat: repeat-x;
+ font-weight: bold;
+ color: #656565;
+ font-size: 10px;
+ border-top: 1px solid #ddd;
+ border-bottom: 1px solid #999;
+ padding-left: 4px;
+}
+
+.admin-ui .portlet-section-header th {
+ background-image: url( img/pathBackground.png );
+ background-position: left;
+ background-repeat: repeat-x;
+ font-weight: bold;
+ color: #656565;
+ font-size: 10px;
+ border-top: 1px solid #ddd;
+ border-bottom: 1px solid #999;
+ padding-left: 4px;
+}
+
+.admin-ui .portlet-section-body {
+ color: #656565;
+ border: 1px solid #d5d5d5;
+ border-top: 0px;
+}
+
+.admin-ui .portlet-section-alternate {
+ background-color: #F2F2F2;
+ border: 1px solid #d5d5d5;
+}
+
+.admin-ui .portlet-section-selected {
+ background-color: #CBD4E6;
+}
+
+.admin-ui .actionDetails {
+ background-image: url( img/actionIcon_Details.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ line-height: 14px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionLayout {
+ background-image: url( img/actionIcon_Layout.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ line-height: 14px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionSecurity {
+ background-image: url( img/actionIcon_Security.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ line-height: 14px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionProperties {
+ background-image: url( img/actionIcon_Properties.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ padding-left: 18px;
+ white-space: nowrap;
+ height: 22px;
+}
+
+.admin-ui .actionTheme {
+ background-image: url( img/actionIcon_Theme.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionRename {
+ background-image: url( img/actionIcon_Rename.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionDelete {
+ background-image: url( img/actionIcon_Delete.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionMakeDefault {
+ background-image: url( img/actionIcon_MakeDefault.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionDefault {
+ background-image: url( img/actionIcon_IsDefault.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionPreferences {
+ background-image: url( img/actionIcon_Properties.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionCreateInstance {
+ background-image: url( img/actionIcon_CreateInstance.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .portlet-content-center {
+ padding: 0;
+ margin: 0;
+}
+
+.admin-ui .portlet-body {
+ padding: 0;
+ margin: 0;
+}
+
+.admin-ui .portlet-content-right {
+ padding: 0;
+ margin: 0;
+}
+
+.admin-ui .portlet-footer-left {
+ padding: 0;
+ margin: 0;
+}
+
+.admin-ui .portlet-table-header {
+ background-color: #eef;
+}
+
+.admin-ui .portlet-section-buttonrow {
+ margin-top: 6px;
+ margin-bottom: 6px;
+ float: right;
+}
+
+/* Change dashed line to solid. */
+
+.admin-ui hr {
+ border-top-style: solid;
+}
+
+.admin-ui .wizardStepBox {
+ display: inline;
+ float: left;
+ border: 1px solid #98B7C6;
+ height: 7em;
+ width: 9em;
+ background-color: #DFE8ED;
+ margin: .5em;
+}
+
+.admin-ui .wizardButtonBox {
+ margin: 1em;
+}
+
+.admin-ui .wizardContent {
+ clear: both;
+}
+
+.admin-ui form {
+ padding: 0;
+ margin: 0;
+}
+
+.admin-ui #selected.wizardStepBox {
+ background-color: #C8DCC4;
+ border: 1px solid black;
+ border-bottom: 5px solid black;
+}
+
+.admin-ui .stepNumber {
+ font-size: 2em;
+ text-align: center;
+ margin-top: 5px;
+ margin-bottom: 0;
+}
+
+.admin-ui .stepText {
+ text-align: center;
+}
+
+.admin-ui .layout-button {
+ width: 50px;
+ margin: 2px;
+ padding: 2px;
+}
+
+.admin-ui .createObjectForm {
+ display: block;
+ padding: 1em 0 0 0;
+}
+
+.admin-ui .objectList {
+ width: 100%;
+}
+
+.admin-ui .objectList .objectNameColumn {
+ width: 25%;
+}
+
+.admin-ui .objectList .objectActionColumn {
+ width: 75%;
+}
+
+.admin-ui .portlet-msg {
+ border: 1px solid #bbb;
+ margin: 2em auto;
+ padding: 1em;
+ width: 60%;
+}
+
+.admin-ui .portlet-msg-body {
+ position: relative;
+ top: -3em;
+ left: 3em;
+ width: 95%;
+}
+
+.admin-label {
+ padding: 0 4px 3px 0;
+ display: inline-block;
+ vertical-align: middle;
+}
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-09-18 19:13:19 UTC (rev 8337)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-09-18 19:22:30 UTC (rev 8338)
@@ -23,7 +23,7 @@
<td colspan="2">
<h:form id="windowForm">
<label for="windowName">
- <span class="portlet-form-field-admin-label">Window Name:</span>
+ <span class="portlet-form-field-label admin-label">Window Name:</span>
<h:inputText id="windowName" value="#{pageManager.windowName}" styleClass="portlet-form-input-field"/>
</label>
<h:message for="windowName" errorClass="portlet-msg-error"/>
@@ -40,7 +40,7 @@
<td>
<h:form id="abc">
<label for="instanceId" class="portlet-form-field-label-container">
- <span class="portlet-form-field-admin-label">Content Type:</span>
+ <span class="portlet-form-field-label admin-label">Content Type:</span>
<h:inputHidden id="windowNameCopy" value="#{pageManager.windowName}"/>
<h:selectOneMenu
id="instanceId"
18 years, 7 months
JBoss Portal SVN: r8337 - in branches/JBoss_Portal_Branch_2_6/core-admin/src: resources/portal-admin-war and 2 other directories.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-09-18 15:13:19 -0400 (Tue, 18 Sep 2007)
New Revision: 8337
Added:
branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/
Removed:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml
Log:
- JBPORTAL-1657: Finished styling of confirmation pages.
- JBPORTAL-1704: Moved img directory.
Copied: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img (from rev 8336, branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img)
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css 2007-09-18 18:45:15 UTC (rev 8336)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css 2007-09-18 19:13:19 UTC (rev 8337)
@@ -423,8 +423,8 @@
}
.admin-ui form {
- padding:0;
- margin:0;
+ padding: 0;
+ margin: 0;
}
.admin-ui #selected.wizardStepBox {
@@ -468,11 +468,15 @@
}
.admin-ui .portlet-msg {
- border: 1px solid #d5d5d5;
- margin: auto;
+ border: 1px solid #bbb;
+ margin: 2em auto;
+ padding: 1em;
+ width: 60%;
}
-.admin-ui .portlet-msg-icon {
- float: left;
+.admin-ui .portlet-msg-body {
+ position: relative;
+ top: -3em;
+ left: 3em;
+ width: 95%;
}
-
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-18 18:45:15 UTC (rev 8336)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-18 19:13:19 UTC (rev 8337)
@@ -13,11 +13,11 @@
<ui:define name="content">
<div class="portlet-msg">
+ <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div>
<div class="portlet-msg-body">
<h3>Delete <h:outputText value="#{portalobjectmgr.selectedObjectType}"/></h3>
<p class="portlet-msg-alert">
- <h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\" styleClass="portlet-msg-icon"/>
WARNING! You are about to delete the
<span class="objectName">#{portalobjectmgr.selectedObject.name}</span>
#{portalobjectmgr.selectedObject.typeName} from the
@@ -31,12 +31,12 @@
<h:form>
<h:commandButton value="Delete" action="objects" actionListener="#{portalobjectmgr.destroyObject}"
- styleClass="portlet-form-button">
+ styleClass="portlet-form-button portlet-section-buttonrow">
<f:attribute name="objectId" value="#{portalobjectmgr.selectedObject.id}"/>
</h:commandButton>
<h:commandButton value="Cancel" action="objects"
actionListener="#{portalobjectmgr.selectParentObject}"
- styleClass="portlet-form-button"/>
+ styleClass="portlet-form-button portlet-section-buttonrow"/>
</h:form>
</div>
</div>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2007-09-18 18:45:15 UTC (rev 8336)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2007-09-18 19:13:19 UTC (rev 8337)
@@ -24,11 +24,11 @@
<br/>
<div class="portlet-msg">
+ <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div>
<div class="portlet-msg-body">
<h3>Delete <span class="objectName">#{instancemgr.selectedInstance.id}</span></h3>
<p class="portlet-msg-alert">
- <h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\" styleClass="portlet-msg-icon"/>
WARNING! You are about to delete the
<span class="objectName">#{instancemgr.selectedInstance.id}</span> portlet instance causing windows
referencing it to not be able to display their content anymore.
@@ -38,11 +38,11 @@
<h:form>
<h:commandButton value="Delete" action="instances" actionListener="#{instancemgr.deleteInstance}"
- styleClass="portlet-form-button">
+ styleClass="portlet-form-button portlet-section-buttonrow">
<f:attribute name="instanceId" value="#{instancemgr.selectedInstance.id}"/>
</h:commandButton>
<h:commandButton value="Cancel" action="instances" actionListener="objects"
- styleClass="portlet-form-button"/>
+ styleClass="portlet-form-button portlet-section-buttonrow"/>
</h:form>
</div>
</div>
18 years, 7 months
JBoss Portal SVN: r8336 - in branches/JBoss_Portal_Branch_2_6: core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common and 1 other directory.
by portal-commits@lists.jboss.org
Author: wesleyhales
Date: 2007-09-18 14:45:15 -0400 (Tue, 18 Sep 2007)
New Revision: 8336
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
Log:
JBPORTAL-1578
Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-09-18 18:39:08 UTC (rev 8335)
+++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-09-18 18:45:15 UTC (rev 8336)
@@ -38,7 +38,6 @@
/* Header background */
#header {
-
height: 65px;
width: 100%;
padding: 0px;
@@ -912,7 +911,8 @@
}
/* Text for form field labels */
-.portlet-form-field-label {
+.portlet-form-field-label,
+.portlet-form-field-admin-label,{
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-size: 10px;
color: #000;
@@ -920,6 +920,11 @@
white-space: nowrap
}
+.portlet-form-field-admin-label {
+ padding: 0 4px 3px 0;
+ display: inline-block;
+}
+
/* Text for a form field */
.portlet-form-field {
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-09-18 18:39:08 UTC (rev 8335)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-09-18 18:45:15 UTC (rev 8336)
@@ -20,13 +20,13 @@
</td>
</tr>
<tr>
- <td>
- <span class="portlet-form-field-label">Window Name:</span>
- </td>
- <td width="100%">
+ <td colspan="2">
<h:form id="windowForm">
+ <label for="windowName">
+ <span class="portlet-form-field-admin-label">Window Name:</span>
<h:inputText id="windowName" value="#{pageManager.windowName}" styleClass="portlet-form-input-field"/>
- <h:message for="windowName" errorClass="portlet-msg-error"/>
+ </label>
+ <h:message for="windowName" errorClass="portlet-msg-error"/>
</h:form>
</td>
</tr>
@@ -38,20 +38,20 @@
</tr>
<tr>
<td>
- <span class="portlet-form-field-label">Content Type:</span>
- </td>
- <td>
<h:form id="abc">
- <h:inputHidden id="windowNameCopy" value="#{pageManager.windowName}"/>
- <h:selectOneMenu
- id="instanceId"
- value="#{pageManager.selectedContentType}"
- styleClass="portlet-form-field contentType"
- onchange="document.getElementById('abc:windowNameCopy').value = document.getElementById('windowForm:windowName').value;
- document.getElementById('abc').submit(); ">
- <f:selectItems value="#{pageManager.contentTypeItems}"/>
- </h:selectOneMenu>
- <h:message for="instanceId" errorClass="portlet-msg-error"/>
+ <label for="instanceId" class="portlet-form-field-label-container">
+ <span class="portlet-form-field-admin-label">Content Type:</span>
+ <h:inputHidden id="windowNameCopy" value="#{pageManager.windowName}"/>
+ <h:selectOneMenu
+ id="instanceId"
+ value="#{pageManager.selectedContentType}"
+ styleClass="portlet-form-field contentType"
+ onchange="document.getElementById('abc:windowNameCopy').value = document.getElementById('windowForm:windowName').value;
+ document.getElementById('abc').submit(); ">
+ <f:selectItems value="#{pageManager.contentTypeItems}"/>
+ </h:selectOneMenu>
+ </label>
+ <h:message for="instanceId" errorClass="portlet-msg-error"/>
</h:form>
</td>
</tr>
18 years, 7 months