Revert "LT-160: Create user accounts and require login for access by using active-entry package"
This reverts commit 3394b9ed64.
This commit is contained in:
parent
3394b9ed64
commit
4e38bbfa0b
@ -12,7 +12,7 @@ if (Meteor.isClient){
|
|||||||
destination: '/worklist'
|
destination: '/worklist'
|
||||||
},
|
},
|
||||||
themeColors: {
|
themeColors: {
|
||||||
primary: ""
|
primary: 'black'
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@ -4,19 +4,6 @@
|
|||||||
<img src="/images/logo.png">
|
<img src="/images/logo.png">
|
||||||
<h4 class="name">Open Health Imaging Foundation</h4>
|
<h4 class="name">Open Health Imaging Foundation</h4>
|
||||||
</a>
|
</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="#" id="logoutButton">Logout</a></li>
|
|
||||||
</ul>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{{/if}}
|
|
||||||
</div>
|
</div>
|
||||||
{{> yield}}
|
{{> yield}}
|
||||||
</template>
|
</template>
|
||||||
@ -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;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
@ -7,38 +7,32 @@
|
|||||||
@media only screen and (min-device-width : 375px) and (max-device-width : 667px) and (orientation : portrait)
|
@media only screen and (min-device-width : 375px) and (max-device-width : 667px) and (orientation : portrait)
|
||||||
width: 15%
|
width: 15%
|
||||||
|
|
||||||
#userProfile
|
.navbar-brand
|
||||||
position: relative
|
display: inline-block
|
||||||
float: right
|
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
|
color: #C1C1C1
|
||||||
|
@media only screen and (min-device-width : 375px) and (max-device-width : 667px) and (orientation : portrait)
|
||||||
.navbar-brand
|
font-size: 0.3em
|
||||||
display: inline-block
|
font-size: 0.3em
|
||||||
padding: 0
|
width: 50%;
|
||||||
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%;
|
|
||||||
|
|
||||||
|
|||||||
@ -28,21 +28,11 @@ var routerOptions = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
Router.route('/', function() {
|
Router.route('/', function() {
|
||||||
// Check user is logged in
|
this.render('worklist', routerOptions);
|
||||||
if (!Meteor.user() || !Meteor.userId()) {
|
|
||||||
this.render('entrySignIn', routerOptions);
|
|
||||||
} else{
|
|
||||||
this.render('worklist', routerOptions);
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
Router.route('/worklist', function() {
|
Router.route('/worklist', function() {
|
||||||
// Check user is logged in
|
this.render('worklist', routerOptions);
|
||||||
if (!Meteor.user() || !Meteor.userId()) {
|
|
||||||
this.render('entrySignIn', routerOptions);
|
|
||||||
} else{
|
|
||||||
this.render('worklist', routerOptions);
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
Router.route('/viewer/:_id', {
|
Router.route('/viewer/:_id', {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user