From 6fcf28266a8904d25caad170222280845c3af21c Mon Sep 17 00:00:00 2001
From: FTBZ <florent.bruchez@mac.com>
Date: Sat, 28 Jan 2017 04:34:02 +0100
Subject: [PATCH] Correcting some HP to HPE logo (#5557)

* Correcting some HP to HPE logo

* Keeping only the logo without text

* Add full hpe logo
Use the logo for HP comware

* Change procurve to use hpe logo too

* Remove padding
---
 html/images/logos/hpe.svg          | 42 ++++++++++++++++++++++++++++++
 html/images/os/hpe.svg             |  1 +
 includes/definitions/comware.yaml  |  2 +-
 includes/definitions/hpblmos.yaml  |  2 +-
 includes/definitions/hpe-msl.yaml  |  2 +-
 includes/definitions/hpvc.yaml     |  2 +-
 includes/definitions/informos.yaml |  2 +-
 includes/definitions/procurve.yaml |  2 +-
 8 files changed, 49 insertions(+), 6 deletions(-)
 create mode 100644 html/images/logos/hpe.svg
 create mode 100644 html/images/os/hpe.svg

diff --git a/html/images/logos/hpe.svg b/html/images/logos/hpe.svg
new file mode 100644
index 0000000000..6c74d59b13
--- /dev/null
+++ b/html/images/logos/hpe.svg
@@ -0,0 +1,42 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1372.9464 573.37965"><path d="M440.45 105.57H29.37v-76.2h411.08v76.2zM469.82 
+0H0v134.92h469.82V0z" fill="#00b188"/><path d="M29.37 
+357.92H0V223h29.37v53.3h52.47V223h29.36v134.9H81.84V302H29.37v55.92m126.3-59.16h35c-.66-9.92-4.76-16.84-16.2-16.84-8.65 0-16.2 3.68-18.8 
+16.84zm22.25 61.3c-29.8 0-50.1-18.77-50.1-49.63 0-30 19.87-50.73 46.2-50.73 28.73 0 42.98 19.2 42.98 47.92v10.8h-61.32c3.46 14.88 15.1 
+18.77 26.78 18.77 10.14 0 17.48-2.2 26.54-7.8h1.1v22.2c-7.78 5.6-18.8 8.4-32.18 8.4m115.72-58.7l-15.1 
+56.5h-25.7l-29.37-95v-1.1h28.07l15.98 56.8 15.1-56.8h22.9l15.33 56.8 16.2-56.8h27v1l-29.38 95h-25.7l-15.33-56.6m118.1 58.7c-23.3 
+0-32.82-9.3-32.82-31.1V223h28.5v104.05c0 6.7 2.6 9.07 8.2 9.07 1.95 0 4.76-.65 6.48-1.3h.44v23.53c-2.37.86-6.48 1.72-10.8 
+1.72m46.66-61.3h34.97c-.65-9.93-4.75-16.85-16.2-16.85-8.63 0-16.2 3.68-18.78 16.84zm22.22 61.3c-29.8 0-50.08-18.78-50.08-49.64 0-30 
+19.86-50.73 46.2-50.73 28.72 0 42.97 19.2 42.97 47.92v10.8h-61.3c3.5 14.88 15.1 18.77 26.8 18.77 10.2 0 17.5-2.2 26.6-7.8h1.1v22.2c-7.7 
+5.6-18.7 8.4-32.1 8.4m156.1-98.2H658v22.8h-21.2v39c0 8.4 3.23 12.3 11.87 12.3 2.4 0 5.4-.2 8.66-1.3h.62V357c-3.7 1.3-9.3 2.8-17.5 
+2.8-23.1 0-32.2-10.58-32.2-34.97v-40.3h-36.5v39.05c0 8.4 3.25 12.3 11.88 12.3 2.4 0 5.43-.2 8.67-1.3h.63v22.45c-3.64 1.3-9.3 2.8-17.45 
+2.8-23.1 0-32.2-10.57-32.2-34.96v-40.3h-14.7v-22.8h14.7v-26.3h28.5v26.33h36.5v-26.3h28.5v26.35m117.2 27.42c14.9 0 22-8.42 22-20.5 
+0-12.54-7.1-20.95-22-20.95h-18.6v41.45h18.57zm51.82-20.5c0 29.36-19.65 45.32-49.46 45.32h-21v43.8H706V223h50.3c29.8 0 49.45 15.97 49.45 
+45.76m62.6 58.94v-8.2c-4.32-2.37-9.92-3.24-15.75-3.24-9.3 0-14.9 3.45-14.9 11.22 0 8 5.6 11.45 14.03 11.45 8 0 14.04-4.1 
+16.62-11.24zm.87 20.72c-6.26 7.56-15.54 11.23-25.5 11.23-18.76 0-34.1-11.43-34.1-31.74 0-18.7 15.34-31.3 37.35-31.3 6.9 0 14.05 1.1 
+21.38 3.3v-1.7c0-10.4-5.82-14.9-21.14-14.9-9.7 0-19 2.8-27 7.4h-1v-22.9c7.4-4.3 20.3-7.9 33.1-7.9 29 0 44.7 13.8 44.7 
+38V358h-27.7v-9.5m42.1-38.44c0-30.88 21.8-50.3 50.3-50.3 10.2 0 19.7 2.16 26.8 7.33v24.4h-1c-6.2-4.8-13.6-7.6-22-7.6-14.2 0-25 9.7-25 
+26.1s10.8 25.9 25.1 25.9c8.4 0 15.8-2.8 22-7.6h1.1v24.4c-7.1 5.2-16.6 7.3-26.7 7.3-28.5 0-50.3-19.2-50.3-50.1m123.4 
+4.3v43.6h-28.5V223h28.5v76.84l28.74-38h32.4v1.1l-34.6 43.6 34.57 50.3v1.08h-32.6l-28.5-43.6m125 
+13.38v-8.2c-4.3-2.37-9.9-3.24-15.75-3.24-9.3 0-14.9 3.45-14.9 11.22 0 8 5.6 11.45 14 11.45 8 0 14.08-4.1 16.67-11.24zm.9 20.72c-6.3 
+7.56-15.57 11.23-25.5 11.23-18.8 0-34.1-11.43-34.1-31.74 0-18.7 15.35-31.3 37.4-31.3 6.9 0 14 1.1 21.36 
+3.3v-1.7c0-10.4-5.84-14.9-21.17-14.9-9.7 0-19 2.8-27 7.4h-1.1v-22.9c7.33-4.3 20.3-7.9 33.02-7.9 28.95 0 44.7 13.8 44.7 
+38V358h-27.64v-9.5m75.58-71.04c5.2-10.6 12.8-16.63 23.3-16.63 3.9 0 7.8.84 9.3 1.7v27.2h-1.1c-3.2-1.3-7.1-2.15-12.5-2.15-8.83 0-15.74 
+5.18-18.12 15.1v55.28h-28.5V261.9h27.7v15.53m108.18 47.93v-30.88c-4.7-6.9-11-9.92-18.1-9.92-12.5 0-20.9 9.08-20.9 25.48s8.4 25.28 20.9 
+25.28c7.1 0 13.4-3 18.1-9.92zm.9 22.67c-6.03 7.76-15.53 12.06-28.5 12.06-24.6 0-40.36-22.5-40.36-50.1 0-27.7 15.75-50.3 40.4-50.3 12.53 
+0 21.6 3.9 27.64 11V223h28.5v134.92h-27.66V348M0 401.98h83.34v16.4H18.78v41.23h58.5v16H18.8v44.9h64.56v16.4H0V402m152.22 38c21.37 0 
+33.24 14.03 33.24 37.12v59.8h-17.9v-59.4c0-12.3-6.28-21.15-19.88-21.15-11.22 0-20.73 7.13-23.97 17.26v63.28h-17.9v-95h17.9v13.9c5.7-8.8 
+15.2-15.7 28.6-15.7m81.4 2h24.4v15.4h-24.4v51.2c0 10.8 5.6 14.5 15.8 14.5 2.8 0 5.9-.4 8-1.3h.7V537c-2.6 1.06-6.2 1.93-11.2 1.93-22.2 
+0-31.1-10.17-31.1-28.7v-52.9h-16.4v-15.4h16.4V416.7h18v25.24m54.4 38.2h47.3c-.6-14-7.5-24.8-22.2-24.8-13.6 0-22.4 10.17-25 24.8zm28.3 
+58.77c-27.8 0-46.8-18.5-46.8-48.3 0-29.8 17.7-50.5 43.4-50.5 26.1 0 39.7 18.8 39.7 46.6v8.2h-65.3c2 19.2 14.3 28.5 31.3 28.5 10.6 0 
+18.2-2.3 26.6-8.6h.7v15.8c-7.8 6.1-17.9 8.4-29.6 8.4m75.4-82.2c4.1-10.1 13.2-16.2 23.58-16.2 4.1 0 7.8.7 9.3 
+1.5v17.7h-.6c-2.6-1.2-6.9-1.9-11.27-1.9-9.7 0-17.9 6.5-20.9 17.3V537h-18v-95H392v14.7m90.66 66.05c17.7 0 28.1-14.03 28.1-33.25 
+0-19-10.36-33.26-28.06-33.26-9.73 0-18.8 5.82-23.54 15.1v36.5c4.7 9.26 13.8 14.87 23.5 14.87zm3.02-82.67c28.27 0 43.4 23.1 43.4 
+49.43S513.78 539 485.5 539c-11.68 0-21.6-6.02-26.57-12.5v47.07H441V441.9h17.92v10.8c4.95-6.7 14.9-12.73 26.54-12.73m82.48 
+16.63c4.1-10.16 13.17-16.2 23.53-16.2 4.1 0 7.77.65 9.28 1.5v17.7h-.62c-2.6-1.28-6.9-1.93-11.2-1.93-9.75 0-17.95 6.47-20.98 
+17.27v61.95h-18v-95h17.93v14.7m58.74-53.1c6.25 0 11.43 4.9 11.43 11.2 0 6.2-5.1 11.2-11.4 11.2-6.02 0-11.42-5-11.42-11.3 0-6.3 5.4-11.2 
+11.46-11.2m-8.9 133.4h17.9v-95h-18v95zm81.8-55.5c13.6 4.3 28.7 9.9 28.7 28 0 19.4-16 29.3-36.5 29.3-12.6 0-25.1-3.1-32.2-8.7v-17h.9c8 
+7.3 19.8 10.5 31 10.5 10.1 0 19.2-3.9 19.2-12.1 0-8.4-7.6-10.4-22.5-15.3-13.4-4.3-28.3-9.3-28.3-27.2 0-18.4 15.1-29.2 34.3-29.2 11.2 0 
+21.1 2.37 29.1 7.77V465h-.7c-7.8-6.25-16.88-9.93-28.1-9.93-11.25 0-17.5 4.97-17.5 11.67 0 7.55 6.9 9.7 22.23 
+14.68m62.85-1.32h47.3c-.68-14-7.58-24.8-22.27-24.8-13.6 0-22.5 10.14-25.1 24.8zm28.3 58.74c-27.88 0-46.88-18.57-46.88-48.36 0-29.8 
+17.7-50.5 43.4-50.5 26.15 0 39.74 18.77 39.74 46.6v8.22h-65.2c2 19.2 14.3 28.5 31.3 28.5 10.6 0 18.2-2.38 26.6-8.65h.63v15.77c-7.75 
+6.04-17.9 8.42-29.57 8.42" fill="#231f20"/></svg>
diff --git a/html/images/os/hpe.svg b/html/images/os/hpe.svg
new file mode 100644
index 0000000000..f83156bd8b
--- /dev/null
+++ b/html/images/os/hpe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 291 83.599998"><path d="M272.8 65.4H18.2V18.2h254.6zM291 0H0v83.6h291z" fill="#00b188"/></svg>
diff --git a/includes/definitions/comware.yaml b/includes/definitions/comware.yaml
index 3084986040..fc3b09eb6b 100644
--- a/includes/definitions/comware.yaml
+++ b/includes/definitions/comware.yaml
@@ -1,7 +1,7 @@
 os: comware
 text: 'HP Comware'
 type: network
-icon: hp
+icon: hpe
 over:
     - { graph: device_bits, text: Traffic }
 discovery:
diff --git a/includes/definitions/hpblmos.yaml b/includes/definitions/hpblmos.yaml
index f24e868b64..067f5a2ba1 100644
--- a/includes/definitions/hpblmos.yaml
+++ b/includes/definitions/hpblmos.yaml
@@ -1,7 +1,7 @@
 os: hpblmos
 text: 'HP Blade Management'
 type: appliance
-icon: hp
+icon: hpe
 over:
     - { graph: device_bits, text: Traffic }
     - { graph: device_processor, text: 'CPU Usage' }
diff --git a/includes/definitions/hpe-msl.yaml b/includes/definitions/hpe-msl.yaml
index d92658f62b..79c203b685 100644
--- a/includes/definitions/hpe-msl.yaml
+++ b/includes/definitions/hpe-msl.yaml
@@ -1,7 +1,7 @@
 os: hpe-msl
 text: 'HPE StoreEver MSL'
 type: storage
-icon: hp
+icon: hpe
 over:
     - { graph: device_bits, text: Traffic }
 discovery:
diff --git a/includes/definitions/hpvc.yaml b/includes/definitions/hpvc.yaml
index 596e700233..f01bb0e10f 100644
--- a/includes/definitions/hpvc.yaml
+++ b/includes/definitions/hpvc.yaml
@@ -1,7 +1,7 @@
 os: hpvc
 text: 'HP Virtual Connect'
 type: network
-icon: hp
+icon: hpe
 over:
     - { graph: device_bits, text: Traffic }
 discovery:
diff --git a/includes/definitions/informos.yaml b/includes/definitions/informos.yaml
index fb860134e3..e2faa6b181 100644
--- a/includes/definitions/informos.yaml
+++ b/includes/definitions/informos.yaml
@@ -1,7 +1,7 @@
 os: informos
 text: 'HPE 3PAR'
 type: storage
-icon: hp
+icon: hpe
 over:
     - { graph: device_bits, text: Traffic }
 discovery:
diff --git a/includes/definitions/procurve.yaml b/includes/definitions/procurve.yaml
index 680281744d..65bc80b3e3 100644
--- a/includes/definitions/procurve.yaml
+++ b/includes/definitions/procurve.yaml
@@ -1,7 +1,7 @@
 os: procurve
 text: 'HP ProCurve'
 type: network
-icon: hp
+icon: hpe
 over:
     - { graph: device_bits, text: Traffic }
     - { graph: device_processor, text: 'CPU Usage' }