[jboss-svn-commits] JBoss Portal SVN: r5632 - in trunk/core/src: main/org/jboss/portal/core/portlet/cms/admin resources/portal-samples-war/WEB-INF/jsp/info
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Nov 13 13:28:01 EST 2006
Author: roy.russo at jboss.com
Date: 2006-11-13 13:27:59 -0500 (Mon, 13 Nov 2006)
New Revision: 5632
Modified:
trunk/core/src/main/org/jboss/portal/core/portlet/cms/admin/CMSAdminPortlet.java
trunk/core/src/resources/portal-samples-war/WEB-INF/jsp/info/view.jsp
Log:
JBPORTAL-1115 - Update content for Greeting Portlet
Modified: trunk/core/src/main/org/jboss/portal/core/portlet/cms/admin/CMSAdminPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/cms/admin/CMSAdminPortlet.java 2006-11-13 17:31:54 UTC (rev 5631)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/cms/admin/CMSAdminPortlet.java 2006-11-13 18:27:59 UTC (rev 5632)
@@ -386,6 +386,8 @@
{
roleSet = roleModule.findRoles();
userSet = userModule.findUsers(0, 1000);
+
+ // TODO: get roles/users from DB and mark certain ones selected.
}
catch (IdentityException ie)
{
@@ -895,6 +897,8 @@
String[] selectedRoles = aReq.getParameterValues("secureroles");
String[] selectedUsers = aReq.getParameterValues("secureusers");
+ // TODO: assign roles/users to node
+
aRes.setRenderParameter("op", CMSAdminConstants.OP_CONFIRMSECURE);
aRes.setRenderParameter("path", aReq.getParameter("path"));
aRes.setRenderParameter("confirm", "Security settings updated successfully.");
Modified: trunk/core/src/resources/portal-samples-war/WEB-INF/jsp/info/view.jsp
===================================================================
--- trunk/core/src/resources/portal-samples-war/WEB-INF/jsp/info/view.jsp 2006-11-13 17:31:54 UTC (rev 5631)
+++ trunk/core/src/resources/portal-samples-war/WEB-INF/jsp/info/view.jsp 2006-11-13 18:27:59 UTC (rev 5632)
@@ -1,25 +1,26 @@
+<%@ page import="org.jboss.portal.server.PortalConstants" %>
<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
- ~ contributors as indicated by the @authors tag. See the ~
- ~ copyright.txt in the distribution for a full listing of ~
- ~ individual contributors. ~
- ~ ~
- ~ This is free software; you can redistribute it and/or modify it ~
- ~ under the terms of the GNU Lesser General Public License as ~
- ~ published by the Free Software Foundation; either version 2.1 of ~
- ~ the License, or (at your option) any later version. ~
- ~ ~
- ~ This software is distributed in the hope that it will be useful, ~
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
- ~ Lesser General Public License for more details. ~
- ~ ~
- ~ You should have received a copy of the GNU Lesser General Public ~
- ~ License along with this software; if not, write to the Free ~
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
+~ JBoss, a division of Red Hat ~
+~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+~ contributors as indicated by the @authors tag. See the ~
+~ copyright.txt in the distribution for a full listing of ~
+~ individual contributors. ~
+~ ~
+~ This is free software; you can redistribute it and/or modify it ~
+~ under the terms of the GNU Lesser General Public License as ~
+~ published by the Free Software Foundation; either version 2.1 of ~
+~ the License, or (at your option) any later version. ~
+~ ~
+~ This software is distributed in the hope that it will be useful, ~
+~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+~ Lesser General Public License for more details. ~
+~ ~
+~ You should have received a copy of the GNU Lesser General Public ~
+~ License along with this software; if not, write to the Free ~
+~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
<%@ page isELIgnored="false" %>
@@ -28,7 +29,7 @@
<table border="0" cellspacing="2" cellpadding="2">
<tr>
- <td align="center"><a href="http://portal.demo.jboss.com"><img
+ <td align="center"><a href="http://portal.demo.jboss.com" target="_blank"><img
src="<%= renderRequest.getContextPath() %>/images/dodemo.gif" border="0"
alt="Try the latest release of JBoss Portal, live and online."></a>
<a href="http://labs.jboss.com/portal/jbossportal/download/index.html" target="_blank"><img
@@ -43,8 +44,9 @@
</tr>
<tr>
<td class="portlet-section-alternate">
- <font class="portlet-font">This is a basic installation of JBoss Portal's most recent release. You may log in
- at any time, using the User Portlet below with the following credentials:</font>
+ <font class="portlet-font">This is a basic installation of <b><%= PortalConstants.VERSION %></b>. You may
+ log in at any time, using the <i>Login</i> link at the top-right of this page, with the following
+ credentials:</font>
</td>
</tr>
<tr>
@@ -52,4 +54,10 @@
<b>user/user</b> or <b>admin/admin</b>
</td>
</tr>
+ <tr>
+ <td align="center">
+ If you are in need of guidance with regards to navigating, configuring, or operating the portal, please view
+ our <a href="http://labs.jboss.com/portal/jbossportal/docs/index.html" target="_blank">online documentation</a>.
+ </td>
+ </tr>
</table>
More information about the jboss-svn-commits
mailing list