Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

web/app/assets/javascripts/findSession.js

@@ -22,9 +22,11 @@
 
     var currentActiveSessionsQuery = defaultActiveSessionsQuery();
 
+    var $asSpinner = null;
+
     var $ssNext = null;
     var $ssScroller = null;
-    var $ssNoMoreEntries = null;
+    var $ssSpinner = null;
     var currentScheduledSessionsPage = 0;
     var currentScheduledSessionsQuery = defaultScheduledSessionsQuery();
 
@@ -32,15 +34,6 @@
       return CATEGORY;
     }
 
-    function removeSpinner($selector) {
-      $('div[layout-id=findSession] .content .spinner').remove();// remove any existing spinners
-    }
-
-    function addSpinner($selector) {
-      removeSpinner();
-      $selector.append('<div class="spinner spinner-large"></div>')
-    }
-
     function search() {
       logger.debug("Searching for sessions...");
       clearResults();
@@ -50,8 +43,8 @@
     }
 
     function loadSessions() {
-      addSpinner($('#sessions-active'));
-      addSpinner($('#sessions-scheduled'));
+      $asSpinner.show();
+      $ssSpinner.show();
 
       // get active sessions
       rest.findActiveSessions(currentActiveSessionsQuery)
@@ -67,7 +60,8 @@
           }
         })
         .always(function() {
-          removeSpinner($('#sessions-active'));
+          context.JK.bindHoverEvents();
+          $asSpinner.hide();
         });
 
       // get scheduled sessions
@@ -84,7 +78,8 @@
           }
         })
         .always(function() {
-          removeSpinner($('#sessions-scheduled'));
+          context.JK.bindHoverEvents();
+          $ssSpinner.hide();
         });
     }
 
@@ -142,11 +137,9 @@
       var $noSessionsMsgSelector = $('#no-active-sessions');
       
       if (sessionList.length === 0) {
-        $(CATEGORY.ACTIVE.id).hide();
         $noSessionsMsgSelector.show();
       }
       else {
-        $(CATEGORY.ACTIVE.id).show();
         $noSessionsMsgSelector.hide();
       }
 
@@ -205,24 +198,17 @@
     }
 
     function afterLoadScheduledSessions(sessionList) {
+
       var $noSessionsMsgSelector = $('#no-scheduled-sessions');
-      
-      if (sessionList.length === 0 && currentScheduledSessionsPage === 0) {
-        $(CATEGORY.SCHEDULED.id).hide();
-        $noSessionsMsgSelector.show();
-      }
-      else {
-        $(CATEGORY.SCHEDULED.id).show();
-        $noSessionsMsgSelector.hide();
-      }
 
       if(sessionList.length < SCHEDULED_SESSIONS_LIMIT) {
         // if we retrieve less results than asked for, end searching
         $ssScroller.infinitescroll('pause');
-        $ssNoMoreEntries.show();
+        $noSessionsMsgSelector.show();
         $('.infinite-scroll-loader').remove();
       }
       else {
+        // $noSessionsMsgSelector.hide();
         currentScheduledSessionsPage++;
         buildScheduledSessionsQuery();
         registerScheduledSessionInfiniteScroll();
@@ -278,7 +264,9 @@
       currentScheduledSessionsPage = 0;
       $ssScroller.infinitescroll('resume');
       $('table#sessions-scheduled').find("tr:gt(0)").remove();
-      $ssNoMoreEntries.hide();
+
+      $('#no-active-sessions').hide();
+      // $('#no-scheduled-sessions').hide();
     }
 
     function events() {
@@ -310,7 +298,9 @@
       $screen = $('#findSession');
       $ssNext = $screen.find('#sessions-scheduled .btn-next')
       $ssScroller = $screen.find('.content-body-scroller');
-      $ssNoMoreEntries = $screen.find('#end-of-ss-list')
+      $ssSpinner = $screen.find('#sessions-scheduled .paginate-wait');
+
+      $asSpinner = $screen.find('#sessions-active .paginate-wait');
 
       $dateFilter.datepicker({
           dateFormat: "D d MM yy",

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

@@ -2,6 +2,17 @@
 
 #findSession {
 
+  .paginate-wait {
+    margin:auto;
+    text-align:center;
+    vertical-align:bottom;
+    line-height:32px;
+    .spinner-small {
+      display:inline-block;
+      vertical-align:top;
+    }
+  }
+
   th, td { margin: 4px; padding:4px; }
 
   .content .spinner {

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

@@ -51,19 +51,18 @@
               <div id="sessions-active" class="session-container">
                 <%= render :partial => "sessionList", :locals => {:title => "current, active sessions", :category => "sessions-active"} %>
                 <br />
-                <div id="no-active-sessions">
-                  No active public sessions found.
+                <div class="paginate-wait">Fetching results...<div class="spinner-small"></div></div>
+                <div id="no-active-sessions" class="end-of-list">
+                  End of list.
                 </div>
               </div>
               <br />
               <div id="sessions-scheduled" class="session-container">
                 <%= render :partial => "sessionList", :locals => {:title => "future, scheduled sessions", :category => "sessions-scheduled"} %>
                 <br />
-                <div id="no-scheduled-sessions">
-                  No scheduled sessions found.
-                </div>
-                <div id="end-of-ss-list" class="end-of-list">
-                  No more scheduled sessions.
+                <div class="paginate-wait">Fetching results...<div class="spinner-small"></div></div>
+                <div id="no-scheduled-sessions" class="end-of-list">
+                  End of list.
                 </div>
                 <span class="btn-next-wrapper"><a href="/api/sessions/inactive?page=1" class="btn-next">Next</a></span>
               </div>
@@ -216,7 +215,7 @@
 <script type="text/template" id="template-musician-info">
   <tr>
     <td width="24">
-      <a user-id="{userId}" hoveraction="musician" href="#" class="avatar-tiny">
+      <a user-id="{userId}" hoveraction="musician" href="{profile_url}" class="avatar-tiny">
         <img src="{avatar_url}" />
       </a>
     </td>

web/spec/features/find_sessions_spec.rb

@@ -113,7 +113,7 @@ describe "Find Session", :js => true, :type => :feature, :capybara_feature => tr
           page.assert_selector('div#sessions-scheduled .found-session', count: 20)
 
           page.execute_script('jQuery("#findSession .content-body-scroller").scrollTo("100%",100)') #scroll to the bottom of the element
-          find('#end-of-ss-list')
+          find('#no-scheduled-sessions')
           page.assert_selector('div#sessions-scheduled .found-session', count: 21)
         end
       end