[jboss-svn-commits] JBoss Portal SVN: r5378 - 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
Mon Oct 9 15:24:26 EDT 2006
Author: roy.russo at jboss.com
Date: 2006-10-09 15:24:22 -0400 (Mon, 09 Oct 2006)
New Revision: 5378
Added:
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/register_ty.jsp
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/login.jsp
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.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-09 18:23:07 UTC (rev 5377)
+++ trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2006-10-09 19:24:22 UTC (rev 5378)
@@ -3,13 +3,13 @@
/* *************************************************** */
#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;
+ font-size: 12px;
}
/*****************
@@ -19,41 +19,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 +65,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 +97,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 +142,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..
- margin: 0 30% 0 0; */
+ /* 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 +207,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 +220,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 +371,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 +397,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,94 +425,94 @@
*/
.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;
@@ -521,185 +521,185 @@
}
.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: 12px;
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 11px;
}
SELECT {
@@ -714,6 +714,44 @@
LEGEND {
}
+h1 {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ font-weight: bold;
+ color: #656565;
+ padding-top: 10px;
+ padding-bottom: 5px;
+ margin: 0px;
+}
+
+h2 {
+}
+
+h3 {
+}
+
+h4 {
+ 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;
+}
+
/********
* FONTS *
*********/
@@ -721,46 +759,45 @@
/* 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;
+}
+
.portlet-form-label {
- color: #336699;
- text-decoration: none;
- font-weight: bold;
- font-size: 12px;
+ 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: 12px;
- border-color: #000000;
- border-style: solid;
- border-width: 1px;
- background-color: #336699;
+ color: #000000;
+ font-size: 11px;
}
/* Form Button Style */
.portlet-form-button {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- 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;
+
}
/* Text that appears beside a context dependent action icon */
@@ -776,53 +813,57 @@
/* 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;
+}
+
/********
* LINKS *
*********/
.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;
}
/***********
@@ -831,42 +872,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;
}
/***********
@@ -875,40 +916,40 @@
/* Table or section header */
.portlet-section-header {
- font-weight: bold;
- color: #000;
- font-size: 13px;
- background-color: #CBD4E6;
+ font-weight: bold;
+ color: #000;
+ font-size: 13px;
+ background-color: #CBD4E6;
}
.portlet-section-body {
- font-size: 12px;
+ font-size: 12px;
}
.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;
}
/*******************
@@ -916,49 +957,49 @@
********************/
/* Table header */
.portlet-table-header {
- font-weight: bold;
- color: #FFF;
- font-size: 13px;
- background-color: #336699;
+ font-weight: bold;
+ color: #FFF;
+ font-size: 13px;
+ background-color: #336699;
}
/* Normal text in a table cell */
.portlet-table-body {
- color: #000;
- font-size: 12px;
+ color: #000;
+ font-size: 12px;
}
/* Text in every other row in the table */
.portlet-table-alternate {
- color: #000;
- font-size: 12px;
- background-color: #E6E8E5;
+ color: #000;
+ font-size: 12px;
+ background-color: #E6E8E5;
}
/* 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;
+ font-size: 12px;
+ color: #000;
+ font-style: italic;
}
/********
@@ -972,17 +1013,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. */
@@ -1054,13 +1095,23 @@
*****************/
.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;
+}
+
+/********************* 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;
}
\ 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-09 18:23:07 UTC (rev 5377)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java 2006-10-09 19:24:22 UTC (rev 5378)
@@ -68,1040 +68,887 @@
* @version $Revision$
*/
public class UserPortlet
- extends JBossPortlet
-{
+ extends JBossPortlet {
- /**
- * The class logger.
- */
- public static final Logger log = Logger.getLogger(JBossPortlet.class);
+ /**
+ * The class logger.
+ */
+ public static final Logger log = Logger.getLogger(JBossPortlet.class);
- /**
- * Render operation to show the login screen.
- */
- public static final String OP_SHOWLOGIN = "showLogin";
+ /**
+ * Render operation to show the login screen.
+ */
+ public static final String OP_SHOWLOGIN = "showLogin";
- /**
- * Render operation to show the register screen.
- */
- public static final String OP_SHOWREGISTER = "showRegister";
+ /**
+ * Render operation to show the register screen.
+ */
+ public static final String OP_SHOWREGISTER = "showRegister";
- /**
- * Render operation to show the user menu screen.
- */
- public static final String OP_SHOWMENU = "showMenu";
+ /**
+ * Render operation to show the register thankyou screen.
+ */
+ public static final String OP_SHOWREGISTER_TY = "showRegisterty";
- /**
- * Render operation to show the user profile to edit.
- */
- public static final String OP_SHOWPROFILE = "showProfile";
+ /**
+ * Render operation to show the user menu screen.
+ */
+ public static final String OP_SHOWMENU = "showMenu";
- /**
- * Render operation to show the screen to assign roles to a user.
- */
- public static final String OP_SHOWADDROLESTOUSER = "showAddRolesToUser";
+ /**
+ * Render operation to show the user profile to edit.
+ */
+ public static final String OP_SHOWPROFILE = "showProfile";
- /**
- * Render operation to show the list of users.
- */
- public static final String OP_SHOWLISTUSERS = "showListUsers";
+ /**
+ * Render operation to show the screen to assign roles to a user.
+ */
+ public static final String OP_SHOWADDROLESTOUSER = "showAddRolesToUser";
- /**
- * Logout the user.
- */
- public static final String OP_USERLOGOUT = "userLogout";
+ /**
+ * Render operation to show the list of users.
+ */
+ public static final String OP_SHOWLISTUSERS = "showListUsers";
- /**
- * Deletes the user
- */
- public static final String OP_DELETEUSER = "deleteUser";
+ /**
+ * Logout the user.
+ */
+ public static final String OP_USERLOGOUT = "userLogout";
- private UserModule userModule;
- private RoleModule roleModule;
- private MailModule mailModule;
- private PortletHelper portletHelper;
- public static final short UNDEFINED_TIMEZONE = (short) 0;
+ /**
+ * Deletes the user
+ */
+ public static final String OP_DELETEUSER = "deleteUser";
- /**
- * init method of the portlet, Setting up the diffrent modules used.
- *
- * @throws PortletException If a module cannot be looked up.
- */
- public void init()
- throws PortletException
- {
- super.init();
+ private UserModule userModule;
+ private RoleModule roleModule;
+ private MailModule mailModule;
+ private PortletHelper portletHelper;
+ public static final short UNDEFINED_TIMEZONE = (short) 0;
- //
- userModule = (UserModule) getPortletContext().getAttribute("UserModule");
- roleModule = (RoleModule) getPortletContext().getAttribute("RoleModule");
- mailModule = (MailModule) getPortletContext().getAttribute("MailModule");
- portletHelper = new PortletHelper(this);
+ /**
+ * init method of the portlet, Setting up the diffrent modules used.
+ *
+ * @throws PortletException If a module cannot be looked up.
+ */
+ public void init()
+ throws PortletException {
+ super.init();
- //
- if(userModule == null)
- {
- throw new PortletException("No user module");
- }
- if(roleModule == null)
- {
- throw new PortletException("No role module");
- }
- if(mailModule == null)
- {
- throw new PortletException("No mail module");
- }
- }
+ //
+ userModule = (UserModule) getPortletContext().getAttribute("UserModule");
+ roleModule = (RoleModule) getPortletContext().getAttribute("RoleModule");
+ mailModule = (MailModule) getPortletContext().getAttribute("MailModule");
+ portletHelper = new PortletHelper(this);
- public void destroy()
- {
- super.destroy();
+ //
+ if (userModule == null) {
+ throw new PortletException("No user module");
+ }
+ if (roleModule == null) {
+ throw new PortletException("No role module");
+ }
+ if (mailModule == null) {
+ throw new PortletException("No mail module");
+ }
+ }
- //
- userModule = null;
- roleModule = null;
- mailModule = null;
- portletHelper = null;
- }
+ public void destroy() {
+ super.destroy();
- public String getDefaultOperation()
- {
- return OP_SHOWLOGIN;
- }
+ //
+ userModule = null;
+ roleModule = null;
+ mailModule = null;
+ portletHelper = null;
+ }
- /**
- * doView method
- *
- * @param req Render request
- * @param resp render response
- * @throws PortletException DOCUMENT_ME
- * @throws PortletSecurityException DOCUMENT_ME
- * @throws IOException DOCUMENT_ME
- */
- protected void doView(JBossRenderRequest req, JBossRenderResponse resp)
- throws PortletException,
- PortletSecurityException,
- IOException
- {
- String op;
- resp.setContentType("text/html");
- PrintWriter writer = resp.getWriter();
+ public String getDefaultOperation() {
+ return OP_SHOWLOGIN;
+ }
- if((req.getUser() != null) && (!req.getUser().getEnabled()))
- {
- req.getPortletSession().invalidate();
- PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/login.jsp");
- PortalNode currentNode = req.getPortalNode();
- PortalNodeURL url = resp.createRenderURL(currentNode);
- url.setAuthenticated(Boolean.TRUE);
- if("1".equals(getPortletConfig().getInitParameter("useSSL")))
- {
- url.setSecure(Boolean.TRUE);
- req.setAttribute("secureURL", url.toString());
- }
- url.setSecure(null);
- req.setAttribute("URL", url.toString());
- rd.include(req, resp);
- return;
- }
+ /**
+ * doView method
+ *
+ * @param req Render request
+ * @param resp render response
+ * @throws PortletException DOCUMENT_ME
+ * @throws PortletSecurityException DOCUMENT_ME
+ * @throws IOException DOCUMENT_ME
+ */
+ protected void doView(JBossRenderRequest req, JBossRenderResponse resp)
+ throws PortletException,
+ PortletSecurityException,
+ IOException {
+ String op;
+ resp.setContentType("text/html");
+ PrintWriter writer = resp.getWriter();
- if(req.getRemoteUser() != null)
- {
- if(req.getWindowState() != WindowState.MAXIMIZED)
- {
- op = OP_SHOWMENU;
- }
- else
- {
- op = req.getParameters().get(getOperationName(),
- OP_SHOWMENU);
- // Because of the automatic redirection
- if(op.equals(OP_SHOWLOGIN))
- {
- op = OP_SHOWMENU;
+ if ((req.getUser() != null) && (!req.getUser().getEnabled())) {
+ req.getPortletSession().invalidate();
+ PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/login.jsp");
+ PortalNode currentNode = req.getPortalNode();
+ PortalNodeURL url = resp.createRenderURL(currentNode);
+ url.setAuthenticated(Boolean.TRUE);
+ if ("1".equals(getPortletConfig().getInitParameter("useSSL"))) {
+ url.setSecure(Boolean.TRUE);
+ req.setAttribute("secureURL", url.toString());
}
- }
+ url.setSecure(null);
+ req.setAttribute("URL", url.toString());
+ rd.include(req, resp);
+ return;
+ }
- Locale requestLocale = req.getLocale();
- ResourceBundle bundle = getResourceBundle(requestLocale);
- if(OP_SHOWPROFILE.equals(op))
- {
- String userid = req.getParameters().getParameter("userid");
- User user = null;
- if(userid != null)
- {
- try
- {
- user = userModule.findUserById(userid);
- }
- catch(Exception e)
- {
- log.error("Cannot retrive user", e);
- }
+ if (req.getRemoteUser() != null) {
+ if (req.getWindowState() != WindowState.MAXIMIZED) {
+ op = OP_SHOWMENU;
+ } else {
+ op = req.getParameters().get(getOperationName(),
+ OP_SHOWMENU);
+ // Because of the automatic redirection
+ if (op.equals(OP_SHOWLOGIN)) {
+ op = OP_SHOWMENU;
+ }
}
- else
- {
- user = req.getUser();
- }
- // Validate we have a user object
- if(user == null)
- {
- throw new PortletException("Not user object found");
- }
+ Locale requestLocale = req.getLocale();
+ ResourceBundle bundle = getResourceBundle(requestLocale);
+ if (OP_SHOWPROFILE.equals(op)) {
+ String userid = req.getParameters().getParameter("userid");
+ User user = null;
+ if (userid != null) {
+ try {
+ user = userModule.findUserById(userid);
+ }
+ catch (Exception e) {
+ log.error("Cannot retrive user", e);
+ }
+ } else {
+ user = req.getUser();
+ }
- //
- DelegateContext ctx = new DelegateContext();
+ // Validate we have a user object
+ if (user == null) {
+ throw new PortletException("Not user object found");
+ }
- //
- ctx.put("userid", user.getId().toString());
- fillContextWithUserProfile(user, ctx);
+ //
+ DelegateContext ctx = new DelegateContext();
- //
- String selectedTimeZone = (String) user.getProfile().get(User.INFO_USER_TIME_ZONE_OFFSET);
- for(int i = 0; i < UserPortletConstants.TIME_ZONE_OFFSETS.length; i++)
- {
- if(UserPortletConstants.TIME_ZONE_OFFSETS[i] != null)
- {
- DelegateContext timeZoneCtx = ctx.next("timezone");
- timeZoneCtx.put("name", UserPortletConstants.TIME_ZONE_OFFSETS[i]);
- timeZoneCtx.put("id", "" + i);
- if(selectedTimeZone != null && selectedTimeZone.equals("" + i))
- {
- timeZoneCtx.put("selected", "selected");
- }
- }
- }
+ //
+ ctx.put("userid", user.getId().toString());
+ fillContextWithUserProfile(user, ctx);
- //
- String selectedLocale = (String) user.getProfile().get(User.INFO_USER_LOCALE);
- for(Iterator i = LocaleInfo.getAll().iterator(); i.hasNext();)
- {
- LocaleInfo info = (LocaleInfo) i.next();
- Locale locale = info.getLocale();
- DelegateContext localeCtx = ctx.next("locale");
- localeCtx.put("name", locale.getDisplayName(requestLocale));
- localeCtx.put("id", locale.toString());
- if(selectedLocale != null && selectedLocale.equals(locale.toString()))
- {
- localeCtx.put("selected", "selected");
- }
- }
+ //
+ String selectedTimeZone = (String) user.getProfile().get(User.INFO_USER_TIME_ZONE_OFFSET);
+ for (int i = 0; i < UserPortletConstants.TIME_ZONE_OFFSETS.length; i++) {
+ if (UserPortletConstants.TIME_ZONE_OFFSETS[i] != null) {
+ DelegateContext timeZoneCtx = ctx.next("timezone");
+ timeZoneCtx.put("name", UserPortletConstants.TIME_ZONE_OFFSETS[i]);
+ timeZoneCtx.put("id", "" + i);
+ if (selectedTimeZone != null && selectedTimeZone.equals("" + i)) {
+ timeZoneCtx.put("selected", "selected");
+ }
+ }
+ }
- //
- String selectedTheme = (String) user.getProfile().get(User.INFO_USER_THEME);
- ThemeService themeService = (ThemeService) getPortletContext().getAttribute("ThemeService");
- for(Iterator i = themeService.getThemes().iterator(); i.hasNext();)
- {
- PortalTheme theme = (PortalTheme) i.next();
- ThemeInfo info = theme.getThemeInfo();
- DelegateContext themeCtx = ctx.next("theme");
- themeCtx.put("name", info.getAppId() + "." + info.getName());
- themeCtx.put("id", info.getRegistrationId().toString());
- if((selectedTheme != null) && selectedTheme.equals(info.getRegistrationId().toString()))
- {
- themeCtx.put("selected", "selected");
- }
- }
+ //
+ String selectedLocale = (String) user.getProfile().get(User.INFO_USER_LOCALE);
+ for (Iterator i = LocaleInfo.getAll().iterator(); i.hasNext();) {
+ LocaleInfo info = (LocaleInfo) i.next();
+ Locale locale = info.getLocale();
+ DelegateContext localeCtx = ctx.next("locale");
+ localeCtx.put("name", locale.getDisplayName(requestLocale));
+ localeCtx.put("id", locale.toString());
+ if (selectedLocale != null && selectedLocale.equals(locale.toString())) {
+ localeCtx.put("selected", "selected");
+ }
+ }
- //
- req.setAttribute(PortalJsp.CTX_REQUEST, ctx);
- resp.setTitle(bundle.getString("REGISTER_PERSONALINFO"));
- PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/editProfile.jsp");
- rd.include(req, resp);
- }
- else if(OP_SHOWMENU.equals(op))
- {
- DelegateContext ctx = new DelegateContext();
- if(req.isUserInRole("Admin"))
- {
- ctx.next("admin");
- }
- req.setAttribute(PortalJsp.CTX_REQUEST, ctx);
- PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/menu.jsp");
- rd.include(req, resp);
+ //
+ String selectedTheme = (String) user.getProfile().get(User.INFO_USER_THEME);
+ ThemeService themeService = (ThemeService) getPortletContext().getAttribute("ThemeService");
+ for (Iterator i = themeService.getThemes().iterator(); i.hasNext();) {
+ PortalTheme theme = (PortalTheme) i.next();
+ ThemeInfo info = theme.getThemeInfo();
+ DelegateContext themeCtx = ctx.next("theme");
+ themeCtx.put("name", info.getAppId() + "." + info.getName());
+ themeCtx.put("id", info.getRegistrationId().toString());
+ if ((selectedTheme != null) && selectedTheme.equals(info.getRegistrationId().toString())) {
+ themeCtx.put("selected", "selected");
+ }
+ }
- }
- else if(OP_SHOWLISTUSERS.equals(op))
- {
- if(req.isUserInRole("Admin"))
- {
- try
- {
- int offset = req.getParameters().getInt("offset", 0);
- int usersPerPage = req.getParameters().getInt("usersperpage", UserPortletConstants.DEFAULT_USERSPERPAGE);
- String usernameFilter = req.getParameters().get("usernamefilter", "");
+ //
+ req.setAttribute(PortalJsp.CTX_REQUEST, ctx);
+ resp.setTitle(bundle.getString("REGISTER_PERSONALINFO"));
+ PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/editProfile.jsp");
+ rd.include(req, resp);
+ } else if (OP_SHOWMENU.equals(op)) {
+ DelegateContext ctx = new DelegateContext();
+ if (req.isUserInRole("Admin")) {
+ ctx.next("admin");
+ }
+ req.setAttribute(PortalJsp.CTX_REQUEST, ctx);
+ PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/menu.jsp");
+ rd.include(req, resp);
- // We get usersPerPage + 1 entries so we can know if there is
- // a next page
- // It's tricky but it avoids to make 2 queries.
- Set users = null;
- if(usernameFilter.trim().length() == 0)
- {
- users = userModule.findUsers(offset, usersPerPage + 1);
- }
- else
- {
- users = userModule.findUsersFilteredByUserName(usernameFilter, offset, usersPerPage + 1);
- }
+ } else if (OP_SHOWLISTUSERS.equals(op)) {
+ if (req.isUserInRole("Admin")) {
+ try {
+ int offset = req.getParameters().getInt("offset", 0);
+ int usersPerPage = req.getParameters().getInt("usersperpage", UserPortletConstants.DEFAULT_USERSPERPAGE);
+ String usernameFilter = req.getParameters().get("usernamefilter", "");
- User[] usersArray = new User[users.size()];
- usersArray = (User[]) users.toArray(usersArray);
- DelegateContext ctx = new DelegateContext();
+ // We get usersPerPage + 1 entries so we can know if there is
+ // a next page
+ // It's tricky but it avoids to make 2 queries.
+ Set users = null;
+ if (usernameFilter.trim().length() == 0) {
+ users = userModule.findUsers(offset, usersPerPage + 1);
+ } else {
+ users = userModule.findUsersFilteredByUserName(usernameFilter, offset, usersPerPage + 1);
+ }
- DelegateContext rowCtx = null;
- for(int i = 0; i < Math.min(usersArray.length, usersPerPage); i++)
- {
- int oddeven = i % 2;
- User user = usersArray[i];
- if(oddeven == 0)
- {
- rowCtx = ctx.next("row");
- }
+ User[] usersArray = new User[users.size()];
+ usersArray = (User[]) users.toArray(usersArray);
+ DelegateContext ctx = new DelegateContext();
- rowCtx.put("fullname" + oddeven, getFullName(bundle, user));
- rowCtx.put("username" + oddeven, user.getUserName());
+ DelegateContext rowCtx = null;
+ for (int i = 0; i < Math.min(usersArray.length, usersPerPage); i++) {
+ int oddeven = i % 2;
+ User user = usersArray[i];
+ if (oddeven == 0) {
+ rowCtx = ctx.next("row");
+ }
- //
- Iterator itRoles = roleModule.getRoles(user).iterator();
- while(itRoles.hasNext())
- {
- DelegateContext rolesCtx = rowCtx.next("roles" + oddeven);
- rolesCtx.put("name", ((Role) itRoles.next()).getDisplayName());
- }
+ rowCtx.put("fullname" + oddeven, getFullName(bundle, user));
+ rowCtx.put("username" + oddeven, user.getUserName());
- PortletURL editURL = resp.createRenderURL();
- editURL.setParameter(getOperationName(), OP_SHOWPROFILE);
- editURL.setParameter("userid", "" + user.getId());
+ //
+ Iterator itRoles = roleModule.getRoles(user).iterator();
+ while (itRoles.hasNext()) {
+ DelegateContext rolesCtx = rowCtx.next("roles" + oddeven);
+ rolesCtx.put("name", ((Role) itRoles.next()).getDisplayName());
+ }
- PortletURL rolesURL = resp.createRenderURL();
- rolesURL.setParameter(getOperationName(), OP_SHOWADDROLESTOUSER);
- rolesURL.setParameter("userid", "" + user.getId());
+ PortletURL editURL = resp.createRenderURL();
+ editURL.setParameter(getOperationName(), OP_SHOWPROFILE);
+ editURL.setParameter("userid", "" + user.getId());
- PortletURL deleteUrl = resp.createActionURL();
- deleteUrl.setParameter(getOperationName(), OP_DELETEUSER);
- deleteUrl.setParameter("userid", "" + user.getId());
+ PortletURL rolesURL = resp.createRenderURL();
+ rolesURL.setParameter(getOperationName(), OP_SHOWADDROLESTOUSER);
+ rolesURL.setParameter("userid", "" + user.getId());
- rowCtx.put("editURL" + oddeven, editURL.toString());
- rowCtx.put("rolesURL" + oddeven, rolesURL.toString());
- rowCtx.put("deleteURL" + oddeven, deleteUrl.toString());
- }
+ PortletURL deleteUrl = resp.createActionURL();
+ deleteUrl.setParameter(getOperationName(), OP_DELETEUSER);
+ deleteUrl.setParameter("userid", "" + user.getId());
- if(offset != 0)
- {
- PortletURL previousPageLink = resp.createRenderURL();
- previousPageLink.setParameter(getOperationName(), OP_SHOWLISTUSERS);
- previousPageLink.setParameter("offset", "" + Math.max(0, offset - usersPerPage));
- previousPageLink.setParameter("usersperpage", "" + usersPerPage);
- previousPageLink.setParameter("usernamefilter", usernameFilter);
- DelegateContext previousCtx = ctx.next("previouspage");
- previousCtx.put("link", previousPageLink.toString());
- }
+ rowCtx.put("editURL" + oddeven, editURL.toString());
+ rowCtx.put("rolesURL" + oddeven, rolesURL.toString());
+ rowCtx.put("deleteURL" + oddeven, deleteUrl.toString());
+ }
- if(usersArray.length > usersPerPage)
- {
- PortletURL nextPageLink = resp.createRenderURL();
- nextPageLink.setParameter(getOperationName(), OP_SHOWLISTUSERS);
- nextPageLink.setParameter("offset", "" + (offset + usersPerPage));
- nextPageLink.setParameter("usersperpage", "" + usersPerPage);
- nextPageLink.setParameter("usernamefilter", usernameFilter);
- DelegateContext nextCtx = ctx.next("nextpage");
- nextCtx.put("link", nextPageLink.toString());
- }
+ if (offset != 0) {
+ PortletURL previousPageLink = resp.createRenderURL();
+ previousPageLink.setParameter(getOperationName(), OP_SHOWLISTUSERS);
+ previousPageLink.setParameter("offset", "" + Math.max(0, offset - usersPerPage));
+ previousPageLink.setParameter("usersperpage", "" + usersPerPage);
+ previousPageLink.setParameter("usernamefilter", usernameFilter);
+ DelegateContext previousCtx = ctx.next("previouspage");
+ previousCtx.put("link", previousPageLink.toString());
+ }
- ctx.put("usernamefilter", usernameFilter);
- req.setAttribute(PortalJsp.CTX_REQUEST, ctx);
- }
- catch(IllegalArgumentException e)
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- catch(IdentityException e)
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ if (usersArray.length > usersPerPage) {
+ PortletURL nextPageLink = resp.createRenderURL();
+ nextPageLink.setParameter(getOperationName(), OP_SHOWLISTUSERS);
+ nextPageLink.setParameter("offset", "" + (offset + usersPerPage));
+ nextPageLink.setParameter("usersperpage", "" + usersPerPage);
+ nextPageLink.setParameter("usernamefilter", usernameFilter);
+ DelegateContext nextCtx = ctx.next("nextpage");
+ nextCtx.put("link", nextPageLink.toString());
+ }
- PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/listUsers.jsp");
- rd.include(req, resp);
- }
- }
- else if(OP_SHOWADDROLESTOUSER.equals(op))
- {
- if(req.isUserInRole("Admin"))
- {
- DelegateContext ctx = new DelegateContext();
+ ctx.put("usernamefilter", usernameFilter);
+ req.setAttribute(PortalJsp.CTX_REQUEST, ctx);
+ }
+ catch (IllegalArgumentException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ catch (IdentityException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
- try
- {
- User user = userModule.findUserById(req.getParameter("userid"));
- ctx.put("userid", user.getId().toString());
- ctx.put("username", user.getUserName());
- ctx.put("userfullname", getFullName(bundle, user));
- Set userRoles = roleModule.getRoles(user);
+ PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/listUsers.jsp");
+ rd.include(req, resp);
+ }
+ } else if (OP_SHOWADDROLESTOUSER.equals(op)) {
+ if (req.isUserInRole("Admin")) {
+ DelegateContext ctx = new DelegateContext();
- Set roles = roleModule.findRoles();
- Role[] rolesArray = new Role[roles.size()];
- rolesArray = (Role[]) roles.toArray(rolesArray);
- Role role = null;
- DelegateContext rowCtx = null;
- for(int i = 0; i < rolesArray.length; i++)
- {
- int oddeven = i % 3;
- role = rolesArray[i];
- if(oddeven == 0)
- {
- rowCtx = ctx.next("row");
- }
+ try {
+ User user = userModule.findUserById(req.getParameter("userid"));
+ ctx.put("userid", user.getId().toString());
+ ctx.put("username", user.getUserName());
+ ctx.put("userfullname", getFullName(bundle, user));
+ Set userRoles = roleModule.getRoles(user);
- DelegateContext colCtx = rowCtx.next("col");
- if(userRoles.contains(role))
- {
- colCtx.put("ischecked", "checked");
- }
+ Set roles = roleModule.findRoles();
+ Role[] rolesArray = new Role[roles.size()];
+ rolesArray = (Role[]) roles.toArray(rolesArray);
+ Role role = null;
+ DelegateContext rowCtx = null;
+ for (int i = 0; i < rolesArray.length; i++) {
+ int oddeven = i % 3;
+ role = rolesArray[i];
+ if (oddeven == 0) {
+ rowCtx = ctx.next("row");
+ }
- colCtx.put("name", role.getName());
- colCtx.put("displayname", role.getDisplayName());
- }
- }
- catch(IllegalArgumentException e)
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- catch(IdentityException e)
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ DelegateContext colCtx = rowCtx.next("col");
+ if (userRoles.contains(role)) {
+ colCtx.put("ischecked", "checked");
+ }
- req.setAttribute(PortalJsp.CTX_REQUEST, ctx);
- PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/editUserRoles.jsp");
- rd.include(req, resp);
+ colCtx.put("name", role.getName());
+ colCtx.put("displayname", role.getDisplayName());
+ }
+ }
+ catch (IllegalArgumentException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ catch (IdentityException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ req.setAttribute(PortalJsp.CTX_REQUEST, ctx);
+ PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/editUserRoles.jsp");
+ rd.include(req, resp);
+ }
+ } else if (OP_SHOWREGISTER.equals(op)) {
+ if (req.isUserInRole("Admin")) {
+ PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/registerUser.jsp");
+ rd.include(req, resp);
+ }
+ } else {
+ log.error("This operation does not exist when user is logged in:" + op);
}
- }
- else if(OP_SHOWREGISTER.equals(op))
- {
- if(req.isUserInRole("Admin"))
- {
- PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/registerUser.jsp");
- rd.include(req, resp);
+ } else {
+ // User is not logged in
+ if (req.getWindowState() != WindowState.MAXIMIZED) {
+ op = OP_SHOWLOGIN;
+ } else {
+ op = req.getParameters().get(getOperationName(), OP_SHOWLOGIN);
}
- }
- else
- {
- log.error("This operation does not exist when user is logged in:" + op);
- }
- }
- else
- {
- // User is not logged in
- if(req.getWindowState() != WindowState.MAXIMIZED)
- {
- op = OP_SHOWLOGIN;
- }
- else
- {
- op = req.getParameters().get(getOperationName(), OP_SHOWLOGIN);
- }
- if(OP_SHOWREGISTER.equals(op))
- {
- PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/register.jsp");
- rd.include(req, resp);
- }
- else if(OP_SHOWLOGIN.equals(op))
- {
- PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/login.jsp");
- PortalNode currentNode = Navigation.getCurrentNode();
- PortalNodeURL url = resp.createRenderURL(currentNode);
- url.setAuthenticated(Boolean.TRUE);
- if("1".equals(getPortletConfig().getInitParameter("useSSL")))
- {
- url.setSecure(Boolean.TRUE);
- req.setAttribute("secureURL", url.toString());
+ if (OP_SHOWREGISTER.equals(op)) {
+ PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/register.jsp");
+ rd.include(req, resp);
+ } else if (OP_SHOWREGISTER_TY.equals(op)) {
+ PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/register_ty.jsp");
+ PortalNode currentNode = Navigation.getCurrentNode();
+ PortalNodeURL url = resp.createRenderURL(currentNode);
+ url.setAuthenticated(Boolean.TRUE);
+ if ("1".equals(getPortletConfig().getInitParameter("useSSL"))) {
+ url.setSecure(Boolean.TRUE);
+ req.setAttribute("secureURL", url.toString());
+ }
+ url.setSecure(null);
+ req.setAttribute("URL", url.toString());
+ rd.include(req, resp);
+ } else if (OP_SHOWLOGIN.equals(op)) {
+ PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/login.jsp");
+ rd.include(req, resp);
+ } else {
+ log.error("This operation does not exist when user is not logged in:" + op);
}
- url.setSecure(null);
- req.setAttribute("URL", url.toString());
- rd.include(req, resp);
- }
- else
- {
- log.error("This operation does not exist when user is not logged in:" + op);
- }
- }
+ }
- writer.close();
- }
+ writer.close();
+ }
- /**
- *
- */
- public void showListUsers(JBossActionRequest actionRequest, JBossActionResponse actionResponse) throws IOException
- {
- if(actionRequest.isUserInRole("Admin"))
- {
- actionResponse.setRenderParameter("usernamefilter", actionRequest.getParameter("usernamefilter"));
- actionResponse.setRenderParameter("usersperpage", actionRequest.getParameter("usersperpage"));
- actionResponse.setRenderParameter("op", OP_SHOWLISTUSERS);
- }
- }
+ /**
+ *
+ */
+ public void showListUsers(JBossActionRequest actionRequest, JBossActionResponse actionResponse) throws IOException {
+ if (actionRequest.isUserInRole("Admin")) {
+ actionResponse.setRenderParameter("usernamefilter", actionRequest.getParameter("usernamefilter"));
+ actionResponse.setRenderParameter("usersperpage", actionRequest.getParameter("usersperpage"));
+ actionResponse.setRenderParameter("op", OP_SHOWLISTUSERS);
+ }
+ }
- /**
- * Performs a log out.
- */
- public void userLogout(JBossActionRequest req, JBossActionResponse resp) throws IOException
- {
- String locationURL = req.getParameter("locationURL");
- if(locationURL != null)
- {
- resp.signOut(locationURL);
- }
- else
- {
- resp.signOut();
- }
- }
+ /**
+ * Performs a log out.
+ */
+ public void userLogout(JBossActionRequest req, JBossActionResponse resp) throws IOException {
+ String locationURL = req.getParameter("locationURL");
+ if (locationURL != null) {
+ resp.signOut(locationURL);
+ } else {
+ resp.signOut();
+ }
+ }
- /**
- * Action when a user register
- *
- * @param req JBoss action request
- * @param resp JBoss action response
- */
- public void userRegister(JBossActionRequest req, JBossActionResponse resp)
- {
- // TODO: Check that a bot is not creating many accounts
- String uname = req.getParameter("uname");
- int nbErrors = 0;
- if((uname == null) || (uname.length() == 0))
- {
- nbErrors++;
- resp.setRenderParameter("uname_error", "REGISTER_ERROR_INVALIDUSERNAME");
- }
- else
- {
- try
- {
- User user = userModule.findUserByUserName(uname);
- if(user != null)
- {
- nbErrors++;
- resp.setRenderParameter("uname_error", "REGISTER_ERROR_EXISTINGUSERNAME");
+ /**
+ * Action when a user register
+ *
+ * @param req JBoss action request
+ * @param resp JBoss action response
+ */
+ public void userRegister(JBossActionRequest req, JBossActionResponse resp) {
+ // TODO: Check that a bot is not creating many accounts
+ String uname = req.getParameter("uname");
+ int nbErrors = 0;
+ if ((uname == null) || (uname.length() == 0)) {
+ nbErrors++;
+ resp.setRenderParameter("uname_error", "REGISTER_ERROR_INVALIDUSERNAME");
+ } else {
+ try {
+ User user = userModule.findUserByUserName(uname);
+ if (user != null) {
+ nbErrors++;
+ resp.setRenderParameter("uname_error", "REGISTER_ERROR_EXISTINGUSERNAME");
+ }
}
- }
- catch(IllegalArgumentException e)
- {
- log.error("", e);
- }
- catch(IdentityException e)
- {
- // Ok the user does not exist yet
- }
- }
+ catch (IllegalArgumentException e) {
+ log.error("", e);
+ }
+ catch (IdentityException e) {
+ // Ok the user does not exist yet
+ }
+ }
- String pass1 = req.getParameter("pass1");
- if((pass1 == null) || (pass1.length() == 0))
- {
- nbErrors++;
- resp.setRenderParameter("pass1_error", "REGISTER_ERROR_INVALIDPASSWORD1");
- }
+ String pass1 = req.getParameter("pass1");
+ if ((pass1 == null) || (pass1.length() == 0)) {
+ nbErrors++;
+ resp.setRenderParameter("pass1_error", "REGISTER_ERROR_INVALIDPASSWORD1");
+ }
- String pass2 = req.getParameter("pass2");
- if((pass2 == null) || (pass2.length() == 0))
- {
- nbErrors++;
- resp.setRenderParameter("pass2_error", "REGISTER_ERROR_INVALIDPASSWORD2");
- }
- else if(!pass1.equals(pass2))
- {
- nbErrors++;
- resp.setRenderParameter("pass2_error", "REGISTER_ERROR_PASSWORDMISMATCH");
- }
+ String pass2 = req.getParameter("pass2");
+ if ((pass2 == null) || (pass2.length() == 0)) {
+ nbErrors++;
+ resp.setRenderParameter("pass2_error", "REGISTER_ERROR_INVALIDPASSWORD2");
+ } else if (!pass1.equals(pass2)) {
+ nbErrors++;
+ resp.setRenderParameter("pass2_error", "REGISTER_ERROR_PASSWORDMISMATCH");
+ }
- String realEmail = req.getParameter("realemail");
- if(!URLTools.isEmailValid(realEmail))
- {
- nbErrors++;
- resp.setRenderParameter("realemail_error", "REGISTER_ERROR_INVALIDREALEMAIL");
- }
+ String realEmail = req.getParameter("realemail");
+ if (!URLTools.isEmailValid(realEmail)) {
+ nbErrors++;
+ resp.setRenderParameter("realemail_error", "REGISTER_ERROR_INVALIDREALEMAIL");
+ }
- String fakeEmail = req.getParameter("fakeemail");
- String question = req.getParameter("question");
- String answer = req.getParameter("answer");
- User user = null;
- if(nbErrors == 0)
- {
- try
- {
- user = userModule.createUser(uname, pass1, realEmail);
- user.setFakeEmail(fakeEmail);
+ String fakeEmail = req.getParameter("fakeemail");
+ String question = req.getParameter("question");
+ String answer = req.getParameter("answer");
+ User user = null;
+ if (nbErrors == 0) {
+ try {
+ user = userModule.createUser(uname, pass1, realEmail);
+ user.setFakeEmail(fakeEmail);
- //user.setRegistrationDate(new Date());
- String subscriptionMode = getPortletConfig().getInitParameter(UserPortletConstants.SUBSCRIPTIONMODE);
- if(subscriptionMode == null)
- {
- subscriptionMode = UserPortletConstants.SUBSCRIPTIONMODE_AUTOMATIC;
- }
+ //user.setRegistrationDate(new Date());
+ String subscriptionMode = getPortletConfig().getInitParameter(UserPortletConstants.SUBSCRIPTIONMODE);
+ if (subscriptionMode == null) {
+ subscriptionMode = UserPortletConstants.SUBSCRIPTIONMODE_AUTOMATIC;
+ }
- if(UserPortletConstants.SUBSCRIPTIONMODE_AUTOMATIC.equals(subscriptionMode))
- {
- user.setEnabled(true);
- }
+ if (UserPortletConstants.SUBSCRIPTIONMODE_AUTOMATIC.equals(subscriptionMode)) {
+ user.setEnabled(true);
+ } else if (UserPortletConstants.SUBSCRIPTIONMODE_EMAILVERIFICATION.equals(subscriptionMode)) {
+ user.setEnabled(false);
+ String emailText = generateValidationEmail(req, resp, user, pass1);
+ String from = getPortletConfig().getInitParameter(UserPortletConstants.EMAILFROM);
+ Locale locale = req.getLocale();
+ ResourceBundle bundle = getResourceBundle(locale);
+ String subject = bundle.getString("REGISTER_CONFIRMATIONEMAIL");
+ mailModule.send(from, user.getRealEmail(), subject, emailText);
+ }
- else if(UserPortletConstants.SUBSCRIPTIONMODE_EMAILVERIFICATION.equals(subscriptionMode))
- {
- user.setEnabled(false);
- String emailText = generateValidationEmail(req, resp, user, pass1);
- String from = getPortletConfig().getInitParameter(UserPortletConstants.EMAILFROM);
- Locale locale = req.getLocale();
- ResourceBundle bundle = getResourceBundle(locale);
- String subject = bundle.getString("REGISTER_CONFIRMATIONEMAIL");
- mailModule.send(from, user.getRealEmail(), subject, emailText);
- }
+ /*
+ * Have to define the link to /login Have to redirect after the
+ * login try { resp.sendRedirect("/portal/login?username=" + uname +
+ * "&password=" + pass1); } catch (IOException e1) { // TODO
+ * Auto-generated catch block e1.printStackTrace(); }
+ */
- /*
- * Have to define the link to /login Have to redirect after the
- * login try { resp.sendRedirect("/portal/login?username=" + uname +
- * "&password=" + pass1); } catch (IOException e1) { // TODO
- * Auto-generated catch block e1.printStackTrace(); }
- */
-
- // Add the user to the default user role
- String defaultRole = getPortletConfig().getInitParameter(UserPortletConstants.DEFAULT_ROLE);
- if(defaultRole != null)
- {
- Set roleSet = new HashSet();
- Role role = roleModule.findRoleByName(defaultRole);
- if(role != null)
- {
- roleSet.add(role);
- roleModule.setRoles(user, roleSet);
- }
- else
- {
- log.error("The role you specified as default role does not exist, check your portlet configuration");
- }
+ // Add the user to the default user role
+ String defaultRole = getPortletConfig().getInitParameter(UserPortletConstants.DEFAULT_ROLE);
+ if (defaultRole != null) {
+ Set roleSet = new HashSet();
+ Role role = roleModule.findRoleByName(defaultRole);
+ if (role != null) {
+ roleSet.add(role);
+ roleModule.setRoles(user, roleSet);
+ } else {
+ log.error("The role you specified as default role does not exist, check your portlet configuration");
+ }
+ } else {
+ log.info("You didn't specify a default role in the portlet init configuration, please refer to the documentation");
+ }
+ resp.setRenderParameter("op", OP_SHOWREGISTER_TY);
}
- else
- {
- log.info("You didn't specify a default role in the portlet init configuration, please refer to the documentation");
+ catch (IllegalArgumentException e) {
+ log.error("Cannot create user " + uname, e);
}
- }
- catch(IllegalArgumentException e)
- {
- log.error("Cannot create user " + uname, e);
- }
- catch(IdentityException e)
- {
- log.error("Cannot create user " + uname, e);
- }
- }
- else
- {
- portletHelper.setRenderParameter(resp, "USERNAME", uname);
- portletHelper.setRenderParameter(resp, "REALEMAIL", realEmail);
- portletHelper.setRenderParameter(resp, "FAKEEMAIL", fakeEmail);
- portletHelper.setRenderParameter(resp, "QUESTION", question);
- portletHelper.setRenderParameter(resp, "ANSWER", answer);
- portletHelper.setRenderParameter(resp, getOperationName(), OP_SHOWREGISTER);
- }
- }
+ catch (IdentityException e) {
+ log.error("Cannot create user " + uname, e);
+ }
+ } else {
+ portletHelper.setRenderParameter(resp, "USERNAME", uname);
+ portletHelper.setRenderParameter(resp, "REALEMAIL", realEmail);
+ portletHelper.setRenderParameter(resp, "FAKEEMAIL", fakeEmail);
+ portletHelper.setRenderParameter(resp, "QUESTION", question);
+ portletHelper.setRenderParameter(resp, "ANSWER", answer);
+ portletHelper.setRenderParameter(resp, getOperationName(), OP_SHOWREGISTER);
+ }
+ }
- private void fillContextWithUserProfile(User user, DelegateContext ctx)
- {
- ctx.put("GIVENNAME", user.getGivenName());
- ctx.put("FAMILYNAME", user.getFamilyName());
- ctx.put("REALEMAIL", user.getRealEmail());
- ctx.put("FAKEEMAIL", user.getFakeEmail());
- ctx.put("THEME", user.getTheme());
- ctx.put("VIEWREALEMAIL", user.getViewRealEmail() ? "checked=\"checked\"" : "");
- ctx.put("HOMEPAGE", (String) (user.getProfile().get(User.INFO_USER_HOMEPAGE)));
- ctx.put("ICQ", (String) (user.getProfile().get(User.INFO_USER_IM_ICQ)));
- ctx.put("AIM", (String) (user.getProfile().get(User.INFO_USER_IM_AIM)));
- ctx.put("YIM", (String) (user.getProfile().get(User.INFO_USER_IM_YIM)));
- ctx.put("MSNM", (String) (user.getProfile().get(User.INFO_USER_IM_MSNM)));
- ctx.put("SKYPE", (String) (user.getProfile().get(User.INFO_USER_IM_SKYPE)));
- ctx.put("SIGNATURE", (String) (user.getProfile().get(User.INFO_USER_SIGNATURE)));
- ctx.put("LOCATION", (String) (user.getProfile().get(User.INFO_USER_LOCATION)));
- ctx.put("OCCUPATION", (String) (user.getProfile().get(User.INFO_USER_OCCUPATION)));
- ctx.put("INTERESTS", (String) (user.getProfile().get(User.INFO_USER_INTERESTS)));
- ctx.put("EXTRA", (String) (user.getProfile().get(User.INFO_USER_EXTRA)));
- ctx.put("QUESTION", (String) (user.getProfile().get(User.INFO_USER_SECURITY_QUESTION)));
- ctx.put("ANSWER", (String) (user.getProfile().get(User.INFO_USER_SECURITY_ANSWER)));
- }
+ private void fillContextWithUserProfile(User user, DelegateContext ctx) {
+ ctx.put("GIVENNAME", user.getGivenName());
+ ctx.put("FAMILYNAME", user.getFamilyName());
+ ctx.put("REALEMAIL", user.getRealEmail());
+ ctx.put("FAKEEMAIL", user.getFakeEmail());
+ ctx.put("THEME", user.getTheme());
+ ctx.put("VIEWREALEMAIL", user.getViewRealEmail() ? "checked=\"checked\"" : "");
+ ctx.put("HOMEPAGE", (String) (user.getProfile().get(User.INFO_USER_HOMEPAGE)));
+ ctx.put("ICQ", (String) (user.getProfile().get(User.INFO_USER_IM_ICQ)));
+ ctx.put("AIM", (String) (user.getProfile().get(User.INFO_USER_IM_AIM)));
+ ctx.put("YIM", (String) (user.getProfile().get(User.INFO_USER_IM_YIM)));
+ ctx.put("MSNM", (String) (user.getProfile().get(User.INFO_USER_IM_MSNM)));
+ ctx.put("SKYPE", (String) (user.getProfile().get(User.INFO_USER_IM_SKYPE)));
+ ctx.put("SIGNATURE", (String) (user.getProfile().get(User.INFO_USER_SIGNATURE)));
+ ctx.put("LOCATION", (String) (user.getProfile().get(User.INFO_USER_LOCATION)));
+ ctx.put("OCCUPATION", (String) (user.getProfile().get(User.INFO_USER_OCCUPATION)));
+ ctx.put("INTERESTS", (String) (user.getProfile().get(User.INFO_USER_INTERESTS)));
+ ctx.put("EXTRA", (String) (user.getProfile().get(User.INFO_USER_EXTRA)));
+ ctx.put("QUESTION", (String) (user.getProfile().get(User.INFO_USER_SECURITY_QUESTION)));
+ ctx.put("ANSWER", (String) (user.getProfile().get(User.INFO_USER_SECURITY_ANSWER)));
+ }
- /**
- * DOCUMENT_ME
- *
- * @param req DOCUMENT_ME
- * @param resp DOCUMENT_ME
- */
- public void storeProfile(JBossActionRequest req, JBossActionResponse resp) throws PortletException
- {
- User currentUser = req.getUser();
- if(currentUser == null)
- {
- throw new PortletException("No user");
- }
+ /**
+ * DOCUMENT_ME
+ *
+ * @param req DOCUMENT_ME
+ * @param resp DOCUMENT_ME
+ */
+ public void storeProfile(JBossActionRequest req, JBossActionResponse resp) throws PortletException {
+ User currentUser = req.getUser();
+ if (currentUser == null) {
+ throw new PortletException("No user");
+ }
- // Get the user
- User user = null;
- try
- {
- String userid = req.getParameters().getParameter("userid");
- user = userModule.findUserById(userid);
- }
- catch(Exception e)
- {
- throw new PortletException("blah", e);
- }
+ // Get the user
+ User user = null;
+ try {
+ String userid = req.getParameters().getParameter("userid");
+ user = userModule.findUserById(userid);
+ }
+ catch (Exception e) {
+ throw new PortletException("blah", e);
+ }
- // Are we editing ourself ?
- boolean self = currentUser.getId().equals(user.getId());
- if(!self && !req.isUserInRole("Admin"))
- {
- throw new PortletException();
- }
+ // Are we editing ourself ?
+ boolean self = currentUser.getId().equals(user.getId());
+ if (!self && !req.isUserInRole("Admin")) {
+ throw new PortletException();
+ }
- int nbErrors = 0;
- boolean changePassword = false;
- String givenName = req.getParameter("givenname");
- String familyName = req.getParameter("familyname");
- String pass1 = req.getParameter("pass1");
- String pass2 = req.getParameter("pass2");
- if(!(((pass2 == null) || (pass2.length() == 0)) && ((pass1 == null) || (pass1.length() == 0))))
- {
- changePassword = true;
- if((pass1 == null) || (pass1.length() == 0))
- {
- nbErrors++;
- resp.setRenderParameter("pass1_error", "REGISTER_ERROR_INVALIDPASSWORD1");
- }
+ int nbErrors = 0;
+ boolean changePassword = false;
+ String givenName = req.getParameter("givenname");
+ String familyName = req.getParameter("familyname");
+ String pass1 = req.getParameter("pass1");
+ String pass2 = req.getParameter("pass2");
+ if (!(((pass2 == null) || (pass2.length() == 0)) && ((pass1 == null) || (pass1.length() == 0)))) {
+ changePassword = true;
+ if ((pass1 == null) || (pass1.length() == 0)) {
+ nbErrors++;
+ resp.setRenderParameter("pass1_error", "REGISTER_ERROR_INVALIDPASSWORD1");
+ }
- if((pass2 == null) || (pass2.length() == 0))
- {
+ if ((pass2 == null) || (pass2.length() == 0)) {
+ nbErrors++;
+ resp.setRenderParameter("pass2_error", "REGISTER_ERROR_INVALIDPASSWORD2");
+ } else if (!pass1.equals(pass2)) {
+ nbErrors++;
+ resp.setRenderParameter("pass2_error", "REGISTER_ERROR_PASSWORDMISMATCH");
+ }
+ }
+
+ String realEmail = req.getParameter("realemail");
+ if (!URLTools.isEmailValid(realEmail)) {
nbErrors++;
- resp.setRenderParameter("pass2_error", "REGISTER_ERROR_INVALIDPASSWORD2");
- }
- else if(!pass1.equals(pass2))
- {
- nbErrors++;
- resp.setRenderParameter("pass2_error", "REGISTER_ERROR_PASSWORDMISMATCH");
- }
- }
+ resp.setRenderParameter("realemail_error", "REGISTER_ERROR_INVALIDREALEMAIL");
+ }
- String realEmail = req.getParameter("realemail");
- if(!URLTools.isEmailValid(realEmail))
- {
- nbErrors++;
- resp.setRenderParameter("realemail_error", "REGISTER_ERROR_INVALIDREALEMAIL");
- }
+ String fakeEmail = req.getParameter("fakeemail");
+ boolean viewRealEmail = req.getParameters().getBoolean("viewrealemail", false);
+ String homepage = req.getParameter("homepage");
+ Short timezoneoffset = req.getParameters().getShortObject("timezoneoffset", UNDEFINED_TIMEZONE);
+ String question = req.getParameter("question");
+ String answer = req.getParameter("answer");
+ String icq = req.getParameter("icq");
+ String msnm = req.getParameter("msnm");
+ String yim = req.getParameter("yim");
+ String aim = req.getParameter("aim");
+ String skype = req.getParameter("skype");
+ String location = req.getParameter("location");
+ String occupation = req.getParameter("occupation");
+ String interests = req.getParameter("interests");
+ String signature = req.getParameter("signature");
+ String extra = req.getParameter("extra");
+ String locale = req.getParameter("locale");
+ String theme = req.getParameter("theme");
- String fakeEmail = req.getParameter("fakeemail");
- boolean viewRealEmail = req.getParameters().getBoolean("viewrealemail", false);
- String homepage = req.getParameter("homepage");
- Short timezoneoffset = req.getParameters().getShortObject("timezoneoffset", UNDEFINED_TIMEZONE);
- String question = req.getParameter("question");
- String answer = req.getParameter("answer");
- String icq = req.getParameter("icq");
- String msnm = req.getParameter("msnm");
- String yim = req.getParameter("yim");
- String aim = req.getParameter("aim");
- String skype = req.getParameter("skype");
- String location = req.getParameter("location");
- String occupation = req.getParameter("occupation");
- String interests = req.getParameter("interests");
- String signature = req.getParameter("signature");
- String extra = req.getParameter("extra");
- String locale = req.getParameter("locale");
- String theme = req.getParameter("theme");
+ if (nbErrors == 0) {
+ //
+ if (givenName.trim().length() != 0) {
+ user.setGivenName(givenName);
+ }
- if(nbErrors == 0)
- {
- //
- if(givenName.trim().length() != 0)
- {
- user.setGivenName(givenName);
- }
+ if (familyName.trim().length() != 0) {
+ user.setFamilyName(familyName);
+ }
- if(familyName.trim().length() != 0)
- {
- user.setFamilyName(familyName);
- }
+ if (realEmail.trim().length() != 0) {
+ user.setRealEmail(realEmail);
+ }
- if(realEmail.trim().length() != 0)
- {
- user.setRealEmail(realEmail);
- }
+ if (fakeEmail.trim().length() != 0) {
+ user.setFakeEmail(fakeEmail);
+ }
- if(fakeEmail.trim().length() != 0)
- {
- user.setFakeEmail(fakeEmail);
- }
+ user.setViewRealEmail(viewRealEmail);
+ if (changePassword) {
+ user.updatePassword(pass1);
+ }
- user.setViewRealEmail(viewRealEmail);
- if(changePassword)
- {
- user.updatePassword(pass1);
- }
+ if (timezoneoffset.shortValue() != UNDEFINED_TIMEZONE) {
+ user.getProfile().put(User.INFO_USER_TIME_ZONE_OFFSET, timezoneoffset.toString());
+ }
- if(timezoneoffset.shortValue() != UNDEFINED_TIMEZONE)
- {
- user.getProfile().put(User.INFO_USER_TIME_ZONE_OFFSET, timezoneoffset.toString());
- }
+ LocaleInfo localeInfo = LocaleInfo.decodeLocaleInfo(locale);
+ if (localeInfo != null) {
+ user.setPreferredLocale(localeInfo.getLocale());
+ }
- LocaleInfo localeInfo = LocaleInfo.decodeLocaleInfo(locale);
- if(localeInfo != null)
- {
- user.setPreferredLocale(localeInfo.getLocale());
- }
+ putNonEmptyProperty(user, User.INFO_USER_THEME, theme);
+ putNonEmptyProperty(user, User.INFO_USER_HOMEPAGE, homepage);
+ putNonEmptyProperty(user, User.INFO_USER_SECURITY_QUESTION, question);
+ putNonEmptyProperty(user, User.INFO_USER_SECURITY_ANSWER, answer);
+ putNonEmptyProperty(user, User.INFO_USER_IM_ICQ, icq);
+ putNonEmptyProperty(user, User.INFO_USER_IM_MSNM, msnm);
+ putNonEmptyProperty(user, User.INFO_USER_IM_YIM, yim);
+ putNonEmptyProperty(user, User.INFO_USER_IM_AIM, aim);
+ putNonEmptyProperty(user, User.INFO_USER_IM_SKYPE, skype);
+ putNonEmptyProperty(user, User.INFO_USER_SIGNATURE, signature);
+ putNonEmptyProperty(user, User.INFO_USER_LOCATION, location);
+ putNonEmptyProperty(user, User.INFO_USER_OCCUPATION, occupation);
+ putNonEmptyProperty(user, User.INFO_USER_INTERESTS, interests);
+ putNonEmptyProperty(user, User.INFO_USER_EXTRA, extra);
- putNonEmptyProperty(user, User.INFO_USER_THEME, theme);
- putNonEmptyProperty(user, User.INFO_USER_HOMEPAGE, homepage);
- putNonEmptyProperty(user, User.INFO_USER_SECURITY_QUESTION, question);
- putNonEmptyProperty(user, User.INFO_USER_SECURITY_ANSWER, answer);
- putNonEmptyProperty(user, User.INFO_USER_IM_ICQ, icq);
- putNonEmptyProperty(user, User.INFO_USER_IM_MSNM, msnm);
- putNonEmptyProperty(user, User.INFO_USER_IM_YIM, yim);
- putNonEmptyProperty(user, User.INFO_USER_IM_AIM, aim);
- putNonEmptyProperty(user, User.INFO_USER_IM_SKYPE, skype);
- putNonEmptyProperty(user, User.INFO_USER_SIGNATURE, signature);
- putNonEmptyProperty(user, User.INFO_USER_LOCATION, location);
- putNonEmptyProperty(user, User.INFO_USER_OCCUPATION, occupation);
- putNonEmptyProperty(user, User.INFO_USER_INTERESTS, interests);
- putNonEmptyProperty(user, User.INFO_USER_EXTRA, extra);
+ // Set back to normal window state
+ resp.setWindowState(WindowState.NORMAL);
+ portletHelper.setRenderParameter(resp, getOperationName(), OP_SHOWMENU);
+ } else {
+ portletHelper.setRenderParameter(resp, "GIVENNAME", givenName);
+ portletHelper.setRenderParameter(resp, "FAMILYNAME", familyName);
+ portletHelper.setRenderParameter(resp, "REALEMAIL", realEmail);
+ portletHelper.setRenderParameter(resp, "FAKEEMAIL", fakeEmail);
+ if (user.getViewRealEmail()) {
+ portletHelper.setRenderParameter(resp, "VIEWREALEMAIL", "checked=\"checked\"");
+ } else {
+ portletHelper.setRenderParameter(resp, "VIEWREALEMAIL", "");
+ }
- // Set back to normal window state
- resp.setWindowState(WindowState.NORMAL);
- portletHelper.setRenderParameter(resp, getOperationName(), OP_SHOWMENU);
- }
- else
- {
- portletHelper.setRenderParameter(resp, "GIVENNAME", givenName);
- portletHelper.setRenderParameter(resp, "FAMILYNAME", familyName);
- portletHelper.setRenderParameter(resp, "REALEMAIL", realEmail);
- portletHelper.setRenderParameter(resp, "FAKEEMAIL", fakeEmail);
- if(user.getViewRealEmail())
- {
- portletHelper.setRenderParameter(resp, "VIEWREALEMAIL", "checked=\"checked\"");
- }
- else
- {
- portletHelper.setRenderParameter(resp, "VIEWREALEMAIL", "");
- }
+ portletHelper.setRenderParameter(resp, "HOMEPAGE", homepage);
+ portletHelper.setRenderParameter(resp, "SELECTEDTIMEZONE", "" + timezoneoffset);
+ portletHelper.setRenderParameter(resp, "SELECTEDLOCALE", locale);
+ portletHelper.setRenderParameter(resp, "THEME", theme);
+ portletHelper.setRenderParameter(resp, "ICQ", icq);
+ portletHelper.setRenderParameter(resp, "AIM", aim);
+ portletHelper.setRenderParameter(resp, "YIM", yim);
+ portletHelper.setRenderParameter(resp, "MSNM", msnm);
+ portletHelper.setRenderParameter(resp, "SKYPE", skype);
+ portletHelper.setRenderParameter(resp, "SIGNATURE", signature);
+ portletHelper.setRenderParameter(resp, "LOCATION", location);
+ portletHelper.setRenderParameter(resp, "OCCUPATION", occupation);
+ portletHelper.setRenderParameter(resp, "INTERESTS", interests);
+ portletHelper.setRenderParameter(resp, "EXTRA", extra);
+ portletHelper.setRenderParameter(resp, getOperationName(), OP_SHOWPROFILE);
+ }
+ }
- portletHelper.setRenderParameter(resp, "HOMEPAGE", homepage);
- portletHelper.setRenderParameter(resp, "SELECTEDTIMEZONE", "" + timezoneoffset);
- portletHelper.setRenderParameter(resp, "SELECTEDLOCALE", locale);
- portletHelper.setRenderParameter(resp, "THEME", theme);
- portletHelper.setRenderParameter(resp, "ICQ", icq);
- portletHelper.setRenderParameter(resp, "AIM", aim);
- portletHelper.setRenderParameter(resp, "YIM", yim);
- portletHelper.setRenderParameter(resp, "MSNM", msnm);
- portletHelper.setRenderParameter(resp, "SKYPE", skype);
- portletHelper.setRenderParameter(resp, "SIGNATURE", signature);
- portletHelper.setRenderParameter(resp, "LOCATION", location);
- portletHelper.setRenderParameter(resp, "OCCUPATION", occupation);
- portletHelper.setRenderParameter(resp, "INTERESTS", interests);
- portletHelper.setRenderParameter(resp, "EXTRA", extra);
- portletHelper.setRenderParameter(resp, getOperationName(), OP_SHOWPROFILE);
- }
- }
+ /**
+ * DOCUMENT_ME
+ *
+ * @param request DOCUMENT_ME
+ * @param response DOCUMENT_ME
+ */
+ public void addRolesToUser(JBossActionRequest request, JBossActionResponse response) {
+ if (request.isUserInRole("Admin")) {
+ String[] selectedRoles = request.getParameterValues("roles");
+ String userId = request.getParameters().getParameter("userid");
+ try {
+ User user = userModule.findUserById(userId);
+ Set roles = roleModule.findRolesByNames(selectedRoles);
+ roleModule.setRoles(user, roles);
+ }
+ catch (IllegalArgumentException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ catch (IdentityException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+ }
- /**
- * DOCUMENT_ME
- *
- * @param request DOCUMENT_ME
- * @param response DOCUMENT_ME
- */
- public void addRolesToUser(JBossActionRequest request, JBossActionResponse response)
- {
- if(request.isUserInRole("Admin"))
- {
- String[] selectedRoles = request.getParameterValues("roles");
- String userId = request.getParameters().getParameter("userid");
- try
- {
- User user = userModule.findUserById(userId);
- Set roles = roleModule.findRolesByNames(selectedRoles);
- roleModule.setRoles(user, roles);
- }
- catch(IllegalArgumentException e)
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- catch(IdentityException e)
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- }
-
- /*
+ /*
* TODO: The email verification needs an email service. This is not done yet.
* It also needs a way to generate portlet URL or some kind of URL. Once all
* of this made, it will be quick to implement.
*/
- /*
+ /*
* * Generates the body of the email sent for user activation.
*
* @param user user @param password unencrypted password @return email body
*
*/
- private String generateValidationEmail(JBossActionRequest req,
- JBossActionResponse resp,
- User user,
- String clearPassword)
- {
- // gen link using username, encrypted pw, and a salt.
- String hash = Tools.md5AsHexString(user.getUserName() + user.getRegistrationDate() + UserPortletConstants.SALT);
+ private String generateValidationEmail(JBossActionRequest req,
+ JBossActionResponse resp,
+ User user,
+ String clearPassword) {
+ // gen link using username, encrypted pw, and a salt.
+ String hash = Tools.md5AsHexString(user.getUserName() + user.getRegistrationDate() + UserPortletConstants.SALT);
- String rootURL = getPortletConfig().getInitParameter("emailDomain");
+ String rootURL = getPortletConfig().getInitParameter("emailDomain");
- PortalNode node = req.getPortalNode();
- PortalNodeURL link = resp.createActionURL(node);
- link.setParameter("op", "activate");
- link.setParameter(UserPortletConstants.USERID, "" + user.getId());
- link.setParameter(UserPortletConstants.HASH, hash);
- link.setRelative(false);
+ PortalNode node = req.getPortalNode();
+ PortalNodeURL link = resp.createActionURL(node);
+ link.setParameter("op", "activate");
+ link.setParameter(UserPortletConstants.USERID, "" + user.getId());
+ link.setParameter(UserPortletConstants.HASH, hash);
+ link.setRelative(false);
- // TODO: refactor to have a simple text file outside the code that can be
- // easily changed
- StringBuffer sb = new StringBuffer();
- Locale locale = req.getLocale();
- ResourceBundle bundle = getResourceBundle(locale);
- try
- {
- sb.append(bundle.getString("VALIDATIONEMAIL_1") + " - ");
- sb.append(rootURL);
- sb.append("\n\n");
- sb.append(bundle.getString("VALIDATIONEMAIL_2") + ":\n\n");
- sb.append("----------------------------\n");
- sb.append(bundle.getString("USERNAME") + ": " + user.getUserName() + "\n");
- sb.append(bundle.getString("PASSWORD") + ": " + clearPassword + "\n");
- sb.append("----------------------------\n\n");
- sb.append(bundle.getString("VALIDATIONEMAIL_3") + ": \n");
- sb.append(link);
- sb.append("\n\n");
- sb.append(bundle.getString("VALIDATIONEMAIL_4"));
- sb.append("\n\n");
- sb.append(bundle.getString("VALIDATIONEMAIL_5") + "\n");
- }
- catch(Exception e)
- {
- log.error("Cannot generate an email notification", e);
- }
+ // TODO: refactor to have a simple text file outside the code that can be
+ // easily changed
+ StringBuffer sb = new StringBuffer();
+ Locale locale = req.getLocale();
+ ResourceBundle bundle = getResourceBundle(locale);
+ try {
+ sb.append(bundle.getString("VALIDATIONEMAIL_1") + " - ");
+ sb.append(rootURL);
+ sb.append("\n\n");
+ sb.append(bundle.getString("VALIDATIONEMAIL_2") + ":\n\n");
+ sb.append("----------------------------\n");
+ sb.append(bundle.getString("USERNAME") + ": " + user.getUserName() + "\n");
+ sb.append(bundle.getString("PASSWORD") + ": " + clearPassword + "\n");
+ sb.append("----------------------------\n\n");
+ sb.append(bundle.getString("VALIDATIONEMAIL_3") + ": \n");
+ sb.append(link);
+ sb.append("\n\n");
+ sb.append(bundle.getString("VALIDATIONEMAIL_4"));
+ sb.append("\n\n");
+ sb.append(bundle.getString("VALIDATIONEMAIL_5") + "\n");
+ }
+ catch (Exception e) {
+ log.error("Cannot generate an email notification", e);
+ }
- return sb.toString();
- }
+ return sb.toString();
+ }
- /**
- * DOCUMENT_ME
- *
- * @param req DOCUMENT_ME
- * @param resp DOCUMENT_ME
- */
- public void activate(JBossActionRequest req,
- JBossActionResponse resp)
- {
- String hash = req.getParameter(UserPortletConstants.HASH);
- String userId = req.getParameters().getParameter(UserPortletConstants.USERID);
+ /**
+ * DOCUMENT_ME
+ *
+ * @param req DOCUMENT_ME
+ * @param resp DOCUMENT_ME
+ */
+ public void activate(JBossActionRequest req,
+ JBossActionResponse resp) {
+ String hash = req.getParameter(UserPortletConstants.HASH);
+ String userId = req.getParameters().getParameter(UserPortletConstants.USERID);
- User user = null;
- try
- {
- user = userModule.findUserById(userId);
- String hexCompare = Tools.md5AsHexString(user.getUserName() + user.getRegistrationDate() + UserPortletConstants.SALT);
- if(hash.equals(hexCompare))
- {
- user.setEnabled(true);
- portletHelper.setI18nRenderParameter(req, resp, UserPortletConstants.INFOMESSAGE, "INFOMESSAGE_CONGRATULATIONACTIVATED");
- }
- else
- {
+ User user = null;
+ try {
+ user = userModule.findUserById(userId);
+ String hexCompare = Tools.md5AsHexString(user.getUserName() + user.getRegistrationDate() + UserPortletConstants.SALT);
+ if (hash.equals(hexCompare)) {
+ user.setEnabled(true);
+ portletHelper.setI18nRenderParameter(req, resp, UserPortletConstants.INFOMESSAGE, "INFOMESSAGE_CONGRATULATIONACTIVATED");
+ } else {
+ portletHelper.setI18nRenderParameter(req, resp, UserPortletConstants.ERRORMESSAGE, "ERRORMESSAGE_UNABLEACTIVATE");
+ }
+ }
+ catch (Exception e) {
portletHelper.setI18nRenderParameter(req, resp, UserPortletConstants.ERRORMESSAGE, "ERRORMESSAGE_UNABLEACTIVATE");
- }
- }
- catch(Exception e)
- {
- portletHelper.setI18nRenderParameter(req, resp, UserPortletConstants.ERRORMESSAGE, "ERRORMESSAGE_UNABLEACTIVATE");
- }
- }
+ }
+ }
- private String getFullName(ResourceBundle bundle,
- User user)
- {
- if((user.getGivenName() != null) && (user.getGivenName().trim().length() != 0))
- {
- if((user.getFamilyName() != null) && (user.getFamilyName().trim().length() != 0))
- {
- return user.getGivenName() + " " + user.getFamilyName();
- }
- else
- {
- return user.getGivenName().trim();
- }
- }
- else
- {
- 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) {
+ if ((user.getGivenName() != null) && (user.getGivenName().trim().length() != 0)) {
+ if ((user.getFamilyName() != null) && (user.getFamilyName().trim().length() != 0)) {
+ return user.getGivenName() + " " + user.getFamilyName();
+ } else {
+ return user.getGivenName().trim();
+ }
+ } else {
+ if ((user.getFamilyName() != null) && (user.getFamilyName().trim().length() != 0)) {
+ return user.getFamilyName().trim();
+ } else {
+ return bundle.getString("NAMENOTAVAILABLE");
+ }
+ }
+ }
- private void putNonEmptyProperty(User user, String key, String value)
- {
- if((value != null) && (value.trim().length() != 0))
- {
- user.getProfile().put(key, value);
- }
- }
+ private void putNonEmptyProperty(User user, String key, String value) {
+ if ((value != null) && (value.trim().length() != 0)) {
+ user.getProfile().put(key, value);
+ }
+ }
- public void deleteUser(JBossActionRequest request, JBossActionResponse response)
- {
- if(request.isUserInRole("Admin"))
- {
- try
- {
- User user = userModule.findUserById(request.getParameter("userid"));
- userModule.removeUser(user.getId());
- }
- catch(IdentityException e)
- {
- e.printStackTrace();
- }
- }
- portletHelper.setRenderParameter(response, getOperationName(), OP_SHOWLISTUSERS);
- }
+ public void deleteUser(JBossActionRequest request, JBossActionResponse response) {
+ if (request.isUserInRole("Admin")) {
+ try {
+ User user = userModule.findUserById(request.getParameter("userid"));
+ userModule.removeUser(user.getId());
+ }
+ catch (IdentityException e) {
+ e.printStackTrace();
+ }
+ }
+ portletHelper.setRenderParameter(response, getOperationName(), OP_SHOWLISTUSERS);
+ }
- /*
- * private String getTimezoneOffsetString(short timezoneOffset) {
- * StringBuffer timeZone = new StringBuffer(); for (int i = 0; i <
- * UserPortletConstants.TIME_ZONE_OFFSETS.length; i++) { if
- * (UserPortletConstants.TIME_ZONE_OFFSETS[i] != null) { timeZone.append("
- * <option value=\"").append(i); if (timezoneOffset == i) {
- * timeZone.append("\" selected>"); } else { timeZone.append("\">"); }
- * timeZone.append(UserPortletConstants.TIME_ZONE_OFFSETS[i]).append("
- * </option>"); } } return timeZone.toString(); }
- *
- * private String getTimezoneOffsetString() { return
- * getTimezoneOffsetString((short)0); }
- *
- * private String getTimezoneOffsetString(String timezoneOffset) { short
- * offset = Short.parseShort(timezoneOffset); return
- * getTimezoneOffsetString(offset); }
- */
+ /*
+ * private String getTimezoneOffsetString(short timezoneOffset) {
+ * StringBuffer timeZone = new StringBuffer(); for (int i = 0; i <
+ * UserPortletConstants.TIME_ZONE_OFFSETS.length; i++) { if
+ * (UserPortletConstants.TIME_ZONE_OFFSETS[i] != null) { timeZone.append("
+ * <option value=\"").append(i); if (timezoneOffset == i) {
+ * timeZone.append("\" selected>"); } else { timeZone.append("\">"); }
+ * timeZone.append(UserPortletConstants.TIME_ZONE_OFFSETS[i]).append("
+ * </option>"); } } return timeZone.toString(); }
+ *
+ * private String getTimezoneOffsetString() { return
+ * getTimezoneOffsetString((short)0); }
+ *
+ * private String getTimezoneOffsetString(String timezoneOffset) { short
+ * offset = Short.parseShort(timezoneOffset); return
+ * getTimezoneOffsetString(offset); }
+ */
}
\ No newline at end of file
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-09 18:23:07 UTC (rev 5377)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2006-10-09 19:24:22 UTC (rev 5378)
@@ -157,9 +157,11 @@
NAMENOTAVAILABLE=N/A
// Registration
-REGISTER_REGISTER=Don't have an account yet? You can
+REGISER_NOT_LOGGED_IN=You are currently not logged in.
+REGISTER_REGISTER=You can create an account.
REGISTER_REGISTER_LINK=create one
REGISTER_REGISTER_ADMIN_LINK=Create new account
+REGISTER_TY=Thank you for registering.
REGISTER_NEWUSER=New user registration
REGISTER_PASSWORDAGAIN=Confirm your password
REGISTER_REALEMAIL=Real e-mail
@@ -169,7 +171,6 @@
REGISTER_FAKEEMAIL_EXPLAIN=If this field is not empty, the real email will be used only to send notifications
REGISTER_QUESTION=Secret question
REGISTER_ANSWER=Secret answer
-REGISTER_NEWUSER=Create New user
REGISTER_ASREGUSER=As a registered user you can:
REGISTER_ASREG6=Select different themes
REGISTER_ASREG5=Customize the comments
@@ -203,7 +204,6 @@
REGISTER_CANKNOWABOUT=(255 characters max. Type what you'd like others to know about you)
REGISTER_SAVECHANGES=Save changes
REGISTER_CONFIRMATIONEMAIL=Confirmation email
-REGISTER_LANGUAGE=Language
REGISTER_SHOWMENU=Go back to the user menu
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-09 18:23:07 UTC (rev 5377)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_en.properties 2006-10-09 19:24:22 UTC (rev 5378)
@@ -157,9 +157,11 @@
NAMENOTAVAILABLE=N/A
// Registration
-REGISTER_REGISTER=Don't have an account yet? You can
+REGISER_NOT_LOGGED_IN=You are currently not logged in.
+REGISTER_REGISTER=You can create an account.
REGISTER_REGISTER_LINK=create one
REGISTER_REGISTER_ADMIN_LINK=Create new account
+REGISTER_TY=Thank you for registering.
REGISTER_NEWUSER=New user registration
REGISTER_PASSWORDAGAIN=Confirm your password
REGISTER_REALEMAIL=Real e-mail
@@ -169,7 +171,6 @@
REGISTER_FAKEEMAIL_EXPLAIN=If this field is not empty, the real email will be used only to send notifications
REGISTER_QUESTION=Secret question
REGISTER_ANSWER=Secret answer
-REGISTER_NEWUSER=Create New user
REGISTER_ASREGUSER=As a registered user you can:
REGISTER_ASREG6=Select different themes
REGISTER_ASREG5=Customize the comments
@@ -203,7 +204,6 @@
REGISTER_CANKNOWABOUT=(255 characters max. Type what you'd like others to know about you)
REGISTER_SAVECHANGES=Save changes
REGISTER_CONFIRMATIONEMAIL=Confirmation email
-REGISTER_LANGUAGE=Language
REGISTER_SHOWMENU=Go back to the user menu
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-09 18:23:07 UTC (rev 5377)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties 2006-10-09 19:24:22 UTC (rev 5378)
@@ -157,9 +157,11 @@
NAMENOTAVAILABLE=N/A
// Registration
-REGISTER_REGISTER=¿No tiene una cuenta todavía? Puede
+REGISER_NOT_LOGGED_IN=You are currently not logged in.
+REGISTER_REGISTER=Puedes crear una cuenta.
REGISTER_REGISTER_LINK=crear una
REGISTER_REGISTER_ADMIN_LINK=Crear una cuenta
+REGISTER_TY=Thank you for registering.
REGISTER_NEWUSER=Registro de nuevo usuario
REGISTER_PASSWORDAGAIN=Confirme su clave
REGISTER_REALEMAIL=E-mail real
@@ -169,7 +171,6 @@
REGISTER_FAKEEMAIL_EXPLAIN= Si este campo no está vacío, el e-mail real sólo se usará para enviarle notificaciones
REGISTER_QUESTION=Pregunta secreta
REGISTER_ANSWER=Respuesta secreta
-REGISTER_NEWUSER=Crear nuevo usuario
REGISTER_ASREGUSER=Como usuario registrado, usted podrá:
REGISTER_ASREG6=Elegir diferentes estilos
REGISTER_ASREG5=Personalizar los comentarios
@@ -203,7 +204,6 @@
REGISTER_CANKNOWABOUT=(255 caracteres max. Introduzca lo que quiera que otros conozcan de usted)
REGISTER_SAVECHANGES=Guardar cambios
REGISTER_CONFIRMATIONEMAIL=email de confirmación
-REGISTER_LANGUAGE=Lenguaje
REGISTER_SHOWMENU=Volver al menú de usuario
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-09 18:23:07 UTC (rev 5377)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties 2006-10-09 19:24:22 UTC (rev 5378)
@@ -136,9 +136,11 @@
NAMENOTAVAILABLE=N/D
// Registration
-REGISTER_REGISTER=Pas encore membre ?
+REGISER_NOT_LOGGED_IN=You are currently not logged in.
+REGISTER_REGISTER=Créer un compte
REGISTER_REGISTER_LINK=Créer un compte
REGISTER_REGISTER_ADMIN_LINK=Créer un compte
+REGISTER_TY=Thank you for registering.
REGISTER_NEWUSER=Enregistrement d'un nouvel utilisateur
REGISTER_PASSWORDAGAIN=Comfirmer votre mot de passe
REGISTER_REALEMAIL=e-mail réel
@@ -146,7 +148,6 @@
REGISTER_FAKEEMAIL_EXPLAIN=Si ce champ n'est pas vide, l'email réel ne sera utilisé que pour envoyer des notifications
REGISTER_QUESTION=Question secrète
REGISTER_ANSWER=Réponse secrète
-REGISTER_NEWUSER=Nouvel utilisateur
REGISTER_ASREGUSER=En étant enregistré vous pouvez:
REGISTER_ASREG6=Choisir parmi plusieurs thèmes
REGISTER_ASREG5=Personnaliser les commentaires
@@ -181,7 +182,6 @@
REGISTER_CANKNOWABOUT=(255 caracteres max.)
REGISTER_SAVECHANGES=Enregistrer les changements
REGISTER_CONFIRMATIONEMAIL=Email de confirmation
-REGISTER_LANGUAGE=Language
REGISTER_SHOWMENU=Retour au menu utilisateur
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/login.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/login.jsp 2006-10-09 18:23:07 UTC (rev 5377)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/login.jsp 2006-10-09 19:24:22 UTC (rev 5378)
@@ -1,63 +1,20 @@
-<%@ page import="org.jboss.portal.core.CoreConstants"%>
+<%@ page import="org.jboss.portal.core.CoreConstants" %>
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<%@ page isELIgnored ="false" %>
+<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
<div class="box" align="center">
- <%
- String auth = null;
- String url = (String)renderRequest.getAttribute("URL");
- if (url != null)
- {
- auth = url;
- }
- else
- {
- String contextPath = (String)renderRequest.getAttribute(CoreConstants.REQ_ATT_CONTEXT_PATH);
- String servletPath = (String)renderRequest.getAttribute(CoreConstants.REQ_ATT_SERVLET_PATH);
- auth = contextPath + servletPath + "/auth/";
- }
- // SSL
- String secureAuth = null;
- String secureURL = (String)renderRequest.getAttribute("secureURL");
- if (secureURL != null)
- {
- secureAuth = secureURL;
- }
- else
- {
- String contextPath = (String)renderRequest.getAttribute(CoreConstants.REQ_ATT_CONTEXT_PATH);
- String servletPath = (String)renderRequest.getAttribute(CoreConstants.REQ_ATT_SERVLET_PATH);
- secureAuth = contextPath + servletPath + "/authsec/";
- }
- %>
- <table border="0" class="portlet-font" cellspacing="0" cellpadding="2">
- <!-- NYI -->
- <!--tr>
- <td class="portlet-form-field-label">${n:i18n("REMEMBERME")}: </td>
- <td class="portlet-form-field"><input type="checkbox" value="true" name="rememberme"/></td>
- </tr-->
- <tr>
- <td colspan="1" align="center">
- <a id="standardlogin" href="<%= auth %>">Standard ${n:i18n("LOGIN")}</a>
- <%
- if (secureURL != null)
- {
- %>
- |
- <a id="securelogin" href="<%= secureAuth %>">Secured ${n:i18n("LOGIN")}</a>
- <%
- }
- %>
- </td>
- </tr>
- <tr>
- <td colspan="1">
- <span class="portlet-text">${n:i18n("REGISTER_REGISTER")}<br />
- <a id="register" href="<portlet:renderURL windowState="maximized"><portlet:param name="op" value="showRegister"/></portlet:renderURL>">${n:i18n("REGISTER_REGISTER_LINK")}</a></span>
- </td>
- </tr>
- </table>
+ <table border="0" class="portlet-font" cellspacing="0" cellpadding="2">
+ <tr>
+ <td colspan="1">
+ <span class="portlet-text">
+ ${n:i18n("REGISER_NOT_LOGGED_IN")}
+ <br/><br/>
+ <a id="register"
+ href="<portlet:renderURL windowState="maximized"><portlet:param name="op" value="showRegister"/></portlet:renderURL>">${n:i18n("REGISTER_REGISTER")}</a></span>
+ </td>
+ </tr>
+ </table>
</div>
\ No newline at end of file
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp 2006-10-09 18:23:07 UTC (rev 5377)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp 2006-10-09 19:24:22 UTC (rev 5378)
@@ -1,68 +1,72 @@
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<%@ page isELIgnored ="false" %>
+<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
+<p><span class="requiredfield">*</span> Required fields</p>
+<hr/>
+<table width="100%" cellpadding="0" cellspacing="10" border="0" class="pn-normal">
+ <form name="register"
+ action="<portlet:actionURL><portlet:param name="op" value="userRegister"/></portlet:actionURL>" method="post">
+ <tr>
+ <td colspan="3" nowrap><h4>Basic User Information </h4></td>
+ </tr>
+ <tr>
-<div style="margin: 0 15% 0 15%" align="center">
- <form name="register" action="<portlet:actionURL><portlet:param name="op" value="userRegister"/></portlet:actionURL>" method="post">
- <table cellspacing="2" cellpadding="2" border="0">
- <th colspan="2" class="portlet-section-header">${n:i18n("REGISTER_NEWUSER")}</th>
- <tr class="portlet-section-body">
- <td><font class="portlet-form-label">${n:i18n("USERNAME")}: </font></td>
- <td><input class="portlet-form-input-field" type="text" name="uname" value="${param["USERNAME"]}" size="26" maxlength="25"> * <n:error key="uname_error"/></td>
- </tr>
- <tr class="portlet-section-body">
- <td><font class="portlet-form-label">${n:i18n("PASSWORD")}: </font></td>
- <td><input class="portlet-form-input-field" type="password" name="pass1" size="26" maxlength="60"> * <n:error key="pass1_error"/></td>
- </tr>
- <tr class="portlet-section-body">
- <td><font class="portlet-form-label">${n:i18n("REGISTER_PASSWORDAGAIN")}: </font></td>
- <td><input class="portlet-form-input-field" type="password" name="pass2" size="26" maxlength="60"> * <n:error key="pass2_error"/></td>
- </tr>
- <tr class="portlet-section-body">
- <td><font class="portlet-form-label">${n:i18n("REGISTER_REALEMAIL")}: </font></td>
- <td><input class="portlet-form-input-field" type="text" name="realemail" value="${param["REALEMAIL"]}" size="26" maxlength="60"> * <n:error key="realemail_error"/></td>
- </tr>
- <tr class="portlet-section-body">
- <td><font class="portlet-form-label">${n:i18n("REGISTER_FAKEEMAIL")}: </font></td>
- <td><input class="portlet-form-input-field" type="text" name="fakeemail" value="${param["FAKEEMAIL"]}" size="26" maxlength="60"></td>
- </tr>
- <tr class="portlet-section-body">
- <td colspan="2"><font class="portlet-form-label">*${n:i18n("REGISTER_FAKEEMAIL_EXPLAIN")}</font></td>
- </tr>
- <tr class="portlet-section-body">
- <td><font class="portlet-form-label">${n:i18n("REGISTER_QUESTION")}: </font></td>
- <td><input class="portlet-form-input-field" type="text" name="question" value="${param["QUESTION"]}" size="26" maxlength="25"> * <n:error key="question_error"/></td>
- </tr>
- <tr class="portlet-section-body">
- <td><font class="portlet-form-label">${n:i18n("REGISTER_ANSWER")}: </font></td>
- <td><input class="portlet-form-input-field" type="text" name="answer" value="${param["ANSWER"]}" size="26" maxlength="25"> * <n:error key="answer_error"/></td>
- </tr>
- <tr><td colspan="2" height="5"></td></tr>
- <tr>
- <td colspan="2" align="center"><input name="register" type="submit" class="portlet-form-button" value="${n:i18n("REGISTER_NEWUSER")}" /></td>
- </tr>
- </table>
- </form>
-</div>
- <br/>
- <div align="center" class="portlet-font">${n:i18n("REGISTER_ALREADYHAVEACCOUNT")} <a id="login" href="<portlet:renderURL><portlet:param name="op" value="showLogin"/></portlet:renderURL>">${n:i18n("REGISTER_SIGNIN")}</a></div>
- <!-- BEGIN disclaimer -->
- <div class="portlet-font">
- ${n:i18n("REGISTER_ASREGUSER")}
- <ul>
- <li>${n:i18n("REGISTER_ASREG1")}</li>
- <li>${n:i18n("REGISTER_ASREG2")}</li>
- <li>${n:i18n("REGISTER_ASREG3")}</li>
- <li>${n:i18n("REGISTER_ASREG4")}</li>
- <li>${n:i18n("REGISTER_ASREG5")}</li>
- <li>${n:i18n("REGISTER_ASREG6")}</li>
- </ul></div>
- <div align="center">
- <div class="portlet-font">${n:i18n("REGISTER_REGISTERNOW")}</div>
- <div class="portlet-font">${n:i18n("REGISTER_WEDONTGIVE")}</div>
- </div>
- <!-- END disclaimer -->
+ <td class="portlet-form-label" nowrap>${n:i18n("USERNAME")}<span class="requiredfield">*</span></td>
+ <td colspan="2"><input type="text" name="uname" value="${param["USERNAME"]}"
+ size="30" maxlength="25">
+ <n:error key="uname_error"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_REALEMAIL")}<span class="requiredfield">*</span>
+ </td>
+ <td><input type="text" name="realemail" value="user at portal.com" size="30" maxlength="60">
+ <n:error key="realemail_error"/>
+ </td>
+ <td><input type="checkbox" name="viewrealemail" value="true" checked="checked" class="portlet-form-label"/>Allow
+ other users to view my real e-mail address
+ </td>
+ </tr>
+ <tr>
+ <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_FAKEEMAIL")}</td>
+ <td colspan="2"><input type="text" name="fakeemail" value="" size="30" maxlength="60"></td>
+ </tr>
+ <tr>
+ <td class="portlet-form-label" nowrap>${n:i18n("PASSWORD")}<span class="requiredfield">*</span></td>
+
+ <td colspan="2"><input type="password" name="pass1" size="30" maxlength="20">
+ <n:error key="pass1_error"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_PASSWORDAGAIN")}<span
+ class="requiredfield">*</span></td>
+ <td colspan="2"><input type="password" name="pass2" size="30" maxlength="20">
+ <n:error key="pass2_error"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_QUESTION")}</td>
+
+ <td class="pn-normal" colspan="2"><input type="text" name="question" value="" size="30" maxlength="100">
+ </td>
+ </tr>
+ <tr>
+ <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_ANSWER")}</td>
+ <td class="pn-normal" colspan="2"><input type="text" name="answer" value="" size="30" maxlength="100">
+ </td>
+ </tr>
+ <tr>
+ <td colspan="3" class="bottombuttonbar">
+ <input name="register" type="submit" class="portlet-form-button"
+ value="${n:i18n("REGISTER_NEWUSER")}"/> <input type="submit"
+ value="Cancel"
+ class="portlet-form-button">
+ </td>
+ </tr>
+ </form>
+</table>
\ No newline at end of file
Added: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/register_ty.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/register_ty.jsp 2006-10-09 18:23:07 UTC (rev 5377)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/register_ty.jsp 2006-10-09 19:24:22 UTC (rev 5378)
@@ -0,0 +1,52 @@
+<%@ page import="org.jboss.portal.core.CoreConstants" %>
+<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
+<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<%@ page isELIgnored="false" %>
+<portlet:defineObjects/>
+
+<span class="portlet-font"><a
+ href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showMenu"/></portlet:renderURL>">${n:i18n("REGISTER_SHOWMENU")}</a></span>
+<br/>
+
+<div class="box" align="center">
+ <%
+ String auth = null;
+ String url = (String) renderRequest.getAttribute("URL");
+ if (url != null) {
+ auth = url;
+ } else {
+ String contextPath = (String) renderRequest.getAttribute(CoreConstants.REQ_ATT_CONTEXT_PATH);
+ String servletPath = (String) renderRequest.getAttribute(CoreConstants.REQ_ATT_SERVLET_PATH);
+ auth = contextPath + servletPath + "/auth/";
+ }
+ // SSL
+ String secureAuth = null;
+ String secureURL = (String) renderRequest.getAttribute("secureURL");
+ if (secureURL != null) {
+ secureAuth = secureURL;
+ } else {
+ String contextPath = (String) renderRequest.getAttribute(CoreConstants.REQ_ATT_CONTEXT_PATH);
+ String servletPath = (String) renderRequest.getAttribute(CoreConstants.REQ_ATT_SERVLET_PATH);
+ secureAuth = contextPath + servletPath + "/authsec/";
+ }
+ %>
+ <table border="0" class="portlet-font" cellspacing="0" cellpadding="2">
+ <tr>
+ <td align="center">${n:i18n("REGISTER_TY")}</td>
+ </tr>
+ <tr>
+ <td colspan="1" align="center">
+ <a id="standardlogin" href="<%= auth %>">Standard ${n:i18n("LOGIN")}</a>
+ <%
+ if (secureURL != null) {
+ %>
+ |
+ <a id="securelogin" href="<%= secureAuth %>">Secured ${n:i18n("LOGIN")}</a>
+ <%
+ }
+ %>
+ </td>
+ </tr>
+ </table>
+</div>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list