othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OHIF-149 The viewer shall allow the root URL to be changed - WIP

Browse Source 
- Use absoluteUrl for hard-coded paths in html and js
This commit is contained in:
Evren Ozkan 2017-01-10 13:09:43 -05:00
parent a91894c42d
commit 76ebe11c8e
20 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LesionTracker/client/components/app/app.html
View File

@ -5,7 +5,7 @@
class="brandSection pull-left" class="brandSection pull-left"
href="http://ohif.org"> href="http://ohif.org">
<svg class="logoImage"> <svg class="logoImage">
<use xlink:href="/packages/ohif_viewerbase/assets/icons.svg#icon-ohif-logo"></use> <use xlink:href={{absoluteUrl "packages/ohif_viewerbase/assets/icons.svg#icon-ohif-logo"}}></use>
</svg> </svg>
<div class="logoText">Open Health Imaging Foundation</div> <div class="logoText">Open Health Imaging Foundation</div>
</a> </a>

4
LesionTracker/client/components/toolbarSection/toolbarSection.html
View File

@ -23,7 +23,7 @@
<div id="toggleHUD" class="toolbarSectionButton pull-right rp-x-1 m-t-1 rm-r-3 {{#if session 'measurementTableHudOpen'}}active{{/if}}"> <div id="toggleHUD" class="toolbarSectionButton pull-right rp-x-1 m-t-1 rm-r-3 {{#if session 'measurementTableHudOpen'}}active{{/if}}">
<div class="svgContainer"> <div class="svgContainer">
<svg> <svg>
<use xlink:href="/packages/ohif_viewerbase/assets/icons.svg#icon-hud"></use> <use xlink:href={{absoluteUrl "packages/ohif_viewerbase/assets/icons.svg#icon-hud"}}></use>
</svg> </svg>
</div> </div>
<div class="buttonLabel">HUD</div> <div class="buttonLabel">HUD</div>
@ -31,7 +31,7 @@
<div id="toggleTrial" class="toolbarSectionButton pull-right rp-x-1 m-t-1 rm-r-1"> <div id="toggleTrial" class="toolbarSectionButton pull-right rp-x-1 m-t-1 rm-r-1">
<div class="svgContainer"> <div class="svgContainer">
<svg> <svg>
<use xlink:href="/packages/ohif_viewerbase/assets/icons.svg#icon-trial-info"></use> <use xlink:href={{absoluteUrl "packages/ohif_viewerbase/assets/icons.svg#icon-trial-info"}}></use>
</svg> </svg>
</div> </div>
<div class="buttonLabel">Trial</div> <div class="buttonLabel">Trial</div>

2
OHIFViewer/client/components/ohifViewer/ohifViewer.html
View File

@ -5,7 +5,7 @@
class="brandSection pull-left" class="brandSection pull-left"
href="http://ohif.org"> href="http://ohif.org">
<svg class="logoImage"> <svg class="logoImage">
<use xlink:href="/packages/ohif_viewerbase/assets/icons.svg#icon-ohif-logo"></use> <use xlink:href={{absoluteUrl "packages/ohif_viewerbase/assets/icons.svg#icon-ohif-logo"}}></use>
</svg> </svg>
<div class="logoText"> <div class="logoText">
Open Health Imaging Foundation Open Health Imaging Foundation

6
Packages/ohif-core/client/helpers/blaze.js
View File

@ -1,3 +1,4 @@
import { Meteor } from 'meteor/meteor';
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
import { Session } from 'meteor/session'; import { Session } from 'meteor/session';
import { ReactiveVar } from 'meteor/reactive-var'; import { ReactiveVar } from 'meteor/reactive-var';
@ -6,6 +7,11 @@ import { ReactiveVar } from 'meteor/reactive-var';
* Global Blaze UI helpers to work with Blaze * 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 // Return the current template instance
Template.registerHelper('instance', () => { Template.registerHelper('instance', () => {
return Template.instance(); return Template.instance();

2
Packages/ohif-design/components/roundedButtonGroup/roundedButtonGroup.html
View File

@ -5,7 +5,7 @@
<div class="roundedButton"> <div class="roundedButton">
{{#if item.svgLink}} {{#if item.svgLink}}
<svg style="width: {{item.svgWidth}}px; height: {{item.svgHeight}}px"> <svg style="width: {{item.svgWidth}}px; height: {{item.svgHeight}}px">
<use xlink:href="{{item.svgLink}}"></use> <use xlink:href="{{absoluteUrl item.svgLink}}"></use>
</svg> </svg>
{{/if}} {{/if}}
{{#if item.text}} {{#if item.text}}

2
Packages/ohif-hanging-protocols/client/components/nextPresentationGroupButton/nextPresentationGroupButton.html
View File

@ -6,7 +6,7 @@
<div class="svgContainer"> <div class="svgContainer">
{{ #if this.svgLink }} {{ #if this.svgLink }}
<svg> <svg>
<use xlink:href={{this.svgLink}}></use> <use xlink:href={{absoluteUrl this.svgLink}}></use>
</svg> </svg>
{{ else }} {{ else }}
<i class={{iconClasses}}></i> <i class={{iconClasses}}></i>

2
Packages/ohif-hanging-protocols/client/components/previousPresentationGroupButton/previousPresentationGroupButton.html
View File

@ -6,7 +6,7 @@
<div class="svgContainer"> <div class="svgContainer">
{{ #if this.svgLink }} {{ #if this.svgLink }}
<svg> <svg>
<use xlink:href={{this.svgLink}}></use> <use xlink:href={{absoluteUrl this.svgLink}}></use>
</svg> </svg>
{{ else }} {{ else }}
<i class={{iconClasses}}></i> <i class={{iconClasses}}></i>

4
Packages/ohif-measurements/client/components/caseProgress/radialProgressBar/radialProgressBar.html
View File

@ -29,12 +29,12 @@
<div class="progressText"> <div class="progressText">
{{#if isLocked}} {{#if isLocked}}
<svg class="locked"> <svg class="locked">
<use xlink:href=/packages/ohif_viewerbase/assets/icons.svg#icon-status-lock></use> <use xlink:href={{absoluteUrl "packages/ohif_viewerbase/assets/icons.svg#icon-status-lock"}}></use>
</svg> </svg>
{{else}} {{else}}
{{#if progressComplete}} {{#if progressComplete}}
<svg class="complete"> <svg class="complete">
<use xlink:href=/packages/ohif_viewerbase/assets/icons.svg#icon-status-complete></use> <use xlink:href={{absoluteUrl "packages/ohif_viewerbase/assets/icons.svg#icon-status-complete"}}></use>
</svg> </svg>
{{else}} {{else}}
{{progressText}} {{progressText}}

2
Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.html
View File

@ -12,7 +12,7 @@
{{#if linked}} {{#if linked}}
<div class="link-icon"> <div class="link-icon">
<svg> <svg>
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/packages/ohif_viewerbase/assets/icons.svg#icon-viewport-link"></use> <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href={{absoluteUrl "packages/ohif_viewerbase/assets/icons.svg#icon-viewport-link"}}></use>
</svg> </svg>
</div> </div>
{{/if}} {{/if}}

2
Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.html
View File

@ -3,7 +3,7 @@
<div class="header"> <div class="header">
<span>Measurements</span> <span>Measurements</span>
<svg class="buttonClose"> <svg class="buttonClose">
<use xlink:href="/packages/ohif_viewerbase/assets/icons.svg#icon-ui-close"></use> <use xlink:href={{absoluteUrl "packages/ohif_viewerbase/assets/icons.svg#icon-ui-close"}}></use>
</svg> </svg>
</div> </div>
{{>measurementTableView (clone this)}} {{>measurementTableView (clone this)}}

2
Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.html
View File

@ -3,7 +3,7 @@
{{#if anyUnmarkedLesionsLeft}} {{#if anyUnmarkedLesionsLeft}}
<div class="add js-setTool"> <div class="add js-setTool">
<svg> <svg>
<use xlink:href=/packages/ohif_viewerbase/assets/icons.svg#icon-ui-add></use> <use xlink:href={{absoluteUrl "packages/ohif_viewerbase/assets/icons.svg#icon-ui-add"}}></use>
</svg> </svg>
</div> </div>
{{/if}} {{/if}}

6
Packages/ohif-measurements/client/components/measurementTable/measurementTableRow/measurementTableRow.html
View File

@ -7,7 +7,7 @@
{{#unless rowItem.location}} {{#unless rowItem.location}}
<div class="warning-icon"> <div class="warning-icon">
<svg> <svg>
<use xlink:href=/packages/ohif_viewerbase/assets/icons.svg#icon-ui-warning></use> <use xlink:href={{absoluteUrl "packages/ohif_viewerbase/assets/icons.svg#icon-ui-warning"}}></use>
</svg> </svg>
</div> </div>
{{/unless}} {{/unless}}
@ -36,13 +36,13 @@
<div class="rowOptions"> <div class="rowOptions">
<div class="rowAction js-rename pull-left m-r-2" tabindex="1"> <div class="rowAction js-rename pull-left m-r-2" tabindex="1">
<svg class="edit-icon"> <svg class="edit-icon">
<use xlink:href="/packages/ohif_viewerbase/assets/icons.svg#icon-measurements-additional"></use> <use xlink:href={{absoluteUrl "packages/ohif_viewerbase/assets/icons.svg#icon-measurements-additional"}}></use>
</svg> </svg>
Rename Rename
</div> </div>
<div class="rowAction js-delete pull-left" tabindex="1"> <div class="rowAction js-delete pull-left" tabindex="1">
<svg class="close-icon"> <svg class="close-icon">
<use xlink:href=/packages/ohif_viewerbase/assets/icons.svg#icon-ui-close></use> <use xlink:href={{absoluteUrl "packages/ohif_viewerbase/assets/icons.svg#icon-ui-close"}}></use>
</svg> </svg>
Delete Delete
</div> </div>

4
Packages/ohif-user-management/client/active-entry/activeEntry.js
View File

@ -1,8 +1,10 @@
import { Meteor } from 'meteor/meteor';
Meteor.startup(function() { Meteor.startup(function() {
if (Meteor.isClient){ if (Meteor.isClient){
ActiveEntry.configure({ ActiveEntry.configure({
logo: { logo: {
url: '/images/logo.png', url: Meteor.absoluteUrl('/images/logo.png'),
displayed: true displayed: true
}, },
signIn: { signIn: {

18
Packages/ohif-user-management/client/components/userAccountMenu/userAccountMenu.html
View File

@ -10,17 +10,17 @@
<ul class="dropdown-menu dropdown-menu-right"> <ul class="dropdown-menu dropdown-menu-right">
{{#if showStudyListMenu}} {{#if showStudyListMenu}}
<li> <li>
<a href="studylist" id="studylist"> <a href="{{absoluteUrl "studylist"}}" id="studylist">
<svg class="study-list"> <svg class="study-list">
<use xlink:href=/packages/ohif_user-management/assets/user-menu-icons.svg#study-list></use> <use xlink:href={{absoluteUrl "packages/ohif_user-management/assets/user-menu-icons.svg#study-list"}}></use>
</svg> Study List </svg> Study List
</a> </a>
</li> </li>
{{else}} {{else}}
<li> <li>
<a href="/audit" id="audit"> <a href="{{absoluteUrl "audit"}}" id="audit">
<svg class="log"> <svg class="log">
<use xlink:href=/packages/ohif_user-management/assets/user-menu-icons.svg#log></use> <use xlink:href={{absoluteUrl "packages/ohif_user-management/assets/user-menu-icons.svg#log"}}></use>
</svg> View Audit Log </svg> View Audit Log
</a> </a>
</li> </li>
@ -29,7 +29,7 @@
<li> <li>
<a id="themeSelector"> <a id="themeSelector">
<svg class="theme"> <svg class="theme">
<use xlink:href=/packages/ohif_user-management/assets/user-menu-icons.svg#theme></use> <use xlink:href={{absoluteUrl "packages/ohif_user-management/assets/user-menu-icons.svg#theme"}}></use>
</svg> Themes </svg> Themes
</a> </a>
</li> </li>
@ -37,22 +37,22 @@
<li> <li>
<a id="serverInformation"> <a id="serverInformation">
<svg class="server"> <svg class="server">
<use xlink:href=/packages/ohif_user-management/assets/user-menu-icons.svg#server></use> <use xlink:href={{absoluteUrl "packages/ohif_user-management/assets/user-menu-icons.svg#server"}}></use>
</svg> Server Information </svg> Server Information
</a> </a>
</li> </li>
<li role="separator" class="divider"></li> <li role="separator" class="divider"></li>
<li> <li>
<a href="changePassword" id="changePassword"> <a href="{{absoluteUrl "changePassword"}}" id="changePassword">
<svg class="password"> <svg class="password">
<use xlink:href=/packages/ohif_user-management/assets/user-menu-icons.svg#password></use> <use xlink:href={{absoluteUrl "packages/ohif_user-management/assets/user-menu-icons.svg#password"}}></use>
</svg> Change Password </svg> Change Password
</a> </a>
</li> </li>
<li> <li>
<a id="logoutButton"> <a id="logoutButton">
<svg class="logout"> <svg class="logout">
<use xlink:href=/packages/ohif_user-management/assets/user-menu-icons.svg#logout></use> <use xlink:href={{absoluteUrl "packages/ohif_user-management/assets/user-menu-icons.svg#logout"}}></use>
</svg> Logout </svg> Logout
</a> </a>
</li> </li>

2
Packages/ohif-viewerbase/client/components/basic/aboutModal/aboutModal.html
View File

@ -28,7 +28,7 @@
</a> </a>
<div class="logo p-x-3 p-y-3"> <div class="logo p-x-3 p-y-3">
<svg class="logoImage"> <svg class="logoImage">
<use xlink:href="/packages/ohif_viewerbase/assets/icons.svg#icon-ohif-logo"></use> <use xlink:href={{absoluteUrl "packages/ohif_viewerbase/assets/icons.svg#icon-ohif-logo"}}></use>
</svg> </svg>
<a class="logoText" <a class="logoText"
target="_blank" target="_blank"

2
Packages/ohif-viewerbase/client/components/viewer/layoutButton/layoutButton.html
View File

@ -7,7 +7,7 @@
<div class="svgContainer"> <div class="svgContainer">
{{#if this.svgLink}} {{#if this.svgLink}}
<svg> <svg>
<use xlink:href={{this.svgLink}}></use> <use xlink:href={{absoluteUrl this.svgLink}}></use>
</svg> </svg>
{{else}} {{else}}
<i class={{iconClasses}}></i> <i class={{iconClasses}}></i>

2
Packages/ohif-viewerbase/client/components/viewer/toolbarSectionButton/toolbarSectionButton.html
View File

@ -9,7 +9,7 @@
{{#let svg=svgLink icon=iconClasses}} {{#let svg=svgLink icon=iconClasses}}
{{#if svg}} {{#if svg}}
<svg> <svg>
<use xlink:href={{svg}}></use> <use xlink:href={{absoluteUrl svg}}></use>
</svg> </svg>
{{else}} {{else}}
<i class={{icon}}></i> <i class={{icon}}></i>

4
Packages/ohif-viewerbase/client/lib/getImageId.js
View File

@ -1,3 +1,5 @@
import { Meteor } from "meteor/meteor";
/** /**
* Obtain an imageId for Cornerstone from an image instance * Obtain an imageId for Cornerstone from an image instance
* *
@ -14,7 +16,7 @@ getImageId = function(instance, frame) {
} }
if (instance.wadouri) { if (instance.wadouri) {
var imageId = 'dicomweb:' + instance.wadouri; // WADO-URI; var imageId = 'dicomweb:' + Meteor.absoluteUrl(instance.wadouri); // WADO-URI;
if (frame !== undefined) { if (frame !== undefined) {
imageId += '&frame=' + frame; imageId += '&frame=' + frame;
} }

3
Packages/ohif-viewerbase/client/lib/getWADORSImageId.js
View File

@ -1,3 +1,4 @@
import { Meteor } from 'meteor/meteor';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
/** /**
@ -25,7 +26,7 @@ getWADORSImageId = function(instance) {
} }
var image = { var image = {
uri: instance.wadorsuri, uri: Meteor.absoluteUrl(instance.wadorsuri),
//imageId : '', //imageId : '',
//minPixelValue : 0, //minPixelValue : 0,
//maxPixelValue : 255, //maxPixelValue : 255,

2
StandaloneViewer/StandaloneViewer/client/components/standaloneViewer/standaloneViewer.html
View File

@ -5,7 +5,7 @@
class="brandSection pull-left" class="brandSection pull-left"
href="http://ohif.org"> href="http://ohif.org">
<svg class="logoImage"> <svg class="logoImage">
<use xlink:href="/packages/ohif_viewerbase/assets/icons.svg#icon-ohif-logo"></use> <use xlink:href={{absoluteUrl "packages/ohif_viewerbase/assets/icons.svg#icon-ohif-logo"}}></use>
</svg> </svg>
<div class="logoText"> <div class="logoText">
Open Health Imaging Foundation Open Health Imaging Foundation