Merge "Removing the current project from the drop-down."

This commit is contained in:
Jenkins 2012-05-26 22:12:57 +00:00 committed by Gerrit Code Review
commit 26634cd1b6
2 changed files with 5 additions and 3 deletions

View File

@ -6,7 +6,9 @@
<ul id="region_list" class="dropdown-menu">
<li class='divider'></li>
{% for region in regions.available %}
<li><a class="ajax-modal" href="{% url horizon:auth_login %}?region={{ region.endpoint }}">{{ region.name }}</a></li>
{% if region.name != regions.current.name %}
<li><a class="ajax-modal" href="{% url horizon:auth_login %}?region={{ region.endpoint }}">{{ region.name }}</a></li>
{% endif %}
{% endfor %}
</ul>
</div>

View File

@ -8,13 +8,13 @@
{% if request.horizon.dashboard.supports_tenants %}
<div id="tenant_switcher" class="dropdown switcher_bar" tabindex='1'>
<a class="dropdown-toggle" data-toggle="dropdown" href="#tenant_switcher">
<h4>{% trans "Project" %}</h4>
<h4>{% trans "Current Project" %}</h4>
<h3>{{ request.user.tenant_name }}</h3>
</a>
<ul id="tenant_list" class="dropdown-menu">
<li class='divider'></li>
{% for tenant in authorized_tenants %}
{% if tenant.enabled %}
{% if tenant.enabled and tenant.id != request.user.tenant_id %}
<li><a href="{% url horizon:auth_switch tenant.id %}">{{ tenant.name }}</a></li>
{% endif %}
{% endfor %}