summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/toastergui
diff options
context:
space:
mode:
authorBelen Barros Pena <belen.barros.pena@intel.com>2015-10-14 13:12:14 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-16 14:13:21 +0100
commitc895838189462158e0785376216b630d572e53f6 (patch)
tree50791a206a53ee3b74e554e62e53deab9d40aa9a /bitbake/lib/toaster/toastergui
parent2f52ef4b2f22dc266bbf61bebddbcf8bc65e72c8 (diff)
downloadpoky-c895838189462158e0785376216b630d572e53f6.tar.gz
bitbake: toaster: Improve directory structure layout
File names in the directory structure often wrap due to big indenting for nested files and directories, unnecessary width in certain columns, and not using colspan when the symlink and package cells are empty. The wrapping makes the table harder to read. This patch reduces the amount of indenting, limits the width of the 'Size', 'Permissions', 'Owner' and 'Group' columns, and sets colspan to use the white space of the symlink and package names when empty. (Bitbake rev: 6167ee5a7569d8f841c340e672645cc133ea5a31) Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com> Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui')
-rw-r--r--bitbake/lib/toaster/toastergui/static/css/default.css4
-rw-r--r--bitbake/lib/toaster/toastergui/static/js/jquery.treetable.js2
-rw-r--r--bitbake/lib/toaster/toastergui/templates/dirinfo.html18
3 files changed, 16 insertions, 8 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/css/default.css b/bitbake/lib/toaster/toastergui/static/css/default.css
index cce3e315fc..06d9976557 100644
--- a/bitbake/lib/toaster/toastergui/static/css/default.css
+++ b/bitbake/lib/toaster/toastergui/static/css/default.css
@@ -164,6 +164,10 @@ table { table-layout: fixed; word-wrap: break-word; }
164/* Remove bottom margin for forms inside modal dialogs */ 164/* Remove bottom margin for forms inside modal dialogs */
165#dependencies-modal-form { margin-bottom: 0px; } 165#dependencies-modal-form { margin-bottom: 0px; }
166 166
167/* Custom column widths */
168.narrow-col { width: 8%; }
169.medium-col { width: 12%; }
170
167/* Configuration styles */ 171/* Configuration styles */
168.icon-trash { color: #B94A48; font-size: 16px; padding-left: 5px; } 172.icon-trash { color: #B94A48; font-size: 16px; padding-left: 5px; }
169.icon-trash:hover { color: #943A38; text-decoration: none; cursor: pointer; } 173.icon-trash:hover { color: #943A38; text-decoration: none; cursor: pointer; }
diff --git a/bitbake/lib/toaster/toastergui/static/js/jquery.treetable.js b/bitbake/lib/toaster/toastergui/static/js/jquery.treetable.js
index 42e7427cc0..794b902c58 100644
--- a/bitbake/lib/toaster/toastergui/static/js/jquery.treetable.js
+++ b/bitbake/lib/toaster/toastergui/static/js/jquery.treetable.js
@@ -421,7 +421,7 @@
421 columnElType: "td", // i.e. 'td', 'th' or 'td,th' 421 columnElType: "td", // i.e. 'td', 'th' or 'td,th'
422 expandable: false, 422 expandable: false,
423 expanderTemplate: "<a href='#'>&nbsp;</a>", 423 expanderTemplate: "<a href='#'>&nbsp;</a>",
424 indent: 19, 424 indent: 10,
425 indenterTemplate: "<span class='indenter'></span>", 425 indenterTemplate: "<span class='indenter'></span>",
426 initialState: "collapsed", 426 initialState: "collapsed",
427 nodeIdAttr: "ttId", // maps to data-tt-id 427 nodeIdAttr: "ttId", // maps to data-tt-id
diff --git a/bitbake/lib/toaster/toastergui/templates/dirinfo.html b/bitbake/lib/toaster/toastergui/templates/dirinfo.html
index a5bc48127c..7819894b65 100644
--- a/bitbake/lib/toaster/toastergui/templates/dirinfo.html
+++ b/bitbake/lib/toaster/toastergui/templates/dirinfo.html
@@ -103,12 +103,16 @@
103 name += '</td>'; 103 name += '</td>';
104 } 104 }
105 else { 105 else {
106 name = '<td>';
107 if (o.link_to == null) { 106 if (o.link_to == null) {
108 name += '<i class="icon-file"></i>'; 107 namespan = 2;
108 if (o.package == null) {
109 namespan = 3;
110 }
111 var colspan = 'colspan="' + namespan + '"';
112 name = '<td ' + colspan + '><i class="icon-file"></i>';
109 } 113 }
110 else { 114 else {
111 name += '<i class="icon-hand-right"></i>'; 115 name = '<td><i class="icon-hand-right"></i>';
112 } 116 }
113 name += '&nbsp;' + o.name; 117 name += '&nbsp;' + o.name;
114 name += '</td>'; 118 name += '</td>';
@@ -207,10 +211,10 @@
207 <th>Directory / File</th> 211 <th>Directory / File</th>
208 <th>Symbolic link to</th> 212 <th>Symbolic link to</th>
209 <th>Source package</th> 213 <th>Source package</th>
210 <th>Size</th> 214 <th class="narrow-col">Size</th>
211 <th>Permissions</th> 215 <th class="medium-col">Permissions</th>
212 <th>Owner</th> 216 <th class="narrow-col">Owner</th>
213 <th>Group</th> 217 <th class="narrow-col">Group</th>
214 </tr> 218 </tr>
215 </thead> 219 </thead>
216 <tbody> 220 <tbody>