major navbar overhaul: .btn-primary.btn-xl now reads CONT GAME and links to the user's most recently active game; log out functionality transferred to new BYE .btn-abandon abutting login spans; tooltips for each asserted via new FTs.test_navbar methods to appear w.in visible area
This commit is contained in:
@@ -5,20 +5,33 @@
|
||||
<h1>Welcome,<br>Earthman</h1>
|
||||
</a>
|
||||
{% if user.email %}
|
||||
<div class="navbar-text">
|
||||
<span class="navbar-label">
|
||||
Logged in as
|
||||
</span>
|
||||
<span class="navbar-identity">
|
||||
@{{ user|display_name }}
|
||||
</span>
|
||||
<div class="navbar-user">
|
||||
<div class="navbar-text">
|
||||
<span class="navbar-label">
|
||||
Logged in as
|
||||
</span>
|
||||
<span class="navbar-identity">
|
||||
@{{ user|display_name }}
|
||||
</span>
|
||||
</div>
|
||||
<form method="POST" action="{% url "logout" %}">
|
||||
{% csrf_token %}
|
||||
<button id="id_logout" class="btn btn-abandon" type="submit" data-confirm="Log out?">
|
||||
BYE
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
<form method="POST" action="{% url "logout" %}">
|
||||
{% csrf_token %}
|
||||
<button id="id_logout" class="btn btn-primary btn-xl" type="submit" data-confirm="Log out?">
|
||||
Log Out
|
||||
{% if navbar_recent_room_url %}
|
||||
<button
|
||||
id="id_cont_game"
|
||||
class="btn btn-primary btn-xl"
|
||||
type="button"
|
||||
data-confirm="Continue game?"
|
||||
data-href="{{ navbar_recent_room_url }}"
|
||||
>
|
||||
CONT<br>GAME
|
||||
</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<form method="POST" action="{% url "send_login_email" %}">
|
||||
<div class="input-group">
|
||||
|
||||
@@ -86,11 +86,13 @@
|
||||
portal.style.left = Math.round(cleft) + 'px';
|
||||
var cardCenterY = rect.top + rect.height / 2;
|
||||
if (cardCenterY < window.innerHeight / 2) {
|
||||
portal.style.top = Math.round(rect.top) + 'px';
|
||||
portal.style.transform = 'translate(-50%, calc(-100% - 0.5rem))';
|
||||
} else {
|
||||
// button in upper half → show below
|
||||
portal.style.top = Math.round(rect.bottom) + 'px';
|
||||
portal.style.transform = 'translate(-50%, 0.5rem)';
|
||||
} else {
|
||||
// button in lower half → show above
|
||||
portal.style.top = Math.round(rect.top) + 'px';
|
||||
portal.style.transform = 'translate(-50%, calc(-100% - 0.5rem))';
|
||||
}
|
||||
}
|
||||
|
||||
@@ -140,6 +142,7 @@
|
||||
var form = btn.closest('form');
|
||||
show(btn, btn.dataset.confirm, function () {
|
||||
if (form) form.submit();
|
||||
else if (btn.dataset.href) window.location.href = btn.dataset.href;
|
||||
});
|
||||
}, true);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user