From 2070f6aa10e570280cfe02cba0db7103b07c4999 Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Wed, 5 Oct 2011 10:20:29 +0000
Subject: [PATCH] Multiple cards played on a site in adventure path should be
 now layed out correctly - all should be visible, rather than only the one
 played most recently, also the played cards will be placed "under" the site,
 rather than on top. Also player tokens on the site will be put on top of the
 site and will not be obscured from view by the cards on top of the site.

---
 .../src/main/webapp/includes/changeLog.html       |  7 +++++++
 .../src/main/webapp/js/jCardGroup.js              | 15 ++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
index 42ef02bdd..f71d5c915 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
@@ -1,4 +1,11 @@
 <pre style="font-size:80%">
+<b>5 Oct. 2011</b>
+- Added timestamps to the chat messages in GameHall.
+- Multiple cards played on a site in adventure path should be now layed out correctly - all should be visible, rather
+than only the one played most recently, also the played cards will be placed "under" the site, rather than on top. Also
+player tokens on the site will be put on top of the site and will not be obscured from view by the cards on top of the
+site.
+
 <b>4 Oct. 2011</b>
 - Added Deck Builder filtering in collection by set and card type. Also cards in deck builder collection are sorted
 by name.
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCardGroup.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCardGroup.js
index 38465e9b5..a27200b37 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCardGroup.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCardGroup.js
@@ -106,7 +106,7 @@ var AdvPathCardGroup = CardGroup.extend({
                 function(first, second) {
                     return (first.data("card").siteNumber - second.data("card").siteNumber);
                 }
-                );
+        );
 
         var cardCount = cardsToLayout.length;
         var totalHeight = 0;
@@ -129,13 +129,18 @@ var AdvPathCardGroup = CardGroup.extend({
                 if (this.positions[i] == cardData.siteNumber)
                     cardData.tokens["" + (i + 1)] = 1;
 
-            this.layoutCard(cardElem, x, y, this.width, cardHeight, index);
-
-            for (var i = 0; i < cardData.attachedCards.length; i++) {
-                this.layoutCard(cardData.attachedCards[i], x + (this.width - cardHeight) / 2, y - (this.width - cardHeight) / 2, cardHeight, this.width, index);
+            if (cardData.attachedCards.length == 1) {
+                this.layoutCard(cardData.attachedCards[0], x + (this.width - cardHeight) / 2, y - (this.width - cardHeight) / 2, cardHeight, this.width, index);
                 index++;
+            } else {
+                for (var i = 0; i < cardData.attachedCards.length; i++) {
+                    this.layoutCard(cardData.attachedCards[0], x + i * (this.width - cardHeight) / (cardData.attachedCards.length - 1), y - (this.width - cardHeight) / 2, cardHeight, this.width, index);
+                    index++;
+                }
             }
 
+            this.layoutCard(cardElem, x, y, this.width, cardHeight, index);
+
             y += cardHeight + resultPadding;
             index++;
         }