[jetrix-cvs] SF.net SVN: jetrix:[826] monitor/trunk/src/main/webapp
Brought to you by:
smanux
Menu
▾
▴
[jetrix-cvs] SF.net SVN: jetrix:[826] monitor/trunk/src/main/webapp
|
From: <sm...@us...> - 2010-02-22 18:53:22
|
Revision: 826
http://jetrix.svn.sourceforge.net/jetrix/?rev=826&view=rev
Author: smanux
Date: 2010-02-22 18:53:16 +0000 (Mon, 22 Feb 2010)
Log Message:
-----------
Nice URL for the player page
Modified Paths:
--------------
monitor/trunk/src/main/webapp/WEB-INF/web.xml
monitor/trunk/src/main/webapp/player.jsp
monitor/trunk/src/main/webapp/server.jsp
Modified: monitor/trunk/src/main/webapp/WEB-INF/web.xml
===================================================================
--- monitor/trunk/src/main/webapp/WEB-INF/web.xml 2010-02-22 17:33:40 UTC (rev 825)
+++ monitor/trunk/src/main/webapp/WEB-INF/web.xml 2010-02-22 18:53:16 UTC (rev 826)
@@ -61,6 +61,16 @@
<url-pattern>/server/*</url-pattern>
</servlet-mapping>
+ <servlet>
+ <servlet-name>player</servlet-name>
+ <jsp-file>/player.jsp</jsp-file>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>player</servlet-name>
+ <url-pattern>/player/*</url-pattern>
+ </servlet-mapping>
+
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
Modified: monitor/trunk/src/main/webapp/player.jsp
===================================================================
--- monitor/trunk/src/main/webapp/player.jsp 2010-02-22 17:33:40 UTC (rev 825)
+++ monitor/trunk/src/main/webapp/player.jsp 2010-02-22 18:53:16 UTC (rev 826)
@@ -7,9 +7,18 @@
<%
WebApplicationContext context = ContextLoader.getCurrentWebApplicationContext();
PlayerStatsDao dao = (PlayerStatsDao) context.getBean("playerStatsDao");
-
- PlayerStats player = dao.getStats(request.getParameter("id"));
-
+
+ PlayerStats player = null;
+ if (request.getParameter("id") != null) {
+ player = dao.getStats(request.getParameter("id"));
+ } else if (request.getPathInfo() != null) {
+ player = dao.getStats(request.getPathInfo().substring(request.getPathInfo().lastIndexOf('/') + 1));
+ }
+
+ if (player == null) {
+ response.sendError(HttpServletResponse.SC_BAD_REQUEST, "TetriNET player not found");
+ return;
+ }
%>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
@@ -19,13 +28,12 @@
<fmt:param><%= StyleUtils.strip(player.getName()) %></fmt:param>
</fmt:message>
</title>
- <link rel="stylesheet" type="text/css" href="stylesheets/style.css">
- <link rel="Shorcut Icon" href="favicon.ico">
+ <link rel="stylesheet" type="text/css" href="<%= request.getContextPath() %>/stylesheets/style.css">
+ <link rel="Shorcut Icon" href="<%= request.getContextPath() %>/favicon.ico">
</head>
<body>
-
<h1>
<fmt:message key="title.player">
<fmt:param><%= StyleUtils.strip(player.getName()) %></fmt:param>
@@ -47,7 +55,7 @@
</tr>
<tr>
<th><fmt:message key="word.server"/></th>
- <td><a href="server.jsp?id=<%= player.getLastServer().getId() %>"><%= player.getLastServer().getHostname() %></a></td>
+ <td><a href="<%= request.getContextPath() %>/server/<%= player.getLastServer().getHostname() %>"><%= player.getLastServer().getHostname() %></a></td>
</tr>
<tr>
<th><fmt:message key="word.channel"/></th>
Modified: monitor/trunk/src/main/webapp/server.jsp
===================================================================
--- monitor/trunk/src/main/webapp/server.jsp 2010-02-22 17:33:40 UTC (rev 825)
+++ monitor/trunk/src/main/webapp/server.jsp 2010-02-22 18:53:16 UTC (rev 826)
@@ -189,7 +189,7 @@
<tbody>
<% for (PlayerInfo player : server.getPlayers()) { %>
<tr>
- <td<%= player.getAuthenticationLevel() > 1 ? " style=\"font-weight: bold\"" : "" %>><a style="text-decoration: none; color: black" href="<%= request.getContextPath() %>/player.jsp?id=<%= player.getNick() %>"><%= StyleUtils.toHTML(player.getNick()) %></a></td>
+ <td<%= player.getAuthenticationLevel() > 1 ? " style=\"font-weight: bold\"" : "" %>><a style="text-decoration: none; color: black" href="<%= request.getContextPath() %>/player/<%= player.getNick() %>"><%= StyleUtils.toHTML(player.getNick()) %></a></td>
<td><%= StyleUtils.toHTML(player.getTeam()) %></td>
<td><%= player.getChannel() %></td>
<td><%= player.getSlot() %></td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
