RRS: move Export button and restore Tools drop-down menu

Move the Export Recipe List button, change it to match the Export CSV
button on the layer detail page and put the Tools menu back (useful for
accessing the Admin site if not just for consistency). The Submit Layer
button remains hidden.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>

templates/base.html

@@ -68,9 +68,13 @@
                     <li class="divider-vertical"></li>
                 </ul>
                 {% block topfunctions %}
+                {% block topfunctions_extra %}
+                {% endblock %}
+                {% block submitlayer %}
                 <div class="pull-right nav-spacer">
                     <a class="btn btn-info navbar-btn" href="{% url 'submit_layer' %}">Submit layer</a>
                 </div>
+                {% endblock %}
                 <ul class="nav navbar-nav pull-right">
                     {% if user.is_authenticated %}
                     <li class="dropdown">

templates/rrs/base_toplevel.html

@@ -13,7 +13,9 @@
 
 {% block contenttag %}<div id="content" class="container-fluid top-padded">{% endblock %}
 
-{% block topfunctions %}
+{% block submitlayer %}
+{% endblock %}
+{% block topfunctions_extra %}
 <ul class="nav navbar-nav">
 <li class="divider-vertical" style="display; list-item;"/>
 {% block maintplan_selector %}
@@ -68,7 +70,6 @@
     </li>
 {% endblock %}
 </ul>
-                    <a href="{% url 'rrs_recipesreport' maintplan_name release_name milestone_name %}" class="btn btn-default navbar-btn pull-right">Export recipe list</a>
 {% endblock %}
 
 {% block head_extra %}

templates/rrs/recipes.html

@@ -71,6 +71,8 @@
                 </div>
             </div>
         </form>
+
+        <a href="{% url 'rrs_recipesreport' maintplan_name release_name milestone_name %}" class="btn btn-default navbar-btn pull-right"><i class="glyphicon glyphicon-file" aria-hidden="true"></i> Export CSV</a>
     </div>
 </nav>