Style and bug fixes related to active-entry and hipaaAuditLog integration

Packages/lesiontracker/client/components/lesionTrackerLayout/lesionTrackerLayout.html

@@ -1,26 +1,39 @@
 <template name="lesionTrackerLayout">
     <div class="logoContainer">
+        <div id="menu" class="row-fluid">
+            {{#if currentUser}}
+            <button type='button' class="btn btn-link dropdown-toggle" data-toggle="dropdown" id="userMenu">
+                {{fullName}} <span class="caret"></span>
+            </button>
+            <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="userMenu">
+                <li>
+                    <!-- TODO: Move this elsewhere in the Worklist? -->
+                    {{ >optionsButton }}
+                </li>
+                <li>
+                    <a href="audit" id="audit">
+                        <i class="fa fa-list-ul"></i> View Audit Log
+                    </a>
+                </li>
+                <li>
+                    <a href="changePassword" id="changePassword">
+                        <i class="fa fa-lock"></i> Change Password
+                    </a>
+                </li>
+                <li class="divider"></li>
+                <li>
+                    <a href="#" id="logoutButton">
+                        <i class="fa fa-power-off"></i>Logout
+                    </a>
+                </li>
+            </ul>
+            {{/if}}
+        </div>
         <a class="navbar-brand" href="http://ohif.org">
             <img src="/images/logo.png">
             <h4 class="name">Open Health Imaging Foundation</h4>
         </a>
-        {{#if currentUser}}
-            <div id="userProfile" class="row-fluid">
-                <div class="dropdown clearfix">
-                    <ul class="nav nav-pills pull-right">
-                        <li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" href="#">{{fullName}}<b class="caret"></b></a>
-                            <ul class="dropdown-menu pull-right">
-                                <li><a href="changePassword" id="changePassword"><i class="fa fa-lock"></i>Change Password</a></li>
-                                <li class="divider"></li>
-                                <li><a href="#" id="logoutButton"><i class="fa fa-power-off"></i>Logout</a></li>
-                            </ul>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        {{/if}}
     </div>
     {{> timeoutCountdownDialog}}
-    {{ >optionsButton }}
     {{ >yield }}
 </template>

Packages/lesiontracker/client/components/lesionTrackerLayout/lesionTrackerLayout.js

@@ -1,6 +1,8 @@
+Session.set('defaultSignInMessage', 'Tumor tracking in your browser.');
+
 Template.lesionTrackerLayout.events({
     'click #logoutButton': function() {
-        Meteor.logout(function(){
+        Meteor.logout(function() {
             Router.go('/entrySignIn');
         });
     },
@@ -10,7 +12,7 @@ Template.lesionTrackerLayout.events({
 });
 
 Template.lesionTrackerLayout.helpers({
-    'fullName': function() {
+    fullName: function() {
         return Meteor.user().profile.fullName;
     }
 });
@@ -18,27 +20,30 @@ Template.lesionTrackerLayout.helpers({
 Template.lesionTrackerLayout.onCreated(function() {
     // Show countdown dialog
     var handle;
-    $(document).on('TriggerOpenTimeoutCountdownDialog', function (e, leftTime) {
+    $(document).on('TriggerOpenTimeoutCountdownDialog', function(e, leftTime) {
         // TODO: Show modal dialog
         handle = setInterval(function() {
-            leftTime --;
+            leftTime--;
             // Set countdownDialogLeftTime session
-            Session.set("countdownDialogLeftTime", leftTime);
+            Session.set('countdownDialogLeftTime', leftTime);
+
             // Show dialog
-            if ($("#timeoutCountdownDialog").css("display") == "none") {
-                $("#timeoutCountdownDialog").css("display", "block");
+            var dialog = $('#timeoutCountdownDialog');
+            if (dialog.css('display') === 'none') {
+                dialog.css('display', 'block');
             }
         }, 1000);
 
     });
 
-    $(document).on('TriggerCloseTimeoutCountdownDialog', function (e) {
-        $("#timeoutCountdownDialog").css("display", "none");
+    $(document).on('TriggerCloseTimeoutCountdownDialog', function(e) {
+        var dialog = $('#timeoutCountdownDialog');
+        dialog.css('display', 'none');
         if (handle) {
             clearInterval(handle);
             // Close the dialog
-            $("#timeoutCountdownDialog").css("display", "none");
+            dialog.css('display', 'none');
 
         }
     });
-});
+});

Packages/lesiontracker/client/components/lesionTrackerLayout/lesionTrackerLayout.styl

@@ -1,19 +1,18 @@
 .logoContainer
-  position: absolute;
-  height: 40px;
-  top: 0;
-  right: 0;
-  color: white;
+  position: absolute
+  height: 40px
+  top: 0
+  right: 0
+  padding: 0 10px
+  color: white
   @media only screen and (min-device-width : 375px) and (max-device-width : 667px) and (orientation : portrait)
     width: 15%
 
-  #userProfile
+  #menu
     position: relative
     float: right
-
-    .nav-pills > li > a:hover, .nav .open > a, .nav .open > a:hover, .nav .open > a:focus
-      background-color: #eee
-      color: black
+    height: 100%
+    line-height: 40px
 
     .dropdown-menu > li > a:hover
       background-color: #eee
@@ -22,7 +21,10 @@
       margin-right: 5px
 
     .dropdown-toggle
-      color: #C1C1C1
+      color: white
+      height: 100%
+      font-size: 12pt
+      font-family: "Sanchez"
 
     .divider
       height: 2px
@@ -41,7 +43,7 @@
       height: 30px
       float: left
       margin-right: 10px
-      margin-top: 5px;
+      margin-top: 5px
       /* Media queries for iPhone6*/
       @media only screen and (min-device-width : 375px) and (max-device-width : 667px) and (orientation : portrait)
         height: 20px
@@ -51,11 +53,11 @@
 
     h4.name
       float: left
-      margin: 10px 0;
+      margin: 10px 0
       font-family: "Sanchez"
-      color: #C1C1C1
+      color: white
       @media only screen and (min-device-width : 375px) and (max-device-width : 667px) and (orientation : portrait)
         font-size: 0.3em
         font-size: 0.3em
-        width: 50%;
+        width: 50%