diff --git a/view-webapp/src/main/sass/main.scss b/view-webapp/src/main/sass/main.scss index cd023e7..660193e 100644 --- a/view-webapp/src/main/sass/main.scss +++ b/view-webapp/src/main/sass/main.scss @@ -216,6 +216,9 @@ display: flex; flex-flow: row wrap; justify-content: space-between; + &.right { + justify-content: flex-end; + } } input[type="number"] { @@ -317,6 +320,11 @@ border-radius: 5px; overflow-x: hidden; overflow-y: auto; + .popup-header { + text-align: center; + font-size: 1.5em; + margin-bottom: 1em; + } .popup-content { display: flex; flex-direction: column; diff --git a/view-webapp/src/main/sass/tour.scss b/view-webapp/src/main/sass/tour.scss index 781d7cb..df4c701 100644 --- a/view-webapp/src/main/sass/tour.scss +++ b/view-webapp/src/main/sass/tour.scss @@ -209,8 +209,14 @@ flex-flow: column nowrap; min-height: 10vh; max-height: 30vh; - min-width: 50vw; } + + #pairing-right { + display: inline-flex; + flex-flow: row wrap; + gap: 1em; + } + .choose-round.button { padding: 0.2em 0.8em; } diff --git a/view-webapp/src/main/webapp/js/main.js b/view-webapp/src/main/webapp/js/main.js index 5b86eb1..5cbeb44 100644 --- a/view-webapp/src/main/webapp/js/main.js +++ b/view-webapp/src/main/webapp/js/main.js @@ -191,13 +191,11 @@ onLoad(() => { document.on('keyup', e => { switch (e.key) { case 'Escape': { - if ($('#player').hasClass('shown')) { - if ($('#needle')[0].value) { + if ($('#player').hasClass('shown') && $('#needle')[0].value) { $('#needle')[0].value = ''; initSearch(); - } else { - close_modal(); - } + } else { + close_modal(); } break; } diff --git a/view-webapp/src/main/webapp/js/tour-pairing.inc.js b/view-webapp/src/main/webapp/js/tour-pairing.inc.js index 99b8988..55a3011 100644 --- a/view-webapp/src/main/webapp/js/tour-pairing.inc.js +++ b/view-webapp/src/main/webapp/js/tour-pairing.inc.js @@ -51,6 +51,7 @@ onLoad(()=>{ $('#unpair').on('click', e => { let games = $('#paired')[0].childNodes.filter('.selected.listitem').map(item => parseInt(item.data("id"))); if (games.length == 0) { + $('#paired .listitem').addClass('selected'); games = $('#paired')[0].childNodes.filter('.selected.listitem').map(item => parseInt(item.data("id"))); } unpair(games); diff --git a/view-webapp/src/main/webapp/js/tour-standings.inc.js b/view-webapp/src/main/webapp/js/tour-standings.inc.js index fa21e4a..d9f74e9 100644 --- a/view-webapp/src/main/webapp/js/tour-standings.inc.js +++ b/view-webapp/src/main/webapp/js/tour-standings.inc.js @@ -39,4 +39,10 @@ onLoad(() => { e.preventDefault(); return false; }); + $('#publish').on('click', e => { + modal('publish-modal'); + }); + $('#publish-modal').on('click', e => { + close_modal(); + }); }); diff --git a/view-webapp/src/main/webapp/tour-pairing.inc.html b/view-webapp/src/main/webapp/tour-pairing.inc.html index 8beff3f..9468c74 100644 --- a/view-webapp/src/main/webapp/tour-pairing.inc.html +++ b/view-webapp/src/main/webapp/tour-pairing.inc.html @@ -22,35 +22,39 @@
-
+
+
#foreach($p in $pairables) #set($part = $pmap[$p]) -
$part.name $part.firstname#rank($part.rank) $part.country
+
$part.name $part.firstname#rank($part.rank) $part.country
#end -
-
- - -
-
-#foreach($game in $games) - #set($white = $pmap[$game.w]) - #set($black = $pmap[$game.b]) -
#$game.t#if($white)$white.name $white.firstname #rank($white.rank)#{else}BIP#end #if($black)$black.name $black.firstname #rank($black.rank)#{else}BIP#end#if($game.h)h$game.h#end
-#end -
-
-
+
+
#foreach($p in $unpairables) #set($part = $pmap[$p]) -
$part.name $part.firstname#rank($part.rank) $part.country
+
$part.name $part.firstname#rank($part.rank) $part.country
#end +
+
+
+
+ + +
+
+ #foreach($game in $games) + #set($white = $pmap[$game.w]) + #set($black = $pmap[$game.b]) +
#$game.t#if($white)$white.name $white.firstname #rank($white.rank)#{else}BIP#end #if($black)$black.name $black.firstname #rank($black.rank)#{else}BIP#end#if($game.h)h$game.h#end
+ #end +
+
diff --git a/view-webapp/src/main/webapp/tour-standings.inc.html b/view-webapp/src/main/webapp/tour-standings.inc.html index 2a8ee8e..46f127e 100644 --- a/view-webapp/src/main/webapp/tour-standings.inc.html +++ b/view-webapp/src/main/webapp/tour-standings.inc.html @@ -87,4 +87,26 @@ +
+ +
+ +