aboutsummaryrefslogtreecommitdiffstats
path: root/bitbake/lib
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
parent2f52ef4b2f22dc266bbf61bebddbcf8bc65e72c8 (diff)
downloadopenembedded-core-contrib-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')
-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; }
/* Remove bottom margin for forms inside modal dialogs */
#dependencies-modal-form { margin-bottom: 0px; }
+/* Custom column widths */
+.narrow-col { width: 8%; }
+.medium-col { width: 12%; }
+
/* Configuration styles */
.icon-trash { color: #B94A48; font-size: 16px; padding-left: 5px; }
.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 @@
columnElType: "td", // i.e. 'td', 'th' or 'td,th'
expandable: false,
expanderTemplate: "<a href='#'>&nbsp;</a>",
- indent: 19,
+ indent: 10,
indenterTemplate: "<span class='indenter'></span>",
initialState: "collapsed",
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 @@
name += '</td>';
}
else {
- name = '<td>';
if (o.link_to == null) {
- name += '<i class="icon-file"></i>';
+ namespan = 2;
+ if (o.package == null) {
+ namespan = 3;
+ }
+ var colspan = 'colspan="' + namespan + '"';
+ name = '<td ' + colspan + '><i class="icon-file"></i>';
}
else {
- name += '<i class="icon-hand-right"></i>';
+ name = '<td><i class="icon-hand-right"></i>';
}
name += '&nbsp;' + o.name;
name += '</td>';
@@ -207,10 +211,10 @@
<th>Directory / File</th>
<th>Symbolic link to</th>
<th>Source package</th>
- <th>Size</th>
- <th>Permissions</th>
- <th>Owner</th>
- <th>Group</th>
+ <th class="narrow-col">Size</th>
+ <th class="medium-col">Permissions</th>
+ <th class="narrow-col">Owner</th>
+ <th class="narrow-col">Group</th>
</tr>
</thead>
<tbody>