X-Git-Url: https://git.auder.net/pieces/Cwda/n_black_bishop.svg?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FHall.vue;h=34cd63b7c85416fcc4d9751a3c2cedba2976903c;hb=f5f51daf4515c43d11bc5d739660ac213abec613;hp=bcc6cbab5acd3db589a0f4042b10ac27ca129ce4;hpb=9a3049f3a48fa4b3627ef26ccdf213a8e550d478;p=vchess.git

diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue
index bcc6cbab..34cd63b7 100644
--- a/client/src/views/Hall.vue
+++ b/client/src/views/Hall.vue
@@ -1,15 +1,13 @@
 <template lang="pug">
 main
   input#modalInfo.modal(type="checkbox")
-  div#infoDiv(role="dialog" data-checkbox="modalInfo" aria-labelledby="infoMessage")
-    .card.smallpad.small-modal.text-center
+  div#infoDiv(role="dialog" data-checkbox="modalInfo")
+    .card.text-center
       label.modal-close(for="modalInfo")
-      h3#infoMessage.section
-        p(v-html="infoMessage")
+      p(v-html="infoMessage")
   input#modalNewgame.modal(type="checkbox")
-  div#newgameDiv(role="dialog" data-checkbox="modalNewgame"
-      aria-labelledby="titleFenedit")
-    .card.smallpad(@keyup.enter="newChallenge()")
+  div#newgameDiv(role="dialog" data-checkbox="modalNewgame")
+    .card(@keyup.enter="newChallenge()")
       label#closeNewgame.modal-close(for="modalNewgame")
       fieldset
         label(for="selectVariant") {{ st.tr["Variant"] }} *
@@ -304,7 +302,7 @@ export default {
             if (s.sid != this.st.user.sid && !identityAsked[s.sid])
             {
               identityAsked[s.sid] = true;
-              this.send("askidentity", {target:s.sid});
+              this.send("askidentity", {target:s.sid, page:s.page || "/"});
             }
             if (!this.people[s.sid])
               this.$set(this.people, s.sid, {id:0, name:"", pages:[s.page || "/"]});
@@ -313,7 +311,7 @@ export default {
             if (!s.page) //peer is in Hall
               this.send("askchallenge", {target:s.sid});
             else //peer is in Game
-              this.send("askgame", {target:s.sid});
+              this.send("askgame", {target:s.sid, page:s.page});
           });
           break;
         }
@@ -328,7 +326,7 @@ export default {
             if (data.code == "connect")
               this.send("askchallenge", {target:data.from});
             else
-              this.send("askgame", {target:data.from});
+              this.send("askgame", {target:data.from, page:data.page});
           }
           else
           {
@@ -339,7 +337,7 @@ export default {
           if (this.people[data.from].id == 0)
           {
             this.newConnect[data.from] = true; //for self multi-connects tests
-            this.send("askidentity", {target:data.from});
+            this.send("askidentity", {target:data.from, page:data.page || "/"});
           }
           break;
         case "disconnect":
@@ -490,6 +488,8 @@ export default {
             newGame.vname = this.getVname(game.vid);
             if (!game.score) //if new game from Hall
               newGame.score = "*";
+            newGame.rids = [game.rid];
+            delete newGame["rid"];
             this.games.push(newGame);
           }
           else
@@ -513,7 +513,6 @@ export default {
               "#/game/" + gameInfo.id + "</a>";
             let modalBox = document.getElementById("modalInfo");
             modalBox.checked = true;
-            setTimeout(() => { modalBox.checked = false; }, 3000);
           }
           break;
         }
@@ -715,6 +714,15 @@ export default {
 #newGame
   display: block
   margin: 10px auto 5px auto
+
+#infoDiv > .card
+  padding: 15px 0
+  max-width: 430px
+
+#newgameDiv > .card
+  max-width: 767px
+  max-height: 100%
+
 #people
   width: 100%
 #players