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..05436d7a9 --- /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; + } +}); diff --git a/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.styl b/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.styl index bf8fd3071..c21a9d6d6 100644 --- a/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.styl +++ b/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.styl @@ -7,12 +7,18 @@ @media only screen and (min-device-width : 375px) and (max-device-width : 667px) and (orientation : portrait) width: 15% -.navbar-brand + #userProfile + position: relative + float: right + + .dropdown-toggle + color: #C1C1C1 + + .navbar-brand display: inline-block padding: 0 margin-right: 5px height: 100% - width: 100% img height: 30px 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', {