LT-67; OHIF-78: Merging server configuration and CINE dialog changes from downstream (Ascend)

OHIFViewer/.meteor/versions

@@ -1,3 +1,4 @@
+accounts-base@1.2.11
 aldeed:simple-schema@1.5.3
 aldeed:template-extension@4.0.0
 allow-deny@1.0.5
@@ -24,6 +25,7 @@ cornerstone@0.0.1
 ddp@1.2.5
 ddp-client@1.3.1
 ddp-common@1.2.6
+ddp-rate-limiter@1.0.5
 ddp-server@1.3.10
 deps@1.0.12
 design@0.0.1
@@ -51,6 +53,7 @@ johdirr:meteor-git-rev@0.0.4
 jquery@1.11.9
 launch-screen@1.0.12
 livedata@1.0.18
+localstorage@1.0.11
 logging@1.1.15
 mdg:validation-error@0.5.1
 meteor@1.2.17
@@ -78,12 +81,14 @@ practicalmeteor:chai@2.1.0_1
 practicalmeteor:loglevel@1.2.0_2
 promise@0.8.7
 random@1.0.10
+rate-limit@1.0.5
 reactive-dict@1.1.8
 reactive-var@1.0.10
 reload@1.1.10
 retry@1.0.8
 routepolicy@1.0.11
 rwatts:uuid@0.1.0
+service-configuration@1.0.10
 session@1.1.6
 shell-server@0.2.1
 silentcicero:jszip@0.0.4

OHIFViewer/client/components/ohifViewer/ohifViewer.html

@@ -11,19 +11,36 @@
                     Open Health Imaging Foundation
                 </div>
             </a>
-            {{ #if studyListToggleText }}
-            <a class="btn studyListLinkSection pull-left m-x-1 p-x-2 p-y-0 js-toggle-studyList">
-                {{studyListToggleText}}
-            </a>
-            {{ /if }}
-            <a class="btn pull-right p-y-0"
-               data-toggle="modal"
-               data-target="#aboutModal">
-                About
-            </a>
+            {{#if studyListToggleText}}
+                <a class="btn studyListLinkSection pull-left m-x-1 p-x-2 p-y-0 js-toggle-studyList">
+                    {{studyListToggleText}}
+                </a>
+            {{/if}}
+            <span class="pull-right">
+                <div class="dropdown">
+                    <div class="dropdown-toggle noselect clearfix" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        <span class="pull-left m-r-1">Options</span>
+                        <div class="menuButton pull-right"><span class="caret-down"></span></div>
+                    </div>
+                    <ul class="dropdown-menu dropdown-menu-right">
+                        <li>
+                            <a data-toggle="modal" data-target="#serverInformationModal">
+                                <i class="fa fa-server fa-lg"></i> Server Information
+                            </a>
+                        </li>
+                        <li role="separator" class="divider"></li>
+                        <li>
+                            <a data-toggle="modal" data-target="#aboutModal">
+                                <i class="fa fa-info"></i> About
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+            </span>
         </div>
     </div>
-    {{> worklist }}
-    {{> aboutModal }}
-    {{> viewSeriesDetailsModal }}
-</template>
+    {{>serverInformationModal}}
+    {{>worklist}}
+    {{>aboutModal}}
+    {{>viewSeriesDetailsModal}}
+</template>

OHIFViewer/client/components/ohifViewer/ohifViewer.js

@@ -1,3 +1,6 @@
+import { Template } from 'meteor/templating';
+import { Session } from 'meteor/session';
+
 const worklistContentId = 'worklistTab';
 let lastContentId;
 
@@ -39,7 +42,7 @@ Template.ohifViewer.helpers({
             return 'Study list';
         }
     },
-    
+
     onStudyList() {
         return (Session.get('activeContentId') === 'worklistTab');
     }

OHIFViewer/client/components/toolbarSection/toolbarSection.js

@@ -221,6 +221,10 @@ Template.toolbarSection.onRendered(function() {
 
     instance.$('#layout').dropdown();
 
+    if (OHIF.uiSettings.showCineDialogOnRendered) {
+        toggleCineDialog();
+    }
+
     // Set disabled/enabled tool buttons that are set in toolManager
     const states = toolManager.getToolDefaultStates();
     const disabledToolButtons = states.disabledToolButtons;