From c3afd068a45db8f2c4f4fbf90fd94c27247491c8 Mon Sep 17 00:00:00 2001
From: Bruno Alves de Faria <brunoalvesdefaria@gmail.com>
Date: Mon, 6 Mar 2017 12:00:08 -0300
Subject: [PATCH] Removing lastLoginModal from DOM

---
 LesionTracker/client/components/app/app.html  |  1 -
 LesionTracker/client/routes.js                |  1 -
 .../bootstrap/dialog/bootstrap.styl           | 16 ++++++++++++--
 .../components/bootstrap/dialog/form.html     | 13 ++---------
 .../components/bootstrap/dialog/header.html   | 16 ++++++++++++++
 .../components/bootstrap/dialog/simple.html   |  9 +-------
 .../components/bootstrap/dialog/simple.js     |  6 +++++
 .../client/components/bootstrap/index.js      |  1 +
 Packages/ohif-core/client/lib/blaze.js        |  1 +
 .../lastLoginModal/lastLoginModal.html        | 22 +++++++------------
 .../userAccountMenu/userAccountMenu.js        | 15 +++++--------
 11 files changed, 54 insertions(+), 47 deletions(-)
 create mode 100644 Packages/ohif-core/client/components/bootstrap/dialog/header.html

diff --git a/LesionTracker/client/components/app/app.html b/LesionTracker/client/components/app/app.html
index 96d4da791..9263a1b35 100644
--- a/LesionTracker/client/components/app/app.html
+++ b/LesionTracker/client/components/app/app.html
@@ -28,7 +28,6 @@
         <div class="tab-pane" id="viewerTab">
         </div>
     </div>
-    {{>lastLoginModal}}
     {{>progressDialog}}
     {{>viewSeriesDetailsModal}}
 </template>
diff --git a/LesionTracker/client/routes.js b/LesionTracker/client/routes.js
index bb63ffeea..0a86d8487 100644
--- a/LesionTracker/client/routes.js
+++ b/LesionTracker/client/routes.js
@@ -17,7 +17,6 @@ Router.onBeforeAction('loading');
 
 const data = {
     additionalTemplates: [
-        'lastLoginModal',
         'viewSeriesDetailsModal'
     ]
 };
diff --git a/Packages/ohif-core/client/components/bootstrap/dialog/bootstrap.styl b/Packages/ohif-core/client/components/bootstrap/dialog/bootstrap.styl
index d1128f095..695ad3731 100644
--- a/Packages/ohif-core/client/components/bootstrap/dialog/bootstrap.styl
+++ b/Packages/ohif-core/client/components/bootstrap/dialog/bootstrap.styl
@@ -1,2 +1,14 @@
-.modal .modal-footer:empty
-  display: none
+.modal
+  .modal-header:empty, .modal-footer:empty
+    display: none
+
+  .modal-blank
+
+    .modal-content
+      border: 0
+
+    .modal-header, .modal-footer
+      display: none
+
+    .modal-body
+      padding: 0
diff --git a/Packages/ohif-core/client/components/bootstrap/dialog/form.html b/Packages/ohif-core/client/components/bootstrap/dialog/form.html
index 04067c96e..7fa0d51e4 100644
--- a/Packages/ohif-core/client/components/bootstrap/dialog/form.html
+++ b/Packages/ohif-core/client/components/bootstrap/dialog/form.html
@@ -4,21 +4,12 @@
             {{#form class='modal-content' hideValidationBox=true
                 api=(extend instance.api instance.data.api) schema=this.schema
             }}
-                <div class="modal-header">
-                    {{#button class='close' action='cancel'
-                        tagAttributes=(extend this.tagAttributes
-                            data-dismiss='modal' aria-label='Close'
-                        )
-                    }}<span aria-hidden="true">&times;</span>{{/button}}
-                    <h4 class="modal-title">
-                        {{#if this.titleIcon}}<i class="{{this.titleIcon}}"></i>{{/if}}
-                        <span>{{this.title}}</span>
-                    </h4>
-                </div>
+                {{>dialogHeader this}}
                 <div class="modal-body">
                     {{>UI.contentBlock}}
                 </div>
                 <div class="modal-footer">
+                    {{>section 'dialogFooter'}}
                     {{#button action='cancel'
                         class=(concat 'btn btn-cancel ' (choose this.cancelClass 'btn-default'))
                         tagAttributes=(extend this.tagAttributes data-dismiss='modal')
diff --git a/Packages/ohif-core/client/components/bootstrap/dialog/header.html b/Packages/ohif-core/client/components/bootstrap/dialog/header.html
new file mode 100644
index 000000000..4ad0a6c4f
--- /dev/null
+++ b/Packages/ohif-core/client/components/bootstrap/dialog/header.html
@@ -0,0 +1,16 @@
+<template name="dialogHeader">
+    <div class="modal-header">
+        {{>section 'dialogHeader'}}
+        {{#if this.title}}
+            {{#button class='close' action='cancel'
+                tagAttributes=(extend this.tagAttributes
+                    data-dismiss='modal' aria-label='Close'
+                )
+            }}<span aria-hidden="true">&times;</span>{{/button}}
+            <h4 class="modal-title">
+                {{#if this.titleIcon}}<i class="{{this.titleIcon}}"></i>{{/if}}
+                <span>{{this.title}}</span>
+            </h4>
+        {{/if}}
+    </div>
+</template>
diff --git a/Packages/ohif-core/client/components/bootstrap/dialog/simple.html b/Packages/ohif-core/client/components/bootstrap/dialog/simple.html
index 9b4b61be4..b2b814da9 100644
--- a/Packages/ohif-core/client/components/bootstrap/dialog/simple.html
+++ b/Packages/ohif-core/client/components/bootstrap/dialog/simple.html
@@ -2,14 +2,7 @@
     <div id="{{this.id}}" class="modal fade" tabindex="-1" role="dialog">
         <div class="modal-dialog {{this.dialogClass}}" role="document">
             <div class="modal-content">
-                <div class="modal-header">
-                    {{#button class='close' action='cancel'
-                        tagAttributes=(extend this.tagAttributes
-                            data-dismiss='modal' aria-label='Close'
-                        )
-                    }}<span aria-hidden="true">&times;</span>{{/button}}
-                    <h4 class="modal-title">{{this.title}}</h4>
-                </div>
+                {{>dialogHeader this}}
                 <div class="modal-body">
                     {{>UI.contentBlock}}
                 </div>
diff --git a/Packages/ohif-core/client/components/bootstrap/dialog/simple.js b/Packages/ohif-core/client/components/bootstrap/dialog/simple.js
index 25debff5a..f44cb2cb9 100644
--- a/Packages/ohif-core/client/components/bootstrap/dialog/simple.js
+++ b/Packages/ohif-core/client/components/bootstrap/dialog/simple.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
 import { _ } from 'meteor/underscore';
 import { OHIF } from 'meteor/ohif:core';
@@ -9,6 +10,11 @@ Template.dialogSimple.onCreated(() => {
         const $modal = instance.$('.modal');
         $modal.on('hidden.bs.modal', () => instance.data.promiseResolve()).modal('hide');
     };
+
+    // Automatically close the modal if a timeout value was given
+    if (instance.data.timeout) {
+        Meteor.setTimeout(instance.close, instance.data.timeout);
+    }
 });
 
 Template.dialogSimple.onRendered(() => {
diff --git a/Packages/ohif-core/client/components/bootstrap/index.js b/Packages/ohif-core/client/components/bootstrap/index.js
index 8cf23160d..ef8169b87 100644
--- a/Packages/ohif-core/client/components/bootstrap/index.js
+++ b/Packages/ohif-core/client/components/bootstrap/index.js
@@ -1,6 +1,7 @@
 import './dialog/confirm.html';
 import './dialog/form.html';
 import './dialog/form.js';
+import './dialog/header.html';
 import './dialog/info.html';
 import './dialog/info.js';
 import './dialog/loading.html';
diff --git a/Packages/ohif-core/client/lib/blaze.js b/Packages/ohif-core/client/lib/blaze.js
index d5357df54..64a4a2ed8 100644
--- a/Packages/ohif-core/client/lib/blaze.js
+++ b/Packages/ohif-core/client/lib/blaze.js
@@ -46,6 +46,7 @@ OHIF.blaze.getParentTemplateView = view => {
     let currentView = view;
     while (currentView) {
         currentView = currentView.originalParentView || currentView.parentView;
+        if (!currentView || !currentView.name) return;
         if (currentView.name.indexOf('Template.') > -1) {
             return currentView;
         }
diff --git a/Packages/ohif-user-management/client/components/lastLoginModal/lastLoginModal.html b/Packages/ohif-user-management/client/components/lastLoginModal/lastLoginModal.html
index 4b15781fb..4c273d192 100644
--- a/Packages/ohif-user-management/client/components/lastLoginModal/lastLoginModal.html
+++ b/Packages/ohif-user-management/client/components/lastLoginModal/lastLoginModal.html
@@ -1,16 +1,10 @@
 <template name="lastLoginModal">
-    <div class="modal fade">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-body" style="padding: 0;">
-                    <div class="alert alert-info" style="margin: 0 auto;">
-                        <a href="#" class="close" data-dismiss="modal">&times;</a>
-                        {{#if lastLoginDate}}
-                            <h5>You last logged in on <strong>{{lastLoginDate}}</strong></h5>
-                        {{/if}}
-                    </div>
-                </div>
-            </div>
+    {{#dialogSimple (extend this dialogClass='modal-blank')}}
+        <div class="alert alert-info" style="margin: 0 auto;">
+            <a href="#" class="close" data-dismiss="modal">&times;</a>
+            {{#if lastLoginDate}}
+                <h5>You last logged in on <strong>{{lastLoginDate}}</strong></h5>
+            {{/if}}
         </div>
-    </div>
-</template>
\ No newline at end of file
+    {{/dialogSimple}}
+</template>
diff --git a/Packages/ohif-user-management/client/components/userAccountMenu/userAccountMenu.js b/Packages/ohif-user-management/client/components/userAccountMenu/userAccountMenu.js
index 7988e42f8..90c2d16c2 100644
--- a/Packages/ohif-user-management/client/components/userAccountMenu/userAccountMenu.js
+++ b/Packages/ohif-user-management/client/components/userAccountMenu/userAccountMenu.js
@@ -111,16 +111,11 @@ Template.userAccountMenu.onCreated(function userAccountMenuCreated() {
             return;
         }
 
-        // Displaye the modal
-        Modal.show('lastLoginModal', {
-            lastLoginDate: lastLoginDate
-        });
-
-        // Hide the modal after 5sec
-        Meteor.setTimeout(() => {
-            Modal.hide('lastLoginModal');
-            Session.setPersistent('displayLastLoginModal', false);
-        }, 5000);
+        // Display the modal and hide it after 5 seconds
+        OHIF.ui.showDialog('lastLoginModal', {
+            lastLoginDate,
+            timeout: 5000
+        }).then(() => Session.setPersistent('displayLastLoginModal', false));
 
         // Log signin
         HipaaLogger.logEvent({