social_stream 0.23.2 → 0.23.3

data/documents/app/assets/javascripts/social_stream.audio.js.erb

@@ -0,0 +1,25 @@
+//= require social_stream.timeline
+
+SocialStream.Audio = (function(SS, $, undefined){
+  var initJplayer = function(){
+    $(".jp-audio .jp-jplayer").each(function() {
+      $(this).jPlayer({
+        ready: function () {
+          $(this).jPlayer("setMedia", {
+            webma: $(this).closest(".audio").find(".audio-webma").attr("href"), // Defines the webm url
+          });
+        },
+      preload: "none",
+      supplied: "webma",
+      swfPath: "<%= asset_path "" %>",
+      cssSelectorAncestor: "#" + $(this).closest(".audio-full").attr("id")
+      })
+    });
+
+    $(".audio-format-links").hide();
+  }
+
+  SocialStream.Timeline.addInitCallback(initJplayer);
+
+
+})(SocialStream, jQuery);

data/documents/app/assets/javascripts/social_stream.repository.js.erb

@@ -0,0 +1,27 @@
+SocialStream.Repository = (function(SS, $, undefined){
+	var init = function(){
+		$("body").screw({
+			loadingHTML: '<img src="<%= asset_path('loading.gif') %>">'
+		});
+	}
+
+	var toggleDocumentMenu = function(name){
+		$(".document_menu").each(function(){
+			console.log($(this));
+			if($(this).css("display")!="none"){
+				$(this).slideToggle("slow");
+				$("#" + $(this).attr('id') + "_action").removeClass("selected");
+			}
+		});
+		if($("#document_" + name).css("display")=="none"){
+			$("#document_" + name).slideToggle("slow");
+			$("#document_" + name + "_action").addClass("selected");    
+		}
+	}
+
+	return {
+		init: init,
+		toggleDocumentMenu: toggleDocumentMenu
+	}
+
+})(SocialStream, jQuery)

data/documents/app/assets/javascripts/social_stream.video.js.erb

@@ -0,0 +1,38 @@
+//= require social_stream.timeline
+
+SocialStream.Video = (function(SS, $, undefined){
+  var initJplayer = function(){
+    $(".jp-video .jp-jplayer").each(function() {
+      $(this).jPlayer({
+        ready: function () {
+          $(this).jPlayer("setMedia", {
+            webmv: $(this).closest(".video").find(".video-webm").attr("href"), // Defines the webm url
+            flv: $(this).closest(".video").find(".video-flv").attr("href") // Defines the flv url
+          });
+        },
+      solution:"flash, html",
+      preload: "none",
+      supplied: "webmv, flv",
+      swfPath: "<%= asset_path "" %>",
+      cssSelectorAncestor: "#" + $(this).closest(".video-full").attr("id")
+      })
+    });
+
+    $(".video-format-links").hide();
+    $(".video-full").hide();
+
+    $(".video_thumbnail_play_over").click(function(){
+      var video = $(this).closest(".video")
+      video.find(".video-thumb").hide();
+      video.find(".video-details").hide();
+      video.find(".jp-video-play").hide();
+      video.find(".video-full").show();
+    video.find(".jp-jplayer").jPlayer("play", 0);
+    });
+
+  }
+
+  SocialStream.Timeline.addInitCallback(initJplayer);
+
+
+})(SocialStream, jQuery);

data/documents/app/assets/stylesheets/documents.css.scss

@@ -238,39 +238,36 @@
 	width: 0px;
 }
 
-.video_thumbnail_class {
-	width: 180px;
-	height: 135px;
+.video_thumbnail_show {
+	width: 130px;
+	height: 97px;
+	padding: 10px;
+	float: left;
 }
 
 .video_thumbnail_image{
 	position: relative;
 	top:0px;
-	width: 180px;
+	width: 130px;
 	z-index:1;
-  width: 180px;
-  height: 135px;
-  overflow: hidden;
+	height: 97px;
+	overflow: hidden;
 }
 
 .video_thumbnail_play_over {
 	background: transparent url("jplayer.blue.monday.video.play.png") no-repeat center;
-	/* position: relative; */
 	position: relative;
 	cursor:pointer;
 	z-index:2;
+	top:-97px;
+	width:130px;
+	height:97px;
 }
 
 .video_thumbnail_play_over:hover {
 	background: transparent url("jplayer.blue.monday.video.play.hover.png") no-repeat center;
 }
 
-.video_thumbnail_play_over {
-	top:-135px;
-	width:180px;
-	height:135px;
-}
-
 /* needed to hide the flash element when used */
 .jpId_size0{
 	width: 0px;

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

@@ -1,29 +1,11 @@
-<% content_for :javascript do %>
-
-  $("#jpId<%=audio.id%>").jPlayer( {
-    ready: function () {
-      $(this).jPlayer("setMedia", {        
-        webma: "<%= audio_url(audio, :format => 'webma') %>" // Defines the webma url
-      });
-    },
-    supplied: "webma",
-    preload: "none",
-	swfPath: "assets",
-	cssSelectorAncestor: "#jp_interface_<%=audio.id%>"
-  });
-
-<% end %>
-
 <%= div_for audio, :class => 'content_size' do %>
 
-
   <% if audio.file_processing %>
     <%= render :partial => 'audios/audio_processing', :locals => {:audio => audio}%>
   <% else %>
     <%= render :partial => 'audios/audio_processed', :locals => {:audio => audio}%>  
   <% end %>
 
-
 <% end %>
 
 <div class="clearfloat"></div>

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

@@ -1,45 +1,41 @@
-<div class="attachment_thumb">
-  <%= link_to thumb_for(audio, 16),
-              audio_path(audio),
-              :class => "" %>
+<div class="audio-format-links">
+  <%= link_to "WebMA", audio_path(audio, :format => :webma), :class => "audio-webma" %>
 </div>
-<div class="attachment_text">
-  <%= t('audio.msg') %><%= link_to "\""+audio.title+"\"",
-                                   audio_path(audio),
-                                   :class => "attachment_text_link" %>
-</div>
-<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 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">
+        <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 class="jp-volume-bar">
-        <div class="jp-volume-bar-value"></div>
-      </div>
-      <div class="jp-current-time"></div>
-      <div class="jp-duration"></div>
+      <div id="jp_playlist_<%= dom_id audio %>" class="jp-playlist"></div>
     </div>
-    <div id="jp_playlist_<%= audio.id%>" class="jp-playlist"></div>
   </div>
 </div>

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

@@ -5,10 +5,10 @@
     </div>
   <% end %>
   <div id="actions">
-    <%= link_to content_tag(:span,image_tag("btn/btn_write.png") + t('document.actions.details'), :class => :action, :id => :document_details_action), "javascript:toggleDocumentMenu('details');" %>
+    <%= link_to content_tag(:span,image_tag("btn/btn_write.png") + t('document.actions.details'), :class => :action, :id => :document_details_action), "javascript:SocialStream.Repository.toggleDocumentMenu('details');" %>
     <%= link_to content_tag(:span,image_tag("btn/download.png") + t('document.actions.download'), :class => :action), download_document_path(document) %>
     <% if document.post_activity.edit_object_by?(current_subject) %>
-    <%= link_to content_tag(:span,image_tag("btn/edit.png") + t('document.actions.edit'), :class => :action, :id => :document_edit_action), "javascript:toggleDocumentMenu('edit');" %>
+    <%= link_to content_tag(:span,image_tag("btn/edit.png") + t('document.actions.edit'), :class => :action, :id => :document_edit_action), "javascript:SocialStream.Repository.toggleDocumentMenu('edit');" %>
     <% end %>
     <% if document.post_activity.delete_object_by?(current_subject) %>
     <%= link_to content_tag(:span,image_tag("btn/error.png") + t('document.actions.delete'), :class => :action), document.post_activity.direct_object , :confirm => t('confirm_delete',

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

@@ -51,7 +51,7 @@
 <% if params[:editing].present? and params[:editing].eql?"true" and document.post_activity.edit_object_by?(current_subject) %>
   <%= javascript_tag do %>
     $(document).ready(function(){
-      toggleDocumentMenu('edit');
+      SocialStream.Repository.toggleDocumentMenu('edit');
     });
   <% end %>
 <% end %>

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

@@ -29,7 +29,7 @@ $(document).ready(function() {
   var last_search = "";
   
   
-  $("#repository_filter_input").Watermark("<%= escape_javascript(I18n.t('search.name')) %>");
+  $("#repository_filter_input").watermark("<%= escape_javascript(I18n.t('search.name')) %>");
 
   $("#repository_filter_input").keyup(function() {
     var searchstring = $(this).val();

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

@@ -39,6 +39,9 @@
 </div>
 <%= javascript_tag do %>
 $(document).ready(function(){
+
+  SocialStream.Repository.init();
+
   $('#<%= dom_id(document)%> .attachment_tile_tipsy a').tipsy({
     delayIn: 0,   
     delayOut: 1000, 

data/documents/app/views/pictures/_picture.html.erb

@@ -12,7 +12,9 @@
         <div class="title"> 
   	  <%= picture.title %>
         </div>
-	<%= picture.description %>
+
+	<%= simple_format auto_link(picture.description) %>
+
         <%= link_to t('picture.msg'),
               picture_path(picture),
               :alt => t('picture.msg'),

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

@@ -1,23 +1,3 @@
-<% content_for :javascript do %>
-
-  $("#jpId<%=video.id%>").jPlayer( {
-    ready: function () {
-      $(this).jPlayer("setMedia", {
-        webmv: "<%= video_url(video, :format => 'webm' ) %>", // Defines the webm url
-        flv:   "<%= video_url(video, :format => 'flv') %>"
-      });
-    },
-	solution:"flash, html",
-	preload: "none",
-	supplied: "webmv, flv",
-	swfPath: "assets",
-	cssSelectorAncestor: "#jp_interface_<%=video.id%>"
-  });
-  
-  hideJplayer(<%=video.id%>);
-  
-<% end %>
-
 <%= div_for video, :class => 'content_size' do %>
 
   <% if video.file_processing %>

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

@@ -1,50 +1,63 @@
-<div class="attachment_thumb">
-  <%= link_to thumb_for(video, 16),
-  video_path(video),
-  :id => video,
-  :class => "" %>
+<div class="video-thumb video_thumbnail_show">
+  <%= image_tag(video_path(video, :format => :png, :style => 'thumbwall'), :class => "video_thumbnail_image", :alt => "")%>
+  <div class="video_thumbnail_play_over"></div>
 </div>
-<div class="attachment_text">
-  <%= t('video.msg') %><%= link_to "\""+video.title+"\"",
-  video,
-  :class => "attachment_text_link" %>
-  <div id="video_thumbnail_<%= video.id%>" class="video_thumbnail_class">
-    <%= image_tag(video_path(video, :format => :png, :style => 'thumbwall'), :class => "video_thumbnail_image", :alt => "")%> <div id="<%= video.id%>" class="video_thumbnail_play_over"></div>
+
+<div class="attachment_text video-details">
+  <div class="title">
+    <%= video.title %>
   </div>
-  <div id="full_video_<%= video.id%>" class="jp-video jp-video-270p">
-    <div class="jp-type-single">
-      <div id="jpId<%= video.id%>" class="jp-jplayer"></div>
-      <div id="jp_interface_<%= video.id%>" 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>
+
+  <%= simple_format auto_link(video.description) %>
+
+  <%= link_to t('video.msg'),
+    video,
+    :alt => t('picture.msg'),
+    :type => video.type,
+    :path => document_path(video),
+    :class => "attachment_text_link video_link" %>
+
+  <div class="video-format-links">
+    <%= link_to "WebM", video_path(video, :format => :webm), :class => "video-webm" %>
+    <%= link_to "FLV",  video_path(video, :format => :flv),  :class => "video-flv" %>
+  </div>
+</div>
+
+<div class="clearfloat"></div>
+
+<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 class="jp-current-time"></div>
-        <div class="jp-duration"></div>
       </div>
-      <div id="jp_playlist_<%= video.id%>" class="jp-playlist"></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>