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

---
 LesionTracker/client/components/app/app.html  |  1 -
 LesionTracker/client/routes.js                |  4 +---
 .../components/ohifViewer/ohifViewer.html     |  1 -
 .../components/seriesDetailsModal/index.js    |  2 +-
 .../seriesDetailsModal.html                   |  5 +++++
 .../viewSeriesDetailsModal.html               | 20 -------------------
 .../studyContextMenu/studyContextMenu.js      |  4 +---
 7 files changed, 8 insertions(+), 29 deletions(-)
 create mode 100644 Packages/ohif-study-list/client/components/seriesDetailsModal/seriesDetailsModal.html
 delete mode 100644 Packages/ohif-study-list/client/components/seriesDetailsModal/viewSeriesDetailsModal.html

diff --git a/LesionTracker/client/components/app/app.html b/LesionTracker/client/components/app/app.html
index 9263a1b35..1b091dc4d 100644
--- a/LesionTracker/client/components/app/app.html
+++ b/LesionTracker/client/components/app/app.html
@@ -29,5 +29,4 @@
         </div>
     </div>
     {{>progressDialog}}
-    {{>viewSeriesDetailsModal}}
 </template>
diff --git a/LesionTracker/client/routes.js b/LesionTracker/client/routes.js
index 0a86d8487..2c9b9ea01 100644
--- a/LesionTracker/client/routes.js
+++ b/LesionTracker/client/routes.js
@@ -16,9 +16,7 @@ Router.configure({
 Router.onBeforeAction('loading');
 
 const data = {
-    additionalTemplates: [
-        'viewSeriesDetailsModal'
-    ]
+    additionalTemplates: []
 };
 
 const routerOptions = { data };
diff --git a/OHIFViewer/client/components/ohifViewer/ohifViewer.html b/OHIFViewer/client/components/ohifViewer/ohifViewer.html
index e18bab2d1..35a75d37c 100644
--- a/OHIFViewer/client/components/ohifViewer/ohifViewer.html
+++ b/OHIFViewer/client/components/ohifViewer/ohifViewer.html
@@ -41,5 +41,4 @@
     </div>
     {{>studylist}}
     {{>aboutModal}}
-    {{>viewSeriesDetailsModal}}
 </template>
diff --git a/Packages/ohif-study-list/client/components/seriesDetailsModal/index.js b/Packages/ohif-study-list/client/components/seriesDetailsModal/index.js
index b209c26b8..a751df312 100644
--- a/Packages/ohif-study-list/client/components/seriesDetailsModal/index.js
+++ b/Packages/ohif-study-list/client/components/seriesDetailsModal/index.js
@@ -1,4 +1,4 @@
-import './viewSeriesDetailsModal.html';
+import './seriesDetailsModal.html';
 
 import './seriesDetailsTable/seriesDetailsTable.html';
 import './seriesDetailsTable/seriesDetailsTable.styl';
diff --git a/Packages/ohif-study-list/client/components/seriesDetailsModal/seriesDetailsModal.html b/Packages/ohif-study-list/client/components/seriesDetailsModal/seriesDetailsModal.html
new file mode 100644
index 000000000..a50a132be
--- /dev/null
+++ b/Packages/ohif-study-list/client/components/seriesDetailsModal/seriesDetailsModal.html
@@ -0,0 +1,5 @@
+<template name="seriesDetailsModal">
+    {{#dialogSimple (extend this title='Series Details')}}
+        {{>seriesDetailsTable selectedStudies=this.selectedStudies}}
+    {{/dialogSimple}}
+</template>
diff --git a/Packages/ohif-study-list/client/components/seriesDetailsModal/viewSeriesDetailsModal.html b/Packages/ohif-study-list/client/components/seriesDetailsModal/viewSeriesDetailsModal.html
deleted file mode 100644
index f14e8e4cd..000000000
--- a/Packages/ohif-study-list/client/components/seriesDetailsModal/viewSeriesDetailsModal.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<template name="viewSeriesDetailsModal">
-    <div class="modal" id="viewSeriesDetailsModal" tabindex="-1" role="dialog" aria-labelledby="viewSeriesDetailsModalLabel">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title" id="associationModalLabel">Series Details</h4>
-                </div>
-                <div class="modal-body">
-                    {{> seriesDetailsTable
-                            selectedStudies=selectedStudies
-                    }}
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal" id='cancelAssociation'>Close</button>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
\ No newline at end of file
diff --git a/Packages/ohif-study-list/client/components/studyContextMenu/studyContextMenu.js b/Packages/ohif-study-list/client/components/studyContextMenu/studyContextMenu.js
index 33eeaddba..954ddddaa 100644
--- a/Packages/ohif-study-list/client/components/studyContextMenu/studyContextMenu.js
+++ b/Packages/ohif-study-list/client/components/studyContextMenu/studyContextMenu.js
@@ -67,9 +67,7 @@ function viewSeriesDetails() {
         return;
     }
 
-    Modal.show('viewSeriesDetailsModal', {
-        selectedStudies: selectedStudies
-    });
+    OHIF.ui.showDialog('seriesDetailsModal', { selectedStudies });
 }
 
 Template.studyContextMenu.events({