diff --git a/LesionTracker/activeEntry.js b/LesionTracker/activeEntry.js
index 595cd4890..a1413b8c8 100644
--- a/LesionTracker/activeEntry.js
+++ b/LesionTracker/activeEntry.js
@@ -12,7 +12,7 @@ if (Meteor.isClient){
destination: '/worklist'
},
themeColors: {
- primary: ""
+ primary: 'black'
}
});
}
diff --git a/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.html b/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.html
index 58b0f4a4c..a7116b58c 100644
--- a/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.html
+++ b/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.html
@@ -4,19 +4,6 @@
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
deleted file mode 100644
index cfc269744..000000000
--- a/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.js
+++ /dev/null
@@ -1,13 +0,0 @@
-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 45b6d6535..bf8fd3071 100644
--- a/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.styl
+++ b/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.styl
@@ -7,38 +7,32 @@
@media only screen and (min-device-width : 375px) and (max-device-width : 667px) and (orientation : portrait)
width: 15%
- #userProfile
- position: relative
- float: right
+.navbar-brand
+ display: inline-block
+ padding: 0
+ margin-right: 5px
+ height: 100%
+ width: 100%
- .dropdown-toggle
+ 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
-
- .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%;
+ @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 eeb88b991..85846aea1 100644
--- a/LesionTracker/client/routes.js
+++ b/LesionTracker/client/routes.js
@@ -28,21 +28,11 @@ var routerOptions = {
};
Router.route('/', function() {
- // Check user is logged in
- if (!Meteor.user() || !Meteor.userId()) {
- this.render('entrySignIn', routerOptions);
- } else{
- this.render('worklist', routerOptions);
- }
+ this.render('worklist', routerOptions);
});
Router.route('/worklist', function() {
- // Check user is logged in
- if (!Meteor.user() || !Meteor.userId()) {
- this.render('entrySignIn', routerOptions);
- } else{
- this.render('worklist', routerOptions);
- }
+ this.render('worklist', routerOptions);
});
Router.route('/viewer/:_id', {