Remove unused 'not_list' template argument
This is unused in Horizon itself and I didn't find any references in plugins. Undefined variable leads to errors during render in a debug mode. Partial-Bug: #1720893 Change-Id: I9de0b24adfeb48f5fe14676aaec6b17b8eb52207
This commit is contained in:
Ivan Kolodyazhny
parent
8343014ece
commit
86d13968d8
@ -1,21 +1,13 @@
|
||||
{% if not_list %}
|
||||
<div class="dropdown" ng-controller="profilerActionsController as ctrl">
|
||||
{% else %}
|
||||
<li class="dropdown" ng-controller="profilerActionsController as ctrl">
|
||||
{% endif %}
|
||||
<a data-toggle="dropdown" href="#" class="dropdown-toggle" role="button"
|
||||
aria-expanded="false">
|
||||
<span class="fa fa-calculator"></span>
|
||||
Profile
|
||||
<span class="fa fa-caret-down"></span>
|
||||
</a>
|
||||
<ul class="dropdown-menu dropdown-menu-right">
|
||||
<li><a href="#" ng-click="ctrl.profilePage()">
|
||||
<span class="fa fa-refresh"></span> Profile Current Page
|
||||
</a></li>
|
||||
</ul>
|
||||
{% if not_list %}
|
||||
</div>
|
||||
{% else %}
|
||||
</li>
|
||||
{% endif %}
|
||||
<li class="dropdown" ng-controller="profilerActionsController as ctrl">
|
||||
<a data-toggle="dropdown" href="#" class="dropdown-toggle" role="button"
|
||||
aria-expanded="false">
|
||||
<span class="fa fa-calculator"></span>
|
||||
Profile
|
||||
<span class="fa fa-caret-down"></span>
|
||||
</a>
|
||||
<ul class="dropdown-menu dropdown-menu-right">
|
||||
<li><a href="#" ng-click="ctrl.profilePage()">
|
||||
<span class="fa fa-refresh"></span> Profile Current Page
|
||||
</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
@ -1,42 +1,33 @@
|
||||
{% load context_selection %}
|
||||
|
||||
{% if not_list %}
|
||||
<div class="dropdown">
|
||||
{% else %}
|
||||
<li class="dropdown">
|
||||
{% endif %}
|
||||
<a class="dropdown-toggle{% if not_list %} btn btn-primary{% endif %}" role="button" aria-expanded="false" data-toggle="dropdown" href="#">
|
||||
{% show_overview %}
|
||||
<span class="fa fa-caret-down"></span>
|
||||
</a>
|
||||
<ul class="dropdown-menu context-selection selection-menu">
|
||||
<li class="dropdown">
|
||||
<a class="dropdown-toggle" role="button" aria-expanded="false" data-toggle="dropdown" href="#">
|
||||
{% show_overview %}
|
||||
<span class="fa fa-caret-down"></span>
|
||||
</a>
|
||||
<ul class="dropdown-menu context-selection selection-menu">
|
||||
|
||||
{% comment %}
|
||||
is_multidomain is only available through an assignment tag pulled in through context_selection
|
||||
{% endcomment %}
|
||||
{% is_multidomain as domain_supported %}
|
||||
{% if domain_supported %}
|
||||
<li>
|
||||
{% show_domain_list %}
|
||||
</li>
|
||||
{% endif %}
|
||||
{% comment %}
|
||||
is_multidomain is only available through an assignment tag pulled in through context_selection
|
||||
{% endcomment %}
|
||||
{% is_multidomain as domain_supported %}
|
||||
{% if domain_supported %}
|
||||
<li>
|
||||
{% show_project_list %}
|
||||
{% show_domain_list %}
|
||||
</li>
|
||||
{% endif %}
|
||||
<li>
|
||||
{% show_project_list %}
|
||||
</li>
|
||||
|
||||
{% comment %}
|
||||
is_multi_region is only available through an assignment tag pulled in through context_selection
|
||||
{% endcomment %}
|
||||
{% is_multi_region as multi_region %}
|
||||
{% if multi_region %}
|
||||
<li>
|
||||
{% show_region_list %}
|
||||
</li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
{% if not_list %}
|
||||
</div>
|
||||
{% else %}
|
||||
</li>
|
||||
{% endif %}
|
||||
|
||||
{% comment %}
|
||||
is_multi_region is only available through an assignment tag pulled in through context_selection
|
||||
{% endcomment %}
|
||||
{% is_multi_region as multi_region %}
|
||||
{% if multi_region %}
|
||||
<li>
|
||||
{% show_region_list %}
|
||||
</li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
@ -1,11 +1,3 @@
|
||||
{% if not_list %}
|
||||
<div class="dropdown">
|
||||
{% else %}
|
||||
<li class="dropdown">
|
||||
{% endif %}
|
||||
<li class="dropdown">
|
||||
{% include "horizon/common/_keystone_provider_selector.html" %}
|
||||
{% if not_list %}
|
||||
</div>
|
||||
{% else %}
|
||||
</li>
|
||||
{% endif %}
|
||||
</li>
|
||||
|
||||
@ -1,11 +1,3 @@
|
||||
{% if not_list %}
|
||||
<div class="dropdown">
|
||||
{% else %}
|
||||
<li class="dropdown">
|
||||
{% endif %}
|
||||
<li class="dropdown">
|
||||
{% include "horizon/common/_region_selector.html" %}
|
||||
{% if not_list %}
|
||||
</div>
|
||||
{% else %}
|
||||
</li>
|
||||
{% endif %}
|
||||
</li>
|
||||
|
||||
@ -1,76 +1,68 @@
|
||||
{% load i18n %}
|
||||
{% load themes %}
|
||||
|
||||
{% if not_list %}
|
||||
<div class="dropdown user-menu">
|
||||
{% else %}
|
||||
<li class="dropdown user-menu">
|
||||
{% endif %}
|
||||
<a data-toggle="dropdown" href="#" class="dropdown-toggle" role="button" aria-expanded="false">
|
||||
<span class="fa fa-user"></span>
|
||||
<span class="user-name">{{ request.user.username }}</span>
|
||||
<span class="fa fa-caret-down"></span>
|
||||
</a>
|
||||
<ul id="editor_list" class="dropdown-menu dropdown-menu-right selection-menu">
|
||||
<li class="dropdown user-menu">
|
||||
<a data-toggle="dropdown" href="#" class="dropdown-toggle" role="button" aria-expanded="false">
|
||||
<span class="fa fa-user"></span>
|
||||
<span class="user-name">{{ request.user.username }}</span>
|
||||
<span class="fa fa-caret-down"></span>
|
||||
</a>
|
||||
<ul id="editor_list" class="dropdown-menu dropdown-menu-right selection-menu">
|
||||
<li>
|
||||
<a href="{% url 'horizon:settings:user:index' %}" target="_self">
|
||||
<span class="fa fa-cog"></span>
|
||||
{% trans "Settings" %}
|
||||
</a>
|
||||
</li>
|
||||
{% if HORIZON_CONFIG.bug_url %}
|
||||
<li>
|
||||
<a href="{% url 'horizon:settings:user:index' %}" target="_self">
|
||||
<span class="fa fa-cog"></span>
|
||||
{% trans "Settings" %}
|
||||
<a href="{{ HORIZON_CONFIG.bug_url }}" target="_blank">
|
||||
<span class="fa fa-bug"></span>
|
||||
{% trans "Report Bug" %}
|
||||
</a>
|
||||
</li>
|
||||
{% if HORIZON_CONFIG.bug_url %}
|
||||
<li>
|
||||
<a href="{{ HORIZON_CONFIG.bug_url }}" target="_blank">
|
||||
<span class="fa fa-bug"></span>
|
||||
{% trans "Report Bug" %}
|
||||
</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% if HORIZON_CONFIG.help_url %}
|
||||
<li>
|
||||
<a href="{{ HORIZON_CONFIG.help_url }}" target="_blank">
|
||||
<span class="fa fa-question-circle"></span>
|
||||
{% trans "Help" %}
|
||||
</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% if HORIZON_CONFIG.help_url %}
|
||||
<li>
|
||||
<a href="{{ HORIZON_CONFIG.help_url }}" target="_blank">
|
||||
<span class="fa fa-question-circle"></span>
|
||||
{% trans "Help" %}
|
||||
</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
|
||||
{% for link in USER_MENU_LINKS %}
|
||||
<li>
|
||||
{% if link.external %}
|
||||
<a href="{{ link.url }}">
|
||||
{% else %}
|
||||
<a href="{% url link.url %}">
|
||||
{% endif %}
|
||||
{% for link in USER_MENU_LINKS %}
|
||||
<li>
|
||||
{% if link.external %}
|
||||
<a href="{{ link.url }}">
|
||||
{% else %}
|
||||
<a href="{% url link.url %}">
|
||||
{% endif %}
|
||||
|
||||
{% if link.icon_classes %}
|
||||
<span class="fa {{ link.icon_classes | join:" "}}"></span>
|
||||
{% else %}
|
||||
<span class="fa fa-download"></span>
|
||||
{% endif %}
|
||||
{{ link.name }}
|
||||
</a>
|
||||
{% if link.icon_classes %}
|
||||
<span class="fa {{ link.icon_classes | join:" "}}"></span>
|
||||
{% else %}
|
||||
<span class="fa fa-download"></span>
|
||||
{% endif %}
|
||||
{{ link.name }}
|
||||
</a>
|
||||
|
||||
</li>
|
||||
{% endfor %}
|
||||
</li>
|
||||
{% endfor %}
|
||||
|
||||
{% themes as available_themes %}
|
||||
{% if available_themes and available_themes|length > 1 %}
|
||||
<li class="divider"></li>
|
||||
<li>
|
||||
{% include 'header/_theme_list.html' %}
|
||||
</li>
|
||||
{% endif %}
|
||||
{% themes as available_themes %}
|
||||
{% if available_themes and available_themes|length > 1 %}
|
||||
<li class="divider"></li>
|
||||
<li>
|
||||
<a href="{% url 'logout' %}" target="_self">
|
||||
<span class="fa fa-sign-out"></span>
|
||||
{% trans "Sign Out" %}
|
||||
</a>
|
||||
{% include 'header/_theme_list.html' %}
|
||||
</li>
|
||||
</ul>
|
||||
{% if not_list %}
|
||||
</div>
|
||||
{% else %}
|
||||
</li>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
<li class="divider"></li>
|
||||
<li>
|
||||
<a href="{% url 'logout' %}" target="_self">
|
||||
<span class="fa fa-sign-out"></span>
|
||||
{% trans "Sign Out" %}
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user