openstack
/
horizon
Code Issues Proposed changes

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 2019-09-09 17:28:46 +03:00
parent 8343014ece
commit 86d13968d8
5 changed files with 99 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
openstack_dashboard/contrib/developer/profiler/templates/profiler/_mode_picker.html
View File

@ -1,21 +1,13 @@
{% if not_list %} <li class="dropdown" ng-controller="profilerActionsController as ctrl">
<div class="dropdown" ng-controller="profilerActionsController as ctrl"> <a data-toggle="dropdown" href="#" class="dropdown-toggle" role="button"
{% else %} aria-expanded="false">
<li class="dropdown" ng-controller="profilerActionsController as ctrl"> <span class="fa fa-calculator"></span>
{% endif %} Profile
<a data-toggle="dropdown" href="#" class="dropdown-toggle" role="button" <span class="fa fa-caret-down"></span>
aria-expanded="false"> </a>
<span class="fa fa-calculator"></span> <ul class="dropdown-menu dropdown-menu-right">
Profile <li><a href="#" ng-click="ctrl.profilePage()">
<span class="fa fa-caret-down"></span> <span class="fa fa-refresh"></span> Profile Current Page
</a> </a></li>
<ul class="dropdown-menu dropdown-menu-right"> </ul>
<li><a href="#" ng-click="ctrl.profilePage()"> </li>
<span class="fa fa-refresh"></span> Profile Current Page
</a></li>
</ul>
{% if not_list %}
</div>
{% else %}
</li>
{% endif %}

63
openstack_dashboard/templates/header/_context_selection.html
View File

@ -1,42 +1,33 @@
{% load context_selection %} {% load context_selection %}
{% if not_list %} <li class="dropdown">
<div class="dropdown"> <a class="dropdown-toggle" role="button" aria-expanded="false" data-toggle="dropdown" href="#">
{% else %} {% show_overview %}
<li class="dropdown"> <span class="fa fa-caret-down"></span>
{% endif %} </a>
<a class="dropdown-toggle{% if not_list %} btn btn-primary{% endif %}" role="button" aria-expanded="false" data-toggle="dropdown" href="#"> <ul class="dropdown-menu context-selection selection-menu">
{% show_overview %}
<span class="fa fa-caret-down"></span>
</a>
<ul class="dropdown-menu context-selection selection-menu">
{% comment %} {% comment %}
is_multidomain is only available through an assignment tag pulled in through context_selection is_multidomain is only available through an assignment tag pulled in through context_selection
{% endcomment %} {% endcomment %}
{% is_multidomain as domain_supported %} {% is_multidomain as domain_supported %}
{% if domain_supported %} {% if domain_supported %}
<li>
{% show_domain_list %}
</li>
{% endif %}
<li> <li>
{% show_project_list %} {% show_domain_list %}
</li> </li>
{% endif %}
<li>
{% show_project_list %}
</li>
{% comment %} {% comment %}
is_multi_region is only available through an assignment tag pulled in through context_selection is_multi_region is only available through an assignment tag pulled in through context_selection
{% endcomment %} {% endcomment %}
{% is_multi_region as multi_region %} {% is_multi_region as multi_region %}
{% if multi_region %} {% if multi_region %}
<li> <li>
{% show_region_list %} {% show_region_list %}
</li> </li>
{% endif %} {% endif %}
</ul> </ul>
{% if not_list %} </li>
</div>
{% else %}
</li>
{% endif %}

12
openstack_dashboard/templates/header/_keystone_provider_selection.html
View File

@ -1,11 +1,3 @@
{% if not_list %} <li class="dropdown">
<div class="dropdown">
{% else %}
<li class="dropdown">
{% endif %}
{% include "horizon/common/_keystone_provider_selector.html" %} {% include "horizon/common/_keystone_provider_selector.html" %}
{% if not_list %} </li>
</div>
{% else %}
</li>
{% endif %}

12
openstack_dashboard/templates/header/_region_selection.html
View File

@ -1,11 +1,3 @@
{% if not_list %} <li class="dropdown">
<div class="dropdown">
{% else %}
<li class="dropdown">
{% endif %}
{% include "horizon/common/_region_selector.html" %} {% include "horizon/common/_region_selector.html" %}
{% if not_list %} </li>
</div>
{% else %}
</li>
{% endif %}

118
openstack_dashboard/templates/header/_user_menu.html
View File

@ -1,76 +1,68 @@
{% load i18n %} {% load i18n %}
{% load themes %} {% load themes %}
{% if not_list %} <li class="dropdown user-menu">
<div class="dropdown user-menu"> <a data-toggle="dropdown" href="#" class="dropdown-toggle" role="button" aria-expanded="false">
{% else %} <span class="fa fa-user"></span>
<li class="dropdown user-menu"> <span class="user-name">{{ request.user.username }}</span>
{% endif %} <span class="fa fa-caret-down"></span>
<a data-toggle="dropdown" href="#" class="dropdown-toggle" role="button" aria-expanded="false"> </a>
<span class="fa fa-user"></span> <ul id="editor_list" class="dropdown-menu dropdown-menu-right selection-menu">
<span class="user-name">{{ request.user.username }}</span> <li>
<span class="fa fa-caret-down"></span> <a href="{% url 'horizon:settings:user:index' %}" target="_self">
</a> <span class="fa fa-cog"></span>
<ul id="editor_list" class="dropdown-menu dropdown-menu-right selection-menu"> {% trans "Settings" %}
</a>
</li>
{% if HORIZON_CONFIG.bug_url %}
<li> <li>
<a href="{% url 'horizon:settings:user:index' %}" target="_self"> <a href="{{ HORIZON_CONFIG.bug_url }}" target="_blank">
<span class="fa fa-cog"></span> <span class="fa fa-bug"></span>
{% trans "Settings" %} {% trans "Report Bug" %}
</a> </a>
</li> </li>
{% if HORIZON_CONFIG.bug_url %} {% endif %}
<li> {% if HORIZON_CONFIG.help_url %}
<a href="{{ HORIZON_CONFIG.bug_url }}" target="_blank"> <li>
<span class="fa fa-bug"></span> <a href="{{ HORIZON_CONFIG.help_url }}" target="_blank">
{% trans "Report Bug" %} <span class="fa fa-question-circle"></span>
</a> {% trans "Help" %}
</li> </a>
{% endif %} </li>
{% if HORIZON_CONFIG.help_url %} {% endif %}
<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 %} {% for link in USER_MENU_LINKS %}
<li> <li>
{% if link.external %} {% if link.external %}
<a href="{{ link.url }}"> <a href="{{ link.url }}">
{% else %} {% else %}
<a href="{% url link.url %}"> <a href="{% url link.url %}">
{% endif %} {% endif %}
{% if link.icon_classes %} {% if link.icon_classes %}
<span class="fa {{ link.icon_classes | join:" "}}"></span> <span class="fa {{ link.icon_classes | join:" "}}"></span>
{% else %} {% else %}
<span class="fa fa-download"></span> <span class="fa fa-download"></span>
{% endif %} {% endif %}
{{ link.name }} {{ link.name }}
</a> </a>
</li> </li>
{% endfor %} {% endfor %}
{% themes as available_themes %} {% themes as available_themes %}
{% if available_themes and available_themes|length > 1 %} {% if available_themes and available_themes|length > 1 %}
<li class="divider"></li>
<li>
{% include 'header/_theme_list.html' %}
</li>
{% endif %}
<li class="divider"></li> <li class="divider"></li>
<li> <li>
<a href="{% url 'logout' %}" target="_self"> {% include 'header/_theme_list.html' %}
<span class="fa fa-sign-out"></span>
{% trans "Sign Out" %}
</a>
</li> </li>
</ul> {% endif %}
{% if not_list %} <li class="divider"></li>
</div> <li>
{% else %} <a href="{% url 'logout' %}" target="_self">
</li> <span class="fa fa-sign-out"></span>
{% endif %} {% trans "Sign Out" %}
</a>
</li>
</ul>
</li>