From cb43d379b1e916b9ddb14e93f04efc34733d8078 Mon Sep 17 00:00:00 2001
From: Erik Ziegler <erik.sweed@gmail.com>
Date: Mon, 7 Jan 2019 11:18:59 +0100
Subject: [PATCH] Try to fix missing icons

---
 OHIFViewer-react/package.json                    |  2 +-
 OHIFViewer-react/public/index.html               |  2 +-
 OHIFViewer-react/src/FlexboxLayout/ToolbarRow.js |  3 ++-
 OHIFViewer-react/src/index.js                    | 13 +++++++------
 OHIFViewer-react/src/sha.js                      |  2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/OHIFViewer-react/package.json b/OHIFViewer-react/package.json
index 57b702747..9de61c2d7 100644
--- a/OHIFViewer-react/package.json
+++ b/OHIFViewer-react/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "license": "MIT",
   "private": true,
-  "homepage": "https://docs.ohif.org/viewer",
+  "homepage": "http://localhost:5000/",
   "dependencies": {
     "cornerstone-core": "2.2.8",
     "cornerstone-math": "0.1.7",
diff --git a/OHIFViewer-react/public/index.html b/OHIFViewer-react/public/index.html
index 7b51614ea..d60d396bb 100644
--- a/OHIFViewer-react/public/index.html
+++ b/OHIFViewer-react/public/index.html
@@ -8,7 +8,7 @@
 
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
 
-    <title>react-cornerstone-viewport</title>
+    <title>OHIF Viewer</title>
 
     <!-- Latest compiled and minified CSS -->
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
diff --git a/OHIFViewer-react/src/FlexboxLayout/ToolbarRow.js b/OHIFViewer-react/src/FlexboxLayout/ToolbarRow.js
index aa6bbd373..765800085 100644
--- a/OHIFViewer-react/src/FlexboxLayout/ToolbarRow.js
+++ b/OHIFViewer-react/src/FlexboxLayout/ToolbarRow.js
@@ -4,6 +4,7 @@ import ConnectedLayoutButton from './ConnectedLayoutButton';
 import PropTypes from 'prop-types';
 import { RoundedButtonGroup } from 'react-viewerbase';
 import './ToolbarRow.css';
+import Icons from "../images/icons.svg"
 
 class ToolbarRow extends Component {
     static propTypes = {
@@ -27,7 +28,7 @@ class ToolbarRow extends Component {
     render() {
         const leftSidebarToggle = [{
             value: 'studies',
-            svgLink: '/icons.svg#icon-studies',
+            svgLink: `${Icons}#icon-studies`,
             svgWidth: 15,
             svgHeight: 13,
             bottomLabel: 'Series',
diff --git a/OHIFViewer-react/src/index.js b/OHIFViewer-react/src/index.js
index 37fa24ddf..c8c3feebc 100644
--- a/OHIFViewer-react/src/index.js
+++ b/OHIFViewer-react/src/index.js
@@ -7,6 +7,7 @@ import App from './App.js';
 import OHIF from 'ohif-core';
 import './config';
 import ui from './redux/ui.js'
+import Icons from "./images/icons.svg"
 
 const reducers = OHIF.redux.reducers;
 reducers.ui = ui;
@@ -19,42 +20,42 @@ const defaultButtons = [
         command: 'Pan',
         type: 'tool',
         text: 'Pan',
-        svgUrl: '/icons.svg#icon-tools-pan',
+        svgUrl: `${Icons}#icon-tools-pan`,
         active: false
     },
     {
         command: 'Zoom',
         type: 'tool',
         text: 'Zoom',
-        svgUrl: '/icons.svg#icon-tools-zoom',
+        svgUrl: `${Icons}#icon-tools-zoom`,
         active: false
     },
     {
         command: 'Bidirectional',
         type: 'tool',
         text: 'Bidirectional',
-        svgUrl: '/icons.svg#icon-tools-measure-target',
+        svgUrl: `${Icons}#icon-tools-measure-target`,
         active: false
     },
     {
         command: 'StackScroll',
         type: 'tool',
         text: 'Stack Scroll',
-        svgUrl: '/icons.svg#icon-tools-stack-scroll',
+        svgUrl: `${Icons}#icon-tools-stack-scroll`,
         active: false
     },
     {
         command: 'reset',
         type: 'command',
         text: 'Reset',
-        svgUrl: '/icons.svg#icon-tools-reset',
+        svgUrl: `${Icons}#icon-tools-reset`,
         active: false
     },
     {
         command: 'Wwwc',
         type: 'tool',
         text: 'Manual',
-        svgUrl: '/icons.svg#icon-tools-levels',
+        svgUrl: `${Icons}#icon-tools-levels`,
         active: true
     },
 ];
diff --git a/OHIFViewer-react/src/sha.js b/OHIFViewer-react/src/sha.js
index f0d49bcbe..910a34594 100644
--- a/OHIFViewer-react/src/sha.js
+++ b/OHIFViewer-react/src/sha.js
@@ -1 +1 @@
-export default 'b84fd28dc262d3d3c569b38ac9e386857cced3e2';
+export default '2b8dfa4468036e027380513dc6a7c51a70be5752';