AWV-3: Adding next and previous display set buttons for CINE dialog

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

@@ -21,6 +21,7 @@ import './mixins/select2.js';
 import './mixins/selectTree.js';
 
 // Templates
+import './templates/button.html';
 import './templates/custom.html';
 import './templates/div.html';
 import './templates/form.html';
@@ -29,4 +30,4 @@ import './templates/select.html';
 
 // wrappers
 import './wrappers/label.html';
-import './wrappers/title.html';
+import './wrappers/labelContent.html';

Packages/ohif-core/client/components/base/templates/button.html

@@ -0,0 +1,11 @@
+<template name="baseButton">
+    <button
+        id="{{this.id}}"
+        class="{{this.class}}"
+        disabled="{{#if this.disabled}}disabled{{/if}}"
+        title="{{this.title}}"
+        {{this.tagAttributes}}
+    >
+        {{>UI.contentBlock}}
+    </button>
+</template>

Packages/ohif-core/client/components/base/templates/input.html

@@ -7,6 +7,7 @@
         value="{{reactive this.value}}"
         placeholder="{{this.placeholder}}"
         checked="{{#if this.checked}}checked{{/if}}"
+        disabled="{{#if this.disabled}}disabled{{/if}}"
         min="{{this.min}}"
         max="{{this.max}}"
         maxlength="{{choose this.maxlength this.max}}"

Packages/ohif-core/client/components/base/wrappers/label.html

@@ -1,11 +1,15 @@
 <template name="wrapperLabel">
-    <label class="wrapperLabel {{this.labelClass}}">
-        {{#if this.labelAfter}}
-            {{>UI.contentBlock}}
-        {{/if}}
-        <span class="wrapperText">{{>section 'labelBeforeText'}}{{reactive this.label}}{{>section 'labelAfterText'}}</span>
-        {{#unless this.labelAfter}}
-            {{>UI.contentBlock}}
-        {{/unless}}
-    </label>
+    {{#unless this.labelAsDiv}}
+        <label class="wrapperLabel {{this.labelClass}}">
+            {{#wrapperLabelContent}}
+                {{>UI.contentBlock}}
+            {{/wrapperLabelContent}}
+        </label>
+    {{else}}
+        <div class="wrapperLabel {{this.labelClass}}">
+            {{#wrapperLabelContent}}
+                {{>UI.contentBlock}}
+            {{/wrapperLabelContent}}
+        </div>
+    {{/unless}}
 </template>

Packages/ohif-core/client/components/base/wrappers/labelContent.html

@@ -0,0 +1,9 @@
+<template name="wrapperLabelContent">
+    {{#if this.labelAfter}}
+        {{>UI.contentBlock}}
+    {{/if}}
+    <span class="wrapperText">{{>section 'labelBeforeText'}}{{reactive this.label}}{{>section 'labelAfterText'}}</span>
+    {{#unless this.labelAfter}}
+        {{>UI.contentBlock}}
+    {{/unless}}
+</template>

Packages/ohif-core/client/components/base/wrappers/title.html

@@ -1,11 +0,0 @@
-<template name="wrapperTitle">
-    <div class="wrapperTitle {{this.labelClass}}">
-        {{#if this.labelAfter}}
-            {{>UI.contentBlock}}
-        {{/if}}
-        <span class="wrapperText">{{>section 'labelBeforeText'}}{{reactive this.label}}{{>section 'labelAfterText'}}</span>
-        {{#unless this.labelAfter}}
-            {{>UI.contentBlock}}
-        {{/unless}}
-    </div>
-</template>

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

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

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

@@ -1,3 +1,4 @@
+import './form/button.html';
 import './form/form.html';
 import './form/group.html';
 

Packages/ohif-core/client/components/bootstrap/input/groupRadio.html

@@ -3,9 +3,10 @@
         class=(concat 'group-radio ' this.class)
         mixins=(concat 'groupRadio ' this.mixins)
         wrappers=(concat ''
-            (valueIf reactive this.label 'wrapperTitle ' '')
+            (valueIf reactive this.label 'wrapperLabel ' '')
             this.wrappers
         )
+        labelAsDiv=true
     )}}
         {{>UI.contentBlock}}
         {{#each item in (reactive this.items)}}

Packages/ohif-core/client/components/bootstrap/input/range.html

@@ -2,6 +2,7 @@
     {{#baseComponent (extend this
         base='baseInput'
         type='range'
+        class=(concat 'form-control ' this.class)
         mixins=(concat 'input ' this.mixins)
         wrappers=(concat ''
             (valueIf reactive this.label 'wrapperLabel ' '')