diff --git a/LesionTracker/.meteor/packages b/LesionTracker/.meteor/packages index 4b378512b..d2458cc0b 100644 --- a/LesionTracker/.meteor/packages +++ b/LesionTracker/.meteor/packages @@ -63,5 +63,5 @@ aldeed:collection2 zuuk:stale-session dangrossman:bootstrap-daterangepicker johdirr:meteor-git-rev -u2622:persistent-session@0.4.4 +cultofcoders:persistent-session@0.4.4 shell-server@0.3.0 diff --git a/LesionTracker/.meteor/versions b/LesionTracker/.meteor/versions index d36d9d99b..744d9f2d8 100644 --- a/LesionTracker/.meteor/versions +++ b/LesionTracker/.meteor/versions @@ -27,6 +27,7 @@ clinical:fonts@1.1.6 clinical:hipaa-audit-log@2.4.2 clinical:hipaa-logger@1.3.0 clinical:theming@0.4.10 +cultofcoders:persistent-session@0.4.5 dangrossman:bootstrap-daterangepicker@2.1.13 ddp@1.4.0 ddp-client@2.2.0 @@ -137,7 +138,6 @@ templating-runtime@1.3.2 templating-tools@1.1.2 tracker@1.1.3 twbs:bootstrap@3.3.6 -u2622:persistent-session@0.4.4 ui@1.0.13 underscore@1.0.10 url@1.1.0 diff --git a/LesionTracker/client/components/app/app.js b/LesionTracker/client/components/app/app.js index 5bbb8c794..f354fc4d7 100644 --- a/LesionTracker/client/components/app/app.js +++ b/LesionTracker/client/components/app/app.js @@ -12,19 +12,19 @@ Template.app.onCreated(() => { action: OHIF.user.audit, text: 'View Audit Log', iconClasses: 'log', - iconSvgUse: 'packages/ohif_user-management/assets/user-menu-icons.svg#log', + iconSvgUse: 'packages/ohif_viewerbase/assets/icons.svg#log', separatorAfter: true }, { action: () => OHIF.ui.showDialog('themeSelectorModal'), text: 'Themes', iconClasses: 'theme', - iconSvgUse: 'packages/ohif_user-management/assets/user-menu-icons.svg#theme', + iconSvgUse: 'packages/ohif_viewerbase/assets/icons.svg#theme', separatorAfter: true }, { action: () => OHIF.ui.showDialog('serverInformationModal'), text: 'Server Information', iconClasses: 'server', - iconSvgUse: 'packages/ohif_user-management/assets/user-menu-icons.svg#server', + iconSvgUse: 'packages/ohif_viewerbase/assets/icons.svg#server', separatorAfter: true }, { action: () => OHIF.ui.showDialog('userPreferencesDialog'), @@ -35,12 +35,12 @@ Template.app.onCreated(() => { action: OHIF.user.changePassword, text: 'Change Password', iconClasses: 'password', - iconSvgUse: 'packages/ohif_user-management/assets/user-menu-icons.svg#password' + iconSvgUse: 'packages/ohif_viewerbase/assets/icons.svg#password' }, { action: OHIF.user.logout, text: 'Logout', iconClasses: 'logout', - iconSvgUse: 'packages/ohif_user-management/assets/user-menu-icons.svg#logout' + iconSvgUse: 'packages/ohif_viewerbase/assets/icons.svg#logout' }]); instance.autorun(() => { diff --git a/LesionTracker/client/components/userPreferences/dialog.html b/LesionTracker/client/components/userPreferences/dialog.html deleted file mode 100644 index d04279ede..000000000 --- a/LesionTracker/client/components/userPreferences/dialog.html +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/OHIFViewer/.meteor/packages b/OHIFViewer/.meteor/packages index 0772d6074..a3916dd92 100644 --- a/OHIFViewer/.meteor/packages +++ b/OHIFViewer/.meteor/packages @@ -49,5 +49,5 @@ aldeed:simple-schema # Third party package to deal with schemas aldeed:template-extension gilbertwat:bootstrap3-daterangepicker johdirr:meteor-git-rev -u2622:persistent-session@0.4.4 +cultofcoders:persistent-session shell-server@0.3.0 diff --git a/OHIFViewer/.meteor/versions b/OHIFViewer/.meteor/versions index ba968f809..aa5b8a5ca 100644 --- a/OHIFViewer/.meteor/versions +++ b/OHIFViewer/.meteor/versions @@ -20,6 +20,7 @@ caching-compiler@1.1.9 caching-html-compiler@1.1.2 callback-hook@1.0.10 check@1.2.5 +cultofcoders:persistent-session@0.4.5 dangrossman:bootstrap-daterangepicker@2.1.13 ddp@1.4.0 ddp-client@2.2.0 @@ -120,7 +121,6 @@ templating-runtime@1.3.2 templating-tools@1.1.2 tracker@1.1.3 twbs:bootstrap@3.3.6 -u2622:persistent-session@0.4.4 ui@1.0.13 underscore@1.0.10 url@1.1.0 diff --git a/OHIFViewer/client/components/ohifViewer/ohifViewer.js b/OHIFViewer/client/components/ohifViewer/ohifViewer.js index ac8bd7677..95a5c8285 100644 --- a/OHIFViewer/client/components/ohifViewer/ohifViewer.js +++ b/OHIFViewer/client/components/ohifViewer/ohifViewer.js @@ -13,6 +13,12 @@ Template.ohifViewer.onCreated(() => { text: 'Server Information', icon: 'fa fa-server fa-lg', separatorAfter: true + }, { + action: () => OHIF.ui.showDialog('themeSelectorModal'), + text: 'Themes', + iconClasses: 'theme', + iconSvgUse: 'packages/ohif_viewerbase/assets/icons.svg#theme', + separatorAfter: false }, { action: () => OHIF.ui.showDialog('userPreferencesDialog'), text: 'Preferences', diff --git a/OHIFViewer/client/components/userPreferences/dialog.js b/OHIFViewer/client/components/userPreferences/dialog.js deleted file mode 100644 index 4a0366d41..000000000 --- a/OHIFViewer/client/components/userPreferences/dialog.js +++ /dev/null @@ -1,22 +0,0 @@ -import { Template } from 'meteor/templating'; -import { ReactiveVar } from 'meteor/reactive-var'; - -Template.userPreferencesDialog.onCreated(() => { - const instance = Template.instance(); - instance.activeTab = new ReactiveVar('hotkeys'); -}); - -Template.userPreferencesDialog.events({ - 'click .nav-tabs li a'(event, instance) { - const tabId = $(event.currentTarget).attr('data-id'); - instance.activeTab.set(tabId); - } -}); - -Template.userPreferencesDialog.helpers({ - tabClasses(tabId) { - const instance = Template.instance(); - const activeTab = instance.activeTab.get(); - return tabId === activeTab ? 'active' : ''; - } -}); diff --git a/OHIFViewer/client/components/userPreferences/dialog.styl b/OHIFViewer/client/components/userPreferences/dialog.styl deleted file mode 100644 index 5fc0a8366..000000000 --- a/OHIFViewer/client/components/userPreferences/dialog.styl +++ /dev/null @@ -1,79 +0,0 @@ -@require '{ohif:design}/app' - -.dialog-user-preferences - - .modal-body - overflow: hidden - - .form-content - theme('border-bottom', '1px solid $uiBorderColor') - margin-bottom: 10px - margin-left: -15px - margin-right: -15px - max-height: 70vh - overflow-y: auto - padding: 15px - - .popover - width: 300px - - .nav-tabs - border-bottom: 0 - margin-bottom: 3px - position: relative - z-index: 1 - - &>li - font-size: 14px - font-weight: normal - height: 40px - line-height: 40px - margin-bottom: 0 - - &>a - display: block - width: 100% - line-height: inherit - margin: 0 - height: inherit - padding: 0 10px 0 10px - - &:after - background-color: transparent - bottom: -3px - content: ' ' - display: block - height: 3px - transition(background-color 0.3s ease) - width: 100% - - &>a, &.active>a - &, &:hover, &:active, &:focus - theme('color', '$activeColor') - background-color: transparent - border: 0 - - &.active>a - font-weight: bold - - &:after - theme('background-color', '$activeColor') - - .form-themed - - table - color: #fff - - th, td - font-size: 14px - font-weight: 300 - - th - line-height: 60px - - td - line-height: 20px - - - input[type=text] - font-weight: 300 diff --git a/Packages/ohif-design/components/roundedButtonGroup/roundedButtonGroup.styl b/Packages/ohif-design/components/roundedButtonGroup/roundedButtonGroup.styl index aaafcd153..250b166ea 100644 --- a/Packages/ohif-design/components/roundedButtonGroup/roundedButtonGroup.styl +++ b/Packages/ohif-design/components/roundedButtonGroup/roundedButtonGroup.styl @@ -32,7 +32,7 @@ $height = 25px padding: 0 22px position: relative text-transform: uppercase - transition: transition($sidebarTransition) + transition($sidebarTransition) z-index: 1 svg diff --git a/Packages/ohif-design/styles/common/form.styl b/Packages/ohif-design/styles/common/form.styl index 83c12d01c..2a74c83a3 100644 --- a/Packages/ohif-design/styles/common/form.styl +++ b/Packages/ohif-design/styles/common/form.styl @@ -76,3 +76,19 @@ label.wrapperLabel:not(.checkboxLabel) &.select2-container--open span.select2-selection span.select2-selection__arrow theme('background-color', '$uiGrayDark') theme('color', '$textPrimaryColor') + + .form-control + background-color: #FFFFFF + border: 0 + border-radius(2px) + font-size: 14px + height: 30px + line-height: 16px + padding: 8px 9px 6px + + &:focus + theme('box-shadow', '0 0 0 2px $activeColor !important') + + .form-themed .form-control + theme('box-shadow', '0 0 0 1px $uiBorderColor') + diff --git a/Packages/ohif-design/styles/common/global.styl b/Packages/ohif-design/styles/common/global.styl index 2bc546d45..953b1acc1 100644 --- a/Packages/ohif-design/styles/common/global.styl +++ b/Packages/ohif-design/styles/common/global.styl @@ -1,8 +1,10 @@ -@require '{ohif:design}/app' +@import '{ohif:design}/app' html body theme('background-color', '$primaryBackgroundColor') font-family: 'Roboto', 'OpenSans', 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif + -webkit-backface-visibility: hidden // Prevent Chrome from shifting parent elements on transform + font-family: Roboto html body.stretch height: 100% @@ -105,15 +107,62 @@ body .select2-container--default .select2-results>.select2-results__options .modal-dialog .modal-content - theme('background', '$primaryBackgroundColor') + theme('background-color', '$uiGrayDarker') theme('border-color', '$uiBorderColor') theme('color', '$textSecondaryColor') + border-radius(6px) + border: 0 .modal-header, .modal-footer theme('border-color', '$uiBorderColor') - &:hover + .dialog-separator, + .dialog-separator-before, + .dialog-separator-after + position: relative + + .dialog-separator:before, + .dialog-separator:after, + .dialog-separator-before:before, + .dialog-separator-after:after + background-color: #000000 + box-shadow(-50px 0 0 #000000\, 50px 0 0 #000000) + content: ' ' + display: block + height: 3px + left: 0 + position: absolute + width: 100% + + .dialog-separator:before, + .dialog-separator-before:before + top: -3px + + .dialog-separator:after, + .dialog-separator-after:after + bottom: -3px + + .modal-body theme('color', '$textPrimaryColor') + padding: 16px 22px 25px + position: relative + + .modal-header + border-bottom-width: 3px + border-bottom-style: solid + border-bottom-color: #000000 + padding: 19px 22px 17px + position: relative + + h4 + theme('color', '$textSecondaryColor') + font-size: 20px + font-weight: 500 + line-height: 24px + padding-right: 24px + + .modal-footer + border-top: 0 .card-round theme('background-color', '$uiGrayDark') @@ -199,3 +248,109 @@ body .select2-container--default .select2-results>.select2-results__options .nowrap white-space: nowrap + +.themed + table + theme('color', '$textPrimaryColor') + + th, td + font-size: 15px + font-weight: normal + + th + line-height: 60px + + td + line-height: 18px + + .btn + border: 0 + border-radius(4px) + font-size: 15px + font-weight: normal + height: 37px + line-height: 37px + padding: 0 12px + + &.btn-primary, &.btn-secondary + color: #000000 + + &:hover, &:active, &:focus, &:focus:active + color: #000000 + + &.btn-primary, &.btn-secondary, &.btn-danger + transition(background-color 0.3s ease) + + &.btn-primary + theme('background-color', '$activeColor') + + &:hover, &:active, &:focus, &:focus:active + theme('background-color', '$activeColor', 0.8) + + &.btn-secondary + theme('background-color', '$textSecondaryColor') + + &:hover, &:active, &:focus, &:focus:active + theme('background-color', '$textSecondaryColor', 0.8) + + &.btn-danger + theme('background-color', '$destructiveColor') + theme('color', '$textPrimaryColor') + + &:hover, &:active, &:focus, &:focus:active + theme('color', '$textPrimaryColor') + theme('background-color', '$destructiveColor', 0.8) + + &.active + box-shadow(inset 1px 1px 2px rgba(0, 0, 0, 0.5)) + + .wrapperLabel .wrapperText + theme('color', '$textPrimaryColor') + font-size: 14px + font-weight: bold + line-height: 16px + + &:not(:empty) + margin-bottom: 13px + + .nav-tabs + border-bottom: 0 + margin-bottom: 3px + position: relative + z-index: 1 + + &>li + font-size: 14px + font-weight: normal + height: 40px + line-height: 40px + margin-bottom: 0 + + &>a + display: block + width: 100% + line-height: inherit + margin: 0 + height: inherit + padding: 0 10px 0 10px + + &:after + background-color: transparent + bottom: -3px + content: ' ' + display: block + height: 3px + transition(background-color 0.3s ease) + width: 100% + + &>a, &.active>a + &, &:hover, &:active, &:focus + theme('color', '$activeColor') + background-color: transparent + border: 0 + + &.active>a + font-weight: bold + + &:after + theme('background-color', '$activeColor') diff --git a/Packages/ohif-hanging-protocols/client/components/protocolEditor/protocolEditor.styl b/Packages/ohif-hanging-protocols/client/components/protocolEditor/protocolEditor.styl index 35ba0d28d..e339d7538 100644 --- a/Packages/ohif-hanging-protocols/client/components/protocolEditor/protocolEditor.styl +++ b/Packages/ohif-hanging-protocols/client/components/protocolEditor/protocolEditor.styl @@ -42,14 +42,14 @@ $height = 20px theme('background-color', '$uiGrayDark') theme('border', '2px solid $uiBorderColorDark') theme('color', '$textSecondaryColor') - transition: transition($sidebarTransition) + transition($sidebarTransition) border-radius: $height &.active a theme('background-color', '$activeColor') theme('border-color', '$uiBorderColorActive') theme('color', '$textColorActive') - transition: transition($sidebarTransition) + transition($sidebarTransition) p h2 diff --git a/Packages/ohif-hotkeys/package.js b/Packages/ohif-hotkeys/package.js index 746d6b686..e4071ef3d 100644 --- a/Packages/ohif-hotkeys/package.js +++ b/Packages/ohif-hotkeys/package.js @@ -19,7 +19,7 @@ Package.onUse(function(api) { 'reactive-var', 'session', 'iron:router', - 'u2622:persistent-session' + 'cultofcoders:persistent-session' ]); // OHIF dependencies diff --git a/Packages/ohif-themes-common/client/components/themeSelectorModal/themeSelectorModal.html b/Packages/ohif-themes-common/client/components/themeSelectorModal/themeSelectorModal.html index d3aafde80..b138941a2 100644 --- a/Packages/ohif-themes-common/client/components/themeSelectorModal/themeSelectorModal.html +++ b/Packages/ohif-themes-common/client/components/themeSelectorModal/themeSelectorModal.html @@ -1,6 +1,6 @@ diff --git a/StandaloneViewer/StandaloneViewer/client/components/toolbarSection/toolbarSection.js b/StandaloneViewer/StandaloneViewer/client/components/toolbarSection/toolbarSection.js index 611f0fc38..1c0473ff1 100644 --- a/StandaloneViewer/StandaloneViewer/client/components/toolbarSection/toolbarSection.js +++ b/StandaloneViewer/StandaloneViewer/client/components/toolbarSection/toolbarSection.js @@ -37,13 +37,6 @@ Template.toolbarSection.helpers({ iconClasses: 'fa fa-crosshairs' }); - extraTools.push({ - id: 'stackScroll', - title: 'Stack Scroll', - classes: 'imageViewerTool', - iconClasses: 'fa fa-bars' - }); - extraTools.push({ id: 'magnify', title: 'Magnify', @@ -116,6 +109,13 @@ Template.toolbarSection.helpers({ const buttonData = []; + buttonData.push({ + id: 'stackScroll', + title: 'Stack Scroll', + classes: 'imageViewerTool', + iconClasses: 'fa fa-bars' + }); + buttonData.push({ id: 'zoom', title: 'Zoom', diff --git a/StandaloneViewer/StandaloneViewer/client/headerItems.js b/StandaloneViewer/StandaloneViewer/client/headerItems.js new file mode 100644 index 000000000..bb63de639 --- /dev/null +++ b/StandaloneViewer/StandaloneViewer/client/headerItems.js @@ -0,0 +1,14 @@ +import { OHIF } from 'meteor/ohif:core'; + +OHIF.header.dropdown.setItems([{ + action: () => OHIF.ui.showDialog('themeSelectorModal'), + text: 'Themes', + iconClasses: 'theme', + iconSvgUse: 'packages/ohif_viewerbase/assets/icons.svg#theme', + separatorAfter: false +}, { + action: () => OHIF.ui.showDialog('userPreferencesDialog'), + text: 'Preferences', + icon: 'fa fa-user', + separatorAfter: false +}]); diff --git a/StandaloneViewer/StandaloneViewer/package.json b/StandaloneViewer/StandaloneViewer/package.json index 60c1b9640..9906ab7a6 100644 --- a/StandaloneViewer/StandaloneViewer/package.json +++ b/StandaloneViewer/StandaloneViewer/package.json @@ -5,8 +5,8 @@ "start": "meteor run" }, "dependencies": { - "babel-runtime": "^6.23.0", - "cornerstone-web-image-loader": "^2.1.0", - "meteor-node-stubs": "^0.2.11" + "@babel/runtime": "^7.0.0-beta.51", + "core-js": "^2.5.7", + "cornerstone-web-image-loader": "^2.1.0" } }