From 9a476e4f812f81dc7ead516513403a30d52e3d30 Mon Sep 17 00:00:00 2001 From: Andy Janata Date: Sun, 29 Jan 2012 17:13:51 -0800 Subject: [PATCH] move index.jsp to game.jsp and add a new index.jsp that has a quick overview --- WebContent/game.jsp | 168 ++++++++++++++++++++++++++++++++++++++ WebContent/index.jsp | 188 +++++++------------------------------------ 2 files changed, 198 insertions(+), 158 deletions(-) create mode 100644 WebContent/game.jsp diff --git a/WebContent/game.jsp b/WebContent/game.jsp new file mode 100644 index 0000000..d1ce9b8 --- /dev/null +++ b/WebContent/game.jsp @@ -0,0 +1,168 @@ + +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8" %> +<%@ page import="javax.servlet.http.HttpSession" %> + + + + +Cards Against Humanity + + + + +<%-- cah must be first, ajax must be before app. app probably has to be last. --%> +<%-- TODO make this be dynamic with looking at the filesystem and using jquery --%> +<%-- except that is nontrivial thanks to dependency ordering -_- --%> + + + + + + + + + + + + + + +<%-- Ensure a session exists for the user. --%> +<% HttpSession hSession = request.getSession(true); %> +<%-- +< % = new net.socialgamer.cah.data.WhiteDeck().getNextCard().toString() % > +--%> + +<%-- +
+
+

Cards Against Humanity is known to have graphical glitches in + $BROWSER_NAME. The game should work, + but it looks much better in Google Chrome.

+

We will not bug you about this again after you dismiss this dialog.

+ +
+
+--%> + +
+ Nickname: + + +
+ +
+ +
+
+
+
+
+
+
+
+
+
+ + +
+
+ + +
+
+ Game ### + status +
+ Host: host +
+ Players: host, player1, player2 +
+
+ +
+
+ + +
+ The quick brown fox jumped over the lazy dog. + Cards Against Humanity +
+ + +
+
+ + +
+ The quick brown fox jumped over the lazy dog. + Cards Against Humanity +
+ + +
+
+ + +
+
+
+ Waiting for server... +
+
+
+
+
+ The black card for this round is: +
+
+
+ +
+
+
+ The white cards played this round are: +
+
+
+
+
+
+ Your Hand +
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+ PlayerName +
+ 0 points + Status +
+
+ + + diff --git a/WebContent/index.jsp b/WebContent/index.jsp index 5531639..7a38677 100644 --- a/WebContent/index.jsp +++ b/WebContent/index.jsp @@ -1,167 +1,39 @@ - + <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> -<%@ page import="javax.servlet.http.HttpSession" %> + Cards Against Humanity - - - - -<%-- cah must be first, ajax must be before app. app probably has to be last. --%> -<%-- TODO make this be dynamic with looking at the filesystem and using jquery --%> -<%-- except that is nontrivial thanks to dependency ordering -_- --%> - - - - - - - - - - - - -<%-- Ensure a session exists for the user. --%> -<% HttpSession hSession = request.getSession(true); %> -<%-- -< % = new net.socialgamer.cah.data.WhiteDeck().getNextCard().toString() % > ---%> - -<%-- -
-
-

Cards Against Humanity is known to have graphical glitches in - $BROWSER_NAME. The game should work, - but it looks much better in Google Chrome.

-

We will not bug you about this again after you dismiss this dialog.

- -
-
---%> - -
- Nickname: - - -
- -
- -
-
-
-
-
-
-
-
-
-
- - -
-
- - -
-
- Game ### - status -
- Host: host -
- Players: host, player1, player2 -
-
- -
-
- - -
- The quick brown fox jumped over the lazy dog. - Cards Against Humanity -
- - -
-
- - -
- The quick brown fox jumped over the lazy dog. - Cards Against Humanity -
- - -
-
- - -
-
-
- Waiting for server... -
-
-
-
-
- The black card for this round is: -
-
-
- -
-
-
- The white cards played this round are: -
-
-
-
-
-
- Your Hand -
-
-
-
-
-
- - -
-
-
-
- - -
-
- PlayerName -
- 0 points - Status -
-
- +

+ This webapp is still in development. There will be bugs, but hopefully they won't affect gameplay + very much. To assist with development, all traffic on this server may be + logged. +

+

+ The name you enter and your computer's IP address will always be logged when you + load the game client. Chat and gameplay may also be logged. +

+

Known issues:

+ +

Current limitations:

+ +

+ +

- + \ No newline at end of file