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

ruby/lib/jam_ruby/models/music_session_history.rb

@@ -39,11 +39,14 @@ module JamRuby
       feed.music_session_history = self
     end
 
+    def like_count
+      self.likes.size
+    end
+
     def comment_count
       self.comments.size
     end
 
-
     def tracks
       tracks = []
       self.music_session_user_histories.each do |msuh|

ruby/lib/jam_ruby/models/recording.rb

@@ -40,6 +40,14 @@ module JamRuby
       self.band_id = nil if self.band_id == ''
     end
 
+    def like_count
+      self.likes.size
+    end
+
+    def play_count
+      self.plays.size
+    end
+
     def comment_count
       self.comments.size
     end

web/app/assets/javascripts/utils.js

@@ -59,13 +59,13 @@
         "mandolin":"mandolin",
         "oboe":"oboe",
         "other":"other",
-        "piano":"keyboard",
+        "piano":"piano",
         "saxophone":"saxophone",
         "trombone":"trombone",
         "trumpet":"trumpet",
         "tuba":"tuba",
         "ukulele":"ukelele",
-        "upright bass":"cello",
+        "upright bass":"upright_bass",
         "viola":"viola",
         "violin":"violin",
         "voice":"voice"

web/app/assets/javascripts/web/recordings.js

@@ -53,12 +53,12 @@
             shareDialog.showDialog();
         });
 
-        $("#txtRecordingComment", $scope).keypress(function(e) {
-            if (e.which === 13) {
-                addComment();
-                $(this).val('');
-                $(this).blur();
-            }
+        $("#btnPostComment").click(function(e) {
+          if ($.trim($("#txtRecordingComment").val()).length > 0) {
+            addComment();
+            $("#txtRecordingComment").val('');
+            $("#txtRecordingComment").blur();
+          }
         });
       }
       else {

web/app/assets/javascripts/web/sessions.js

@@ -43,12 +43,12 @@
               shareDialog.showDialog();
           });
 
-          $("#txtSessionComment").keypress(function(e) {
-              if (e.which === 13) {
-                  addComment();
-                  $(this).val('');
-                  $(this).blur();
-              }
+          $("#btnPostComment").click(function(e) {
+            if ($.trim($("#txtSessionComment").val()).length > 0) {
+              addComment();
+              $("#txtSessionComment").val('');
+              $("#txtSessionComment").blur();
+            }
           });
       }
       else {

web/app/assets/stylesheets/web/main.css.scss

@@ -159,6 +159,19 @@ body.web {
       font-weight:bold;
       color:#ED3618;
     }
+
+    .button-orange {
+      margin: 0px 8px 0px 8px;
+      background-color: #ED3618;
+      border: solid 1px #F27861;
+      outline: solid 2px #ED3618;
+      padding: 3px 10px;
+      font-size: 12px;
+      font-weight: 300;
+      cursor: pointer;
+      color: #FC9;
+      text-decoration: none;
+    }
   }
 
   .landing-comment-scroller {

web/app/views/shared/_comments.html.erb

@@ -6,6 +6,9 @@
   <div class="left w80 p10">
     <textarea id="<%= id %>" class="w100 p5 f15" rows="2" placeholder="Enter a comment..."></textarea>
   </div>
+  <div class="right mr20">
+    <a href="#" id="btnPostComment" class="button-orange">POST</a>
+  </div>
   <br clear="all" />
         
   <div class="landing-comment-scroller">

web/app/views/shared/_landing_sidebar.html.erb

@@ -10,7 +10,7 @@
       </div>
       <div class="f16">
         <span class="orange"><strong>RECORDING:</strong></span>
-        <a recording-id="<%= history_record.recording_id %>" hoveraction="recording" href="/recordings/<%= history_record.recording_id %>" class="white">Test</a>
+        <a recording-id="<%= history_record.id %>" hoveraction="recording" href="/recordings/<%= history_record.id %>" class="white">Test</a>
       </div>
 
     <% elsif history_record.instance_of? MusicSessionHistory %>