More study list styling

This commit is contained in:
Erik Ziegler 2016-06-09 11:21:21 +02:00
parent e0b459abd0
commit ee9ea4450d
8 changed files with 77 additions and 14 deletions

View File

@ -1,10 +1,12 @@
<template name="userAccountMenu"> <template name="userAccountMenu">
{{#if currentUser}} {{#if currentUser}}
<div id="userAccountMenu" class="dropdown"> <div id="userAccountMenu" class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <div class="dropdown-toggle noselect" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{{name}} {{currentPath}} | <i class="fa fa-cog fa-lg"></i> {{name}} {{currentPath}}
<span class="caret"></span> <div class="menuButton">
</a> <i class="fa fa-cog"></i> <span class="caret"></span>
</div>
</div>
<ul class="dropdown-menu dropdown-menu-right"> <ul class="dropdown-menu dropdown-menu-right">
{{#if showWorklistMenu}} {{#if showWorklistMenu}}
<li> <li>

View File

@ -45,6 +45,10 @@ Template.userAccountMenu.onRendered(function() {
this.autorun(function() { this.autorun(function() {
// Hook login/logout // Hook login/logout
var user = Meteor.user(); var user = Meteor.user();
if (!user) {
return;
}
var newUserId = user._id; var newUserId = user._id;
if (oldUserId === null && newUserId) { if (oldUserId === null && newUserId) {

View File

@ -6,10 +6,24 @@
.dropdown-toggle .dropdown-toggle
cursor: pointer cursor: pointer
line-height: 20px
font-weight: 400
font-size: 13px
text-decoration: none text-decoration: none
background-color: $primaryBackgroundColor background-color: $primaryBackgroundColor
color: $textSecondaryColor color: $textSecondaryColor
.menuButton
display: inline-block
padding-left: 5px
border-left: solid 1px #516873
.fa
color: #94a8b3
.caret
color: #516873
ul.dropdown-menu ul.dropdown-menu
li li
cursor: pointer cursor: pointer

View File

@ -1,5 +1,5 @@
<template name="loadingText"> <template name="loadingText">
<div class="loadingTextDiv"> <div class="loadingTextDiv">
<h5>Loading... <i class="fa fa-spinner fa-pulse"></i></h5> Loading... <i class="fa fa-spin fa-circle-o-notch fa-fw"></i>
</div> </div>
</template> </template>

View File

@ -1,5 +1,3 @@
.loadingTextDiv .loadingTextDiv
margin: 30px margin: 30px
text-align: center
h5
text-align: center

View File

@ -14,6 +14,10 @@ createStacks = function(study) {
// Define an empty array of stacks // Define an empty array of stacks
var stacks = []; var stacks = [];
if (!study.seriesList) {
return stacks;
}
// TODO: Split by multi-frame, modality, image size, etc // TODO: Split by multi-frame, modality, image size, etc
study.seriesList.forEach(function(series) { study.seriesList.forEach(function(series) {
// If the series has no instances, skip it // If the series has no instances, skip it

View File

@ -10,6 +10,8 @@
{{>worklistToolbar}} {{>worklistToolbar}}
</div> </div>
</div> </div>
<div class="theadBackground">
</div>
<div id="studyListContainer"> <div id="studyListContainer">
<table id="tblStudyList" class="worklistResult table noselect"> <table id="tblStudyList" class="worklistResult table noselect">
<thead> <thead>
@ -105,7 +107,7 @@
{{/if}} {{/if}}
{{#if showNotFoundMessage}} {{#if showNotFoundMessage}}
<h5 class="text-center">No Studies Found</h5> <div class="notFound">No matching results</div>
{{/if}} {{/if}}
</div> </div>
</template> </template>

View File

@ -8,6 +8,8 @@ $inputBackgroundColor = #2c363f
$inputPlaceholderColor = lightgray $inputPlaceholderColor = lightgray
$studyListToolbarHeight = 75px $studyListToolbarHeight = 75px
$theadBackgroundColor = #151a1f
$tablePadding = 80px
.studyListToolbar .studyListToolbar
height: $studyListToolbarHeight height: $studyListToolbarHeight
@ -36,16 +38,44 @@ $studyListToolbarHeight = 75px
padding: 0 10px padding: 0 10px
line-height: $studyListToolbarHeight line-height: $studyListToolbarHeight
.theadBackground
background-color: $theadBackgroundColor
width: 100%
height: 122px
position: absolute
z-index: 1
#studyListContainer #studyListContainer
padding: 0 $tablePadding
position: absolute
z-index: 2
.loadingTextDiv
color: $textSecondaryColor
font-size: 30px
font-weight: 200
.notFound
color: $textSecondaryColor
font-size: 30px
font-weight: 200
text-align: center
table#tblStudyList table#tblStudyList
thead thead
background-color: #151a1f background-color: $theadBackgroundColor
white-space: nowrap white-space: nowrap
border-bottom: solid 1px #6fbde2;
tr tr
th th
padding: 0 padding: 0
border-bottom: solid 1px #6fbde2
&:first-child
padding-left: $tablePadding
&:last-child
padding-right: $tablePadding
div.sortingCell div.sortingCell
display: inline-block display: inline-block
@ -56,7 +86,6 @@ $studyListToolbarHeight = 75px
color: $textPrimaryColor color: $textPrimaryColor
font-weight: 400 font-weight: 400
padding: 20px padding: 20px
background: #171717
span span
font-size: 15px font-size: 15px
@ -65,8 +94,12 @@ $studyListToolbarHeight = 75px
i i
margin: 0 5px margin: 0 5px
&:hover, &.active &:hover
background: #252525 color: $activeColor
&.active, &:active
color: $activeColor
input.worklist-search input.worklist-search
height: 34px height: 34px
@ -126,6 +159,12 @@ $studyListToolbarHeight = 75px
transition(all 0.1s ease) transition(all 0.1s ease)
&:first-child
padding-left: $tablePadding
&:last-child
padding-right: $tablePadding
&:hover, &:active, &.active &:hover, &:active, &.active
background-color: $hoverColor background-color: $hoverColor
color: white color: white