Skip to content

Feature 229: added Flag to GameView and player.jsp #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
g4ttsu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Feature 229: added Flag to GameView and player.jsp #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/net/deckserver/dwr/model/GameView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ public GameBean create() {
try {
request.setAttribute("game", game);
request.setAttribute("player", playerName);
request.setAttribute("flag", PlayerService.get(playerName).getCountryCode());
request.setAttribute("viewer", playerName);
hand = WebContextFactory.get().forwardToString("/WEB-INF/jsps/game/hand.jsp");
} catch (Exception e) {
Expand Down
2 changes: 2 additions & 0 deletions src/main/webapp/WEB-INF/jsps/game/player.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
JolGame game = (JolGame) request.getAttribute("game");
String viewer = (String) request.getAttribute("viewer");
String player = request.getParameter("player");
String flag = request.getParameter("flag");
String edgeColor = (String) request.getAttribute("edgeColor");
String edgeTextColor = (String) request.getAttribute("edgeTextColor");
String playerIndex = request.getParameter("playerIndex");
Expand All @@ -27,6 +28,7 @@
<h6 class="d-flex justify-content-between align-items-center mb-0 lh-base">
<span class="fw-bold">
<span><%= player %></span>
<span data-tippy-content="<%= flag %>" class="fi fi-gb fis fs-6"></span>
<i class='bi-exclamation-triangle ms-2 pinged d-none'></i>
</span>
<c:if test="<%= edge %>">
Expand Down