diff --git a/LesionTracker/.meteor/packages b/LesionTracker/.meteor/packages index 5e292945a..9dceea041 100644 --- a/LesionTracker/.meteor/packages +++ b/LesionTracker/.meteor/packages @@ -63,3 +63,4 @@ hangingprotocols fastclick@1.0.12 standard-minifier-css@1.1.8 standard-minifier-js@1.1.8 +johdirr:meteor-git-rev diff --git a/LesionTracker/.meteor/versions b/LesionTracker/.meteor/versions index b5320cf1c..7d4b6c902 100644 --- a/LesionTracker/.meteor/versions +++ b/LesionTracker/.meteor/versions @@ -65,6 +65,7 @@ iron:controller@1.0.12 iron:core@1.0.11 iron:dynamic-template@1.0.12 iron:layout@1.0.12 +johdirr:meteor-git-rev@0.0.4 jquery@1.11.9 launch-screen@1.0.12 lesiontracker@0.0.1 diff --git a/OHIFViewer/.meteor/packages b/OHIFViewer/.meteor/packages index aa93d7180..edd4b466c 100644 --- a/OHIFViewer/.meteor/packages +++ b/OHIFViewer/.meteor/packages @@ -40,3 +40,4 @@ fastclick@1.0.12 standard-minifier-css@1.1.8 standard-minifier-js@1.1.8 aldeed:simple-schema +johdirr:meteor-git-rev diff --git a/OHIFViewer/.meteor/versions b/OHIFViewer/.meteor/versions index 7a8f08e69..4bc7a8cbb 100644 --- a/OHIFViewer/.meteor/versions +++ b/OHIFViewer/.meteor/versions @@ -46,6 +46,7 @@ iron:controller@1.0.12 iron:core@1.0.11 iron:dynamic-template@1.0.12 iron:layout@1.0.12 +johdirr:meteor-git-rev@0.0.4 jquery@1.11.9 launch-screen@1.0.12 livedata@1.0.18 diff --git a/OHIFViewer/client/components/ohifViewer/ohifViewer.html b/OHIFViewer/client/components/ohifViewer/ohifViewer.html index 8f4aa5c32..2d59cecb2 100644 --- a/OHIFViewer/client/components/ohifViewer/ohifViewer.html +++ b/OHIFViewer/client/components/ohifViewer/ohifViewer.html @@ -10,11 +10,17 @@ {{ #if studyListToggleText }} -
+ {{studyListToggleText}} -
+ {{ /if }} + + About + {{> worklist }} + {{> aboutModal }} \ No newline at end of file diff --git a/OHIFViewer/client/components/ohifViewer/ohifViewer.styl b/OHIFViewer/client/components/ohifViewer/ohifViewer.styl index 7bc6ccb12..df922b898 100644 --- a/OHIFViewer/client/components/ohifViewer/ohifViewer.styl +++ b/OHIFViewer/client/components/ohifViewer/ohifViewer.styl @@ -31,6 +31,8 @@ $expandedHeight = 160px .studyListLinkSection border-left: $uiBorderThickness solid $uiBorderColor; + + .btn color: $textSecondaryColor cursor: pointer font-size: 13px diff --git a/Packages/design/styles/common/global.styl b/Packages/design/styles/common/global.styl index ede2fbe15..ac25bb23a 100644 --- a/Packages/design/styles/common/global.styl +++ b/Packages/design/styles/common/global.styl @@ -29,3 +29,13 @@ html hr -moz-user-select: none -ms-user-select: none user-select: none + +.modal-dialog + .modal-content + background: $primaryBackgroundColor + border-color: $uiBorderColor + color: $textSecondaryColor + + .modal-header, .modal-footer + border-color: $uiBorderColor + diff --git a/Packages/viewerbase/client/components/basic/confirmDeleteDialog/confirmDeleteDialog.html b/Packages/lesiontracker/client/components/confirmDeleteDialog/confirmDeleteDialog.html similarity index 100% rename from Packages/viewerbase/client/components/basic/confirmDeleteDialog/confirmDeleteDialog.html rename to Packages/lesiontracker/client/components/confirmDeleteDialog/confirmDeleteDialog.html diff --git a/Packages/viewerbase/client/components/basic/confirmDeleteDialog/confirmDeleteDialog.js b/Packages/lesiontracker/client/components/confirmDeleteDialog/confirmDeleteDialog.js similarity index 100% rename from Packages/viewerbase/client/components/basic/confirmDeleteDialog/confirmDeleteDialog.js rename to Packages/lesiontracker/client/components/confirmDeleteDialog/confirmDeleteDialog.js diff --git a/Packages/viewerbase/client/components/basic/confirmDeleteDialog/confirmDeleteDialog.styl b/Packages/lesiontracker/client/components/confirmDeleteDialog/confirmDeleteDialog.styl similarity index 100% rename from Packages/viewerbase/client/components/basic/confirmDeleteDialog/confirmDeleteDialog.styl rename to Packages/lesiontracker/client/components/confirmDeleteDialog/confirmDeleteDialog.styl diff --git a/Packages/viewerbase/client/components/basic/emailVerification/emailVerification.html b/Packages/lesiontracker/client/components/emailVerification/emailVerification.html similarity index 100% rename from Packages/viewerbase/client/components/basic/emailVerification/emailVerification.html rename to Packages/lesiontracker/client/components/emailVerification/emailVerification.html diff --git a/Packages/viewerbase/client/components/basic/emailVerification/emailVerification.js b/Packages/lesiontracker/client/components/emailVerification/emailVerification.js similarity index 100% rename from Packages/viewerbase/client/components/basic/emailVerification/emailVerification.js rename to Packages/lesiontracker/client/components/emailVerification/emailVerification.js diff --git a/Packages/viewerbase/client/components/basic/emailVerification/emailVerification.styl b/Packages/lesiontracker/client/components/emailVerification/emailVerification.styl similarity index 100% rename from Packages/viewerbase/client/components/basic/emailVerification/emailVerification.styl rename to Packages/lesiontracker/client/components/emailVerification/emailVerification.styl diff --git a/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.html b/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.html index 5de2ce16b..febc27ad3 100644 --- a/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.html +++ b/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.html @@ -10,9 +10,9 @@ {{ #if studyListToggleText }} -
+ {{studyListToggleText}} -
+ {{ /if }}
{{>userAccountMenu}} diff --git a/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.styl b/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.styl index c30c878b3..1619a3359 100644 --- a/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.styl +++ b/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.styl @@ -31,6 +31,8 @@ $expandedHeight = 160px .studyListLinkSection border-left: $uiBorderThickness solid $uiBorderColor; + + .btn color: $textSecondaryColor cursor: pointer font-size: 13px diff --git a/Packages/lesiontracker/package.js b/Packages/lesiontracker/package.js index e37f54efb..a6853262b 100644 --- a/Packages/lesiontracker/package.js +++ b/Packages/lesiontracker/package.js @@ -199,6 +199,14 @@ Package.onUse(function(api) { api.addFiles('client/components/lastLoginModal/lastLoginModal.html', 'client'); api.addFiles('client/components/lastLoginModal/lastLoginModal.js', 'client'); + api.addFiles('client/components/basic/confirmDeleteDialog/confirmDeleteDialog.html', 'client'); + api.addFiles('client/components/basic/confirmDeleteDialog/confirmDeleteDialog.styl', 'client'); + api.addFiles('client/components/basic/confirmDeleteDialog/confirmDeleteDialog.js', 'client'); + + api.addFiles('client/components/basic/emailVerification/emailVerification.html', 'client'); + api.addFiles('client/components/basic/emailVerification/emailVerification.styl', 'client'); + api.addFiles('client/components/basic/emailVerification/emailVerification.js', 'client'); + // Server functions api.addFiles('server/servers.js', 'server'); api.addFiles('server/publications.js', 'server'); diff --git a/Packages/viewerbase/client/components/basic/aboutModal/aboutModal.html b/Packages/viewerbase/client/components/basic/aboutModal/aboutModal.html new file mode 100644 index 000000000..54cad3b7b --- /dev/null +++ b/Packages/viewerbase/client/components/basic/aboutModal/aboutModal.html @@ -0,0 +1,94 @@ + \ No newline at end of file diff --git a/Packages/viewerbase/client/components/basic/aboutModal/aboutModal.js b/Packages/viewerbase/client/components/basic/aboutModal/aboutModal.js new file mode 100644 index 000000000..d6393a190 --- /dev/null +++ b/Packages/viewerbase/client/components/basic/aboutModal/aboutModal.js @@ -0,0 +1,5 @@ +Template.aboutModal.helpers({ + githubUrl() { + return 'https://github.com/OHIF/Viewers'; + } +}); diff --git a/Packages/viewerbase/client/components/basic/aboutModal/aboutModal.styl b/Packages/viewerbase/client/components/basic/aboutModal/aboutModal.styl new file mode 100644 index 000000000..6df9f2012 --- /dev/null +++ b/Packages/viewerbase/client/components/basic/aboutModal/aboutModal.styl @@ -0,0 +1,24 @@ +@import "{design}/app" + +#aboutModal + .logo + .logoText + display: inline-block + font-family: $logoFontFamily + font-weight: $logoFontWeight + color: $textPrimaryColor + font-size: 20pt + line-height: 45px + text-decoration: none + + .logoImage + width: 45px + height: 45px + margin: 0 1rem + + .forkOnGithub + position: absolute + top: 0 + right: 0 + border: 0 + cursor: pointer diff --git a/Packages/viewerbase/package.js b/Packages/viewerbase/package.js index 510af9269..68f61f9dc 100644 --- a/Packages/viewerbase/package.js +++ b/Packages/viewerbase/package.js @@ -47,13 +47,9 @@ Package.onUse(function(api) { api.addFiles('client/components/basic/removableBackdrop/removableBackdrop.html', 'client'); api.addFiles('client/components/basic/removableBackdrop/removableBackdrop.styl', 'client'); - api.addFiles('client/components/basic/confirmDeleteDialog/confirmDeleteDialog.html', 'client'); - api.addFiles('client/components/basic/confirmDeleteDialog/confirmDeleteDialog.styl', 'client'); - api.addFiles('client/components/basic/confirmDeleteDialog/confirmDeleteDialog.js', 'client'); - - api.addFiles('client/components/basic/emailVerification/emailVerification.html', 'client'); - api.addFiles('client/components/basic/emailVerification/emailVerification.styl', 'client'); - api.addFiles('client/components/basic/emailVerification/emailVerification.js', 'client'); + api.addFiles('client/components/basic/aboutModal/aboutModal.html', 'client'); + api.addFiles('client/components/basic/aboutModal/aboutModal.js', 'client'); + api.addFiles('client/components/basic/aboutModal/aboutModal.styl', 'client'); // Study Browser components api.addFiles('client/components/studyBrowser/studyBrowser/studyBrowser.html', 'client');