diff --git a/LesionTracker/activeEntry.js b/LesionTracker/activeEntry.js
index a1413b8c8..595cd4890 100644
--- a/LesionTracker/activeEntry.js
+++ b/LesionTracker/activeEntry.js
@@ -12,7 +12,7 @@ if (Meteor.isClient){
destination: '/worklist'
},
themeColors: {
- primary: 'black'
+ primary: ""
}
});
}
diff --git a/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.html b/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.html
index a7116b58c..58b0f4a4c 100644
--- a/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.html
+++ b/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.html
@@ -4,6 +4,19 @@
Open Health Imaging Foundation
+ {{#if currentUser}}
+
+ {{/if}}
{{> yield}}
\ No newline at end of file
diff --git a/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.js b/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.js
new file mode 100644
index 000000000..cfc269744
--- /dev/null
+++ b/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.js
@@ -0,0 +1,13 @@
+Template.layoutLesionTracker.events({
+ 'click #logoutButton': function() {
+ Meteor.logout(function(){
+ Router.go('/entrySignIn');
+ });
+ }
+});
+
+Template.layoutLesionTracker.helpers({
+ 'fullName': function() {
+ return Meteor.user().profile.fullName;
+ }
+});
\ No newline at end of file
diff --git a/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.styl b/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.styl
index bf8fd3071..45b6d6535 100644
--- a/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.styl
+++ b/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.styl
@@ -7,32 +7,38 @@
@media only screen and (min-device-width : 375px) and (max-device-width : 667px) and (orientation : portrait)
width: 15%
-.navbar-brand
- display: inline-block
- padding: 0
- margin-right: 5px
- height: 100%
- width: 100%
+ #userProfile
+ position: relative
+ float: right
- img
- height: 30px
- float: left
- margin-right: 10px
- 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
- margin-top: 10px
- margin-bottom: 10px
- margin-right: 5px
-
- h4.name
- float: left
- margin: 10px 0;
- font-family: "Sanchez"
+ .dropdown-toggle
color: #C1C1C1
- @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%;
+
+ .navbar-brand
+ display: inline-block
+ padding: 0
+ margin-right: 5px
+ height: 100%
+
+ img
+ height: 30px
+ float: left
+ margin-right: 10px
+ 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
+ margin-top: 10px
+ margin-bottom: 10px
+ margin-right: 5px
+
+ h4.name
+ float: left
+ margin: 10px 0;
+ font-family: "Sanchez"
+ color: #C1C1C1
+ @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%;
diff --git a/LesionTracker/client/routes.js b/LesionTracker/client/routes.js
index 85846aea1..eeb88b991 100644
--- a/LesionTracker/client/routes.js
+++ b/LesionTracker/client/routes.js
@@ -28,11 +28,21 @@ var routerOptions = {
};
Router.route('/', function() {
- this.render('worklist', routerOptions);
+ // Check user is logged in
+ if (!Meteor.user() || !Meteor.userId()) {
+ this.render('entrySignIn', routerOptions);
+ } else{
+ this.render('worklist', routerOptions);
+ }
});
Router.route('/worklist', function() {
- this.render('worklist', routerOptions);
+ // Check user is logged in
+ if (!Meteor.user() || !Meteor.userId()) {
+ this.render('entrySignIn', routerOptions);
+ } else{
+ this.render('worklist', routerOptions);
+ }
});
Router.route('/viewer/:_id', {