Less whitespace for menu macro

flask_admin/templates/bootstrap2/admin/layout.html

 {% macro menu_icon(item) -%}
 {% set icon_type = item.get_icon_type() %}
-{% if icon_type %}
+{%- if icon_type %}
   {% set icon_value = item.get_icon_value() %}
   {% if icon_type == 'glyph' %}
     <i class="{{ icon_value }}"></i>
@@ -13,45 +13,43 @@
 {%- endmacro %}
 
 {% macro menu() %}
-  {% for item in admin_view.admin.menu() %}
-    {% if item.is_category() %}
+  {%- for item in admin_view.admin.menu() %}
+    {%- if item.is_category() -%}
       {% set children = item.get_children() %}
-      {% if children %}
+      {%- if children %}
         {% set class_name = item.get_class_name() %}
-        {% if item.is_active(admin_view) %}
+        {%- if item.is_active(admin_view) %}
         <li class="active dropdown{% if class_name %} {{class_name}}{% endif %}">
-        {% else %}
+        {% else -%}
         <li class="dropdown{% if class_name %} {{class_name}}{% endif %}">
-        {% endif %}
-          <a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)">
-            {{ menu_icon(item) }}{{ item.name }}<b class="caret"></b>
-          </a>
+        {%- endif %}
+          <a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)">{{ menu_icon(item) }}{{ item.name }}<b class="caret"></b></a>
           <ul class="dropdown-menu">
-            {% for child in children %}
-              {% set class_name = child.get_class_name() %}
-              {% if child.is_active(admin_view) %}
-              <li class="active{% if class_name %} {{class_name}}{% endif %}">
-              {% else %}
-              <li{% if class_name %} class="{{class_name}}"{% endif %}>
-              {% endif %}
-                <a href="{{ child.get_url() }}">{{ menu_icon(child) }}{{ child.name }}</a>
-              </li>
-            {% endfor %}
+          {%- for child in children -%}
+            {% set class_name = child.get_class_name() %}
+            {%- if child.is_active(admin_view) %}
+            <li class="active{% if class_name %} {{class_name}}{% endif %}">
+            {% else %}
+            <li{% if class_name %} class="{{class_name}}"{% endif %}>
+            {%- endif %}
+              <a href="{{ child.get_url() }}">{{ menu_icon(child) }}{{ child.name }}</a>
+            </li>
+          {%- endfor %}
           </ul>
         </li>
       {% endif %}
-    {% else %}
-      {% if item.is_accessible() and item.is_visible() %}
+    {%- else %}
+      {%- if item.is_accessible() and item.is_visible() -%}
         {% set class_name = item.get_class_name() %}
-        {% if item.is_active(admin_view) %}
+        {%- if item.is_active(admin_view) %}
         <li class="active{% if class_name %} {{class_name}}{% endif %}">
-        {% else %}
+        {%- else %}
         <li{% if class_name %} class="{{class_name}}"{% endif %}>
-        {% endif %}
+        {%- endif %}
           <a href="{{ item.get_url() }}">{{ menu_icon(item) }}{{ item.name }}</a>
         </li>
-      {% endif %}
-    {% endif %}
+      {%- endif -%}
+    {% endif -%}
   {% endfor %}
 {% endmacro %}
 

flask_admin/templates/bootstrap3/admin/layout.html

 {% macro menu_icon(item) -%}
 {% set icon_type = item.get_icon_type() %}
-{% if icon_type %}
+{%- if icon_type %}
   {% set icon_value = item.get_icon_value() %}
   {% if icon_type == 'glyph' %}
     <i class="glyphicon {{ icon_value }}"></i>
@@ -13,42 +13,43 @@
 {%- endmacro %}
 
 {% macro menu() %}
-  {% for item in admin_view.admin.menu() %}
-    {% if item.is_category() %}
+  {%- for item in admin_view.admin.menu() %}
+    {%- if item.is_category() -%}
       {% set children = item.get_children() %}
-      {% if children %}
-        {% if item.is_active(admin_view) %}
+      {%- if children %}
+        {% set class_name = item.get_class_name() %}
+        {%- if item.is_active(admin_view) %}
         <li class="active dropdown{% if class_name %} {{class_name}}{% endif %}">
-        {% else %}
+        {% else -%}
         <li class="dropdown{% if class_name %} {{class_name}}{% endif %}">
-        {% endif %}
+        {%- endif %}
           <a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)">{{ menu_icon(item) }}{{ item.name }}<b class="caret"></b></a>
           <ul class="dropdown-menu">
-            {% for child in children %}
-              {% set class_name = child.get_class_name() %}
-              {% if child.is_active(admin_view) %}
-              <li class="active"{% if class_name %} {{class_name}}{% endif %}>
-              {% else %}
-              <li{% if class_name %} class="{{class_name}}"{% endif %}>
-              {% endif %}
-                <a href="{{ child.get_url() }}">{{ menu_icon(child) }}{{ child.name }}</a>
-              </li>
-            {% endfor %}
+          {%- for child in children -%}
+            {% set class_name = child.get_class_name() %}
+            {%- if child.is_active(admin_view) %}
+            <li class="active{% if class_name %} {{class_name}}{% endif %}">
+            {% else %}
+            <li{% if class_name %} class="{{class_name}}"{% endif %}>
+            {%- endif %}
+              <a href="{{ child.get_url() }}">{{ menu_icon(child) }}{{ child.name }}</a>
+            </li>
+          {%- endfor %}
           </ul>
         </li>
       {% endif %}
-    {% else %}
-      {% if item.is_accessible() and item.is_visible() %}
+    {%- else %}
+      {%- if item.is_accessible() and item.is_visible() -%}
         {% set class_name = item.get_class_name() %}
-        {% if item.is_active(admin_view) %}
-        <li class="active"{% if class_name %} {{class_name}}{% endif %}>
-        {% else %}
+        {%- if item.is_active(admin_view) %}
+        <li class="active{% if class_name %} {{class_name}}{% endif %}">
+        {%- else %}
         <li{% if class_name %} class="{{class_name}}"{% endif %}>
-        {% endif %}
+        {%- endif %}
           <a href="{{ item.get_url() }}">{{ menu_icon(item) }}{{ item.name }}</a>
         </li>
-      {% endif %}
-    {% endif %}
+      {%- endif -%}
+    {% endif -%}
   {% endfor %}
 {% endmacro %}