Skip to content

Commit 9e186fa

Browse files
committed
Merge branch 'develop' of https://github.com/nexB/aboutcode-manager into develop
2 parents 4192fae + 5fbb6a1 commit 9e186fa

File tree

2 files changed

+43
-17
lines changed

2 files changed

+43
-17
lines changed

assets/css/main.css

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,17 @@ div.dataTables_scrollHead th:first-child {
242242
border-top-left-radius: 4px;
243243
}
244244

245+
/* Modify the colvis column-visibility and -grouping buttons */
246+
.buttons-colvis {
247+
padding-right: 10px;
248+
padding-left: 10px;
249+
}
250+
251+
.buttons-colvisGroup {
252+
padding-right: 10px;
253+
padding-left: 10px;
254+
}
255+
245256
/*---------------------------------------
246257
Help page
247258
-----------------------------------------*/

assets/js/aboutCodeDataTables.js

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -237,23 +237,18 @@ class AboutCodeDataTable {
237237
collectionLayout: "fixed two-column"
238238
},
239239
{
240-
// Show only copyright columns
241240
extend: "colvisGroup",
242-
text: "Copyright info",
243-
show: AboutCodeDataTable.COPYRIGHT_GROUP
244-
.map((column) => `${column.name}:name`),
245-
hide: AboutCodeDataTable.TABLE_COLUMNS
246-
.filter((column) => AboutCodeDataTable.COPYRIGHT_GROUP.indexOf(column) < 0)
247-
.map((column) => `${column.name}:name`)
241+
text: "Show all",
242+
show: ":hidden"
248243
},
249244
{
250-
// Show only license columns
245+
// Hide all columns except Path
251246
extend: "colvisGroup",
252-
text: "License info",
253-
show: AboutCodeDataTable.LICENSE_GROUP
247+
text: "Hide all",
248+
show: AboutCodeDataTable.LOCATION_COLUMN
254249
.map((column) => `${column.name}:name`),
255250
hide: AboutCodeDataTable.TABLE_COLUMNS
256-
.filter((column) => AboutCodeDataTable.LICENSE_GROUP.indexOf(column) < 0)
251+
.filter((column) => AboutCodeDataTable.LOCATION_COLUMN.indexOf(column) < 0)
257252
.map((column) => `${column.name}:name`)
258253
},
259254
{
@@ -267,18 +262,33 @@ class AboutCodeDataTable {
267262
.map((column) => `${column.name}:name`)
268263
},
269264
{
265+
// Show only copyright columns
270266
extend: "colvisGroup",
271-
text: "Show all columns",
272-
show: ":hidden"
267+
text: "Copyright info",
268+
show: AboutCodeDataTable.COPYRIGHT_GROUP
269+
.map((column) => `${column.name}:name`),
270+
hide: AboutCodeDataTable.TABLE_COLUMNS
271+
.filter((column) => AboutCodeDataTable.COPYRIGHT_GROUP.indexOf(column) < 0)
272+
.map((column) => `${column.name}:name`)
273273
},
274274
{
275-
// Hide all columns except Path
275+
// Show only license columns
276276
extend: "colvisGroup",
277-
text: "Hide all columns",
278-
show: AboutCodeDataTable.LOCATION_COLUMN
277+
text: "License info",
278+
show: AboutCodeDataTable.LICENSE_GROUP
279279
.map((column) => `${column.name}:name`),
280280
hide: AboutCodeDataTable.TABLE_COLUMNS
281-
.filter((column) => AboutCodeDataTable.LOCATION_COLUMN.indexOf(column) < 0)
281+
.filter((column) => AboutCodeDataTable.LICENSE_GROUP.indexOf(column) < 0)
282+
.map((column) => `${column.name}:name`)
283+
},
284+
{
285+
// Show only package columns
286+
extend: "colvisGroup",
287+
text: "Package info",
288+
show: AboutCodeDataTable.PACKAGE_GROUP
289+
.map((column) => `${column.name}:name`),
290+
hide: AboutCodeDataTable.TABLE_COLUMNS
291+
.filter((column) => AboutCodeDataTable.PACKAGE_GROUP.indexOf(column) < 0)
282292
.map((column) => `${column.name}:name`)
283293
}
284294
],
@@ -320,6 +330,11 @@ class AboutCodeDataTable {
320330
return AboutCodeDataTable.LOCATION_COLUMN
321331
.concat(AboutCodeDataTable.ORIGIN_COLUMNS);
322332
}
333+
334+
static get PACKAGE_GROUP() {
335+
return AboutCodeDataTable.LOCATION_COLUMN
336+
.concat(AboutCodeDataTable.PACKAGE_COLUMNS);
337+
}
323338
}
324339

325340
AboutCodeDataTable.LOCATION_COLUMN =

0 commit comments

Comments
 (0)