You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by rh...@apache.org on 2011/09/28 09:46:05 UTC
svn commit: r1176771 - in /esme/trunk/server/src/main:
resources/ESMEUI.properties scala/org/apache/esme/model/Privilege.scala
webapp/pools_view/index.html
Author: rhirsch
Date: Wed Sep 28 07:46:05 2011
New Revision: 1176771
URL: http://svn.apache.org/viewvc?rev=1176771&view=rev
Log:
[ESME-365] User interface to Pools seems unintuitive
Modified:
esme/trunk/server/src/main/resources/ESMEUI.properties
esme/trunk/server/src/main/scala/org/apache/esme/model/Privilege.scala
esme/trunk/server/src/main/webapp/pools_view/index.html
Modified: esme/trunk/server/src/main/resources/ESMEUI.properties
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/resources/ESMEUI.properties?rev=1176771&r1=1176770&r2=1176771&view=diff
==============================================================================
--- esme/trunk/server/src/main/resources/ESMEUI.properties (original)
+++ esme/trunk/server/src/main/resources/ESMEUI.properties Wed Sep 28 07:46:05 2011
@@ -42,7 +42,7 @@ ui_login_openid=Or Login using Open ID
ui_login_email=Email
ui_default_conversation=Conversation
-ui_default_footer=Apache ESME 2010 - An Apache Project
+ui_default_footer=Apache ESME 2011 - An Apache Project
ui_default_title=Enterprise Social Messaging Environment
ui_default_on_esme=Now on ESME
ui_default_pagetitle=ESME
@@ -57,10 +57,10 @@ ui_pool_list_last_modifier=Last Modifier
ui_pool_list_modify_date=Modify Date
ui_pool_list_last_creator=Creator
ui_pool_list_create_date=Create Date
-ui_pool_list_user_name=Name
+ui_pool_list_user_name=Nickname
ui_pool_list_user_role=Role
ui_pool_edit_label=Pool
-ui_pool_edit_name=User
+ui_pool_edit_name=Nickname
ui_pool_edit_edit=Edit
ui_pool_title_details=Pool Details:
ui_pool_list_users=Users in Pool
Modified: esme/trunk/server/src/main/scala/org/apache/esme/model/Privilege.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/model/Privilege.scala?rev=1176771&r1=1176770&r2=1176771&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/model/Privilege.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/model/Privilege.scala Wed Sep 28 07:46:05 2011
@@ -112,7 +112,7 @@ class Privilege extends LongKeyedMapper[
*/
object Permission extends Enumeration {
val Read = Value(0, "Read")
- val Write = Value(1, "Write")
+ val Write = Value(1, "Read/Write")
val Admin = Value(2, "Admin")
val Denied = Value(3, "Denied")
}
Modified: esme/trunk/server/src/main/webapp/pools_view/index.html
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/webapp/pools_view/index.html?rev=1176771&r1=1176770&r2=1176771&view=diff
==============================================================================
--- esme/trunk/server/src/main/webapp/pools_view/index.html (original)
+++ esme/trunk/server/src/main/webapp/pools_view/index.html Wed Sep 28 07:46:05 2011
@@ -202,7 +202,7 @@
<tr>
<td>
<label for="edit_username">
- <lift:loc>ui_pool_add</lift:loc>
+ <lift:loc>ui_pool_edit_name</lift:loc>
</label>
</td>
<td>