Skip to content

Commit

Permalink
updated images and lookup table for 45Drives-system page
Browse files Browse the repository at this point in the history
  • Loading branch information
markdhooper committed Aug 23, 2021
1 parent cfbe38f commit 7228b22
Show file tree
Hide file tree
Showing 12 changed files with 69 additions and 100 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
## cockpit-45drives-hardware 2.0.0-4
## cockpit-45drives-hardware 2.0.0-5

* build 3, added require el7 folder
* updated images used in 45drives-system page
4 changes: 2 additions & 2 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"title": "cockpit-45drives-hardware",
"prerelease": true,
"version": "2.0.0",
"buildVersion": "4",
"buildVersion": "5",
"author": "Mark Hooper <[email protected]>",
"url": "https://github.com/45Drives/cockpit-hardware",
"category": "utils",
Expand Down Expand Up @@ -63,7 +63,7 @@
"changelog": {
"urgency": "medium",
"version": "2.0.0",
"buildVersion": "4",
"buildVersion": "5",
"ignore": [],
"date": null,
"packager": "Mark Hooper <[email protected]>",
Expand Down
38 changes: 0 additions & 38 deletions package-deb.sh

This file was deleted.

57 changes: 0 additions & 57 deletions package-rpm-el7.sh

This file was deleted.

2 changes: 2 additions & 0 deletions packaging/el7/main.spec
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ make DESTDIR=%{buildroot} install
/usr/share/cockpit/45drives-system/*

%changelog
* Mon Aug 23 2021 Mark Hooper <[email protected]> 2.0.0-5
- updated images used in 45drives-system page
* Fri Aug 20 2021 Mark Hooper <[email protected]> 2.0.0-4
- build 3, added require el7 folder
* Fri Aug 20 2021 Mark Hooper <[email protected]> 2.0.0-3
Expand Down
2 changes: 2 additions & 0 deletions packaging/el8/main.spec
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ make DESTDIR=%{buildroot} install
/usr/share/cockpit/45drives-system/*

%changelog
* Mon Aug 23 2021 Mark Hooper <[email protected]> 2.0.0-5
- updated images used in 45drives-system page
* Fri Aug 20 2021 Mark Hooper <[email protected]> 2.0.0-4
- build 3, added require el7 folder
* Fri Aug 20 2021 Mark Hooper <[email protected]> 2.0.0-3
Expand Down
6 changes: 6 additions & 0 deletions packaging/focal/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
cockpit-45drives-hardware (2.0.0-5focal) focal; urgency=medium

* updated images used in 45drives-system page

-- Mark Hooper <[email protected]> Mon, 23 Aug 2021 06:02:17 -0300

cockpit-45drives-hardware (2.0.0-4focal) focal; urgency=medium

* build 3, added require el7 folder
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
body {
overflow-y:auto !important;
}

.hardware_container {
margin: 0;
padding: 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
body {
overflow-y:auto !important;
}

.hardware_container {
margin: 0;
padding: 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
body {
padding-bottom: 20px;
overflow-y:auto !important;
}

.system_container {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,65 +6,109 @@ let ram_info = null;
let network_info = null;

var product_img_lut = {};
product_img_lut[""] = "";
product_img_lut[""] = "img/products/45dlogo.png";
product_img_lut["Storinator-H8-AV15-Enhanced"] = "img/products/storinatorAV15.jpg";
product_img_lut["Storinator-H8-AV15-Enhanced-S"] = "img/products/storinatorAV15.jpg";
product_img_lut["Storinator-H8-AV15-Enhanced-AMD"] = "img/products/storinatorAV15.jpg";
product_img_lut["Storinator-H8-AV15-Turbo"] = "img/products/storinatorAV15.jpg";
product_img_lut["Storinator-H8-AV15-Turbo-G"] = "img/products/storinatorAV15.jpg";
product_img_lut["Storinator-H8-Q30-Base"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-H8-Q30-Base-B"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-H8-Q30-Enhanced"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-H8-Q30-Enhanced-S"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-H8-Q30-Enhanced-AMD"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-H8-Q30-Turbo"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-H8-Q30-Turbo-G"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-H8-S45-Base"] = "img/products/storinatorS45.jpg";
product_img_lut["Storinator-H8-S45-Base-B"] = "img/products/storinatorS45.jpg";
product_img_lut["Storinator-H8-S45-Enhanced"] = "img/products/storinatorS45.jpg";
product_img_lut["Storinator-H8-S45-Enhanced-S"] = "img/products/storinatorS45.jpg";
product_img_lut["Storinator-H8-S45-Enhanced-AMD"] = "img/products/storinatorS45.jpg";
product_img_lut["Storinator-H8-S45-Turbo"] = "img/products/storinatorS45.jpg";
product_img_lut["Storinator-H8-S45-Turbo-G"] = "img/products/storinatorS45.jpg";
product_img_lut["Storinator-H8-XL60-Enhanced"] = "img/products/storinatorXL60.jpg";
product_img_lut["Storinator-H8-XL60-Enhanced-S"] = "img/products/storinatorXL60.jpg";
product_img_lut["Storinator-H8-XL60-Enhanced-AMD"] = "img/products/storinatorXL60.jpg";
product_img_lut["Storinator-H8-XL60-Turbo"] = "img/products/storinatorXL60.jpg";
product_img_lut["Storinator-H8-XL60-Turbo-G"] = "img/products/storinatorXL60.jpg";
product_img_lut["Storinator-H16-Q30-Enhanced-AMD"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-H16-S45-Enhanced-AMD"] = "img/products/storinatorS45.jpg";
product_img_lut["Storinator-H16-XL60-Enhanced-AMD"] = "img/products/storinatorXL60.jpg";
product_img_lut["Storinator-H32-Q30-Enhanced-AMD"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-H32-S45-Enhanced-AMD"] = "img/products/storinatorS45.jpg";
product_img_lut["Storinator-H32-XL60-Enhanced-AMD"] = "img/products/storinatorXL60.jpg";
product_img_lut["Storinator-AV15-Turbo"] = "img/products/storinatorAV15.jpg";
product_img_lut["Storinator-AV15-Turbo-G"] = "img/products/storinatorAV15.jpg";
product_img_lut["Storinator-Q30-Turbo"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-Q30-Turbo-G"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-S45-Turbo"] = "img/products/storinatorS45.jpg";
product_img_lut["Storinator-S45-Turbo-G"] = "img/products/storinatorS45.jpg";
product_img_lut["Storinator-XL60-Turbo"] = "img/products/storinatorXL60.jpg";
product_img_lut["Storinator-XL60-Turbo-G"] = "img/products/storinatorXL60.jpg";
product_img_lut["Stornado-AV15-Turbo"] = "img/products/stornadoAV15.jpg";
product_img_lut["Stornado-AV15-Turbo-G"] = "img/products/stornadoAV15.jpg";
product_img_lut["Storinator-H16-Q30-Turbo"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-H16-Q30-Turbo-G"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-H16-S45-Turbo"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-H16-S45-Turbo-G"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-H16-XL60-Turbo"] = "img/products/storinatorXL60.jpg";
product_img_lut["Storinator-H16-XL60-Turbo-G"] = "img/products/storinatorXL60.jpg";
product_img_lut["Storinator-H32-Q30-Turbo"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-H32-Q30-Turbo-G"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-H32-S45-Turbo"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-H32-S45-Turbo-G"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-H32-XL60-Turbo"] = "img/products/storinatorXL60.jpg";
product_img_lut["Storinator-H32-XL60-Turbo-G"] = "img/products/storinatorXL60.jpg";
product_img_lut["Storinator-AV15-Enhanced"] = "img/products/storinatorAV15.jpg";
product_img_lut["Storinator-AV15-Enhanced-S"] = "img/products/storinatorAV15.jpg";
product_img_lut["Storinator-Q30-Enhanced"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-Q30-Enhanced-S"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-S45-Enhanced"] = "img/products/storinatorS45.jpg";
product_img_lut["Storinator-S45-Enhanced-S"] = "img/products/storinatorS45.jpg";
product_img_lut["Storinator-XL60-Enhanced"] = "img/products/storinatorXL60.jpg";
product_img_lut["Storinator-XL60-Enhanced-S"] = "img/products/storinatorXL60.jpg";
product_img_lut["Stornado-AV15-Enhanced"] = "img/products/stornadoAV15.jpg";
product_img_lut["Stornado-AV15-Enhanced-S"] = "img/products/stornadoAV15.jpg";
product_img_lut["Storinator-AV15-Enhanced-AMD"] = "img/products/storinatorAV15.jpg";
product_img_lut["Storinator-Q30-Enhanced-AMD"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-S45-Enhanced-AMD"] = "img/products/storinatorS45.jpg";
product_img_lut["Storinator-XL60-Enhanced-AMD"] = "img/products/storinatorXL60.jpg";
product_img_lut["Stornado-AV15-Enhanced-AMD"] = "img/products/stornadoAV15.jpg";
product_img_lut["Storinator-H16-Q30-Enhanced"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-H16-Q30-Enhanced-S"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-H16-S45-Enhanced"] = "img/products/storinatorS45.jpg";
product_img_lut["Storinator-H16-S45-Enhanced-S"] = "img/products/storinatorS45.jpg";
product_img_lut["Storinator-H16-XL60-Enhanced"] = "img/products/storinatorXL60.jpg";
product_img_lut["Storinator-H16-XL60-Enhanced-S"] = "img/products/storinatorXL60.jpg";
product_img_lut["Storinator-H32-Q30-Enhanced"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-H32-Q30-Enhanced-S"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-H32-S45-Enhanced"] = "img/products/storinatorS45.jpg";
product_img_lut["Storinator-H32-S45-Enhanced-S"] = "img/products/storinatorS45.jpg";
product_img_lut["Storinator-H32-XL60-Enhanced"] = "img/products/storinatorXL60.jpg";
product_img_lut["Storinator-H32-XL60-Enhanced-S"] = "img/products/storinatorXL60.jpg";
product_img_lut["Storinator-AV15-Base"] = "img/products/storinatorAV15.jpg";
product_img_lut["Storinator-AV15-Base-B"] = "img/products/storinatorAV15.jpg";
product_img_lut["Storinator-Q30-Base"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-Q30-Base-B"] = "img/products/storinatorQ30.jpg";
product_img_lut["Storinator-S45-Base"] = "img/products/storinatorS45.jpg";
product_img_lut["Storinator-S45-Base-B"] = "img/products/storinatorS45.jpg";
product_img_lut["Storinator-C8-Base"] = "img/products/storinatorC8.jpg";
product_img_lut["Storinator-C8-Base-B"] = "img/products/storinatorC8.jpg";
product_img_lut["Storinator-C8-Enhanced"] = "img/products/storinatorC8.jpg";
product_img_lut["Storinator-C8-Enhanced-S"] = "img/products/storinatorC8.jpg";
product_img_lut["Storinator-C8-Enhanced-AMD"] = "img/products/storinatorC8.jpg";
product_img_lut["Storinator-C8-Enhanced-AMD"] = "img/products/storinatorC8.jpg";
product_img_lut["Storinator-C8-Turbo"] = "img/products/storinatorC8.jpg";
product_img_lut["Storinator-C8-Turbo-G"] = "img/products/storinatorC8.jpg";
product_img_lut["Storinator-MI4-Base"] = "img/products/storinatorMI4.jpg";
product_img_lut["Storinator-MI4-Base-B"] = "img/products/storinatorMI4.jpg";
product_img_lut["Storinator-MI4-Enhanced"] = "img/products/storinatorMI4.jpg";
product_img_lut["Storinator-MI4-Enhanced-S"] = "img/products/storinatorMI4.jpg";
product_img_lut["Storinator-MI4-Enhanced-AMD"] = "img/products/storinatorMI4.jpg";
product_img_lut["Storinator-MI4-Turbo"] = "img/products/storinatorMI4.jpg";
product_img_lut["Storinator-MI4-Turbo-G"] = "img/products/storinatorMI4.jpg";


//Placeholder for failed autodetect.
product_img_lut["Storinator-AV15-Generic"] = "img/products/storinatorAV15.jpg";
product_img_lut["Storinator-Q30-Generic"] = "img/products/storinatorQ30.jpg";
Expand All @@ -90,6 +134,7 @@ function sys_manual_scan(){
sys_info = JSON.parse(data);
let sys_img = document.createElement("IMG");
sys_img.src = product_img_lut[String(sys_info["System"][product_idx]["Product"][0]["ProductID"])];
//sys_img.src = product_img_lut[String(sys_info["System"][product_idx]["Product"][0]["Chassis Size"])]
document.getElementById("sys_img_div").appendChild(sys_img);
document.getElementById("sys_model").innerHTML = sys_info["System"][product_idx]["Product"][0]["System Model"];
document.getElementById("sys_chassis_size").innerHTML = sys_info["System"][product_idx]["Product"][0]["Chassis Size"];
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7228b22

Please sign in to comment.