Toaster UI tweaks
cover Toaster UI tweaks
Fix global navigation and improve layout on builds page.
The following changes since commit 393bd7496d71eb101f21234c1233a2d18fd2c73e:
oeqa/oetest.py: add better package search for hasPackage() (2015-08-26 08:28:06 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib elliot/submit/bbarrosp/project-builds
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=elliot/submit/bbarrosp/project-builds
Belen Barros Pena (2):
toaster: adjust spacing in project pages
toaster: fix global navigation
lib/toaster/toastergui/templates/base.html | 6 +++-- .../templates/baseprojectbuildspage.html | 2 +- .../toastergui/templates/projectbuilds.html | 6 ++--- .../toastergui/templates/projecttopbar.html | 28 +++++++--------------- 4 files changed, 16 insertions(+), 26 deletions(-)
Signature · 12 lines
1.9.3 --------------------------------------------------------------------- Intel Corporation (UK) Limited Registered No. 1134945 (England) Registered Office: Pipers Way, Swindon SN3 1RJ VAT No: 860 2173 47 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
PATCH 1/2 toaster: adjust spacing in project pages
From: Belen Barros Pena <[email protected]>
Mainly in the top of the page, by adjusting some classes and the headings.
Also, it removes the commented out tab for the 'My image recipes' section, since the final designs for image customisation do not need it.
Signed-off-by Belen Barros Pena <[email protected]>
Signed-off-by Elliot Smith <[email protected]>
--- .../templates/baseprojectbuildspage.html | 2 +- .../toastergui/templates/projectbuilds.html | 6 ++--- .../toastergui/templates/projecttopbar.html | 28 +++++++--------------- 3 files changed, 12 insertions(+), 24 deletions(-)
lib/toaster/toastergui/templates/baseprojectbuildspage.html +1 -1
@@ -6,7 +6,7 @@ {% include "projecttopbar.html" %} <!-- Begin main page container --> -<div class="row-fluid"> +<div> {% block projectinfomain %}{% endblock %} </div> <!-- End main container -->
lib/toaster/toastergui/templates/projectbuilds.html +2 -4
@@ -21,8 +21,7 @@ }); </script> - <div class="page-header"> - <h1> + <h2> {% if request.GET.filter and objects.paginator.count > 0 or request.GET.search and objects.paginator.count > 0 %} {{objects.paginator.count}} build{{objects.paginator.count|pluralize}} found {%elif request.GET.filter and objects.paginator.count == 0 or request.GET.search and objects.paginator.count == 0 %}
@@ -31,8 +30,7 @@ Project builds {%endif%} <i class="icon-question-sign get-help heading-help" title="This page lists all the builds for the current project"></i> - </h1> - </div> + </h2> {% if objects.paginator.count == 0 %}
lib/toaster/toastergui/templates/projecttopbar.html +9 -19
@@ -17,7 +17,7 @@ </form> </div> -<div class="row-fluid" id="project-topbar"> +<div id="project-topbar"> <ul class="nav nav-pills"> <li> <a href="{% url 'projectbuilds' project.id %}">
@@ -34,24 +34,14 @@ Import layer </a> </li> - <!-- Coming soon - <li> - <a href="my-image-recipes.html"> - My image recipes - </a> - </li> - --> <li class="pull-right"> - - <i class="icon-question-sign get-help heading-help" data-placement="left" title="" data-original-title="Type the name of one or more recipes you want to build, separated by a space. You can also specify a task by appending a semicolon and a task name to the recipe name, like so: <code>busybox:clean</code>"> - </i> + <form class="form-inline" style="margin-bottom:0px;"> + <i class="icon-question-sign get-help heading-help" data-placement="left" title="" data-original-title="Type the name of one or more recipes you want to build, separated by a space. You can also specify a task by appending a semicolon and a task name to the recipe name, like so: <code>busybox:clean</code>"></i> <div class="input-append"> - <form class="form-inline" style="margin-bottom: 0"> - <input id="build-input" type="text" class="input-xlarge input-lg build-target-input" placeholder="Type the recipe you want to build" autocomplete="off" disabled> - <button id="build-button" class="btn btn-primary btn-large build-button" data-project-id="{{project.id}}" disabled>Build - </button> - </form> - </div> - </li> - </ul> + <input id="build-input" type="text" class="input-xlarge input-lg build-target-input" placeholder="Type the recipe you want to build" autocomplete="off" disabled> + <button id="build-button" class="btn btn-primary btn-large build-button" data-project-id="{{project.id}}" disabled>Build</button> + </div> + </form> + </li> + </ul> </div>
Signature · 12 lines
1.9.3 --------------------------------------------------------------------- Intel Corporation (UK) Limited Registered No. 1134945 (England) Registered Office: Pipers Way, Swindon SN3 1RJ VAT No: 860 2173 47 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
PATCH 2/2 toaster: fix global navigation
From: Belen Barros Pena <[email protected]>
The "All builds" item in the global navigation should only be active when you are in the "all builds" page.
The global navigation should not appear at all in the landing page and in the new project page.
Signed-off-by Belen Barros Pena <[email protected]>
Signed-off-by Elliot Smith <[email protected]>
--- lib/toaster/toastergui/templates/base.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
lib/toaster/toastergui/templates/base.html +4 -2
@@ -89,8 +89,9 @@ <i class="icon-info-sign" title="<strong>Toaster version information</strong>" data-content="<dl><dt>Branch</dt><dd>{{TOASTER_BRANCH}}</dd><dt>Revision</dt><dd>{{TOASTER_REVISION}}</dd></dl>"></i> {% endif %} </span> + {% if request.resolver_match.url_name != 'landing' and request.resolver_match.url_name != 'newproject' %} <ul class="nav"> - <li {% if "builds" in request.path %} + <li {% if request.resolver_match.url_name == 'all-builds' %} class="active" {% endif %}> <a href="{% url 'all-builds' %}">
@@ -98,7 +99,7 @@ All builds </a> </li> - <li {% if "projects" in request.path %} + <li {% if request.resolver_match.url_name == 'all-projects' %} class="active" {% endif %}> <a href="{% url 'all-projects' %}">
@@ -107,6 +108,7 @@ </a> </li> </ul> + {% endif %} <ul class="nav pull-right"> <li> <a target="_blank" href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html">
Signature · 12 lines
1.9.3 --------------------------------------------------------------------- Intel Corporation (UK) Limited Registered No. 1134945 (England) Registered Office: Pipers Way, Swindon SN3 1RJ VAT No: 860 2173 47 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.