Skip to content

SpiderFoot automates OSINT for threat intelligence and mapping your attack surface.

sfwebui: Move tablesorter js/css to ./static/node_modules (#1297)

bcoles043041e29bf9
diff --git a/.gitignore b/.gitignore
index 4beebc41..a71cbf97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,6 +55,22 @@ spiderfoot/static/node_modules/sigma/build/plugins/*
!spiderfoot/static/node_modules/sigma/build/plugins/sigma.layout.forceAtlas2.min.js
!spiderfoot/static/node_modules/sigma/build/plugins/sigma.renderers.snapshot.min.js
+spiderfoot/static/node_modules/tablesorter/*
+spiderfoot/static/node_modules/tablesorter/dist/*
+spiderfoot/static/node_modules/tablesorter/dist/js/*
+spiderfoot/static/node_modules/tablesorter/dist/css/*
+spiderfoot/static/node_modules/tablesorter/dist/js/extras/*
+
+!spiderfoot/static/node_modules/tablesorter/
+!spiderfoot/static/node_modules/tablesorter/dist/
+!spiderfoot/static/node_modules/tablesorter/dist/css/
+!spiderfoot/static/node_modules/tablesorter/dist/css/jquery.tablesorter.pager.min.css
+!spiderfoot/static/node_modules/tablesorter/dist/css/theme.default.min.css
+!spiderfoot/static/node_modules/tablesorter/dist/js/
+!spiderfoot/static/node_modules/tablesorter/dist/js/jquery.tablesorter.min.js
+!spiderfoot/static/node_modules/tablesorter/dist/js/extras/
+!spiderfoot/static/node_modules/tablesorter/dist/js/extras/jquery.tablesorter.pager.min.js
+
# Compiled source #
###################
*.com
diff --git a/spiderfoot/static/css/dark.css b/spiderfoot/static/css/dark.css
index 1ec76f21..be6e5264 100644
--- a/spiderfoot/static/css/dark.css
+++ b/spiderfoot/static/css/dark.css
@@ -203,4 +203,7 @@ tr.danger {
.ajs-dialog, .ajs-header, .ajs-body, .ajs-footer {
background-color: #3a3a3a !important;
-}
\ No newline at end of file
+}
+
+/* tablesorter */
+.tablesorter-default{width:100%;font:12px/18px Arial,Sans-serif;border-spacing:0;margin:10px 0 15px;text-align:left}.tablesorter-default th,.tablesorter-default thead td{font-weight:700;border-collapse:collapse;border-bottom:#ccc 2px solid;padding:0}.tablesorter-default tfoot td,.tablesorter-default tfoot th{border:0}.tablesorter-default .header,.tablesorter-default .tablesorter-header{background-image:url(data:image/gif;base64,R0lGODlhFQAJAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAkAAAIXjI+AywnaYnhUMoqt3gZXPmVg94yJVQAAOw==);background-position:center right;background-repeat:no-repeat;cursor:pointer;white-space:normal;padding:4px 20px 4px 4px}.tablesorter-default thead .headerSortUp,.tablesorter-default thead .tablesorter-headerAsc,.tablesorter-default thead .tablesorter-headerSortUp{background-image:url(data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7);border-bottom:#000 2px solid}.tablesorter-default thead .headerSortDown,.tablesorter-default thead .tablesorter-headerDesc,.tablesorter-default thead .tablesorter-headerSortDown{background-image:url(data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7);border-bottom:#000 2px solid}.tablesorter-default thead .sorter-false{background-image:none;cursor:default;padding:4px}.tablesorter-default tfoot .tablesorter-headerAsc,.tablesorter-default tfoot .tablesorter-headerDesc,.tablesorter-default tfoot .tablesorter-headerSortDown,.tablesorter-default tfoot .tablesorter-headerSortUp{border-top:#000 2px solid}.tablesorter-default td{border-bottom:#ccc 1px solid;padding:4px;vertical-align:top}.tablesorter-default tbody>tr.even:hover>td,.tablesorter-default tbody>tr.hover>td,.tablesorter-default tbody>tr.odd:hover>td,.tablesorter-default tbody>tr:hover>td{}.tablesorter-default .tablesorter-processing{background-position:center center!important;background-repeat:no-repeat!important;background-image:url(data:image/gif;base64,R0lGODlhFAAUAKEAAO7u7lpaWgAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQBCgACACwAAAAAFAAUAAACQZRvoIDtu1wLQUAlqKTVxqwhXIiBnDg6Y4eyx4lKW5XK7wrLeK3vbq8J2W4T4e1nMhpWrZCTt3xKZ8kgsggdJmUFACH5BAEKAAIALAcAAAALAAcAAAIUVB6ii7jajgCAuUmtovxtXnmdUAAAIfkEAQoAAgAsDQACAAcACwAAAhRUIpmHy/3gUVQAQO9NetuugCFWAAAh+QQBCgACACwNAAcABwALAAACE5QVcZjKbVo6ck2AF95m5/6BSwEAIfkEAQoAAgAsBwANAAsABwAAAhOUH3kr6QaAcSrGWe1VQl+mMUIBACH5BAEKAAIALAIADQALAAcAAAIUlICmh7ncTAgqijkruDiv7n2YUAAAIfkEAQoAAgAsAAAHAAcACwAAAhQUIGmHyedehIoqFXLKfPOAaZdWAAAh+QQFCgACACwAAAIABwALAAACFJQFcJiXb15zLYRl7cla8OtlGGgUADs=)!important}.tablesorter-default tr.odd>td{}.tablesorter-default tr.even>td{}.tablesorter-default tr.odd td.primary{}.tablesorter-default td.primary,.tablesorter-default tr.even td.primary{}.tablesorter-default tr.odd td.secondary{}.tablesorter-default td.secondary,.tablesorter-default tr.even td.secondary{}.tablesorter-default tr.odd td.tertiary{}.tablesorter-default td.tertiary,.tablesorter-default tr.even td.tertiary{}.tablesorter-default>caption{}.tablesorter-default .tablesorter-filter-row{}.tablesorter-default .tablesorter-filter-row td{}.tablesorter-default .tablesorter-filter-row .disabled{opacity:.5;cursor:not-allowed}.tablesorter-default .tablesorter-filter-row.hideme td{padding:2px;margin:0;line-height:0;cursor:pointer}.tablesorter-default .tablesorter-filter-row.hideme *{height:1px;min-height:0;border:0;padding:0;margin:0;opacity:0}.tablesorter-default input.tablesorter-filter,.tablesorter-default select.tablesorter-filter{width:95%;height:auto;margin:4px auto;padding:4px;background-color:#fff;border:1px solid #bbb;color:#333;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:height .1s ease;-moz-transition:height .1s ease;-o-transition:height .1s ease;transition:height .1s ease}.tablesorter .filtered{display:none}.tablesorter .tablesorter-errorRow td{text-align:center;cursor:pointer;background-color:#e6bf99}
diff --git a/spiderfoot/static/node_modules/tablesorter/dist/css/jquery.tablesorter.pager.min.css b/spiderfoot/static/node_modules/tablesorter/dist/css/jquery.tablesorter.pager.min.css
new file mode 100644
index 00000000..17bc885c
--- /dev/null
+++ b/spiderfoot/static/node_modules/tablesorter/dist/css/jquery.tablesorter.pager.min.css
@@ -0,0 +1 @@
+.tablesorter-pager{padding:5px}td.tablesorter-pager{background-color:#e6eeee;margin:0}.tablesorter-pager img{vertical-align:middle;margin-right:2px;cursor:pointer}.tablesorter-pager .pagedisplay{padding:0 5px 0 5px;width:auto;white-space:nowrap;text-align:center}.tablesorter-pager select{margin:0;padding:0}.tablesorter-pager.disabled{display:none}.tablesorter-pager .disabled{opacity:.5;cursor:default}
\ No newline at end of file
diff --git a/spiderfoot/static/css/tablesorter-theme.default.min.css b/spiderfoot/static/node_modules/tablesorter/dist/css/theme.default.min.css
similarity index 100%
rename from spiderfoot/static/css/tablesorter-theme.default.min.css
rename to spiderfoot/static/node_modules/tablesorter/dist/css/theme.default.min.css
diff --git a/spiderfoot/static/js/jquery.tablesorter.pager.min.js b/spiderfoot/static/node_modules/tablesorter/dist/js/extras/jquery.tablesorter.pager.min.js
similarity index 100%
rename from spiderfoot/static/js/jquery.tablesorter.pager.min.js
rename to spiderfoot/static/node_modules/tablesorter/dist/js/extras/jquery.tablesorter.pager.min.js
diff --git a/spiderfoot/static/js/jquery.tablesorter.min.js b/spiderfoot/static/node_modules/tablesorter/dist/js/jquery.tablesorter.min.js
similarity index 100%
rename from spiderfoot/static/js/jquery.tablesorter.min.js
rename to spiderfoot/static/node_modules/tablesorter/dist/js/jquery.tablesorter.min.js
diff --git a/spiderfoot/static/package.json b/spiderfoot/static/package.json
index 59ca0a8c..d9494759 100644
--- a/spiderfoot/static/package.json
+++ b/spiderfoot/static/package.json
@@ -3,6 +3,7 @@
"alertifyjs": "^1.13.1",
"bootstrap": "^3.4.1",
"jquery": "^3.6.0",
- "sigma": "^1.2.1"
+ "sigma": "^1.2.1",
+ "tablesorter": "^2.31.3"
}
}
diff --git a/spiderfoot/templates/HEADER.tmpl b/spiderfoot/templates/HEADER.tmpl
index d111b450..b75e49e2 100644
--- a/spiderfoot/templates/HEADER.tmpl
+++ b/spiderfoot/templates/HEADER.tmpl
@@ -13,23 +13,21 @@
<link href="${docroot}/static/css/spiderfoot.css" rel="stylesheet">
<link href="${docroot}/static/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
+ <link href="${docroot}/static/node_modules/tablesorter/dist/css/jquery.tablesorter.pager.min.css" rel="stylesheet">
<link href="${docroot}/static/node_modules/alertifyjs/build/css/alertify.min.css" rel="stylesheet">
<script>
-
- // Executes the fastes and preloads the stylesheet before the body loads
- var head = document.getElementsByTagName('HEAD')[0];
+ // Load themes before the page body loads
+ var head = document.getElementsByTagName('HEAD')[0];
var link = document.createElement('link');
-
- // set the attributes for link element
- link.rel = 'stylesheet';
+ link.rel = 'stylesheet';
link.type = 'text/css';
-
if (localStorage.getItem("theme") === "dark-theme") {
- link.href = "${docroot}/static/css/dark.css";
+ link.href = "${docroot}/static/css/dark.css";
+ } else {
+ link.href = "${docroot}/static/node_modules/tablesorter/dist/css/theme.default.min.css";
}
-
- head.appendChild(link);
+ head.appendChild(link);
</script>
</head>
@@ -121,8 +119,8 @@ class="nav-item"><a href="${docroot}/opts" class="nav-link"><i class="glyphicon
<script src="${docroot}/static/node_modules/jquery/dist/jquery.min.js"></script>
<script src="${docroot}/static/node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="${docroot}/static/node_modules/alertifyjs/build/alertify.min.js"></script>
- <script src="${docroot}/static/js/jquery.tablesorter.min.js"></script>
- <script src='${docroot}/static/js/jquery.tablesorter.pager.min.js'></script>
+ <script src="${docroot}/static/node_modules/tablesorter/dist/js/jquery.tablesorter.min.js"></script>
+ <script src='${docroot}/static/node_modules/tablesorter/dist/js/extras/jquery.tablesorter.pager.min.js'></script>
<script src="${docroot}/static/js/d3.min.js"></script>
<script type='text/javascript' hash="sha256-0kTZzWMEh3cdgCMVytlY1E8rg7oO13eyLa+kvyAhRmo=">sf.updateTooltips();</script>