PWV-1: Migrating study association modal to the new structure

Packages/ohif-core/client/components/bootstrap/dialog/form.html

@@ -1,17 +1,19 @@
 <template name="dialogForm">
     <div id="{{this.id}}" class="modal fade" tabindex="-1" role="dialog">
         <div class="modal-dialog {{this.dialogClass}}" role="document">
-            {{#form class='modal-content' schema=this.schema hideValidationBox=true api=instance.api}}
+            {{#form class='modal-content' api=instance.api schema=this.schema hideValidationBox=true}}
                 <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    {{#button class='close' action='cancel' tagAttributes=(extend this.tagAttributes aria-label='Close')}}
+                        <span aria-hidden="true">&times;</span>
+                    {{/button}}
                     <h4 class="modal-title">{{this.title}}</h4>
                 </div>
                 <div class="modal-body">
                     {{>UI.contentBlock}}
                 </div>
                 <div class="modal-footer">
-                    {{#button class='btn-default' action='cancel'}}Cancel{{/button}}
-                    {{#button class='btn-primary' action='confirm'}}Confirm{{/button}}
+                    {{#button class='btn btn-default' action='cancel'}}{{choose this.cancelLabel 'Cancel'}}{{/button}}
+                    {{#button class='btn btn-primary' action='confirm'}}{{choose this.confirmLabel 'Confirm'}}{{/button}}
                 </div>
             {{/form}}
         </div>

Packages/ohif-core/client/components/bootstrap/dialog/form.js

@@ -36,7 +36,10 @@ Template.dialogForm.onRendered(() => {
 
     // Create the bootstrap modal
     const $modal = instance.$('.modal');
-    $modal.modal();
+    $modal.modal({
+        backdrop: 'static',
+        keyboard: false
+    });
 
     // Remove the created modal backdrop from DOM after promise is done
     const $backdrop = $modal.next('.modal-backdrop');

Packages/ohif-core/client/components/bootstrap/form/button.html

@@ -1,8 +1,7 @@
 <template name="button">
     {{#baseComponent (extend this
         base='baseButton'
-        class=(concat 'btn ' this.class)
-        mixins=(concat 'button ' this.mixins)
+        mixins=(concat 'button action ' this.mixins)
     )}}
         {{>UI.contentBlock}}
     {{/baseComponent}}

Packages/ohif-core/client/components/bootstrap/form/link.html

@@ -0,0 +1,8 @@
+<template name="link">
+    {{#baseComponent (extend this
+        base='baseLink'
+        mixins=(concat 'link action ' this.mixins)
+    )}}
+        {{>UI.contentBlock}}
+    {{/baseComponent}}
+</template>

Packages/ohif-core/client/components/bootstrap/index.js

@@ -6,6 +6,7 @@ import './dialog/login.js';
 import './form/button.html';
 import './form/form.html';
 import './form/group.html';
+import './form/link.html';
 
 import './input/checkbox.html';
 import './input/hidden.html';