LT-354: Converting to the new dialog/form structure

This commit is contained in:
Bruno Alves de Faria committed 2016-11-17 13:45:51 -02:00
1 parent b3b6f91bfe
commit 6e2bef5317
8 files changed
+52 -85

No files matched your search

+14 -17
View File
@@ -7,35 +7,32 @@
<svg class="logoImage">
<use xlink:href="/packages/ohif_viewerbase/assets/icons.svg#icon-ohif-logo"></use>
</svg>
<div class="logoText">
Open Health Imaging Foundation
</div>
<div class="logoText">Open Health Imaging Foundation</div>
</a>
{{ #if studyListToggleText }}
<a class="btn studyListLinkSection pull-left js-toggle-studyList" id="{{dasherize studyListToggleText}}-btn">
{{studyListToggleText}}
</a>
{{ /if }}
{{#if studyListToggleText}}
<a class="btn studyListLinkSection pull-left js-toggle-studyList" id="{{dasherize studyListToggleText}}-btn">
{{studyListToggleText}}
</a>
{{/if}}
<div class="userAccountSection pull-right">
{{>userAccountMenu}}
</div>
</div>
</div>
{{ >timeoutCountdownDialog }}
{{>timeoutCountdownDialog}}
<div id="studylistTabs" class="tab-content">
<div class="tab-pane active" id="studylistTab">
<div class="studylistContainer">
{{> studylistResult }}
{{>studylistResult}}
</div>
</div>
<div class="tab-pane" id="viewerTab">
</div>
</div>
{{ >optionsModal }}
{{ >serverInformationModal }}
{{ >confirmRemoveTimepointAssociation }}
{{ >lastLoginModal }}
{{ >progressDialog }}
{{ >viewSeriesDetailsModal }}
{{ >themeSelectorModal }}
{{>optionsModal}}
{{>serverInformationModal}}
{{>lastLoginModal}}
{{>progressDialog}}
{{>viewSeriesDetailsModal}}
{{>themeSelectorModal}}
</template>
+2 -3
View File
@@ -14,7 +14,6 @@ var data = {
additionalTemplates: [
'optionsModal',
'serverInformationModal',
'confirmRemoveTimepointAssociation',
'lastLoginModal',
'viewSeriesDetailsModal'
]
@@ -29,7 +28,7 @@ Router.route('/', function() {
if (Meteor.user() && Meteor.userId()) {
if (verifyEmail && Meteor.user().emails && !Meteor.user().emails[0].verified) {
this.render('emailVerification', routerOptions);
}
}
else {
const contentId = Session.get('activeContentId');
if(!contentId) {
@@ -38,7 +37,7 @@ Router.route('/', function() {
this.render('app', routerOptions);
}
}
}
else {
this.render('entrySignIn', routerOptions);
}