kimptoc 02/04/28 13:16:55
Modified: src/java/org/apache/jetspeed/modules/actions/portlets/security
UserBrowserAction.java
webapp/WEB-INF/templates/vm/portlets/html user-browser.vm
webapp/css default.css
xdocs changes.xml
Log:
highlight disabled/unconfirmed users on the user browser page
Revision Changes Path
1.5 +5 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/UserBrowserAction.java
Index: UserBrowserAction.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/UserBrowserAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UserBrowserAction.java 25 Mar 2002 21:35:23 -0000 1.4
+++ UserBrowserAction.java 28 Apr 2002 20:16:55 -0000 1.5
@@ -56,6 +56,7 @@
// velocity
import org.apache.velocity.context.Context;
+import org.apache.velocity.app.FieldMethodizer;
// turbine util
import org.apache.turbine.util.Log;
@@ -85,7 +86,7 @@
* This action sets up the template context for browsing of users in the Turbine
database.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
- * @version $Id: UserBrowserAction.java,v 1.4 2002/03/25 21:35:23 kimptoc Exp $
+ * @version $Id: UserBrowserAction.java,v 1.5 2002/04/28 20:16:55 kimptoc Exp $
*/
public class UserBrowserAction extends VelocityPortletAction
{
@@ -132,6 +133,9 @@
{
try
{
+ //hack to make the static variables visible in template
+ context.put("s_config", new FieldMethodizer( context.get("config") ) );
+
Criteria criteria = new Criteria();
User[] users = JetspeedSecurity.getUsers(criteria);
context.put(SecurityConstants.CONTEXT_USERS, users);
1.3 +5 -2
jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/user-browser.vm
Index: user-browser.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/user-browser.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- user-browser.vm 11 Mar 2002 07:20:30 -0000 1.2
+++ user-browser.vm 28 Apr 2002 20:16:55 -0000 1.3
@@ -1,7 +1,7 @@
#**
@author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
-@version $Id: user-browser.vm,v 1.2 2002/03/11 07:20:30 taylor Exp $
+@version $Id: user-browser.vm,v 1.3 2002/04/28 20:16:55 kimptoc Exp $
*#
@@ -19,7 +19,10 @@
</tr>
#foreach ($user in $users)
- <tr>
+ <tr
+ #if ($user.Disabled) class="UserBrowserUserDisabled" #end
+ #if ($user.Confirmed != ${s_config.CONFIRM_VALUE})
class="UserBrowserUserConfirmed" #end
+ >
#entryCell ($!user.UserName)
#entryCell ($!user.FirstName)
#entryCell ($!user.LastName)
1.13 +10 -0 jakarta-jetspeed/webapp/css/default.css
Index: default.css
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/css/default.css,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- default.css 26 Apr 2002 18:31:13 -0000 1.12
+++ default.css 28 Apr 2002 20:16:55 -0000 1.13
@@ -281,3 +281,13 @@
border-bottom: 1px solid #0A0A0A;
width : 65px;
}
+
+.UserBrowserUserDisabled
+{
+ text-decoration: line-through;
+}
+
+.UserBrowserUserConfirmed
+{
+ font-style: italic;
+}
1.37 +11 -8 jakarta-jetspeed/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- changes.xml 9 Apr 2002 22:24:31 -0000 1.36
+++ changes.xml 28 Apr 2002 20:16:55 -0000 1.37
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!--
-$Id: changes.xml,v 1.36 2002/04/09 22:24:31 taylor Exp $
+$Id: changes.xml,v 1.37 2002/04/28 20:16:55 kimptoc Exp $
-->
<document>
<properties>
@@ -20,15 +20,15 @@
***
<li>
action (add/remove/update/fix) - [Bug # xxx -] date - description (committer's
initials) [Thanks to developer_name]
-</li>
+</li>
-->
<li>
Add - Added Change Log (PS)
-</li>
+</li>
<li>
Update - Implemented Internationalization (localization) in the Customizer (PS)
-</li>
+</li>
<li>
Add - Bug # 4142 - Password Reminder Facility (CK)
</li>
@@ -37,7 +37,7 @@
used by all portlet types. (PS) Thanks to Andy Grundman
</li>
<li>
- Add - Add "openinpopup" parameter to the NewRSSPortlet to enable opening links
+ Add - Add "openinpopup" parameter to the NewRSSPortlet to enable opening links
in a new bowser window.(PS)
</li>
<li>
@@ -148,7 +148,7 @@
a profile for a user, it then searches all the roles for that user for the
profile.
</li>
<li>
- Add - 2002/02/10 - New Profiler feature: When creating new users, the default
+ Add - 2002/02/10 - New Profiler feature: When creating new users, the default
template (user account) is now configurable in the JR.p. Setting this to empty
will
not create any PSML entries, and then role-based PSML will be used (if enabled).
</li>
@@ -174,7 +174,7 @@
<li>
Add - 2002/02/24 - Disabled account feature added (DST)
Accounts can be disabled by the
admin user, with User form or by the auto-disable feature
- - Auto-disable feature - disables an
account after x failures over y interval
+ - Auto-disable feature - disables an
account after x failures over y interval
- Extended database model. New interface 'JetspeedUser', impl
'BaseJetspeedUser'
- added 'disabled' column to databases
- automatic saving of user during
Logoff is now optional (off by default)
@@ -184,7 +184,7 @@
</li>
<li>
Add - 2002/03/10 - Started foundation of portlet ids. The portal toolkit now uses
or assigns portlet ids (DST)
- - Converted all paned controllers and security portlets to use
portlet ids
+ - Converted all paned controllers and security portlets to use
portlet ids
</li>
<li>
Add - 2002/13/01 - (PS)
@@ -236,6 +236,9 @@
</li>
<li>
Add - 2002/04/09 - added xml media type (DST)
+</li>
+<li>
+ Add - 2002/04/28 - highlight disabled/unconfirmed users on the user browser page
(CK)
</li>
</ul>
</section>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
