diff --git a/Packages/ohif-user-management/assets/user-menu-icons.svg b/Packages/ohif-user-management/assets/user-menu-icons.svg new file mode 100644 index 000000000..94ab5818c --- /dev/null +++ b/Packages/ohif-user-management/assets/user-menu-icons.svg @@ -0,0 +1,26 @@ + + + Theme + + + + Log + + + + Server + + + + Study List + + + + Logout + + + + Password + + + \ No newline at end of file diff --git a/Packages/ohif-user-management/client/components/userAccountMenu/userAccountMenu.html b/Packages/ohif-user-management/client/components/userAccountMenu/userAccountMenu.html index 5fc6684a8..84edddc51 100644 --- a/Packages/ohif-user-management/client/components/userAccountMenu/userAccountMenu.html +++ b/Packages/ohif-user-management/client/components/userAccountMenu/userAccountMenu.html @@ -11,37 +11,49 @@ {{#if showStudyListMenu}}
  • - Study List + + + Study List
  • {{else}}
  • - View Audit Log + + + View Audit Log
  • {{/if}}
  • - Themes + + + Themes
  • - Server Information + + + Server Information
  • - Change Password + + + Change Password
  • - Logout + + + Logout
  • diff --git a/Packages/ohif-user-management/client/components/userAccountMenu/userAccountMenu.styl b/Packages/ohif-user-management/client/components/userAccountMenu/userAccountMenu.styl index 1c3a9b0f4..619fc573d 100644 --- a/Packages/ohif-user-management/client/components/userAccountMenu/userAccountMenu.styl +++ b/Packages/ohif-user-management/client/components/userAccountMenu/userAccountMenu.styl @@ -1,5 +1,9 @@ @import "{design}/app" +$iconMargin = 5px +$iconWidth = 16px +$iconHeight = 16px + #userAccountMenu padding: 4px 0 height: 100% @@ -30,3 +34,29 @@ ul.dropdown-menu li cursor: pointer + + svg + margin-right: $iconMargin + width: $iconWidth + height: $iconHeight + text-align: center + + svg + display: inline-block + vertical-align: middle + + &.server + width: $iconWidth - 3 + height: $iconWidth - 3 + margin-right: $iconMargin + 2 + margin-left: 1px + + &.theme + width: $iconWidth + 2 + height: $iconWidth + 2 + margin-right: $iconMargin - 2 + + &.study-list + width: $iconWidth + 2 + height: $iconWidth + 2 + margin-right: $iconMargin - 2 diff --git a/Packages/ohif-user-management/package.js b/Packages/ohif-user-management/package.js index da9b44ae9..5bc332dff 100644 --- a/Packages/ohif-user-management/package.js +++ b/Packages/ohif-user-management/package.js @@ -25,6 +25,9 @@ Package.onUse(function(api) { api.use('ohif:core'); api.use('ohif:study-list'); + // Load icons + api.addAssets('assets/user-menu-icons.svg', 'client'); + api.addFiles('both/collections.js', ['client', 'server']); //api.addFiles('both/schema/reviewers.js', ['client', 'server']);