pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always show menu, show a message if there are no other workspaces

Browse Source
This commit is contained in:
Andrew Croce 2018-10-16 11:59:00 -04:00
parent 687f07525a
commit 20ff49c8dd
2 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
styles/elements/_menu.scss
View File

@ -42,6 +42,13 @@
} }
} }
.menu__message {
@include h5;
font-weight: normal;
font-style: italic;
padding: 0 ($gap * 2);
}
.menu__button { .menu__button {
margin: ($gap * 2) ($gap * 2) 0; margin: ($gap * 2) ($gap * 2) 0;
white-space: nowrap; white-space: nowrap;

19
templates/navigation/topbar.html
View File

@ -15,7 +15,6 @@
<div class="topbar__context {% if workspace %}topbar__context--workspace{% endif %}"> <div class="topbar__context {% if workspace %}topbar__context--workspace{% endif %}">
{% if workspace %} {% if workspace %}
{% if workspaces %}
<div is='toggler' class='topbar__workspace-menu'> <div is='toggler' class='topbar__workspace-menu'>
<template slot-scope='props'> <template slot-scope='props'>
@ -30,6 +29,8 @@
<div v-show='props.isVisible' class='topbar__workspace-menu__panel menu'> <div v-show='props.isVisible' class='topbar__workspace-menu__panel menu'>
<h2 class='menu__heading'>Other Active Workspaces</h2> <h2 class='menu__heading'>Other Active Workspaces</h2>
{% if workspaces %}
<ul class='menu__list'> <ul class='menu__list'>
{% for other_workspace in workspaces %} {% for other_workspace in workspaces %}
<li class='menu__list__item'> <li class='menu__list__item'>
@ -40,20 +41,18 @@
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
{% else %}
<p class='menu__message'>You have no other active JEDI workspaces.</p>
{% endif %}
<a href="{{ url_for('requests.requests_form_new', screen=1) }}" class='menu__button usa-button'>Request a new JEDI Workspace</a> <a href="{{ url_for('requests.requests_form_new', screen=1) }}" class='menu__button usa-button'>Request a new JEDI Workspace</a>
</div> </div>
</template> </template>
</div> </div>
{% else %}
<div class='topbar__workspace-menu'>
<a class="topbar__link" href="{{ url_for('workspaces.show_workspace', workspace_id=workspace.id)}}">
<span class="topbar__link-label">{{ ("Workspace " + workspace.name) }}</span>
</a>
</div>
{% endif %}
{% endif %} {% endif %}
<a href="{{ url_for('atst.user') }}" class="topbar__link"> <a href="{{ url_for('atst.user') }}" class="topbar__link">