diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-08-11 11:48:53 +0100 |
---|---|---|
committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-09-05 00:31:23 +0100 |
commit | b5074ed2aae6923b0b2781a2fb36b42318eeb126 (patch) | |
tree | 27c647485623642e3a92263d65471c9a42c60804 /templates | |
parent | c2e36cda119313c121cf81cb1d98591a0a88ee4a (diff) | |
download | openembedded-core-contrib-b5074ed2aae6923b0b2781a2fb36b42318eeb126.tar.gz |
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>
Diffstat (limited to 'templates')
-rw-r--r-- | templates/base.html | 10 | ||||
-rw-r--r-- | templates/layerindex/editlayer.html | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/templates/base.html b/templates/base.html index c6ba512a48..9ac80c6d6c 100644 --- a/templates/base.html +++ b/templates/base.html @@ -56,7 +56,13 @@ </div> {% endif %} <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 %} <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown"> @@ -68,9 +74,9 @@ <li><a href="{% url duplicates 'master' %}">Duplicates</a></li> </ul> </li> - <li class="divider-vertical"></li> {% endif %} </ul> + {% endblock %} </div> <!-- end of "container" --> </div> <!-- "end of "navbar-inner" --> </div> <!-- end of "navbar" --> diff --git a/templates/layerindex/editlayer.html b/templates/layerindex/editlayer.html index 8e524d3764..ba37ee97fa 100644 --- a/templates/layerindex/editlayer.html +++ b/templates/layerindex/editlayer.html @@ -14,8 +14,8 @@ {% block title_append %} - edit layer{% endblock %} --> -{% block submitlink %} -<!-- Remove submit link added by base.html, otherwise clicking it may lose changes --> +{% block topfunctions %} +<!-- Remove submit link/tools drop-down added by base.html, otherwise clicking it may lose changes --> {% endblock %} |