Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update navbar in template. #3151

Merged
merged 2 commits into from
Jan 4, 2019
Merged

Update navbar in template. #3151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12ed544
Update navbar in template.
jkmarx Jan 3, 2019
4629509
Avoid flickering by moving link to base template.
jkmarx Jan 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
84 changes: 44 additions & 40 deletions refinery/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,22 +125,19 @@
<span class="name">{{ REFINERY_INSTANCE_NAME }}</span>
</a>

<button type="button" class="navbar-toggle collapsed"
data-toggle="collapse" data-target="#navbarMain" aria-expanded="false">
<span class="icon-bar"></span>
</button>
</div>

<div class="navbar-text pull-right" id="navbar-right">
{% if user.is_authenticated %}
<a href="/dashboard" class="pointer">
<i id="refinery-logout" class="fa fa-tachometer icon-only"></i>&nbsp;
<span id="dashboard-icon-text">
My Dashboard
</span>
</a>
&nbsp;&nbsp;|&nbsp;&nbsp;
<a
<a href="/dashboard" class="pointer" tabindex=2>
<i id="refinery-logout" class="fa fa-tachometer icon-only"></i>&nbsp;
<span id="dashboard-icon-text">
My Dashboard
</span>
</a>
&nbsp;&nbsp;&nbsp;&nbsp;
<i class="fa fa-info-circle icon-only"></i>
<a href="{% url "about" %}" tabindex=3 class="pointer">About</a>
<!-- <a
class="pointer"
popover-placement="bottom"
popover-trigger="'outsideClick'"
Expand All @@ -149,9 +146,28 @@
<span id="help-icon-text">
Help
</span>
</a>
&nbsp;&nbsp;|&nbsp;&nbsp;
{% endif %}
</a> -->
&nbsp;&nbsp;&nbsp;&nbsp;
<span>
<a rp-analysis-monitor-global-status-tooltip-hider
tabindex=4 class="pointer">
<a
uib-popover-template="'analysesgloballist.html'"
popover-trigger="'outsideClick'"
popover-title="Recent Analyses"
popover-append-to-body="true"
popover-placement="left"
popover-class="global-analysis-popover">
<i class="fa fa-cogs pointer" id="global-analysis-status"
refinery-tooltip
refinery-tooltip-container="body"
refinery-tooltip-placement="left"
title="View Recent Analyses"></i>
Analyses
</a>
</a>
</span>
&nbsp;&nbsp;&nbsp;&nbsp;

{% if user.is_authenticated %}
<a id="refinery-user" href="{% url "user" user.profile.uuid %}"
Expand All @@ -164,7 +180,7 @@
{{ user.username }}
{% endif %}
</span>
</a>&nbsp;&nbsp;|&nbsp;&nbsp;
</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a href="
{% url "django.contrib.auth.views.logout" %}?next={% url "home" %}"
tabindex=6>
Expand All @@ -178,9 +194,10 @@
{% url 'django.contrib.auth.views.login' as login_url %}
{% if REGISTRATION_OPEN %}
<a href="{{registration_url}}" tabindex=7>
<i class="fa fa-pencil"></i>&nbsp;
Register
</a>&nbsp;&nbsp;
&nbsp;&nbsp;|&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;&nbsp;
{% endif %}
<a href="{{login_url}}?next={% if request.path %}{% ifnotequal registration_url request.path %}{% ifnotequal login_url request.path %}{{ request.path|safe }}{% else %}{% url "home" %}{% endifnotequal %}{% else %}{% url "home" %}{% endifnotequal %}{% else %}{% url "home" %}{% endif %}">
<i id="refinery-login" class="fa fa-sign-in"></i>&nbsp;
Expand All @@ -189,28 +206,6 @@
</span>
</a>
{% endif %}
&nbsp;&nbsp;|&nbsp;&nbsp;
<span>
<a rp-analysis-monitor-global-status-tooltip-hider
tabindex=8>
<span>
<rp-analysis-monitor-global-status>
</rp-analysis-monitor-global-status>
</span>
</a>
</span>
</div>
<div class="collapse navbar-collapse" id="navbarMain">
<ul class="nav navbar-nav">
<li class="{{ navbar_class_about }}">
<a href="{% url "about" %}" tabindex=4>About</a>
</li>
{% if REFINERY_CUSTOM_NAVBAR_ITEM %}
<li>
{{ REFINERY_CUSTOM_NAVBAR_ITEM|safe }}
</li>
{% endif %}
</ul>
</div>
</div>
</div>
Expand Down Expand Up @@ -320,6 +315,15 @@
{% block script %}
{% endblock %}

<!-- Script for popup content in the tool status and analyses icon-->
<script type="text/ng-template" id="analysesgloballist.html">
<div>
<rp-analysis-monitor-global-status-popover>
</rp-analysis-monitor-global-status-popover>
</div>
</script>


<script type="text/javascript">
/**
* Provides requestAnimationFrame in a cross browser way.
Expand Down
3 changes: 3 additions & 0 deletions refinery/ui/source/js/analysis-monitor/partials/global-status.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<!-- this partial is unused but should be reused once the navbar is angularized -->
<span id="analysesCogIcon" class="pointer">
<a
uib-popover-template="'analysesgloballist.html'"
Expand All @@ -13,6 +14,7 @@
refinery-tooltip-placement="left"
title="View Recent Analyses">
<i class="fa fa-cog" id="global-analysis-status-run"></i>
Analyses
{{ $ctrl.analysesRunningGlobalCount }}
</span>
</span>
Expand All @@ -22,6 +24,7 @@
refinery-tooltip-container="body"
refinery-tooltip-placement="left"
title="View Recent Analyses"></i>
Analyses
</span>
</a>
</span>
Expand Down