Top bar functions improvements

* Change Submit layer link into a button
* Ensure tools dropdown menu doesn't show on layer submit/edit page

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
Paul Eggleton 2013-08-11 11:48:53 +01:00
parent c2e36cda11
commit b5074ed2aa
3 changed files with 14 additions and 4 deletions

View File

@ -186,3 +186,7 @@ padding: 8px;
.breadcrumb { .breadcrumb {
background-color: transparent; background-color: transparent;
} }
.nav-spacer {
margin-left: 10px;
}

View File

@ -56,7 +56,13 @@
</div> </div>
{% endif %} {% endif %}
<ul class="nav pull-right"> <ul class="nav pull-right">
{% block submitlink %}<li><a href="{% url submit_layer %}">Submit layer</a></li>{% endblock %} <li class="divider-vertical"></li>
</ul>
{% block topfunctions %}
<div class="pull-right nav-spacer">
<a class="btn btn-info" href="{% url submit_layer %}">Submit layer</a>
</div>
<ul class="nav pull-right">
{% if user.is_authenticated %} {% if user.is_authenticated %}
<li class="dropdown"> <li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">
@ -68,9 +74,9 @@
<li><a href="{% url duplicates 'master' %}">Duplicates</a></li> <li><a href="{% url duplicates 'master' %}">Duplicates</a></li>
</ul> </ul>
</li> </li>
<li class="divider-vertical"></li>
{% endif %} {% endif %}
</ul> </ul>
{% endblock %}
</div> <!-- end of "container" --> </div> <!-- end of "container" -->
</div> <!-- "end of "navbar-inner" --> </div> <!-- "end of "navbar-inner" -->
</div> <!-- end of "navbar" --> </div> <!-- end of "navbar" -->

View File

@ -14,8 +14,8 @@
{% block title_append %} - edit layer{% endblock %} {% block title_append %} - edit layer{% endblock %}
--> -->
{% block submitlink %} {% block topfunctions %}
<!-- Remove submit link added by base.html, otherwise clicking it may lose changes --> <!-- Remove submit link/tools drop-down added by base.html, otherwise clicking it may lose changes -->
{% endblock %} {% endblock %}