You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by es...@apache.org on 2011/06/03 19:39:07 UTC
svn commit: r1131118 - in /esme/branches/esme-348-improve-url-design: ./
src/main/scala/bootstrap/liftweb/ src/main/scala/org/apache/esme/lib/
src/main/scala/org/apache/esme/snippet/ src/main/webapp/
src/main/webapp/action_view/ src/main/webapp/auth_vi...
Author: esjewett
Date: Fri Jun 3 17:39:06 2011
New Revision: 1131118
URL: http://svn.apache.org/viewvc?rev=1131118&view=rev
Log:
[ESME-348] Update URL scheme
Added:
esme/branches/esme-348-improve-url-design/
- copied from r1131075, esme/trunk/server/
esme/branches/esme-348-improve-url-design/src/main/webapp/actions.html
- copied unchanged from r1131075, esme/trunk/server/src/main/webapp/action_view/index.html
esme/branches/esme-348-improve-url-design/src/main/webapp/contacts.html
- copied unchanged from r1131075, esme/trunk/server/src/main/webapp/info_view/contacts.html
esme/branches/esme-348-improve-url-design/src/main/webapp/conversation.html
- copied unchanged from r1131075, esme/trunk/server/src/main/webapp/info_view/conversation.html
esme/branches/esme-348-improve-url-design/src/main/webapp/pools.html
- copied unchanged from r1131075, esme/trunk/server/src/main/webapp/pools_view/index.html
esme/branches/esme-348-improve-url-design/src/main/webapp/profile.html
- copied unchanged from r1131075, esme/trunk/server/src/main/webapp/profile_view/edit.html
esme/branches/esme-348-improve-url-design/src/main/webapp/public.html
- copied unchanged from r1131075, esme/trunk/server/src/main/webapp/info_view/public.html
esme/branches/esme-348-improve-url-design/src/main/webapp/search.html
- copied unchanged from r1131075, esme/trunk/server/src/main/webapp/info_view/search.html
esme/branches/esme-348-improve-url-design/src/main/webapp/streams.html
- copied unchanged from r1131075, esme/trunk/server/src/main/webapp/info_view/streams.html
esme/branches/esme-348-improve-url-design/src/main/webapp/tag.html
- copied unchanged from r1131075, esme/trunk/server/src/main/webapp/info_view/tag.html
esme/branches/esme-348-improve-url-design/src/main/webapp/tokens.html
- copied unchanged from r1131075, esme/trunk/server/src/main/webapp/auth_view/index.html
esme/branches/esme-348-improve-url-design/src/main/webapp/tracks.html
- copied unchanged from r1131075, esme/trunk/server/src/main/webapp/track_view/index.html
esme/branches/esme-348-improve-url-design/src/main/webapp/users.html
- copied unchanged from r1131075, esme/trunk/server/src/main/webapp/info_view/users.html
Removed:
esme/branches/esme-348-improve-url-design/src/main/webapp/action_view/
esme/branches/esme-348-improve-url-design/src/main/webapp/auth_view/
esme/branches/esme-348-improve-url-design/src/main/webapp/info_view/contacts.html
esme/branches/esme-348-improve-url-design/src/main/webapp/info_view/conversation.html
esme/branches/esme-348-improve-url-design/src/main/webapp/info_view/public.html
esme/branches/esme-348-improve-url-design/src/main/webapp/info_view/search.html
esme/branches/esme-348-improve-url-design/src/main/webapp/info_view/streams.html
esme/branches/esme-348-improve-url-design/src/main/webapp/info_view/tag.html
esme/branches/esme-348-improve-url-design/src/main/webapp/info_view/users.html
esme/branches/esme-348-improve-url-design/src/main/webapp/pools_view/
esme/branches/esme-348-improve-url-design/src/main/webapp/profile_view/
esme/branches/esme-348-improve-url-design/src/main/webapp/track_view/
Modified:
esme/branches/esme-348-improve-url-design/src/main/scala/bootstrap/liftweb/Boot.scala
esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala
esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/ActionMgr.scala
esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/AuthMgr.scala
esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/ConversationMgr.scala
esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/ProfileMgr.scala
esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/SearchMgr.scala
esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/StreamMgr.scala
esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/TrackMgr.scala
esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/UserMgr.scala
esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/snippet/MenuSnippet.scala
esme/branches/esme-348-improve-url-design/src/main/webapp/templates-hidden/base.html
Modified: esme/branches/esme-348-improve-url-design/src/main/scala/bootstrap/liftweb/Boot.scala
URL: http://svn.apache.org/viewvc/esme/branches/esme-348-improve-url-design/src/main/scala/bootstrap/liftweb/Boot.scala?rev=1131118&r1=1131075&r2=1131118&view=diff
==============================================================================
--- esme/branches/esme-348-improve-url-design/src/main/scala/bootstrap/liftweb/Boot.scala (original)
+++ esme/branches/esme-348-improve-url-design/src/main/scala/bootstrap/liftweb/Boot.scala Fri Jun 3 17:39:06 2011
@@ -177,11 +177,11 @@ class Boot extends Loggable {
Menu(Loc("user", List("info_view", "user"), "User Info", ifIsLoggedIn,
Loc.Snippet("user_info", UserDisplay.userInfo))) ::
logLevel.menu ::
- Menu(Loc("tag", List("info_view", "tag"), "Tag", ifIsLoggedIn,
+ Menu(Loc("tag", List("tag"), "Tag", ifIsLoggedIn,
Loc.Snippet("tag_display", TagDisplay.display))) ::
- Menu(Loc("public", List("info_view", "public"), S.?("base_profile_public"), ifIsLoggedIn)) ::
- Menu(Loc("contacts", List("info_view", "contacts"), S.?("base_profile_contacts"), ifIsLoggedIn)) ::
- Menu(Loc("sign_up", List("signup"), S.?("base_menu_signup"),
+ Menu(Loc("public", List("public"), S.?("base_profile_public"), ifIsLoggedIn)) ::
+ Menu(Loc("contacts", List("contacts"), S.?("base_profile_contacts"), ifIsLoggedIn)) ::
+ Menu(Loc("signup", List("signup"), S.?("base_menu_signup"),
Snippet("signup", User.signupForm),
Unless(User.loggedIn_? _, S.?("base_menu_sign_up_error")))) ::
Menu(Loc("logout", List("logout"), S.?("base_menu_logout"),
Modified: esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala
URL: http://svn.apache.org/viewvc/esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala?rev=1131118&r1=1131075&r2=1131118&view=diff
==============================================================================
--- esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala (original)
+++ esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala Fri Jun 3 17:39:06 2011
@@ -59,7 +59,7 @@ object AccessPoolMgr {
val ifIsLoggedIn = If(loggedIn_? _, strFuncToFailMsg(() => S.?("base_error_not_logged_in")))
val menuItems =
- Menu(Loc("accessPools", new Link("pools_view" :: Nil, true)/*List("pools_view", "index")*/, S.?("base_pool_menu"), ifIsLoggedIn,
+ Menu(Loc("pools", new Link("pools" :: Nil, true)/*List("pools_view", "index")*/, S.?("base_pool_menu"), ifIsLoggedIn,
Loc.Snippet("addPool", addPool),
Loc.Snippet("editPool", editPool),
Loc.Snippet("poolUsers", displayPoolUsers),
Modified: esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/ActionMgr.scala
URL: http://svn.apache.org/viewvc/esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/ActionMgr.scala?rev=1131118&r1=1131075&r2=1131118&view=diff
==============================================================================
--- esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/ActionMgr.scala (original)
+++ esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/ActionMgr.scala Fri Jun 3 17:39:06 2011
@@ -60,7 +60,7 @@ object ActionMgr {
val menuItems:List[Menu] = {
if(Props.get("esme.enable_actions").openOr("true") == "true") {
- Menu(Loc("actionMgt", List("action_view", "index"), S.?("base_actions_menu"), ifIsLoggedIn,
+ Menu(Loc("actions", List("actions"), S.?("base_actions_menu"), ifIsLoggedIn,
Loc.Snippet("displayActions", displayActions),
Loc.Snippet("main", mainActions))) :: Nil
} else {
Modified: esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/AuthMgr.scala
URL: http://svn.apache.org/viewvc/esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/AuthMgr.scala?rev=1131118&r1=1131075&r2=1131118&view=diff
==============================================================================
--- esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/AuthMgr.scala (original)
+++ esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/AuthMgr.scala Fri Jun 3 17:39:06 2011
@@ -56,7 +56,7 @@ object AuthMgr {
val menuItems:List[Menu] = {
if(Props.get("esme.enable_tokens").openOr("true") == "true") {
- Menu(Loc("authToken", List("auth_view", "index"), S.?("base_token_menu"), ifIsLoggedIn,
+ Menu(Loc("tokens", List("tokens"), S.?("base_token_menu"), ifIsLoggedIn,
Loc.Snippet("displayTokens", displayTokens),
Loc.Snippet("main", mainTokens))) :: Nil
} else {
Modified: esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/ConversationMgr.scala
URL: http://svn.apache.org/viewvc/esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/ConversationMgr.scala?rev=1131118&r1=1131075&r2=1131118&view=diff
==============================================================================
--- esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/ConversationMgr.scala (original)
+++ esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/ConversationMgr.scala Fri Jun 3 17:39:06 2011
@@ -49,7 +49,7 @@ object ConversationMgr {
val ifIsLoggedIn = If(loggedIn_? _, strFuncToFailMsg(() => S.?("base_error_not_logged_in")))
val menuItems =
- Menu(Loc("conversation", List("info_view", "conversation"), S.?("base_conv_menu"), ifIsLoggedIn,
+ Menu(Loc("conversation", List("conversation"), S.?("base_conv_menu"), ifIsLoggedIn,
Loc.Snippet("conv_info", convInfo))) :: Nil
def convInfo(in: NodeSeq): NodeSeq = {
Modified: esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/ProfileMgr.scala
URL: http://svn.apache.org/viewvc/esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/ProfileMgr.scala?rev=1131118&r1=1131075&r2=1131118&view=diff
==============================================================================
--- esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/ProfileMgr.scala (original)
+++ esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/ProfileMgr.scala Fri Jun 3 17:39:06 2011
@@ -54,7 +54,7 @@ object ProfileMgr {
val ifIsLoggedIn = If(loggedIn_? _, strFuncToFailMsg(() => S.?("base_error_not_logged_in")))
val menuItems =
- Menu(Loc("profile", List("profile_view", "edit"), S.?("base_profile_menu"), ifIsLoggedIn,
+ Menu(Loc("profile", List("profile", "edit"), S.?("base_profile_menu"), ifIsLoggedIn,
Loc.Snippet("editProfile", editProfile))) ::
Nil
Modified: esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/SearchMgr.scala
URL: http://svn.apache.org/viewvc/esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/SearchMgr.scala?rev=1131118&r1=1131075&r2=1131118&view=diff
==============================================================================
--- esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/SearchMgr.scala (original)
+++ esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/SearchMgr.scala Fri Jun 3 17:39:06 2011
@@ -49,7 +49,7 @@ object SearchMgr {
val ifIsLoggedIn = If(loggedIn_? _, strFuncToFailMsg(() => S.?("base_error_not_logged_in")))
val menuItems =
- Menu(Loc("search", List("info_view", "search"), S.?("base_menu_search"), ifIsLoggedIn,
+ Menu(Loc("search", List("search"), S.?("base_menu_search"), ifIsLoggedIn,
Loc.Snippet("display_search", displaySearch),
Loc.Snippet("searchTerm", searchTerm))) ::
Nil
Modified: esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/StreamMgr.scala
URL: http://svn.apache.org/viewvc/esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/StreamMgr.scala?rev=1131118&r1=1131075&r2=1131118&view=diff
==============================================================================
--- esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/StreamMgr.scala (original)
+++ esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/StreamMgr.scala Fri Jun 3 17:39:06 2011
@@ -58,7 +58,7 @@ object StreamMgr {
val ifIsLoggedIn = If(loggedIn_? _, strFuncToFailMsg(() => S.?("base_error_not_logged_in")))
val menuItems =
- Menu(Loc("streams", List("info_view", "streams"), S.?("base_streams_menu"), ifIsLoggedIn,
+ Menu(Loc("streams", List("streams"), S.?("base_streams_menu"), ifIsLoggedIn,
Loc.Snippet("stream_display", StreamDisplay.display))) ::
Nil
Modified: esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/TrackMgr.scala
URL: http://svn.apache.org/viewvc/esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/TrackMgr.scala?rev=1131118&r1=1131075&r2=1131118&view=diff
==============================================================================
--- esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/TrackMgr.scala (original)
+++ esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/TrackMgr.scala Fri Jun 3 17:39:06 2011
@@ -53,7 +53,7 @@ object TrackMgr {
val menuItems:List[Menu] = {
if(Props.get("esme.enable_tracks").openOr("true") == "true") {
- Menu(Loc("trackMgt", List("track_view", "index"), S.?("base_track_menu"), ifIsLoggedIn,
+ Menu(Loc("tracks", List("tracks"), S.?("base_track_menu"), ifIsLoggedIn,
Loc.Snippet("displayTracking", displayTracking),
Loc.Snippet("main", mainTracking))) :: Nil
} else {
Modified: esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/UserMgr.scala
URL: http://svn.apache.org/viewvc/esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/UserMgr.scala?rev=1131118&r1=1131075&r2=1131118&view=diff
==============================================================================
--- esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/UserMgr.scala (original)
+++ esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/lib/UserMgr.scala Fri Jun 3 17:39:06 2011
@@ -49,7 +49,7 @@ object UserMgr {
val ifIsLoggedIn = If(loggedIn_? _, strFuncToFailMsg(() => S.?("base_error_not_logged_in")))
val menuItems =
- Menu(Loc("list_users", List("info_view", "users"), S.?("base_users_menu"), ifIsLoggedIn,
+ Menu(Loc("users", List("users"), S.?("base_users_menu"), ifIsLoggedIn,
Loc.Snippet("displayUsers", displayUsers))) ::
Nil
Modified: esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/snippet/MenuSnippet.scala
URL: http://svn.apache.org/viewvc/esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/snippet/MenuSnippet.scala?rev=1131118&r1=1131075&r2=1131118&view=diff
==============================================================================
--- esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/snippet/MenuSnippet.scala (original)
+++ esme/branches/esme-348-improve-url-design/src/main/scala/org/apache/esme/snippet/MenuSnippet.scala Fri Jun 3 17:39:06 2011
@@ -38,26 +38,26 @@ class MenuSnippet extends DispatchSnippe
val itemTracks: NodeSeq =
if(Props.get("esme.enable_tracks").openOr("true") == "true") {
- <li><lift:Menu.item donthide="true" name="trackMgt" a:class="tipelement" a:title="You can track words."/></li>
+ <li><lift:Menu.item donthide="true" name="tracks" a:class="tipelement" a:title="You can track words."/></li>
} else {
List()
}
val itemActions: NodeSeq =
if(Props.get("esme.enable_actions").openOr("true") == "true") {
- <li><lift:Menu.item donthide="true" name="actionMgt" a:class="tipelement" a:title="You can create actions to fire when certain events occur"/></li>
+ <li><lift:Menu.item donthide="true" name="actions" a:class="tipelement" a:title="You can create actions to fire when certain events occur"/></li>
} else {
List()
}
val itemTokens: NodeSeq =
if(Props.get("esme.enable_tokens").openOr("true") == "true") {
- <li><lift:Menu.item donthide="true" name="authToken" a:class="tipelement" a:title="You can create tokens to use when accessing ESME via other clients."/></li>
+ <li><lift:Menu.item donthide="true" name="tokens" a:class="tipelement" a:title="You can create tokens to use when accessing ESME via other clients."/></li>
} else {
List()
}
- val itemPools: NodeSeq = <li><lift:Menu.item donthide="true" name="accessPools" a:class="tipelement" a:title="You can create access pools to restrict access top certain messages."/></li>
+ val itemPools: NodeSeq = <li><lift:Menu.item donthide="true" name="pools" a:class="tipelement" a:title="You can create access pools to restrict access top certain messages."/></li>
val itemContacts: NodeSeq = <li><lift:Menu.item donthide="true" name="contacts" a:class="tipelement" a:title="You can manage your followers and those you follow."/></li>
Modified: esme/branches/esme-348-improve-url-design/src/main/webapp/templates-hidden/base.html
URL: http://svn.apache.org/viewvc/esme/branches/esme-348-improve-url-design/src/main/webapp/templates-hidden/base.html?rev=1131118&r1=1131075&r2=1131118&view=diff
==============================================================================
--- esme/branches/esme-348-improve-url-design/src/main/webapp/templates-hidden/base.html (original)
+++ esme/branches/esme-348-improve-url-design/src/main/webapp/templates-hidden/base.html Fri Jun 3 17:39:06 2011
@@ -56,7 +56,7 @@
<lift:Menu.item donthide="true" name="public" a:class="tipelement" a:title="The public timeline includes messages from all users not only those you are following. "/> |
</li>
<li>
- <lift:Menu.item donthide="true" name="list_users" a:class="tipelement" a:title="Users are listed along with their details. "/> |
+ <lift:Menu.item donthide="true" name="users" a:class="tipelement" a:title="Users are listed along with their details. "/> |
</li>
<li>
<lift:Menu.item donthide="true" name="streams" a:class="tipelement" a:title="Streams allow you to view pools or the messages sent by particular users. "/>