[jboss-svn-commits] JBoss Portal SVN: r5402 - in trunk/core/src: bin/portal-core-war/themes/renaissance main/org/jboss/portal/core/portlet/user resources/portal-core-war/WEB-INF/classes resources/portal-core-war/WEB-INF/jsp/user
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Oct 10 13:38:08 EDT 2006
Author: roy.russo at jboss.com
Date: 2006-10-10 13:38:04 -0400 (Tue, 10 Oct 2006)
New Revision: 5402
Modified:
trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java
trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties
trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_en.properties
trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties
trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/menu.jsp
Log:
JBPORTAL-1073 - ui/functionality enhancements to userportlet.
Modified: trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
===================================================================
--- trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2006-10-10 15:23:01 UTC (rev 5401)
+++ trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2006-10-10 17:38:04 UTC (rev 5402)
@@ -3,13 +3,15 @@
/* *************************************************** */
#body {
- background-color: #FFFFFF;
- background-image: url( images/header_bg.gif );
- background-repeat: repeat-x;
- margin: 0px;
- padding: 0px;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
+ background-color: #FFFFFF;
+ background-image: url( images/header_bg.gif );
+ background-repeat: repeat-x;
+ margin: 0px;
+ padding: 0px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ background-repeat: repeat-x;
+ font-size: 11px;
+ color: #656565;
}
/*****************
@@ -19,41 +21,41 @@
/* spacer to keep header at certain width regardless of display size
done to avoid overlapping of tab navigation in header */
#spacer {
- width: 770px;
- line-height: 0px;
- font-size: 0px;
- height: 0px;
+ width: 770px;
+ line-height: 0px;
+ font-size: 0px;
+ height: 0px;
}
/* Wrapper for Header */
#header-container {
- height: 100%;
- width: 100%;
- min-width: 770px;
- z-index: 5;
- margin: 0px -3px 0px 3px;
+ height: 100%;
+ width: 100%;
+ min-width: 770px;
+ z-index: 5;
+ margin: 0px -3px 0px 3px;
}
/* Header background */
#header {
- height: 65px;
- width: 100%;
- padding: 0px;
- margin: 0px;
- z-index: 1;
+ height: 65px;
+ width: 100%;
+ padding: 0px;
+ margin: 0px;
+ z-index: 1;
}
#logoName {
- background-image: url( images/logo.gif );
- background-repeat: no-repeat;
- float: left;
- width: 250px;
- height: 25px;
- z-index: 2;
- position: absolute;
- left: 20px;
- top: 10px;
+ background-image: url( images/logo.gif );
+ background-repeat: no-repeat;
+ float: left;
+ width: 250px;
+ height: 25px;
+ z-index: 2;
+ position: absolute;
+ left: 20px;
+ top: 10px;
}
@@ -65,31 +67,31 @@
#portal-container {
/* part of below IE hack to preserve min-width for portlet regions */
/*width: 100%;*/
- margin: 4px 2% 0px 2%;
+ margin: 4px 2% 0px 2%;
- padding: 0 350px 0 350px;
+ padding: 0 350px 0 350px;
}
/* min width for IE */
#expander {
- position: relative;
- padding: 0 0 0 0;
+ position: relative;
+ padding: 0 0 0 0;
- margin: 0 -350px 0 -350px;
- min-width: 770px;
- padding: 0 0 0 0;
+ margin: 0 -350px 0 -350px;
+ min-width: 770px;
+ padding: 0 0 0 0;
}
/* min width hack for IE */
#sizer {
- width: 100%;
+ width: 100%;
}
/* IE Hack \*/
* html #portal-container,
- * html #sizer,
- * html #expander {
- height: 0;
+ * html #sizer,
+ * html #expander {
+ height: 0;
}
/* end IE min-width hack */
@@ -97,44 +99,44 @@
/* table that contains all regions. does not include header */
#content-container {
- height: 100%;
- text-align: left;
- width: 100%;
- min-width: 770px;
- position: absolute;
- top: 70px;
- left: 0px; /* z-index: 1; */
- /*part of below IE hack
+ height: 100%;
+ text-align: left;
+ width: 100%;
+ min-width: 770px;
+ position: absolute;
+ top: 70px;
+ left: 0px; /* z-index: 1; */
+ /*part of below IE hack
padding: 0 350px 0 350px; */
- padding: 0px 100px 0px 0px;
+ padding: 0px 100px 0px 0px;
}
/* Login JSP Selectors */
#login-container {
- position: relative;
- left: 35%;
- top: 55px;
- right: 45%;
- width: 320px;
- height: 250px;
- margin: 0px;
+ position: relative;
+ left: 35%;
+ top: 55px;
+ right: 45%;
+ width: 320px;
+ height: 250px;
+ margin: 0px;
}
#login-container label, #login-container input {
- display: block;
- float: left;
- width: auto;
- margin-top: 15px;
+ display: block;
+ float: left;
+ width: auto;
+ margin-top: 15px;
}
#login-container label {
- text-align: right;
- padding-right: 20px;
- width: 95px;
+ text-align: right;
+ padding-right: 20px;
+ width: 95px;
}
#login-container br {
- clear: left;
+ clear: left;
}
#loginButton {
@@ -142,64 +144,64 @@
}
#login-container legend {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 13px;
- font-weight: bold;
- color: #768591;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ font-weight: bold;
+ color: #768591;
}
#loginForm {
- margin: 0px;
- padding: 0px;
+ margin: 0px;
+ padding: 0px;
}
/* end Login Page Selectors */
/* portlet regions within content-container. this includes footer-container. */
#regionA {
- /* test to swap columns...
- float: right; */
+ /* test to swap columns...
+ float: right; */
- width: 30%;
- float: left;
- margin: 0px;
- padding: 0px;
- min-width: 250px;
- height: 300px;
+ width: 30%;
+ float: left;
+ margin: 0px;
+ padding: 0px;
+ min-width: 250px;
+ height: 300px;
}
#regionB {
- /* test to swap columns..
+ /* test to swap columns..
margin: 0 30% 0 0; */
- /*two column layout
+ /*two column layout
margin: 0 0 0 30%;*/
- padding: 0px; /* test to add 3rd region in layout...*/
- width: 67%;
- float: left;
- height: 300px;
+ padding: 0px; /* test to add 3rd region in layout...*/
+ width: 67%;
+ float: left;
+ height: 300px;
}
#regionC {
/* inclusion of 3rd region - comment out for 2 region testing */
- padding: 0px;
- margin: 0px;
- width: 28%;
- float: left; /*hide 3rd region*/
- display: none;
+ padding: 0px;
+ margin: 0px;
+ width: 28%;
+ float: left; /*hide 3rd region*/
+ display: none;
}
#footer-container {
- padding: 10px;
- text-align: center;
- clear: both;
+ padding: 10px;
+ text-align: center;
+ clear: both;
}
#navigation-container {
- margin: 0px;
- position: absolute;
- width: 100%;
- z-index: -1;
+ margin: 0px;
+ position: absolute;
+ width: 100%;
+ z-index: -1;
}
/* used to clear float in regionA,B,C divs so that
@@ -207,12 +209,12 @@
/* used to clear float in regionA,B,C divs so that
footer spans bottom of page */
hr.cleaner {
- clear: both;
- height: 1px;
- margin: -1px 0 0 0;
- padding: 0;
- border: none;
- visibility: hidden;
+ clear: both;
+ height: 1px;
+ margin: -1px 0 0 0;
+ padding: 0;
+ border: none;
+ visibility: hidden;
}
/***************************
@@ -220,148 +222,148 @@
*****************************/
UL#tabsHeader {
- margin: 0;
- padding-left: 0px;
- min-width: 550px;
+ margin: 0;
+ padding-left: 0px;
+ min-width: 550px;
}
UL#tabsHeader li {
- display: inline;
- list-style: none;
- float: left;
- margin-left: 0px;
- margin-top: 39px;
- margin-right: 0px;
- position: relative;
- top: 0px;
- background-image: url( images/tab_right.gif );
- background-repeat: no-repeat;
- background-position: right top;
- white-space: nowrap;
+ display: inline;
+ list-style: none;
+ float: left;
+ margin-left: 0px;
+ margin-top: 39px;
+ margin-right: 0px;
+ position: relative;
+ top: 0px;
+ background-image: url( images/tab_right.gif );
+ background-repeat: no-repeat;
+ background-position: right top;
+ white-space: nowrap;
}
UL#tabsHeader li:hover {
- background-image: url( images/tab_right_hover2.gif );
- background-repeat: no-repeat;
- background-position: right top;
- white-space: nowrap;
+ background-image: url( images/tab_right_hover2.gif );
+ background-repeat: no-repeat;
+ background-position: right top;
+ white-space: nowrap;
}
/* hover selectors for main header tabs */
UL#tabsHeader li.hoverOn {
- background-image: url( images/tab_right_hover2.gif );
- background-repeat: no-repeat;
- background-position: right top;
- white-space: nowrap;
+ background-image: url( images/tab_right_hover2.gif );
+ background-repeat: no-repeat;
+ background-position: right top;
+ white-space: nowrap;
}
UL#tabsHeader li.hoverOff {
- background-image: url( images/tab_right.gif );
- background-repeat: no-repeat;
- background-position: top right;
- white-space: nowrap;
+ background-image: url( images/tab_right.gif );
+ background-repeat: no-repeat;
+ background-position: top right;
+ white-space: nowrap;
}
UL#tabsHeader a {
- display: inline;
- float: left;
- text-decoration: none;
- font: 11px / normal Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-weight: bold;
- color: #8a8a8a;
- line-height: 22px;
- padding: 5px 15px 3px 15px; /*background-image: url(../images/tab_left.gif);*/
- background-repeat: no-repeat;
- background-position: top left;
- width: 90px;
- white-space: nowrap;
+ display: inline;
+ float: left;
+ text-decoration: none;
+ font: 11px / normal Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-weight: bold;
+ color: #8a8a8a;
+ line-height: 22px;
+ padding: 5px 15px 3px 15px; /*background-image: url(../images/tab_left.gif);*/
+ background-repeat: no-repeat;
+ background-position: top left;
+ width: 90px;
+ white-space: nowrap;
}
UL#tabsHeader a:hover {
- text-decoration: underline;
- color: #000000; /*background-image: url(../images/tab_left_hover2.gif);*/
- background-repeat: no-repeat;
- background-position: top left;
- white-space: nowrap;
+ text-decoration: underline;
+ color: #000000; /*background-image: url(../images/tab_left_hover2.gif);*/
+ background-repeat: no-repeat;
+ background-position: top left;
+ white-space: nowrap;
}
UL#tabsHeader #current {
- line-height: 22px;
- background-color: #fff;
- background-image: url( images/tab_right_current.gif );
- background-repeat: no-repeat;
- background-position: right top;
- padding-top: -3px;
- border-bottom: 2px solid #fff;
+ line-height: 22px;
+ background-color: #fff;
+ background-image: url( images/tab_right_current.gif );
+ background-repeat: no-repeat;
+ background-position: right top;
+ padding-top: -3px;
+ border-bottom: 2px solid #fff;
}
UL#tabsHeader #current a, #current a:hover {
- font: 11px / normal Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-weight: bold;
- color: #000; /* background-image: url(../images/tab_left_current.gif); */
- background-repeat: no-repeat;
- background-position: top left;
+ font: 11px / normal Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-weight: bold;
+ color: #000; /* background-image: url(../images/tab_left_current.gif); */
+ background-repeat: no-repeat;
+ background-position: top left;
}
/* -------- These are new selectors for the admin and add page styles ------- */
UL#tabsHeader #admin {
- display: inline;
- background-image: url( images/tab_right_admin.gif );
- background-repeat: no-repeat;
- background-position: right top;
- padding-top: -3px;
- line-height: 22px;
+ display: inline;
+ background-image: url( images/tab_right_admin.gif );
+ background-repeat: no-repeat;
+ background-position: right top;
+ padding-top: -3px;
+ line-height: 22px;
}
UL#tabsHeader #admin a {
- text-decoration: none;
- color: #4386b5; /* background-image: url(../images/tab_left_admin.gif);*/
- background-repeat: no-repeat;
- background-position: top left;
- white-space: nowrap;
- padding-top: -3px;
- line-height: 22px;
+ text-decoration: none;
+ color: #4386b5; /* background-image: url(../images/tab_left_admin.gif);*/
+ background-repeat: no-repeat;
+ background-position: top left;
+ white-space: nowrap;
+ padding-top: -3px;
+ line-height: 22px;
}
UL#tabsHeader #admin a:hover {
- text-decoration: underline;
+ text-decoration: underline;
}
UL#tabsHeader #addpage {
- display: inline;
- background-color: none;
- background-image: none;
- margin-bottom: -3px;
- padding-top: 1px;
+ display: inline;
+ background-color: none;
+ background-image: none;
+ margin-bottom: -3px;
+ padding-top: 1px;
}
UL#tabsHeader #addpage a, #addpage a:hover {
- font: 11px / normal Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-weight: bold;
- color: white;
- line-height: 22px;
- background-image: none;
- white-space: nowrap;
+ font: 11px / normal Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-weight: bold;
+ color: white;
+ line-height: 22px;
+ background-image: none;
+ white-space: nowrap;
}
UL#tabsHeader #addpage a:hover {
- text-decoration: underline;
+ text-decoration: underline;
}
/* Tab background color for selected global nav item */
li.currentTabBackground {
- background: #fff;
+ background: #fff;
}
/* backslash hack for IE5-Mac \*/
UL#tabsHeader a {
- float: none;
+ float: none;
}
/* End Mac Hack */
html>body UL#tabsHeader a {
- width: auto;
+ width: auto;
}
/* fixes IE6 win hack */
@@ -371,24 +373,24 @@
*****************************/
#dashboardnav {
- float: right;
- font-size: 10px;
- padding: 6px 12px 0px 0px;
- color: #FFFFFF;
- z-index: 20;
+ float: right;
+ font-size: 10px;
+ padding: 6px 12px 0px 0px;
+ color: #FFFFFF;
+ z-index: 20;
}
#dashboardnav a {
- color: #FFFFFF;
+ color: #FFFFFF;
}
#dashboardnav .addcontent {
- background-image: url( images/ico_addcontent.gif );
- background-repeat: no-repeat;
- background-position: left;
- height: 20px;
- width: 20px;
- padding-left: 16px;
+ background-image: url( images/ico_addcontent.gif );
+ background-repeat: no-repeat;
+ background-position: left;
+ height: 20px;
+ width: 20px;
+ padding-left: 16px;
}
/****************************
@@ -397,27 +399,27 @@
.portlet-container {
/* margin: 10px;*/
- padding: 10px;
+ padding: 10px;
}
/* wrapper for floating portlet window modes */
.portlet-mode-container {
- float: right;
- padding-top: 4px;
- white-space: nowrap;
+ float: right;
+ padding-top: 4px;
+ white-space: nowrap;
}
.portlet-titlebar-title {
- color: #656565;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- font-weight: bold;
- white-space: nowrap;
- line-height: 100%;
- float: left;
- text-indent: 5px;
- padding-top: 5px;
- padding-bottom: 6px;
+ color: #656565;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ font-weight: bold;
+ white-space: nowrap;
+ line-height: 100%;
+ float: left;
+ text-indent: 5px;
+ padding-top: 5px;
+ padding-bottom: 6px;
}
/* ------ NOT CURRENTLY IN USE FOR NEW 2.6 FUNCTIONALITY -------
@@ -425,281 +427,281 @@
*/
.portlet-titlebar-left {
- background-image: url( images/portlet-top-left.gif );
- background-repeat: no-repeat;
- width: 9px;
- height: 29px;
- min-width: 9px;
- background-position: bottom;
- /*
- background-color:#dfe8ed;
- border-top: 1px solid #98b7c6;
- border-bottom: 1px solid #98b7c6;
- border-left: 1px solid #98b7c6;
- width:20px;
- white-space: nowrap;
- */
+ background-image: url( images/portlet-top-left.gif );
+ background-repeat: no-repeat;
+ width: 9px;
+ height: 29px;
+ min-width: 9px;
+ background-position: bottom;
+ /*
+ background-color:#dfe8ed;
+ border-top: 1px solid #98b7c6;
+ border-bottom: 1px solid #98b7c6;
+ border-left: 1px solid #98b7c6;
+ width:20px;
+ white-space: nowrap;
+ */
}
.portlet-titlebar-center {
- background-image: url( images/portlet-top-middle.gif );
- background-repeat: repeat-x;
- height: 29px;
- background-position: bottom;
- /* background-color:#dfe8ed;
- border-top: 1px solid #98b7c6;
- border-bottom: 1px solid #98b7c6;
- white-space: nowrap;
- */
+ background-image: url( images/portlet-top-middle.gif );
+ background-repeat: repeat-x;
+ height: 29px;
+ background-position: bottom;
+ /* background-color:#dfe8ed;
+ border-top: 1px solid #98b7c6;
+ border-bottom: 1px solid #98b7c6;
+ white-space: nowrap;
+ */
}
.portlet-titlebar-right {
- background-image: url( images/portlet-top-right.gif );
- background-repeat: no-repeat;
- width: 10px;
- height: 30px;
- min-width: 10px;
- background-position: bottom left;
- /*
- background-color:#dfe8ed;
- border-top: 1px solid #98b7c6;
- border-right: 1px solid #98b7c6;
- border-bottom: 1px solid #98b7c6;
- width:10px;
- white-space: nowrap;
- */
+ background-image: url( images/portlet-top-right.gif );
+ background-repeat: no-repeat;
+ width: 10px;
+ height: 30px;
+ min-width: 10px;
+ background-position: bottom left;
+ /*
+ background-color:#dfe8ed;
+ border-top: 1px solid #98b7c6;
+ border-right: 1px solid #98b7c6;
+ border-bottom: 1px solid #98b7c6;
+ width:10px;
+ white-space: nowrap;
+ */
}
.portlet-content-left {
- background-image: url( images/portlet-left-vertical.gif );
- background-repeat: repeat-y;
- width: 9px;
- min-width: 9px;
- /*
- width:20px;
- background-color:#FFFFFF;
- border-left: 1px solid #dfe8ed;
- */
+ background-image: url( images/portlet-left-vertical.gif );
+ background-repeat: repeat-y;
+ width: 9px;
+ min-width: 9px;
+ /*
+ width:20px;
+ background-color:#FFFFFF;
+ border-left: 1px solid #dfe8ed;
+ */
}
.portlet-content-center {
- vertical-align: top;
+ vertical-align: top;
}
.portlet-body {
- background-color: #ffffff;
+ background-color: #ffffff;
}
.portlet-content-right {
- background-image: url( images/portlet-right-vertical.gif );
- height: 100%;
- background-repeat: repeat-y;
- background-position: left;
- width: 5px;
- min-width: 5px;
- /*
- width:5px;
- background-color:#FFFFFF;
- border-right: 1px solid #dfe8ed;
- */
+ background-image: url( images/portlet-right-vertical.gif );
+ height: 100%;
+ background-repeat: repeat-y;
+ background-position: left;
+ width: 5px;
+ min-width: 5px;
+ /*
+ width:5px;
+ background-color:#FFFFFF;
+ border-right: 1px solid #dfe8ed;
+ */
}
.portlet-footer-left {
- background-image: url( images/portlet-bottom-left.gif );
- width: 9px;
- height: 4px;
- background-repeat: no-repeat;
- background-position: top right;
- min-width: 9px;
+ background-image: url( images/portlet-bottom-left.gif );
+ width: 9px;
+ height: 4px;
+ background-repeat: no-repeat;
+ background-position: top right;
+ min-width: 9px;
- /*
- background-color:#FFFFFF;
- border-bottom: 1px solid #98b7c6;
- border-left: 1px solid #dfe8ed;
- height:5px;
- */
+ /*
+ background-color:#FFFFFF;
+ border-bottom: 1px solid #98b7c6;
+ border-left: 1px solid #dfe8ed;
+ height:5px;
+ */
}
.portlet-footer-center {
- background-image: url( images/portlet-bottom-middle.gif );
- height: 4px;
- background-repeat: repeat-x;
- /* background-color:#FFFFFF;
- border-bottom: 1px solid #98b7c6;
- height:5px;
- */
+ background-image: url( images/portlet-bottom-middle.gif );
+ height: 4px;
+ background-repeat: repeat-x;
+ /* background-color:#FFFFFF;
+ border-bottom: 1px solid #98b7c6;
+ height:5px;
+ */
}
.portlet-footer-right {
- background-image: url( images/portlet-bottom-right.gif );
- width: 5px;
- height: 4px;
- background-repeat: no-repeat;
- min-width: 5px;
- /*
- background-color:#FFFFFF;
- border-bottom: 1px solid #98b7c6;
- border-right: 1px solid #dfe8ed;
- height:5px;
- */
+ background-image: url( images/portlet-bottom-right.gif );
+ width: 5px;
+ height: 4px;
+ background-repeat: no-repeat;
+ min-width: 5px;
+ /*
+ background-color:#FFFFFF;
+ border-bottom: 1px solid #98b7c6;
+ border-right: 1px solid #dfe8ed;
+ height:5px;
+ */
}
/***********************
* Portlet Window Modes *
************************/
.portlet-mode-maximized {
- background-image: url( images/ico_16_maximize.gif );
- background-repeat: no-repeat;
- width: 16px;
- height: 16px;
- float: left;
- display: inline;
- cursor: pointer;
- padding-left: 3px;
+ background-image: url( images/ico_16_maximize.gif );
+ background-repeat: no-repeat;
+ width: 16px;
+ height: 16px;
+ float: left;
+ display: inline;
+ cursor: pointer;
+ padding-left: 3px;
}
.portlet-mode-minimized {
- background-image: url( images/ico_16_minimize.gif );
- background-repeat: no-repeat;
- width: 16px;
- height: 16px;
- float: left;
- display: inline;
- cursor: pointer;
- padding-left: 3px;
+ background-image: url( images/ico_16_minimize.gif );
+ background-repeat: no-repeat;
+ width: 16px;
+ height: 16px;
+ float: left;
+ display: inline;
+ cursor: pointer;
+ padding-left: 3px;
}
.portlet-mode-normal {
- background-image: url( images/ico_16_normal.gif );
- width: 16px;
- height: 16px;
- background-repeat: no-repeat;
- float: left;
- display: inline;
- cursor: pointer;
- padding-left: 3px;
+ background-image: url( images/ico_16_normal.gif );
+ width: 16px;
+ height: 16px;
+ background-repeat: no-repeat;
+ float: left;
+ display: inline;
+ cursor: pointer;
+ padding-left: 3px;
}
.portlet-mode-help {
- background-image: url( images/ico_16_help.gif );
- width: 16px;
- height: 16px;
- background-repeat: no-repeat;
- float: left;
- display: inline;
- cursor: pointer;
- padding-left: 3px;
+ background-image: url( images/ico_16_help.gif );
+ width: 16px;
+ height: 16px;
+ background-repeat: no-repeat;
+ float: left;
+ display: inline;
+ cursor: pointer;
+ padding-left: 3px;
}
.portlet-mode-edit {
- background-image: url( images/ico_edit.gif );
- background-repeat: no-repeat;
- width: 28px;
- height: 16px;
- float: left;
- display: inline;
- cursor: pointer;
- padding-left: 3px;
+ background-image: url( images/ico_edit.gif );
+ background-repeat: no-repeat;
+ width: 28px;
+ height: 16px;
+ float: left;
+ display: inline;
+ cursor: pointer;
+ padding-left: 3px;
}
.portlet-mode-remove {
- background-image: url( images/ico_16_remove.gif );
- background-repeat: no-repeat;
- width: 16px;
- height: 16px;
- float: left;
- display: inline;
- cursor: pointer;
- padding-left: 3px;
+ background-image: url( images/ico_16_remove.gif );
+ background-repeat: no-repeat;
+ width: 16px;
+ height: 16px;
+ float: left;
+ display: inline;
+ cursor: pointer;
+ padding-left: 3px;
}
.portlet-mode-view {
- background-image: url( images/ico_cancel.gif );
- background-repeat: no-repeat;
- width: 28px;
- height: 16px;
- float: left;
- display: inline;
- cursor: pointer;
- padding-left: 3px;
- padding-right: 20px;
+ background-image: url( images/ico_cancel.gif );
+ background-repeat: no-repeat;
+ width: 28px;
+ height: 16px;
+ float: left;
+ display: inline;
+ cursor: pointer;
+ padding-left: 3px;
+ padding-right: 20px;
}
.portlet-mode-reload {
- background-image: url( images/ico_16_reload.gif );
- background-repeat: no-repeat;
- width: 16px;
- height: 16px;
- float: left;
- display: inline;
- cursor: pointer;
- padding-left: 3px;
+ background-image: url( images/ico_16_reload.gif );
+ background-repeat: no-repeat;
+ width: 16px;
+ height: 16px;
+ float: left;
+ display: inline;
+ cursor: pointer;
+ padding-left: 3px;
}
.portlet-mode-hide {
- background-image: url( images/ico_16_swizzleclosed.gif );
- background-repeat: no-repeat;
- width: 16px;
- height: 16px;
- float: right;
- display: inline;
- cursor: pointer;
+ background-image: url( images/ico_16_swizzleclosed.gif );
+ background-repeat: no-repeat;
+ width: 16px;
+ height: 16px;
+ float: right;
+ display: inline;
+ cursor: pointer;
}
/**********************
* Copyright Selectors *
***********************/
.portal-copyright {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 10px;
- color: #5E6D7A;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ color: #5E6D7A;
}
a.portal-copyright {
- color: #768591;
- text-decoration: none;
+ color: #768591;
+ text-decoration: none;
}
a.portal-copyright:hover {
- color: #bcbcbc;
- text-decoration: underline;
+ color: #bcbcbc;
+ text-decoration: underline;
}
#ThemeBy {
- content: "Theme by JBoss.org Design";
+ content: "Theme by JBoss.org Design";
}
/*************
* Elements *
**************/
a {
- color: #5078aa;
- text-decoration: none;
+ color: #5078aa;
+ text-decoration: none;
}
a:hover {
- color: #7eacd6;
- text-decoration: underline;
+ color: #7eacd6;
+ text-decoration: underline;
}
hr {
- border-top: 1px dashed #d5d5d5;
- border-bottom: 0px;
- border-left: 0px;
- border-right: 0px;
+ border-top: 1px dashed #d5d5d5;
+ border-bottom: 0px;
+ border-left: 0px;
+ border-right: 0px;
}
ul {
- padding-left: 20px;
+ padding-left: 20px;
}
li {
- list-style: url( images/ico_listelement.gif );
+ list-style: url( images/ico_listelement.gif );
}
input {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 11px;
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 11px;
}
SELECT {
@@ -717,13 +719,13 @@
}
h1 {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- font-weight: bold;
- color: #656565;
- padding-top: 10px;
- padding-bottom: 5px;
- margin: 0px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ font-weight: bold;
+ color: #656565;
+ padding-top: 10px;
+ padding-bottom: 5px;
+ margin: 0px;
}
h2 {
@@ -733,25 +735,25 @@
}
h4 {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 11px;
- font-weight: bold;
- color: #656565;
- padding-top: 10px;
- padding-bottom: 5px;
- margin: 0px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ font-weight: bold;
+ color: #656565;
+ padding-top: 10px;
+ padding-bottom: 5px;
+ margin: 0px;
}
h5 {
}
h6 {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 11px;
- font-weight: bold;
- color: #656565;
- padding-top: 5px;
- margin: 0px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ font-weight: bold;
+ color: #656565;
+ padding-top: 5px;
+ margin: 0px;
}
/********
@@ -761,44 +763,44 @@
/* Font attributes for the normal fragment font.
Used for the display of non-accentuated information */
.portlet-font {
- color: #000000;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
+ color: #000000;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
}
/* Font attributes similar to the portlet.font but the color is lighter */
.portlet-font-dim {
- color: #777777;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
+ color: #777777;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
}
/********
* FORMS *
*********/
input {
- margin-right: 6px;
- margin-top: 3px;
+ margin-right: 6px;
+ margin-top: 3px;
}
.portlet-form-label {
- font-size: 11px;
- color: #656565;
+ font-size: 11px;
+ color: #656565;
}
/* Text of the user-input in an input field. not sure if we need this guy? */
.portlet-form-input-field {
- color: #000000;
- font-size: 11px;
+ color: #000000;
+ font-size: 11px;
}
/* Form Button Style */
.portlet-form-button {
- font-size: 10px;
- font-weight: bold;
- color: #FFFFFF;
- background-color: #5078aa;
- border: 1px solid #175877;
+ font-size: 10px;
+ font-weight: bold;
+ color: #FFFFFF;
+ background-color: #5078aa;
+ border: 1px solid #175877;
}
@@ -815,21 +817,21 @@
/* Text for form field labels */
.portlet-form-field-label {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 12px;
- color: #000;
- vertical-align: bottom;
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 12px;
+ color: #000;
+ vertical-align: bottom;
}
/* Text for a form field */
.portlet-form-field {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 12px;
- color: #000; /*margin-top: 10px;*/
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 12px;
+ color: #000; /*margin-top: 10px;*/
}
.requiredfield {
- color: #821717;
+ color: #821717;
}
/********
@@ -837,35 +839,35 @@
*********/
.portal-links:link {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 11px;
- font-weight: bold;
- color: #242424;
- text-decoration: none;
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 11px;
+ font-weight: bold;
+ color: #242424;
+ text-decoration: none;
}
.portal-links:hover {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 11px;
- font-weight: bold;
- color: #5699B7;
- text-decoration: none;
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 11px;
+ font-weight: bold;
+ color: #5699B7;
+ text-decoration: none;
}
.portal-links:active {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 11px;
- font-weight: bold;
- color: #242424;
- text-decoration: none;
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 11px;
+ font-weight: bold;
+ color: #242424;
+ text-decoration: none;
}
.portal-links:visited {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 11px;
- font-weight: bold;
- color: #242424;
- text-decoration: none;
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 11px;
+ font-weight: bold;
+ color: #242424;
+ text-decoration: none;
}
/***********
@@ -874,42 +876,42 @@
/* Status of the current operation. */
.portlet-msg-status {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 12px;
- font-style: normal;
- color: #336699;
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 12px;
+ font-style: normal;
+ color: #336699;
}
/* Help messages, general additional information, etc. */
.portlet-msg-info {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 12px;
- font-style: italic;
- color: #000;
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 12px;
+ font-style: italic;
+ color: #000;
}
/* Error messages. */
.portlet-msg-error {
- color: red;
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 12px;
- font-weight: bold;
+ color: red;
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 12px;
+ font-weight: bold;
}
/* Warning messages. */
.portlet-msg-alert {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 12px;
- font-weight: bold;
- color: #821717;
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 12px;
+ font-weight: bold;
+ color: #821717;
}
/* Verification of the successful completion of a task. */
.portlet-msg-success {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 12px;
- font-weight: bold;
- color: #359630;
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 12px;
+ font-weight: bold;
+ color: #359630;
}
/***********
@@ -918,40 +920,40 @@
/* Table or section header */
.portlet-section-header {
- font-weight: bold;
- color: #000;
- font-size: 13px;
- background-color: #CBD4E6;
+ font-weight: bold;
+ color: #656565;
+ font-size: 12px;
}
.portlet-section-body {
- font-size: 12px;
+ color: #656565;
+ padding: 0px 10px 0px 5px;
}
.portlet-section-alternate {
- font-size: 12px;
- background-color: #E6E8E5;
+ font-size: 12px;
+ background-color: #E6E8E5;
}
.portlet-section-selected {
- font-size: 12px;
- background-color: #CBD4E6;
+ font-size: 12px;
+ background-color: #CBD4E6;
}
.portlet-section-subheader {
- font-weight: bold;
- font-size: 12px;
+ font-weight: bold;
+ font-size: 12px;
}
.portlet-section-footer {
- font-size: 11px;
+ font-size: 11px;
}
/* Text that belongs to the table but does not fall in one of the other categories
(e.g. explanatory or help text that is associated with the section. */
.portlet-section-text {
- font-size: 12px;
- font-style: italic;
+ font-size: 12px;
+ font-style: italic;
}
/*******************
@@ -959,49 +961,48 @@
********************/
/* Table header */
.portlet-table-header {
- font-weight: bold;
- color: #FFF;
- font-size: 13px;
- background-color: #336699;
+ padding: 0px 5px 5px 5px;
+ font-weight: bold;
+ color: #656565;
+ font-size: 10px;
+ border-bottom: 1px solid #d5d5d5;
}
/* Normal text in a table cell */
.portlet-table-body {
- color: #000;
- font-size: 12px;
+
}
/* Text in every other row in the table */
.portlet-table-alternate {
- color: #000;
- font-size: 12px;
- background-color: #E6E8E5;
+ padding: 3px 5px;
+ background-color: #E6E8E5;
+ border-bottom: 1px solid #d5d5d5;
}
/* Text in a selected cell range */
.portlet-table-selected {
- color: #000;
- font-size: 12px;
- background-color: #CBD4E6;
+ color: #000;
+ font-size: 12px;
+ background-color: #CBD4E6;
}
/* Text of a subheading */
.portlet-table-subheader {
- font-weight: bold;
- color: #000;
- font-size: 12px;
+ font-weight: bold;
+ color: #000;
+ font-size: 12px;
}
/* Table footer */
.portlet-table-footer {
- font-size: 11px;
+ font-size: 11px;
}
/* Text that belongs to the table but does not fall in one of the other categories (e.g. explanatory or help text that is associated with the table). */
.portlet-table-text {
- font-size: 12px;
- color: #000;
- font-style: italic;
+ padding: 3px 5px;
+ border-bottom: 1px solid #d5d5d5;
}
/********
@@ -1015,17 +1016,17 @@
/* Normal, unselected menu item. */
.portlet-menu-item {
- color: #242424;
- text-decoration: none;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
+ color: #242424;
+ text-decoration: none;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
}
.portlet-menu-item:hover {
- color: #5699B7;
- text-decoration: none;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
+ color: #5699B7;
+ text-decoration: none;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
}
/* Selected menu item. */
@@ -1097,23 +1098,163 @@
*****************/
.handle {
- cursor: move;
+ cursor: move;
}
.emptyPlaceMarker {
- border-right: red 1px dashed;
- border-top: red 1px dashed;
- border-left: red 1px dashed;
- border-bottom: red 1px dashed;
- background-color: Transparent;
+ border-right: red 1px dashed;
+ border-top: red 1px dashed;
+ border-left: red 1px dashed;
+ border-bottom: red 1px dashed;
+ background-color: Transparent;
}
+/*******************************************************************************************************************************
+
+ New Selectors added by JBoss.ORG UI Design for theme development
+
+******************************************************************************************************************************** */
+
+/****************** link styles (active and disabled) for the "Add" icon ***************************/
+
+a.addicon {
+ font-weight: bold;
+ background-image: url( images/ico_addcontent.gif );
+ background-repeat: no-repeat;
+ background-position: left;
+ padding-left: 16px;
+}
+
+a.addicondisabled {
+ font-weight: bold;
+ color: #d5d5d5;
+ background-image: url( images/ico_addcontent_disa.gif );
+ background-repeat: no-repeat;
+ background-position: left;
+ padding-left: 16px;
+}
+
+/************** Foat Style (used to float objects on the page) **********************/
+
+.floatobjectright {
+ float: right;
+}
+
+.floatobjectleft {
+ float: left;
+}
+
+/**************** Hide/Show functionality ******************************************/
+.hidden {
+ display: none;
+}
+
+/************** Pagination ************************/
+.pagination {
+ padding-top: 6px;
+ white-space: nowrap;
+}
+
+.pagination ul {
+ margin: 0;
+ padding: 0;
+ font-size: 10px;
+ text-align: right;
+}
+
+.pagination li {
+ list-style-type: none;
+ display: inline;
+ padding-bottom: 1px;
+}
+
+.pagination a, .pagination a:visited {
+ padding: 0px 2px;
+ text-decoration: none;
+ color: #5078aa;
+}
+
+.pagination a:hover, .pagination a:active {
+ color: #7eacd6;
+ text-decoration: underline;
+}
+
+.pagination li.currentpage {
+ font-weight: bold;
+ padding: 0 2px;
+ color: #000000;
+}
+
+.pagination li.disablepage {
+ padding: 0 5px;
+ color: #656565;
+}
+
+.pagination li.nextpage {
+ font-weight: bold;
+ background-image: url( images/ico_arrow_blue_right.gif );
+ background-repeat: no-repeat;
+ background-position: left;
+ margin-left: 3px;
+ padding-left: 6px;
+}
+
+.pagination li.nextpagedisabled {
+ color: #656565;
+ font-weight: bold;
+ background-image: url( images/ico_arrow_grey_right.gif );
+ background-repeat: no-repeat;
+ background-position: left;
+ margin-left: 3px;
+ padding-left: 8px;
+ padding-right: 2px;
+}
+
+.pagination li.previouspage {
+ font-weight: bold;
+ background-image: url( images/ico_arrow_blue_left.gif );
+ background-repeat: no-repeat;
+ background-position: right;
+ padding-left: 10px;
+ margin-right: 3px;
+ padding-right: 7px;
+}
+
+.pagination li.previouspagedisabled {
+ font-weight: bold;
+ color: #656565;
+ background-image: url( images/ico_arrow_grey_left.gif );
+ background-repeat: no-repeat;
+ background-position: right;
+ padding-left: 12px;
+ margin-right: 3px;
+ padding-right: 9px;
+}
+
+* html .pagination li.currentpage, * html .pagination li.disablepage {
+/*IE 6 and below. Adjust non linked LIs slightly to account for bugs*/
+ margin-right: 5px;
+ padding-right: 0;
+}
+
/********************* graphic style for bottom button bar in the administration portlets ***********************************/
.bottombuttonbar {
- background-color: #ececec;
- border-bottom: 1px solid #d5d5d5;
- border-top: 1px solid #d5d5d5;
- margin: 15px 10px 15px 5px;
- padding: 10px 10px;
+ background-color: #ececec;
+ border-bottom: 1px solid #d5d5d5;
+ border-top: 1px solid #d5d5d5;
+ margin: 15px 10px 15px 5px;
+ padding: 10px 10px;
+}
+
+/*************** Edit state background for hide/show controls **************************************************
+
+Currently for Role management admin portlet
+
+******************************************************************************************************************/
+
+.editportletbkg {
+ background-color: #eef8fd;
+ padding: 10px;
+ border: 1px solid #000000;
}
\ No newline at end of file
Modified: trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java 2006-10-10 15:23:01 UTC (rev 5401)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java 2006-10-10 17:38:04 UTC (rev 5402)
@@ -365,7 +365,8 @@
rowCtx = ctx.next("row");
}
- rowCtx.put("fullname" + oddeven, getFullName(bundle, user));
+ rowCtx.put("firstname" + oddeven, getFirstName(bundle, user));
+ rowCtx.put("lastname" + oddeven, getLastName(bundle, user));
rowCtx.put("username" + oddeven, user.getUserName());
//
@@ -416,6 +417,7 @@
}
ctx.put("usernamefilter", usernameFilter);
+ ctx.put("results", users.size() + "");
req.setAttribute(PortalJsp.CTX_REQUEST, ctx);
}
catch (IllegalArgumentException e)
@@ -1055,6 +1057,30 @@
}
}
+ private String getFirstName(ResourceBundle bundle, User user)
+ {
+ if ((user.getGivenName() != null) && (user.getGivenName().trim().length() != 0))
+ {
+ return user.getGivenName().trim();
+ }
+ else
+ {
+ return bundle.getString("NAMENOTAVAILABLE");
+ }
+ }
+
+ private String getLastName(ResourceBundle bundle, User user)
+ {
+ if ((user.getFamilyName() != null) && (user.getFamilyName().trim().length() != 0))
+ {
+ return user.getFamilyName().trim();
+ }
+ else
+ {
+ return bundle.getString("NAMENOTAVAILABLE");
+ }
+ }
+
private String getFullName(ResourceBundle bundle,
User user)
{
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2006-10-10 15:23:01 UTC (rev 5401)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2006-10-10 17:38:04 UTC (rev 5402)
@@ -228,6 +228,8 @@
LIST_USERNAMECONTAINS=Username contains
LIST_FULLNAME=Fullname
LIST_USERNAME=Username
+LIST_FIRSTNAME=Firstname
+LIST_LASTNAME=Lastname
LIST_ROLES=Roles
LIST_ACTIONS=Actions
LIST_ACTIONSSHOWPROFILE=Profile
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_en.properties
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_en.properties 2006-10-10 15:23:01 UTC (rev 5401)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_en.properties 2006-10-10 17:38:04 UTC (rev 5402)
@@ -226,6 +226,8 @@
LIST_USERNAMECONTAINS=Username contains
LIST_FULLNAME=Fullname
LIST_USERNAME=Username
+LIST_FIRSTNAME=Firstname
+LIST_LASTNAME=Lastname
LIST_ROLES=Roles
LIST_ACTIONS=Actions
LIST_ACTIONSSHOWPROFILE=Profile
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties 2006-10-10 15:23:01 UTC (rev 5401)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties 2006-10-10 17:38:04 UTC (rev 5402)
@@ -226,6 +226,8 @@
LIST_USERNAMECONTAINS=Usuario contiene
LIST_FULLNAME=Nombre completo
LIST_USERNAME=Nombre de usuario
+LIST_FIRSTNAME=Firstname
+LIST_LASTNAME=Lastname
LIST_ROLES=Roles
LIST_ACTIONS=Acciones
LIST_ACTIONSSHOWPROFILE=Perfil
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties 2006-10-10 15:23:01 UTC (rev 5401)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties 2006-10-10 17:38:04 UTC (rev 5402)
@@ -205,6 +205,8 @@
LIST_USERNAMECONTAINS=Identifiant contient
LIST_FULLNAME=Nom complet
LIST_USERNAME=Identifiant
+LIST_FIRSTNAME=Firstname
+LIST_LASTNAME=Lastname
LIST_ROLES=Roles
LIST_ACTIONS=Actions
LIST_ACTIONSSHOWPROFILE=Profil
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp 2006-10-10 15:23:01 UTC (rev 5401)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp 2006-10-10 17:38:04 UTC (rev 5402)
@@ -30,7 +30,7 @@
</tr>
<tr>
<td> </td>
- <td><span class="portlet-font">${n:i18n("REGISTER_EMAILNOTPUBLIC")}</span></td>
+ <td><span class="portlet-form-label">${n:i18n("REGISTER_EMAILNOTPUBLIC")}</span></td>
</tr>
<tr>
<td class="portlet-form-label">${n:i18n("REGISTER_FAKEEMAIL")}</td>
@@ -40,7 +40,7 @@
</tr>
<tr>
<td> </td>
- <td><span class="portlet-font">${n:i18n("REGISTER_EMAILPUBLIC")}</span></td>
+ <td><span class="portlet-form-label">${n:i18n("REGISTER_EMAILPUBLIC")}</span></td>
</tr>
<tr>
<td class="portlet-form-label">${n:i18n("REGISTER_VIEWREALEMAIL")}</td>
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp 2006-10-10 15:23:01 UTC (rev 5401)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp 2006-10-10 17:38:04 UTC (rev 5402)
@@ -2,13 +2,86 @@
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
<%@ page isELIgnored="false" %>
-<span class="portlet-font"><a
- href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showMenu"/></portlet:renderURL>">${n:i18n("REGISTER_SHOWMENU")}</a></span>
-Search results for “<search parameters>” (<number of results> Matching Users)
+<p>Search results for "${n:out("usernamefilter")}" (${n:out("results")} Matching Users)</p>
+<hr/>
-<form action="<portlet:actionURL><portlet:param name="op" value="showListUsers"/></portlet:actionURL>" method="post">
+<p></p>
+<table width="100%" border="0" cellspacing="0" class="portlet-table-body">
+ <tr>
+ <td nowrap="nowrap" class="portlet-table-header">${n:i18n("LIST_USERNAME")}</td>
+ <td nowrap="nowrap" class="portlet-table-header">${n:i18n("LIST_FIRSTNAME")}</td>
+ <td nowrap="nowrap" class="portlet-table-header">${n:i18n("LIST_LASTNAME")}</td>
+ <td nowrap="nowrap" class="portlet-table-header">${n:i18n("LIST_ROLES")}</td>
+ <td nowrap="nowrap" class="portlet-table-header">${n:i18n("LIST_ACTIONS")}</td>
+ </tr>
+ <n:iterate ctx="row">
+ <tr>
+ <td nowrap="nowrap" class="portlet-table-alternate">${n:out("row.username0")}</td>
+ <td nowrap="nowrap" class="portlet-table-alternate">${n:out("row.firstname0")}</td>
+ <td nowrap="nowrap" class="portlet-table-alternate">${n:out("row.lastname0")}</td>
+ <td nowrap="nowrap" class="portlet-table-alternate">
+ <n:iterate ctx="roles0">${n:out("row.roles0.name")}<br/></n:iterate>
+ </td>
+ <td nowrap="nowrap" class="portlet-table-alternate"><a
+ href="${n:out("row.editURL0")}">${n:i18n("LIST_ACTIONSSHOWPROFILE")}</a> <a
+ href="${n:out("row.rolesURL0")}">${n:i18n("LIST_ACTIONADDROLESTOUSER")}</a> <a
+ href="${n:out("row.deleteURL0")}">${n:i18n("LIST_ACTIONDELETEUSER")}</a></td>
+ </tr>
+ <tr>
+ <td nowrap="nowrap" class="portlet-table-text">${n:out("row.username1")}</td>
+ <td nowrap="nowrap" class="portlet-table-text">${n:out("row.firstname1")}</td>
+ <td nowrap="nowrap" class="portlet-table-text">${n:out("row.lastname1")}</td>
+
+ <td nowrap="nowrap" class="portlet-table-text">
+ <n:iterate ctx="roles1">${n:out("row.roles1.name")}<br/></n:iterate>
+ </td>
+ <td nowrap="nowrap" class="portlet-table-text"><a
+ href="${n:out("row.editURL1")}">${n:i18n("LIST_ACTIONSSHOWPROFILE")}</a> <a
+ href="${n:out("row.rolesURL1")}">${n:i18n("LIST_ACTIONADDROLESTOUSER")}</a> <a
+ href="${n:out("row.deleteURL1")}">${n:i18n("LIST_ACTIONDELETEUSER")}</a></td>
+ </tr>
+ </n:iterate>
+</table>
+
+<table width="0%" border="0" cellspacing="0" cellpadding="0" class="pagination">
+ <tr>
+ <td nowrap>
+ <ul>
+ <li class="previouspage">
+ <n:if ctx="previouspage"><a href="${n:out("previouspage.link")}">${n:i18n("PREVIOUSPAGE")}</a></n:if>
+ </li>
+ <li class="nextpage">
+ <n:if ctx="nextpage"><a href="${n:out("nextpage.link")}">${n:i18n("NEXTPAGE")}</a></n:if>
+ </li>
+ </ul>
+ </td>
+ </tr>
+</table>
+
+<form
+ action="<portlet:actionURL><portlet:param name="op" value="showListUsers"/></portlet:actionURL>"
+ method="post">
+ <font class="portlet-form-label">${n:i18n("REGISTER_ADMIN_SEARCH")}</font><br/>
+ <input type="text" name="usernamefilter" value="${n:out("usernamefilter")}" size="15"/>
+ <select name="usersperpage">
+ <option value="10">10</option>
+ <option value="20">20</option>
+ <option value="30">30</option>
+ <option value="50">50</option>
+ <option value="75">75</option>
+ <option value="100">100</option>
+ </select>
+ <br/>
+ <input name="Find" type="submit" class="portlet-form-button" id="Find"
+ value="${n:i18n("Search")}"/>
+ <span class="portlet-font"><a
+ href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showMenu"/></portlet:renderURL>">Cancel</a></span>
+</form>
+</div>
+
+<%--<form action="<portlet:actionURL><portlet:param name="op" value="showListUsers"/></portlet:actionURL>" method="post">
<table>
<tr class="portlet-section-header">
<th colspan="2">${n:i18n("LIST_FILTERS")}</th>
@@ -32,11 +105,14 @@
</td>
</tr>
</table>
-</form>
+</form>--%>
+<%--
<n:if ctx="previouspage"><a href="${n:out("previouspage.link")}">${n:i18n("PREVIOUSPAGE")}</a></n:if>
<n:if ctx="nextpage"><a href="${n:out("nextpage.link")}">${n:i18n("NEXTPAGE")}</a></n:if>
+--%>
+<%--
<table>
<tr class="portlet-section-header">
<th>${n:i18n("LIST_FULLNAME")}</th>
@@ -48,18 +124,22 @@
<tr class="portlet-section-body">
<td>${n:out("row.fullname0")}</td>
<td>${n:out("row.username0")}</td>
- <td><n:iterate ctx="roles0">${n:out("row.roles0.name")}<br/></n:iterate></td>
+ <td>
+ <n:iterate ctx="roles0">${n:out("row.roles0.name")}<br/></n:iterate>
+ </td>
<td><a href="${n:out("row.editURL0")}">${n:i18n("LIST_ACTIONSSHOWPROFILE")}</a> <a
- href="${n:out("row.rolesURL0")}">${n:i18n("LIST_ACTIONADDROLESTOUSER")}</a> <a
- href="${n:out("row.deleteURL0")}">${n:i18n("LIST_ACTIONDELETEUSER")}</a></td>
+ href="${n:out("row.rolesURL0")}">${n:i18n("LIST_ACTIONADDROLESTOUSER")}</a> <a
+ href="${n:out("row.deleteURL0")}">${n:i18n("LIST_ACTIONDELETEUSER")}</a></td>
</tr>
<tr class="portlet-section-alternate">
<td>${n:out("row.fullname1")}</td>
<td>${n:out("row.username1")}</td>
- <td><n:iterate ctx="roles1">${n:out("row.roles1.name")}<br/></n:iterate></td>
+ <td>
+ <n:iterate ctx="roles1">${n:out("row.roles1.name")}<br/></n:iterate>
+ </td>
<td><a href="${n:out("row.editURL1")}">${n:i18n("LIST_ACTIONSSHOWPROFILE")}</a> <a
- href="${n:out("row.rolesURL1")}">${n:i18n("LIST_ACTIONADDROLESTOUSER")}</a> <a
- href="${n:out("row.deleteURL1")}">${n:i18n("LIST_ACTIONDELETEUSER")}</a></td>
+ href="${n:out("row.rolesURL1")}">${n:i18n("LIST_ACTIONADDROLESTOUSER")}</a> <a
+ href="${n:out("row.deleteURL1")}">${n:i18n("LIST_ACTIONDELETEUSER")}</a></td>
</tr>
</n:iterate>
-</table>
\ No newline at end of file
+</table>--%>
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/menu.jsp
===================================================================
(Binary files differ)
More information about the jboss-svn-commits
mailing list