From 37154f15971bf7d04969ad2c117c35835ba35e58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Thu, 16 Aug 2018 14:22:02 +0200
Subject: [PATCH] misc: use new markup for appbar actions (#25927)

---
 combo/apps/assets/templates/combo/manager_assets.html  | 2 ++
 combo/apps/lingo/templates/lingo/regie_list.html       | 2 ++
 combo/apps/lingo/templates/lingo/transaction_list.html | 2 ++
 combo/apps/maps/templates/maps/manager_home.html       | 2 ++
 combo/manager/templates/combo/manager_home.html        | 2 ++
 combo/manager/templates/combo/page_view.html           | 2 ++
 6 files changed, 12 insertions(+)

diff --git a/combo/apps/assets/templates/combo/manager_assets.html b/combo/apps/assets/templates/combo/manager_assets.html
index 804a8b92..423d0d2d 100644
--- a/combo/apps/assets/templates/combo/manager_assets.html
+++ b/combo/apps/assets/templates/combo/manager_assets.html
@@ -3,7 +3,9 @@
 
 {% block appbar %}
 <h2>{% trans 'Assets' %}</h2>
+<span class="actions">
 <a href="{% url 'combo-manager-asset-upload' %}" rel="popup">{% trans 'Upload' %}</a>
+</span>
 {% endblock %}
 
 {% block breadcrumb %}
diff --git a/combo/apps/lingo/templates/lingo/regie_list.html b/combo/apps/lingo/templates/lingo/regie_list.html
index b8e15d18..5877f8ec 100644
--- a/combo/apps/lingo/templates/lingo/regie_list.html
+++ b/combo/apps/lingo/templates/lingo/regie_list.html
@@ -3,7 +3,9 @@
 
 {% block appbar %}
 <h2>{% trans 'Regies' %}</h2>
+<span class="actions">
 <a rel="popup" href="{% url 'lingo-manager-regie-add' %}">{% trans 'New' %}</a>
+</span>
 {% endblock %}
 
 {% block breadcrumb %}
diff --git a/combo/apps/lingo/templates/lingo/transaction_list.html b/combo/apps/lingo/templates/lingo/transaction_list.html
index a559c825..b7f186a2 100644
--- a/combo/apps/lingo/templates/lingo/transaction_list.html
+++ b/combo/apps/lingo/templates/lingo/transaction_list.html
@@ -3,7 +3,9 @@
 
 {% block appbar %}
 <h2>{% trans 'Transactions' %}</h2>
+<span class="actions">
 <a href="{% url 'lingo-manager-transactions-download' %}">{% trans 'download CSV' %}</a>
+</span>
 {% endblock %}
 
 {% block breadcrumb %}
diff --git a/combo/apps/maps/templates/maps/manager_home.html b/combo/apps/maps/templates/maps/manager_home.html
index 433722a4..00e9d4fc 100644
--- a/combo/apps/maps/templates/maps/manager_home.html
+++ b/combo/apps/maps/templates/maps/manager_home.html
@@ -3,7 +3,9 @@
 
 {% block appbar %}
 <h2>{% trans 'Maps' %}</h2>
+<span class="actions">
 <a rel="popup" href="{% url 'maps-manager-layer-add' %}">{% trans 'New' %}</a>
+</span>
 {% endblock %}
 
 {% block content %}
diff --git a/combo/manager/templates/combo/manager_home.html b/combo/manager/templates/combo/manager_home.html
index 508312ba..a6d6a148 100644
--- a/combo/manager/templates/combo/manager_home.html
+++ b/combo/manager/templates/combo/manager_home.html
@@ -3,6 +3,7 @@
 
 {% block appbar %}
 <h2>{% trans 'Pages' %}</h2>
+<span class="actions">
 <a class="extra-actions-menu-opener"></a>
 <a rel="popup" href="{% url 'combo-manager-page-add' %}">{% trans 'New' %}</a>
 <ul class="extra-actions-menu">
@@ -12,6 +13,7 @@
  <li><a href="{{ extra_action.href }}">{{ extra_action.text }}</a></li>
  {% endfor %}
 </ul>
+</span>
 {% endblock %}
 
 {% block content %}
diff --git a/combo/manager/templates/combo/page_view.html b/combo/manager/templates/combo/page_view.html
index eaa46567..9705f874 100644
--- a/combo/manager/templates/combo/page_view.html
+++ b/combo/manager/templates/combo/page_view.html
@@ -5,10 +5,12 @@
 
 {% block appbar %}
 <h2>{% trans 'Page' %} - {{ object.title }}</h2>
+<span class="actions">
 <a href="{{ object.get_online_url }}">{% trans 'see online' %}</a>
 <a href="{% url 'combo-manager-page-history' pk=object.id %}">{% trans 'history' %}</a>
 <a href="{% url 'combo-manager-page-export' pk=object.id %}">{% trans 'export' %}</a>
 <a rel="popup" href="{% url 'combo-manager-page-delete' pk=object.id %}">{% trans 'delete' %}</a>
+</span>
 {% endblock %}
 
 {% block breadcrumb %}
-- 
2.18.0