LIMS-1204: Remove log area from top of active visits

client/src/css/partials/_content.scss

@@ -19,6 +19,10 @@
 .content {
     padding-bottom: 1%;
 
+    .nopadding {
+        padding-bottom: 0%;
+    }
+
     & > h1 {
         padding: 10px 0;
         margin-bottom: 15px;
@@ -1506,13 +1510,6 @@ div.status {
     }
 }
 
-.status.three {
-    .webcam {
-        @mixin cols 3,0,0.5%;
-        float: left;
-    }
-}
-
 .oav {
     display: block;
     margin: auto;

client/src/js/modules/dc/datacollections.js

@@ -3,7 +3,6 @@ define(['marionette',
 
         'modules/dc/dclist',
         'modules/dc/views/samplechanger',
-        'modules/dc/views/dclog',
         'views/status',
 
         'views/search',
@@ -21,7 +20,7 @@ define(['marionette',
         'templates/dc/dclist.html',
         ],
 function(Marionette, Pages, DCListView,
-         SampleChanger, DCLogView, StatusView, Search, Filter, StackView, DialogView, QueueBuilderView, UserView, DewarsView, 
+         SampleChanger, StatusView, Search, Filter, StackView, DialogView, QueueBuilderView, UserView, DewarsView,
          ReprocessOverview,
          template) {
 
@@ -40,7 +39,6 @@ function(Marionette, Pages, DCListView,
         search: '.srch',
         type: '.type',
         sc: '.sc',
-        log: '.lg',
         status: '.st',
         use: '.usage',
     },
@@ -154,12 +152,6 @@ function(Marionette, Pages, DCListView,
             // Sample changer
             console.log('get sc', this.getOption('sampleChanger'))
             if (this.getOption('sampleChanger') && this.options.params.visit && !app.mobile()) this.sc.show(new SampleChanger({ visit: this.options.params.visit, dcs: this.collection, bl: this.model.get('BL') }))
-
-            // Log View
-            this.log.show(new DCLogView({ collection: this.collection }))
-
-            // Status Display
-
         }
 
         if (this.model && this.model.get('CAMS') == 1) {

client/src/js/templates/dc/dclist.html

@@ -50,7 +50,6 @@ <h1 class="message nou"><a class="button" href="/dc<% if (IS_VISIT) { %>/visit/<
 
     <div class="st"></div>
     <div class="sc"></div>
-    <div class="lg"></div>
 
     <div class="srch"></div>
     <div class="filter type"></div>

client/src/js/templates/status.html

@@ -1,11 +1,8 @@
-<h1 class="status"><%-BL%> Webcams &amp; Beamline Status</h1>
-<div class="status <% if (BL =='i02') { %>three<% } %>">
+<h1 class="status"><span class="showhide">Show</span> <%-BL%> Webcams &amp; Beamline Status <span class="arrows">&#11167;</span></h1>
+<div class="status">
     <div class="pvs"></div>
     <div class="streamed-pvs"></div>
 
     <div class="webcam"><img src="#" alt="webcam1" /></div>
     <div class="webcam"><img src="#" alt="webcam2" /></div>
-    <% if (BL =='i02') { %>
-	<div class="webcam"><img src="#" alt="webcam3" /></div>
-    <% } %>
-</div>
+</div>

client/src/js/templates/types/gen/dc/dclist.html

@@ -30,7 +30,6 @@ <h1 class="message nou"><a class="button" href="/dc<% if (IS_VISIT) { %>/visit/<
     <% if (IS_PJ) { %><h2>Processing Job</h2><% } %>
 
     <div class="st"></div>
-    <div class="lg"></div>
 
     <div class="srch clearfix"></div>
 

client/src/js/templates/types/xpdf/dc/dclist.html

@@ -22,11 +22,10 @@ <h1 class="message nou"><a class="button" href="/dc<% if (IS_VISIT) { %>/visit/<
     <% if (IS_PJ) { %><h2>Processing Job</h2><% } %>
 
     <div class="st"></div>
-    <div class="lg"></div>
 
     <div class="srch clearfix"></div>
 
     <div class="page_wrap one"></div>    
     <div class="data_collections"></div>
     <div class="page_wrap two"></div>
-
+

client/src/js/views/status.js

@@ -8,7 +8,7 @@ define(['marionette',
 
     return Marionette.LayoutView.extend({
         template: template,
-        className: 'content',
+        className: 'content nopadding',
         templateHelpers: function() {
             return {
                 BL: this.getOption('bl'),
@@ -22,11 +22,13 @@ define(['marionette',
 
         regions: {
             pvs: '.pvs',
-            'streamed-pvs': '.streamed-pvs'
+            'streamed-pvs': '.streamed-pvs',
         },
 
         ui: {
             status: 'div.status',
+            showhide: '.showhide',
+            arrows: '.arrows',
         },
 
         // Handler for the camera feed timeout function
@@ -39,6 +41,8 @@ define(['marionette',
 
             this.ui.status.slideToggle('fast', 'swing', function() {
                 if (self.ui.status.is(':visible')) {
+                    self.ui.showhide.html('Hide')
+                    self.ui.arrows.html('⮝')
                     self.pvs.show(new PVView({ bl: self.getOption('bl') }))
                     self['streamed-pvs'].show(new StreamedPVView({ bl: self.getOption('bl') }))
                     self.$el.find('.webcam img').each(function(i,w) {
@@ -59,6 +63,8 @@ define(['marionette',
                     if (self.timeoutHandler) {
                         clearTimeout(self.timeoutHandler)
                     }
+                    self.ui.showhide.html('Show')
+                    self.ui.arrows.html('⮟')
                     self.pvs.empty()
                     self.$el.find('.webcam img').each(function(i,w) {
                         $(w).attr('src', '')
@@ -76,4 +82,4 @@ define(['marionette',
 
     })
 
-})
+})