summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2015-07-31 15:09:02 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-01 11:26:10 +0100
commit3d3a2dbf5fc10773bb18ab7fb00f3db254139f47 (patch)
treec0b184d60704bb19e040107194bc00b47c6fd739 /bitbake
parent8acab25832176d1dfe4fca07c9f43b331d707f51 (diff)
downloadpoky-3d3a2dbf5fc10773bb18ab7fb00f3db254139f47.tar.gz
bitbake: toastergui: Implement new top navigation design
Additional items for top level navigation. This is part of a wider navigation redesign. [YOCTO #7329] (Bitbake rev: 456a4a6782d3098cc9abb39659a619fdcf52eb01) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/toaster/toastergui/static/css/default.css8
-rw-r--r--bitbake/lib/toaster/toastergui/templates/base.html28
-rw-r--r--bitbake/lib/toaster/toastergui/templates/basetable_top_projectbuilds.html14
-rw-r--r--bitbake/lib/toaster/toastergui/templates/projects.html2
4 files changed, 32 insertions, 20 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/css/default.css b/bitbake/lib/toaster/toastergui/static/css/default.css
index 9acf1e187b..da78f47f85 100644
--- a/bitbake/lib/toaster/toastergui/static/css/default.css
+++ b/bitbake/lib/toaster/toastergui/static/css/default.css
@@ -22,7 +22,7 @@
22.get-help-red { color: #B94A48; font-size: 16px; padding-left: 2px; } 22.get-help-red { color: #B94A48; font-size: 16px; padding-left: 2px; }
23.get-help-red:hover { color: #943A38; cursor: pointer; } 23.get-help-red:hover { color: #943A38; cursor: pointer; }
24.build-form>i:first-of-type { margin-left: 5px; } 24.build-form>i:first-of-type { margin-left: 5px; }
25.manual { margin: 11px 15px;} 25.manual { margin: 11px 15px 0 11px;}
26.heading-help { font-size: 14px; } 26.heading-help { font-size: 14px; }
27 27
28/* Styles for the external link */ 28/* Styles for the external link */
@@ -163,7 +163,7 @@ table { table-layout: fixed; word-wrap: break-word; }
163/* Configuration styles */ 163/* Configuration styles */
164.icon-trash { color: #B94A48; font-size: 16px; padding-left: 5px; } 164.icon-trash { color: #B94A48; font-size: 16px; padding-left: 5px; }
165.icon-trash:hover { color: #943A38; text-decoration: none; cursor: pointer; } 165.icon-trash:hover { color: #943A38; text-decoration: none; cursor: pointer; }
166.icon-pencil, .icon-download-alt, .icon-refresh, .icon-star-empty, .icon-star, .icon-tasks { font-size: 16px; color: #0088CC; padding-left: 2px; } 166.icon-pencil, .icon-download-alt, .icon-refresh, .icon-star-empty, .icon-star { font-size: 16px; color: #0088CC; padding-left: 2px; }
167.icon-pencil:hover, .icon-download-alt:hover, .icon-refresh:hover, .icon-star-empty:hover, .icon-star:hover, .icon-tasks:hover { color: #005580; text-decoration: none; cursor: pointer; } 167.icon-pencil:hover, .icon-download-alt:hover, .icon-refresh:hover, .icon-star-empty:hover, .icon-star:hover, .icon-tasks:hover { color: #005580; text-decoration: none; cursor: pointer; }
168.icon-share { padding-left: 2px; } 168.icon-share { padding-left: 2px; }
169.alert-success .icon-refresh, .alert-success .icon-tasks { color: #468847; } 169.alert-success .icon-refresh, .alert-success .icon-tasks { color: #468847; }
@@ -308,3 +308,7 @@ thead .add-del-layers { width: 124px; }
308 } 308 }
309} 309}
310/* End copied in from newer version of Font-Awesome 4.3.0 */ 310/* End copied in from newer version of Font-Awesome 4.3.0 */
311
312.top-padded {
313 padding-top: 60px;
314}
diff --git a/bitbake/lib/toaster/toastergui/templates/base.html b/bitbake/lib/toaster/toastergui/templates/base.html
index 7430338b1c..b34e6c37d3 100644
--- a/bitbake/lib/toaster/toastergui/templates/base.html
+++ b/bitbake/lib/toaster/toastergui/templates/base.html
@@ -69,8 +69,9 @@
69 Loading <i class="fa-pulse icon-spinner"></i> 69 Loading <i class="fa-pulse icon-spinner"></i>
70 </div> 70 </div>
71 71
72<div class="navbar navbar-static-top"> 72<div class="navbar navbar-fixed-top">
73 <div class="navbar-inner"> 73 <div class="navbar-inner">
74 <div class="container-fluid">
74 <a class="brand logo" href="#"><img src="{% static 'img/logo.png' %}" class="" alt="Yocto logo project"/></a> 75 <a class="brand logo" href="#"><img src="{% static 'img/logo.png' %}" class="" alt="Yocto logo project"/></a>
75 <span class="brand"> 76 <span class="brand">
76 <a href="/">Toaster</a> 77 <a href="/">Toaster</a>
@@ -78,6 +79,24 @@
78 <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> 79 <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>
79 {% endif %} 80 {% endif %}
80 </span> 81 </span>
82<ul class="nav">
83
84 <li {% if "builds" in request.path %}
85 class="active"
86 {% endif %}>
87 <a href="{% url 'all-builds' %}">
88 <i class="icon-tasks"></i>
89 All builds
90 </a>
91 </li>
92 <li {% if "projects" in request.path %}
93 class="active"
94 {% endif %}>
95 <a href="{% url 'all-projects' %}">
96 <i class="icon-folder-open"></i>
97 All projects
98 </a>
99 </li> </ul>
81 <a class="pull-right manual" target="_blank" href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html"> 100 <a class="pull-right manual" target="_blank" href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html">
82 <i class="icon-book"></i> 101 <i class="icon-book"></i>
83 Toaster manual 102 Toaster manual
@@ -128,12 +147,15 @@
128 147
129 148
130 </div> 149 </div>
150 </div>
131</div> 151</div>
132 152
133<div class="container-fluid"> 153<div class="container-fluid top-padded">
154<div class="row-fluid">
134{% block pagecontent %} 155{% block pagecontent %}
135{% endblock %} 156{% endblock %}
136</div> 157</div>
158</div>
137</body> 159</body>
138</html> 160</html>
139 161
diff --git a/bitbake/lib/toaster/toastergui/templates/basetable_top_projectbuilds.html b/bitbake/lib/toaster/toastergui/templates/basetable_top_projectbuilds.html
deleted file mode 100644
index f5b01c8ef6..0000000000
--- a/bitbake/lib/toaster/toastergui/templates/basetable_top_projectbuilds.html
+++ /dev/null
@@ -1,14 +0,0 @@
1{% extends "basetable_top.html" %}
2
3{%block custombuttons %}
4 <div class="btn-group builds-projects">
5 <button class="btn dropdown-toggle" data-toggle="dropdown">
6 <span class="selection">Show all projects</span>
7 <i class="icon-caret-down"></i>
8 </button>
9 <ul class="dropdown-menu">
10 <li><a href="{% url 'all-builds'%}">Show all builds</a></li>
11 <li><a href="{% url 'all-projects'%}">Show all projects</a></li>
12 </ul>
13 </div>
14{%endblock%}
diff --git a/bitbake/lib/toaster/toastergui/templates/projects.html b/bitbake/lib/toaster/toastergui/templates/projects.html
index efc3349014..c2d77b5a37 100644
--- a/bitbake/lib/toaster/toastergui/templates/projects.html
+++ b/bitbake/lib/toaster/toastergui/templates/projects.html
@@ -34,7 +34,7 @@
34 </div> 34 </div>
35 35
36 {% else %} {# We have builds to display #} 36 {% else %} {# We have builds to display #}
37 {% include "basetable_top_projectbuilds.html" %} 37 {% include "basetable_top.html" %}
38 {% for o in objects %} 38 {% for o in objects %}
39 <tr class="data"> 39 <tr class="data">
40 <td><a href="{% url 'project' o.id %}">{{o.name}}</a></td> 40 <td><a href="{% url 'project' o.id %}">{{o.name}}</a></td>