Browse Source

Merge "Remove unused 'not_list' template argument"

tags/16.0.0.0b2
Zuul 1 week ago
parent
commit
427263f0cb

+ 13
- 21
openstack_dashboard/contrib/developer/profiler/templates/profiler/_mode_picker.html View File

@@ -1,21 +1,13 @@
1
-{% if not_list %}
2
-  <div class="dropdown" ng-controller="profilerActionsController as ctrl">
3
-{% else %}
4
-  <li class="dropdown" ng-controller="profilerActionsController as ctrl">
5
-{% endif %}
6
-    <a data-toggle="dropdown" href="#" class="dropdown-toggle" role="button"
7
-       aria-expanded="false">
8
-      <span class="fa fa-calculator"></span>
9
-      Profile
10
-      <span class="fa fa-caret-down"></span>
11
-    </a>
12
-    <ul class="dropdown-menu dropdown-menu-right">
13
-      <li><a href="#" ng-click="ctrl.profilePage()">
14
-        <span class="fa fa-refresh"></span> Profile Current Page
15
-      </a></li>
16
-    </ul>
17
-{% if not_list %}
18
-  </div>
19
-{% else %}
20
-  </li>
21
-{% endif %}
1
+<li class="dropdown" ng-controller="profilerActionsController as ctrl">
2
+  <a data-toggle="dropdown" href="#" class="dropdown-toggle" role="button"
3
+     aria-expanded="false">
4
+    <span class="fa fa-calculator"></span>
5
+    Profile
6
+    <span class="fa fa-caret-down"></span>
7
+  </a>
8
+  <ul class="dropdown-menu dropdown-menu-right">
9
+    <li><a href="#" ng-click="ctrl.profilePage()">
10
+      <span class="fa fa-refresh"></span> Profile Current Page
11
+    </a></li>
12
+  </ul>
13
+</li>

+ 27
- 36
openstack_dashboard/templates/header/_context_selection.html View File

@@ -1,42 +1,33 @@
1 1
 {% load context_selection %}
2 2
 
3
-{% if not_list %}
4
-  <div class="dropdown">
5
-{% else %}
6
-  <li class="dropdown">
7
-{% endif %}
8
-    <a class="dropdown-toggle{% if not_list %} btn btn-primary{% endif %}" role="button" aria-expanded="false" data-toggle="dropdown" href="#">
9
-      {% show_overview %}
10
-      <span class="fa fa-caret-down"></span>
11
-    </a>
12
-    <ul class="dropdown-menu context-selection selection-menu">
3
+<li class="dropdown">
4
+  <a class="dropdown-toggle" role="button" aria-expanded="false" data-toggle="dropdown" href="#">
5
+    {% show_overview %}
6
+    <span class="fa fa-caret-down"></span>
7
+  </a>
8
+  <ul class="dropdown-menu context-selection selection-menu">
13 9
 
14
-      {% comment %}
15
-      is_multidomain is only available through an assignment tag pulled in through context_selection
16
-      {% endcomment %}
17
-      {% is_multidomain as domain_supported %}
18
-      {% if domain_supported %}
19
-        <li>
20
-          {% show_domain_list %}
21
-        </li>
22
-      {% endif %}
10
+    {% comment %}
11
+    is_multidomain is only available through an assignment tag pulled in through context_selection
12
+    {% endcomment %}
13
+    {% is_multidomain as domain_supported %}
14
+    {% if domain_supported %}
23 15
       <li>
24
-        {% show_project_list %}
16
+        {% show_domain_list %}
25 17
       </li>
18
+    {% endif %}
19
+    <li>
20
+      {% show_project_list %}
21
+    </li>
26 22
 
27
-      {% comment %}
28
-      is_multi_region is only available through an assignment tag pulled in through context_selection
29
-      {% endcomment %}
30
-      {% is_multi_region as multi_region %}
31
-      {% if multi_region %}
32
-        <li>
33
-          {% show_region_list %}
34
-        </li>
35
-      {% endif %}
36
-    </ul>
37
-{% if not_list %}
38
-  </div>
39
-{% else %}
40
-  </li>
41
-{% endif %}
42
-
23
+    {% comment %}
24
+    is_multi_region is only available through an assignment tag pulled in through context_selection
25
+    {% endcomment %}
26
+    {% is_multi_region as multi_region %}
27
+    {% if multi_region %}
28
+      <li>
29
+        {% show_region_list %}
30
+      </li>
31
+    {% endif %}
32
+  </ul>
33
+</li>

+ 2
- 10
openstack_dashboard/templates/header/_keystone_provider_selection.html View File

@@ -1,11 +1,3 @@
1
-{% if not_list %}
2
-  <div class="dropdown">
3
-{% else %}
4
-  <li class="dropdown">
5
-{% endif %}
1
+<li class="dropdown">
6 2
   {% include "horizon/common/_keystone_provider_selector.html" %}
7
-{% if not_list %}
8
-  </div>
9
-{% else %}
10
-  </li>
11
-{% endif %}
3
+</li>

+ 2
- 10
openstack_dashboard/templates/header/_region_selection.html View File

@@ -1,11 +1,3 @@
1
-{% if not_list %}
2
-  <div class="dropdown">
3
-{% else %}
4
-  <li class="dropdown">
5
-{% endif %}
1
+<li class="dropdown">
6 2
   {% include "horizon/common/_region_selector.html" %}
7
-{% if not_list %}
8
-  </div>
9
-{% else %}
10
-  </li>
11
-{% endif %}
3
+</li>

+ 55
- 63
openstack_dashboard/templates/header/_user_menu.html View File

@@ -1,76 +1,68 @@
1 1
 {% load i18n %}
2 2
 {% load themes %}
3 3
 
4
-{% if not_list %}
5
-  <div class="dropdown user-menu">
6
-{% else %}
7
-  <li class="dropdown user-menu">
8
-{% endif %}
9
-    <a data-toggle="dropdown" href="#" class="dropdown-toggle" role="button" aria-expanded="false">
10
-      <span class="fa fa-user"></span>
11
-      <span class="user-name">{{ request.user.username }}</span>
12
-      <span class="fa fa-caret-down"></span>
13
-    </a>
14
-    <ul id="editor_list" class="dropdown-menu dropdown-menu-right selection-menu">
4
+<li class="dropdown user-menu">
5
+  <a data-toggle="dropdown" href="#" class="dropdown-toggle" role="button" aria-expanded="false">
6
+    <span class="fa fa-user"></span>
7
+    <span class="user-name">{{ request.user.username }}</span>
8
+    <span class="fa fa-caret-down"></span>
9
+  </a>
10
+  <ul id="editor_list" class="dropdown-menu dropdown-menu-right selection-menu">
11
+    <li>
12
+      <a href="{% url 'horizon:settings:user:index' %}" target="_self">
13
+        <span class="fa fa-cog"></span>
14
+        {% trans "Settings" %}
15
+      </a>
16
+    </li>
17
+    {% if HORIZON_CONFIG.bug_url %}
15 18
       <li>
16
-        <a href="{% url 'horizon:settings:user:index' %}" target="_self">
17
-          <span class="fa fa-cog"></span>
18
-          {% trans "Settings" %}
19
+        <a href="{{ HORIZON_CONFIG.bug_url }}" target="_blank">
20
+          <span class="fa fa-bug"></span>
21
+          {% trans "Report Bug" %}
19 22
         </a>
20 23
       </li>
21
-      {% if HORIZON_CONFIG.bug_url %}
22
-        <li>
23
-          <a href="{{ HORIZON_CONFIG.bug_url }}" target="_blank">
24
-            <span class="fa fa-bug"></span>
25
-            {% trans "Report Bug" %}
26
-          </a>
27
-        </li>
28
-      {% endif %}
29
-      {% if HORIZON_CONFIG.help_url %}
30
-        <li>
31
-          <a href="{{ HORIZON_CONFIG.help_url }}" target="_blank">
32
-            <span class="fa fa-question-circle"></span>
33
-            {% trans "Help" %}
34
-          </a>
35
-        </li>
36
-      {% endif %}
24
+    {% endif %}
25
+    {% if HORIZON_CONFIG.help_url %}
26
+      <li>
27
+        <a href="{{ HORIZON_CONFIG.help_url }}" target="_blank">
28
+          <span class="fa fa-question-circle"></span>
29
+          {% trans "Help" %}
30
+        </a>
31
+      </li>
32
+    {% endif %}
37 33
 
38
-      {% for link in USER_MENU_LINKS %}
39
-        <li>
40
-          {% if link.external %}
41
-            <a href="{{ link.url }}">
42
-          {% else %}
43
-            <a href="{% url link.url %}">
44
-          {% endif %}
34
+    {% for link in USER_MENU_LINKS %}
35
+      <li>
36
+        {% if link.external %}
37
+          <a href="{{ link.url }}">
38
+        {% else %}
39
+          <a href="{% url link.url %}">
40
+        {% endif %}
45 41
 
46
-          {% if link.icon_classes %}
47
-              <span class="fa {{ link.icon_classes | join:" "}}"></span>
48
-          {% else %}
49
-              <span class="fa fa-download"></span>
50
-          {% endif %}
51
-          {{ link.name }}
52
-          </a>
42
+        {% if link.icon_classes %}
43
+            <span class="fa {{ link.icon_classes | join:" "}}"></span>
44
+        {% else %}
45
+            <span class="fa fa-download"></span>
46
+        {% endif %}
47
+        {{ link.name }}
48
+        </a>
53 49
 
54
-        </li>
55
-      {% endfor %}
50
+      </li>
51
+    {% endfor %}
56 52
 
57
-      {% themes as available_themes %}
58
-      {% if available_themes and available_themes|length > 1 %}
59
-        <li class="divider"></li>
60
-        <li>
61
-          {% include 'header/_theme_list.html' %}
62
-        </li>
63
-      {% endif %}
53
+    {% themes as available_themes %}
54
+    {% if available_themes and available_themes|length > 1 %}
64 55
       <li class="divider"></li>
65 56
       <li>
66
-        <a href="{% url 'logout' %}" target="_self">
67
-          <span class="fa fa-sign-out"></span>
68
-          {% trans "Sign Out" %}
69
-        </a>
57
+        {% include 'header/_theme_list.html' %}
70 58
       </li>
71
-    </ul>
72
-{% if not_list %}
73
-  </div>
74
-{% else %}
75
-  </li>
76
-{% endif %}
59
+    {% endif %}
60
+    <li class="divider"></li>
61
+    <li>
62
+      <a href="{% url 'logout' %}" target="_self">
63
+        <span class="fa fa-sign-out"></span>
64
+        {% trans "Sign Out" %}
65
+      </a>
66
+    </li>
67
+  </ul>
68
+</li>

Loading…
Cancel
Save