Author: thomas.heute(a)jboss.com Date: 2007-02-14 08:39:58 -0500 (Wed, 14 Feb 2007) New Revision: 6268 Modified: 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_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_ty.jsp Log: Fixed: User registration, usability issue [JBPORTAL-1217] 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 2007-02-14 13:07:21 UTC (rev 6267) +++ trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java 2007-02-14 13:39:58 UTC (rev 6268) @@ -519,14 +519,12 @@ else { // User is not logged in - if (req.getWindowState() != WindowState.MAXIMIZED) + op = req.getParameters().get(getOperationName(), OP_SHOWLOGIN); + + if (req.getWindowState() != WindowState.MAXIMIZED && ! OP_SHOWREGISTER_TY.equals(op)) { op = OP_SHOWLOGIN; } - else - { - op = req.getParameters().get(getOperationName(), OP_SHOWLOGIN); - } if (OP_SHOWREGISTER.equals(op)) { @@ -536,16 +534,6 @@ 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)) @@ -754,7 +742,7 @@ { 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); + resp.setRenderParameter("op", OP_SHOWREGISTER_TY); resp.setWindowState(WindowState.NORMAL); } catch (IllegalArgumentException e) 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 2007-02-14 13:07:21 UTC (rev 6267) +++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2007-02-14 13:39:58 UTC (rev 6268) @@ -178,7 +178,7 @@ NAMENOTAVAILABLE=N/A # Registration -REGISER_NOT_LOGGED_IN=You are currently not logged in. +REGISTER_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 User account 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 2007-02-14 13:07:21 UTC (rev 6267) +++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties 2007-02-14 13:39:58 UTC (rev 6268) @@ -177,14 +177,9 @@ NAMENOTAVAILABLE=N/A # Registration -REGISER_NOT_LOGGED_IN= REGISTER_REGISTER=Puedes crear una cuenta. REGISTER_REGISTER_LINK=crear una REGISTER_REGISTER_ADMIN_LINK=Crear una cuenta -REGISTER_TY= -REGISTER_BASICINFO= -REGISTER_IM= -REGISTER_ADDITIONAL= REGISTER_NEWUSER=Registro de nuevo usuario REGISTER_PASSWORDAGAIN=Confirme su clave REGISTER_REALEMAIL=E-mail real @@ -246,16 +241,12 @@ LIST_USERNAMECONTAINS=Usuario contiene LIST_FULLNAME=Nombre completo LIST_USERNAME=Nombre de usuario -LIST_FIRSTNAME= -LIST_LASTNAME= LIST_ROLES=Roles LIST_ACTIONS=Acciones LIST_ACTIONSSHOWPROFILE=Perfil LIST_ACTIONADDROLESTOUSER=Roles LIST_ACTIONEDITROLES=Editar Roles LIST_ACTIONDELETEUSER=Borrar el usario -LIST_SEARCHRESULTS= -LIST_MATCHING= FILTER=Filtro NEXTPAGE=P�gina siguiente 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 2007-02-14 13:07:21 UTC (rev 6267) +++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties 2007-02-14 13:39:58 UTC (rev 6268) @@ -155,7 +155,7 @@ NAMENOTAVAILABLE=N/D # Registration -REGISER_NOT_LOGGED_IN= +REGISTER_NOT_LOGGED_IN=Vous n'\u00EAtes pas connect\u00E9 REGISTER_REGISTER=Cr\u00E9er un compte REGISTER_REGISTER_ADMIN_LINK=Cr\u00E9er un compte REGISTER_NEWUSER=Enregistrement d'un nouvel 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 2007-02-14 13:07:21 UTC (rev 6267) +++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/login.jsp 2007-02-14 13:39:58 UTC (rev 6268) @@ -10,7 +10,7 @@ <tr> <td colspan="1"> <span class="portlet-text"> - ${n:i18n("REGISER_NOT_LOGGED_IN")} + ${n:i18n("REGISTER_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> Modified: 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 2007-02-14 13:07:21 UTC (rev 6267) +++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/register_ty.jsp 2007-02-14 13:39:58 UTC (rev 6268) @@ -5,48 +5,15 @@ <%@ 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) { - %> - &nbsp;&nbsp;|&nbsp;&nbsp; - <a id="securelogin" href="<%= secureAuth %>">Secured ${n:i18n("LOGIN")}</a> - <% - } - %> - </td> - </tr> </table> -</div> \ No newline at end of file +</div> +<br/> +<br/> +<span class="portlet-font"><a + href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showMenu"/></portlet:renderURL>">${n:i18n("REGISTER_SHOWMENU")}</a></span>