openstack/horizon
Code Issues Proposed changes

Merge "AVAILABLE_REGIONS picker should be responsive"

Browse Source
This commit is contained in:
Jenkins 2015-08-21 10:22:05 +00:00 committed by Gerrit Code Review
commit 63dde49928
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
horizon/templates/horizon/common/_region_selector.html
View File

@ -1,16 +1,14 @@
{% load url from future %}
{% if regions.support %}
<div id="region_switcher" class="dropdown switcher_bar" tabindex='1'>
<button class="btn btn-default btn-topnav dropdown-toggle" data-toggle="dropdown">
{{ regions.current.name }}
<span class="fa fa-caret-down"></span>
</button>
<ul id="region_list" class="dropdown-menu topbar-dropdown-menu">
{% for region in regions.available %}
{% if region.name != regions.current.name %}
<li><a class="ajax-modal" href="{% url 'login' %}?region={{ region.endpoint|urlencode }}">{{ region.name }}</a></li>
{% endif %}
{% endfor %}
</ul>
</div>
<a href="#" class="dropdown-toggle" role="button" aria-expanded="false">
{{ regions.current.name }}
<span class="fa fa-caret-down"></span>
</a>
<ul id="region_list" class="dropdown-menu topbar-dropdown-menu">
{% for region in regions.available %}
{% if region.name != regions.current.name %}
<li><a class="ajax-modal" href="{% url 'login' %}?region={{ region.endpoint|urlencode }}">{{ region.name }}</a></li>
{% endif %}
{% endfor %}
</ul>
{% endif %}

5
openstack_dashboard/templates/_header.html
View File

@ -53,8 +53,6 @@
</li>
</ul>
{% include "horizon/common/_region_selector.html" %}
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" role="button" aria-expanded="false">
@ -86,6 +84,9 @@
</li>
</ul>
</li>
<li class="dropdown">
{% include "horizon/common/_region_selector.html" %}
</li>
</ul>
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->