social_stream 2.0.0.beta2 → 2.0.0.beta3

data/documents/app/assets/stylesheets/social_stream/documents/responsive/_responsive-767px-max.css.sass

@@ -4,13 +4,23 @@
 
 
 @media (max-width: 767px)
-  #user
+  #user,
+  #home,
+  #groups
     .activities
       .wall_input
         #new_post
           .document_description
             width: 96%
-
+      .timeline
+        .objects
+          .thumb
+            float: none
+          .text
+            h6
+              clear: both
+              font-size: 13px
+              @include ellipsis
   .picture,
   .audio,
   .video,
@@ -21,6 +31,7 @@
     .central
       width: 100% !important
       margin-left: 0px !important
+      margin-top: 20px
       .comments
         .avatar
           float: left
@@ -54,5 +65,19 @@
 
 @media (max-width: 480px)
 
+  #user,
+  #home,
+  #groups
+    .activities
+      .timeline
+        .comments
+          .child
+            .avatar
+              margin-right: 5px
+              .media-object
+                a
+                  img
+                    width: 40px
+
 
   

data/documents/app/assets/stylesheets/social_stream/documents/show/_show.css.sass

@@ -16,6 +16,35 @@
         @include border-radius (3px)
         border-bottom-color: #444
         background-color: rgba(50, 50, 50, 0.3)
+      .video
+        .video-container
+          @include centered
+          width: 100%
+          .jp-type-single
+            .jp-player
+              width: 100%
+              background-color: #222 !important
+            .jp-interface
+              min-height: 60px
+              .jp.controls
+                .jp-play,
+                .jp-pause
+                  left: -2px !important
+                  top: 21px !important
+                .jp-stop
+                  left: 38px !important
+                  top: 28px !important
+                .jp-mute,
+                .jp-unmute
+                  left: 73px !important
+                  top: 35px !important
+              .jp-volume-bar
+                left: 95px !important
+                top: 40px !important
+              .jp-current-time
+                left: 137px !important
+                  top: 32px !important
+
     .tabbable
       .tab-content
         .media

data/documents/app/assets/stylesheets/social_stream/documents/show/layout/_show.css.sass

@@ -13,6 +13,33 @@
       .actions
         width: 11%
         margin: 10px auto -7px
+      .video
+        .video-container
+          width: 100%
+          .jp-type-single
+            .jp-player
+              width: 100%
+            .jp-interface
+              min-height: 60px
+              .jp.controls
+                .jp-play,
+                .jp-pause
+                  left: -2px !important
+                  top: 21px !important
+                .jp-stop
+                  left: 38px !important
+                  top: 28px !important
+                .jp-mute,
+                .jp-unmute
+                  left: 73px !important
+                  top: 35px !important
+              .jp-volume-bar
+                left: 95px !important
+                top: 40px !important
+              .jp-current-time
+                left: 137px !important
+                  top: 32px !important
+
 
     .tabbable
       margin-top: 10px
@@ -74,6 +101,12 @@
   .autor,
   .dates
     margin-left: 10px
+  .tags
+    span
+      padding: 3px 3px 4px 3px
+      display: inline-block
+      &:first:child
+        display: inline
 
 
 #picture_description
@@ -81,6 +114,9 @@
  
 #document-edit
   margin-left: 8px
+  .tags
+    .select2-container
+      width: 97%
   .fcbk
     margin-bottom: 20px
   input

data/documents/app/assets/stylesheets/social_stream/documents/timeline/_audios.css.sass

@@ -18,14 +18,14 @@ div.jp-progress
 
     div.jp-play-bar
       background: none $blue
-div.down
-  div.jp-current-time
-    width: 123px !important
-    background-color: rgba(0, 0, 0, .1)
-    @include border-radius(8px)
-    color: rgba(245, 245, 245, 0.3)
-    padding: 0 3px
-    border-top: 1px solid #333
+
+div.jp-current-time
+  width: 123px !important
+  background-color: rgba(0, 0, 0, .1)
+  @include border-radius(8px)
+  color: rgba(245, 245, 245, 0.3)
+  padding: 0 3px
+  border-top: 1px solid #333
 
 div.jp-interface
   border: none !important
@@ -48,13 +48,28 @@ div.jp.controls
 div.jp.volume-bar
   margin-left: 6px
   margin-top: 5px
+  background: url("jplayer.blue.monday.png") 0 -250 repeat-x
+  
   
+div.jp-volume-bar-value
+  background: url("jplayer.blue.monday.png") 0 -256 repeat-x
+
 .play_over
-  z-index: 600
-  position: relative
+  margin-top: 16px
+  z-index: 30
+  position: absolute
+  width: 170px
   min-height: 96px
-  background: rgba (250, 250, 250, .1) url('jplayer.blue.monday.video.play.png') no-repeat center center
+  background: url('jplayer.blue.monday.video.play.png') no-repeat center center
   &:hover
-    background: rgba (250, 250, 250, .1) url('jplayer.blue.monday.video.play.hover.png') no-repeat center center
+    background: url('jplayer.blue.monday.video.play.hover.png') no-repeat center center
 
 
+a.jp-play
+  background: url("jplayer.blue.monday.png") 0 0 no-repeat
+a.jp-pause
+  background: url("jplayer.blue.monday.png") 0 -42 no-repeat
+a.jp-mute
+  background: url("jplayer.blue.monday.png") 0 -186 no-repeat
+a.jp-unmute
+  background: url("jplayer.blue.monday.png") 0 -170 no-repeat

data/documents/app/views/audios/_audio_processed.html.erb

@@ -1,50 +1,9 @@
-<div class="format-links">
-  <%= link_to "WebMA", audio_path(audio, :format => :webma), :class => "audio-webma" %>
-</div>
-
-<div id="full_audio_<%= dom_id audio %>" class="audio-full jp-audio">
-  <div id="jpId<%= dom_id audio %>" class="jpId_size0 jp-jplayer">
-  </div>
-  <div class="jp-audio">
-    <div class="jp-type-single">
-      <div id="jp_interface_<%= dom_id audio %>" class="jp-interface">
-        <div class="jp-progress">
-          <div class="jp-seek-bar">
-            <%= image_tag document_path(audio, format: :png, style: :waveform), class: 'waveform' %>
-            <div class="jp-play-bar"></div>
-          </div>
-        </div>
-        <div class="jp-down">
-          <div class="jp-current-time"></div>
-
-          <ul class="jp-controls">
-            <li>
-              <a href="#" class="jp-play" tabindex="1">play</a>
-            </li>
-            <li>
-              <a href="#" class="jp-pause" tabindex="1">pause</a>
-            </li>
-            <li>
-              <a href="#" class="jp-mute" tabindex="1">mute</a>
-            </li>
-            <li>
-              <a href="#" class="jp-unmute" tabindex="1">unmute</a>
-            </li>
-          </ul>
-    
-          <div class="jp-volume-bar">
-            <div class="jp-volume-bar-value"></div>
-          </div>
-          
-          <div class="jp-duration">
-          </div>
-        </div>
-      </div>
-      <div id="jp_playlist_<%= dom_id audio %>" class="jp-playlist"></div>
-    </div>
-  </div>
+<%= div_for audio do %>
+  <%= render partial: 'audios/player',
+           object: audio,
+           as: :audio %>
 
   <%= render partial: 'objects/timeline_description',
              object: audio,
              as: :obj %>
-</div>
+<% end %>

data/documents/app/views/audios/_audio_show.html.erb

@@ -1,62 +1,21 @@
-<% content_for :javascript do %>
+<%= div_for audio do %>
+  <div class="audio_show">
+    <% if audio.file_processing %>
+      <div class="processing_text">
+        <%= t('audio.processing')%>
+      </div>
+    <% else %>
+      <%= render partial: 'player',
+                 object: audio,
+                 as: :audio %>
+    <% end %>
+  </div>
+<% end %> 
 
-  $("#jpId<%=audio.id%>").jPlayer( {
-    ready: function () {
-      $(this).jPlayer("setMedia", {        
-        webma: "<%= audio_url(audio, :format => 'webma') %>" // Defines the webma url
-      });
-    },
-    supplied: "webma",
-    preload: "none",
-    swfPath: "<%= asset_path "Jplayer.swf" %>",
-    cssSelectorAncestor: "#jp_interface_<%=audio.id%>"
+<%= javascript_tag do %>
+  $(function() {
+    SocialStream.Audio.show();
   });
-
 <% end %>
 
-<%= div_for audio, :class => 'content_size' do %>
-<div class="audio_show">
-  <% if audio.file_processing %>
-  <div class="processing_text">
-    <%= t('audio.processing')%>
-  </div>
-  <% else %>
-  <div id="jpId<%= audio.id%>" class="jpId_size0"></div>
-  <div class="jp-audio">
-    <div class="jp-type-single">
-      <div id="jp_interface_<%= audio.id%>" class="jp-interface">
-        <ul class="jp-controls">
-          <li>
-            <a href="#" class="jp-play" tabindex="1">play</a>
-          </li>
-          <li>
-            <a href="#" class="jp-pause" tabindex="1">pause</a>
-          </li>
-          <li>
-            <a href="#" class="jp-stop" tabindex="1">stop</a>
-          </li>
-          <li>
-            <a href="#" class="jp-mute" tabindex="1">mute</a>
-          </li>
-          <li>
-            <a href="#" class="jp-unmute" tabindex="1">unmute</a>
-          </li>
-        </ul>
-        <div class="jp-progress">
-          <div class="jp-seek-bar">
-            <div class="jp-play-bar"></div>
-          </div>
-        </div>
-        <div class="jp-volume-bar">
-          <div class="jp-volume-bar-value"></div>
-        </div>
-        <div class="jp-current-time"></div>
-        <div class="jp-duration"></div>
-      </div>
-      <div id="jp_playlist_<%= audio.id%>" class="jp-playlist"></div>
-    </div>
-  </div>
-</div>
-<% end %>
 
-<% end %> 

data/documents/app/views/audios/_player.html.erb

@@ -0,0 +1,42 @@
+<div id="full_audio_<%= dom_id audio %>" class="audio-container jp-audio" data-url-webma="<%= audio_path(audio, :format => :webma) %>" data-url-swfplayer="<%= asset_path('Jplayer.swf') %>">
+  <div id="jpId<%= dom_id audio %>" class="jpId_size0 jp-jplayer">
+  </div>
+  <div class="jp-audio">
+    <div class="jp-type-single">
+      <div id="jp_interface_<%= dom_id audio %>" class="jp-interface">
+        <div class="jp-progress">
+          <div class="jp-seek-bar">
+            <%= image_tag document_path(audio, format: :png, style: :waveform), class: 'waveform' %>
+            <div class="jp-play-bar"></div>
+          </div>
+        </div>
+        <div class="jp-down">
+          <div class="jp-current-time"></div>
+
+          <ul class="jp-controls">
+            <li>
+              <a href="#" class="jp-play" tabindex="1">play</a>
+            </li>
+            <li>
+              <a href="#" class="jp-pause" tabindex="1">pause</a>
+            </li>
+            <li>
+              <a href="#" class="jp-mute" tabindex="1">mute</a>
+            </li>
+            <li>
+              <a href="#" class="jp-unmute" tabindex="1">unmute</a>
+            </li>
+          </ul>
+    
+          <div class="jp-volume-bar">
+            <div class="jp-volume-bar-value"></div>
+          </div>
+          
+          <div class="jp-duration">
+          </div>
+        </div>
+      </div>
+      <div id="jp_playlist_<%= dom_id audio %>" class="jp-playlist"></div>
+    </div>
+  </div>
+</div>

data/documents/app/views/common_documents/_index.html.erb

@@ -1,15 +1,13 @@
 <% content_for :title do %>
-  <%= "#{ profile_subject && profile_subject.name + ': ' }#{ t('repository.title') }" %>
+  <%= "#{ profile_or_current_subject.name } : #{ t('repository.title') }" %>
 <% end %>
 
-<% if profile_or_current_subject %>
-  <%= render partial: 'toolbar/profile', locals: { :subject => profile_or_current_subject } %>
-<% end %>
+<%= render partial: 'toolbar/profile', locals: { :subject => profile_or_current_subject } %>
 
 <%= render partial: 'common_documents/filter' %>
 
 <%= render partial: 'common_documents/new_button',
-           locals: { owner: profile_subject } %>
+           locals: { owner: profile_or_current_subject } %>
 
 <section class="documents">
   <%= render partial: 'common_documents/list',

data/documents/app/views/videos/_player.html.erb

@@ -0,0 +1,36 @@
+<div id="full_video_<%= dom_id video %>" class="video-container jp-video jp-video-270p" data-url-webm="<%= video_path(video, :format => :webm) %>" data-url-flv="<%= video_path(video, :format => :flv) %>" data-url-mp4="<%= video_path(video, :format => :mp4) %>" data-url-poster="<%= video_path(video, :format => :png, :style => '170x127#') %>" data-url-swfplayer="<%= asset_path('Jplayer.swf') %>">
+  <div class="jp-type-single">
+    <div id="jpId<%= dom_id video %>" class="jp-jplayer"></div>
+    <div id="jp_interface_<%= dom_id video %>" class="jp-interface">
+      <div class="jp-video-play"></div>
+      <ul class="jp-controls">
+        <li>
+        <a href="#" class="jp-play" tabindex="1">play</a>
+        </li>
+        <li>
+        <a href="#" class="jp-pause" tabindex="1">pause</a>
+        </li>
+        <li>
+        <a href="#" class="jp-stop" tabindex="1">stop</a>
+        </li>
+        <li>
+        <a href="#" class="jp-mute" tabindex="1">mute</a>
+        </li>
+        <li>
+        <a href="#" class="jp-unmute" tabindex="1">unmute</a>
+        </li>
+      </ul>
+      <div class="jp-progress">
+        <div class="jp-seek-bar">
+          <div class="jp-play-bar"></div>
+        </div>
+      </div>
+      <div class="jp-volume-bar">
+        <div class="jp-volume-bar-value"></div>
+      </div>
+      <div class="jp-current-time"></div>
+      <div class="jp-duration"></div>
+    </div>
+    <div id="jp_playlist_<%= dom_id video %>" class="jp-playlist"></div>
+  </div>
+</div>

data/documents/app/views/videos/_video_processed.html.erb

@@ -1,4 +1,4 @@
-<div class="thumb">
+<div class="thumb thumb-play">
   <%= image_tag(video_path(video, :format => :png, :style => '170x127#'))%>
   <div class="play_over">
   </div>
@@ -13,48 +13,10 @@
              object: video,
              as: :obj %>
 
-  <div class="format-links">
-    <%= link_to "WebM", video_path(video, :format => :webm), :class => "video-webm" %>
-    <%= link_to "FLV",  video_path(video, :format => :flv),  :class => "video-flv" %>
-    <%= link_to "MP4",  video_path(video, :format => :mp4),  :class => "video-mp4" %>
-  </div>
 </div>
 
-<div class="clearfloat"></div>
+<%= render partial: 'videos/player',
+           object: video,
+           as: :video %>
 
-<div id="full_video_<%= dom_id video %>" class="video-full jp-video jp-video-270p">
-  <div class="jp-type-single">
-    <div id="jpId<%= dom_id video %>" class="jp-jplayer"></div>
-    <div id="jp_interface_<%= dom_id video %>" class="jp-interface">
-      <div class="jp-video-play"></div>
-      <ul class="jp-controls">
-        <li>
-        <a href="#" class="jp-play" tabindex="1">play</a>
-        </li>
-        <li>
-        <a href="#" class="jp-pause" tabindex="1">pause</a>
-        </li>
-        <li>
-        <a href="#" class="jp-stop" tabindex="1">stop</a>
-        </li>
-        <li>
-        <a href="#" class="jp-mute" tabindex="1">mute</a>
-        </li>
-        <li>
-        <a href="#" class="jp-unmute" tabindex="1">unmute</a>
-        </li>
-      </ul>
-      <div class="jp-progress">
-        <div class="jp-seek-bar">
-          <div class="jp-play-bar"></div>
-        </div>
-      </div>
-      <div class="jp-volume-bar">
-        <div class="jp-volume-bar-value"></div>
-      </div>
-      <div class="jp-current-time"></div>
-      <div class="jp-duration"></div>
-    </div>
-    <div id="jp_playlist_<%= dom_id video %>" class="jp-playlist"></div>
-  </div>
-</div>
+<div class="clearfloat"></div>