VRFS-1916 Find Session formatting wip

web/app/assets/javascripts/findSession.js

@@ -20,13 +20,11 @@
 
     var $asNext = null;
     var $asScroller = null;
-    var $noMoreActiveSessions = null;
     var currentActiveSessionsPage = 0;
     var currentActiveSessionsQuery = defaultActiveSessionsQuery();
 
     var $ssNext = null;
     var $ssScroller = null;
-    var $noMoreScheduledSessions = null;
     var currentScheduledSessionsPage = 0;
     var currentScheduledSessionsQuery = defaultScheduledSessionsQuery();
 
@@ -155,10 +153,6 @@
       if(sessionList.length < LIMIT) {
         // if we retrieve less results than asked for, end searching
         $asScroller.infinitescroll('pause');
-
-        if(currentActiveSessionsPage > 0) {
-          $noMoreActiveSessions.show();
-        }
       }
       else {
         currentActiveSessionsPage++;
@@ -255,10 +249,6 @@
       if(sessionList.length < LIMIT) {
         // if we retrieve less results than asked for, end searching
         $ssScroller.infinitescroll('pause');
-
-        if(currentScheduledSessionsPage > 0) {
-          $noMoreScheduledSessions.show();
-        }
       }
       else {
         currentScheduledSessionsPage++;
@@ -312,12 +302,10 @@
 
     function clearResults() {
       currentActiveSessionsPage = 0;
-      $noMoreActiveSessions.hide();
       $asScroller.infinitescroll('resume');
       $('table#sessions-active').empty();
 
       currentScheduledSessionsPage = 0;
-      $noMoreScheduledSessions.hide();
       $ssScroller.infinitescroll('resume');
       $('table#sessions-scheduled').empty();
     }
@@ -355,11 +343,9 @@
 
       $asNext = $('#sessions-active .btn-next')
       $asScroller = $('#sessions-active .findsession-scroll-container');
-      $noMoreActiveSessions = $('#end-of-as-list');
 
       $ssNext = $('#sessions-scheduled .btn-next')
       $ssScroller = $('#sessions-scheduled .findsession-scroll-container');
-      $noMoreScheduledSessions = $('#end-of-ss-list');
 
       $dateFilter.datepicker({
           dateFormat: "D d MM yy",

web/app/assets/stylesheets/client/findSession.css.scss

@@ -12,8 +12,16 @@
     right: 0;
   }
 
-  .content-body-scroller {
+  .content-wrapper {
+    padding-left:35px;
+    padding-top:10px;
+  }
 
+  .content-body-scroller {
+    height:inherit;
+    position:relative;
+    display:block;
+    overflow:hidden !important;
   }
 
   .session-filter {
@@ -53,6 +61,9 @@
     height:20px;
   }
 
+  .session-container {
+    overflow:auto;
+  }
 
   .btn-next {
     display:none;

web/app/assets/stylesheets/client/sessionList.css.scss

@@ -1,8 +1,8 @@
 @import "client/common";
 
 div.findsession-scroll-container {
-  max-height:275px;
-  overflow-y:scroll;
+  height:200px;
+  overflow-y:auto;
 }
 
 table.findsession-table, table.local-recordings {

web/app/views/clients/_findSession.html.erb

@@ -47,8 +47,8 @@
             </div>
           </div>
           <div>
-            <div class="content-wrapper" style="padding-left:35px;padding-top:10px;">
-              <div id="sessions-active">
+            <div class="content-wrapper">
+              <div id="sessions-active" class="session-container">
                 <%= render :partial => "sessionList", :locals => {:title => "current, active sessions", :category => "sessions-active"} %>
                 <br />
                 <div id="no-active-sessions">
@@ -59,7 +59,7 @@
                 </div>
                 <span class="btn-next-wrapper"><a href="/api/sessions/active?page=1" class="btn-next">Next</a></span>
               </div>
-              <div id="sessions-scheduled" class="mt35">
+              <div id="sessions-scheduled" class="session-container">
                 <%= render :partial => "sessionList", :locals => {:title => "future, scheduled sessions", :category => "sessions-scheduled"} %>
                 <br />
                 <div id="no-scheduled-sessions">

web/app/views/clients/_sessionList.html.erb

@@ -1,17 +1,17 @@
 <h2><%= title %></h2>
 <br/>
-<table class="findsession-table" cellspacing="0" cellpadding="0" border="0">
-  <!-- header -->
-  <tr>
-    <th align="left" width="30%">SESSION</th>
-    <th align="left" width="35%">MUSICIANS</th>
-    <th width="10%" style="text-align:center">LATENCY</th>
-    <th align="left" width="20%">POLICIES</th>        
-    <th id="actionHeader" class="noborder" width="30" style="text-align:center"></th>
-  </tr>
-  <!-- session row goes here -->
-</table>
 <div class="findsession-scroll-container">
+  <table class="findsession-table" cellspacing="0" cellpadding="0" border="0">
+    <!-- header -->
+    <tr>
+      <th align="left" width="30%">SESSION</th>
+      <th align="left" width="35%">MUSICIANS</th>
+      <th width="10%" style="text-align:center">LATENCY</th>
+      <th align="left" width="20%">POLICIES</th>        
+      <th id="actionHeader" class="noborder" width="30" style="text-align:center"></th>
+    </tr>
+    <!-- session row goes here -->
+  </table>
   <table id="<%= category %>" class="findsession-table" cellspacing="0" cellpadding="0" border="0">
     <!-- session row goes here -->
   </table>