From 76ebe11c8ea98121181d8c8311b6eca896ca2952 Mon Sep 17 00:00:00 2001 From: Evren Ozkan Date: Tue, 10 Jan 2017 13:09:43 -0500 Subject: [PATCH] OHIF-149 The viewer shall allow the root URL to be changed - WIP - Use absoluteUrl for hard-coded paths in html and js --- LesionTracker/client/components/app/app.html | 2 +- .../toolbarSection/toolbarSection.html | 4 ++-- .../components/ohifViewer/ohifViewer.html | 2 +- Packages/ohif-core/client/helpers/blaze.js | 6 ++++++ .../roundedButtonGroup/roundedButtonGroup.html | 2 +- .../nextPresentationGroupButton.html | 2 +- .../previousPresentationGroupButton.html | 2 +- .../radialProgressBar/radialProgressBar.html | 4 ++-- .../longitudinalViewportOverlay.html | 2 +- .../measurementTableHUD.html | 2 +- .../measurementTableHeaderRow.html | 2 +- .../measurementTableRow.html | 6 +++--- .../client/active-entry/activeEntry.js | 4 +++- .../userAccountMenu/userAccountMenu.html | 18 +++++++++--------- .../basic/aboutModal/aboutModal.html | 2 +- .../viewer/layoutButton/layoutButton.html | 2 +- .../toolbarSectionButton.html | 2 +- .../ohif-viewerbase/client/lib/getImageId.js | 4 +++- .../client/lib/getWADORSImageId.js | 3 ++- .../standaloneViewer/standaloneViewer.html | 2 +- 20 files changed, 42 insertions(+), 31 deletions(-) diff --git a/LesionTracker/client/components/app/app.html b/LesionTracker/client/components/app/app.html index 627ee8af0..d9e535c3d 100644 --- a/LesionTracker/client/components/app/app.html +++ b/LesionTracker/client/components/app/app.html @@ -5,7 +5,7 @@ class="brandSection pull-left" href="http://ohif.org"> - +
Open Health Imaging Foundation
diff --git a/LesionTracker/client/components/toolbarSection/toolbarSection.html b/LesionTracker/client/components/toolbarSection/toolbarSection.html index b55d02fe1..34c4dc95a 100644 --- a/LesionTracker/client/components/toolbarSection/toolbarSection.html +++ b/LesionTracker/client/components/toolbarSection/toolbarSection.html @@ -23,7 +23,7 @@
- +
HUD
@@ -31,7 +31,7 @@
- +
Trial
diff --git a/OHIFViewer/client/components/ohifViewer/ohifViewer.html b/OHIFViewer/client/components/ohifViewer/ohifViewer.html index 77a41fe54..a03dfc013 100644 --- a/OHIFViewer/client/components/ohifViewer/ohifViewer.html +++ b/OHIFViewer/client/components/ohifViewer/ohifViewer.html @@ -5,7 +5,7 @@ class="brandSection pull-left" href="http://ohif.org"> - +
Open Health Imaging Foundation diff --git a/Packages/ohif-core/client/helpers/blaze.js b/Packages/ohif-core/client/helpers/blaze.js index 0bb880839..816fe19be 100644 --- a/Packages/ohif-core/client/helpers/blaze.js +++ b/Packages/ohif-core/client/helpers/blaze.js @@ -1,3 +1,4 @@ +import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; import { Session } from 'meteor/session'; import { ReactiveVar } from 'meteor/reactive-var'; @@ -6,6 +7,11 @@ import { ReactiveVar } from 'meteor/reactive-var'; * Global Blaze UI helpers to work with Blaze */ +// Return the absolute url +Template.registerHelper('absoluteUrl', path => { + return Meteor.absoluteUrl(path); +}); + // Return the current template instance Template.registerHelper('instance', () => { return Template.instance(); diff --git a/Packages/ohif-design/components/roundedButtonGroup/roundedButtonGroup.html b/Packages/ohif-design/components/roundedButtonGroup/roundedButtonGroup.html index 3d35648fd..e75572d7d 100644 --- a/Packages/ohif-design/components/roundedButtonGroup/roundedButtonGroup.html +++ b/Packages/ohif-design/components/roundedButtonGroup/roundedButtonGroup.html @@ -5,7 +5,7 @@
{{#if item.svgLink}} - + {{/if}} {{#if item.text}} diff --git a/Packages/ohif-hanging-protocols/client/components/nextPresentationGroupButton/nextPresentationGroupButton.html b/Packages/ohif-hanging-protocols/client/components/nextPresentationGroupButton/nextPresentationGroupButton.html index 515a483e6..0e9ca24c2 100644 --- a/Packages/ohif-hanging-protocols/client/components/nextPresentationGroupButton/nextPresentationGroupButton.html +++ b/Packages/ohif-hanging-protocols/client/components/nextPresentationGroupButton/nextPresentationGroupButton.html @@ -6,7 +6,7 @@
{{ #if this.svgLink }} - + {{ else }} diff --git a/Packages/ohif-hanging-protocols/client/components/previousPresentationGroupButton/previousPresentationGroupButton.html b/Packages/ohif-hanging-protocols/client/components/previousPresentationGroupButton/previousPresentationGroupButton.html index d933b693d..eb1973b14 100644 --- a/Packages/ohif-hanging-protocols/client/components/previousPresentationGroupButton/previousPresentationGroupButton.html +++ b/Packages/ohif-hanging-protocols/client/components/previousPresentationGroupButton/previousPresentationGroupButton.html @@ -6,7 +6,7 @@
{{ #if this.svgLink }} - + {{ else }} diff --git a/Packages/ohif-measurements/client/components/caseProgress/radialProgressBar/radialProgressBar.html b/Packages/ohif-measurements/client/components/caseProgress/radialProgressBar/radialProgressBar.html index eda660148..a76281378 100644 --- a/Packages/ohif-measurements/client/components/caseProgress/radialProgressBar/radialProgressBar.html +++ b/Packages/ohif-measurements/client/components/caseProgress/radialProgressBar/radialProgressBar.html @@ -29,12 +29,12 @@
{{#if isLocked}} - + {{else}} {{#if progressComplete}} - + {{else}} {{progressText}} diff --git a/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.html b/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.html index 5e0d582c9..8e5400da5 100644 --- a/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.html +++ b/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.html @@ -12,7 +12,7 @@ {{#if linked}}
- +
{{/if}} diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.html b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.html index 045a3ca8c..0be649306 100644 --- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.html +++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.html @@ -3,7 +3,7 @@
Measurements - +
{{>measurementTableView (clone this)}} diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.html b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.html index 8a6dce2d3..6b0092625 100644 --- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.html +++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.html @@ -3,7 +3,7 @@ {{#if anyUnmarkedLesionsLeft}}
- +
{{/if}} diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableRow/measurementTableRow.html b/Packages/ohif-measurements/client/components/measurementTable/measurementTableRow/measurementTableRow.html index 2fb1a6f9e..bfb7e50a1 100644 --- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableRow/measurementTableRow.html +++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableRow/measurementTableRow.html @@ -7,7 +7,7 @@ {{#unless rowItem.location}}
- +
{{/unless}} @@ -36,13 +36,13 @@
- + Rename
- + Delete
diff --git a/Packages/ohif-user-management/client/active-entry/activeEntry.js b/Packages/ohif-user-management/client/active-entry/activeEntry.js index e50ef5630..0fdc1568e 100644 --- a/Packages/ohif-user-management/client/active-entry/activeEntry.js +++ b/Packages/ohif-user-management/client/active-entry/activeEntry.js @@ -1,8 +1,10 @@ +import { Meteor } from 'meteor/meteor'; + Meteor.startup(function() { if (Meteor.isClient){ ActiveEntry.configure({ logo: { - url: '/images/logo.png', + url: Meteor.absoluteUrl('/images/logo.png'), displayed: true }, signIn: { diff --git a/Packages/ohif-user-management/client/components/userAccountMenu/userAccountMenu.html b/Packages/ohif-user-management/client/components/userAccountMenu/userAccountMenu.html index 84edddc51..a2021710f 100644 --- a/Packages/ohif-user-management/client/components/userAccountMenu/userAccountMenu.html +++ b/Packages/ohif-user-management/client/components/userAccountMenu/userAccountMenu.html @@ -10,17 +10,17 @@