social_stream-documents 1.1.4 → 2.0.0.beta1

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

@@ -0,0 +1,112 @@
+.picture,
+.audio,
+.video,
+.documents
+  .central
+    @include grid-core-span(7, $fluidGridColumnWidth, $fluidGridGutterWidth)
+    float: left 
+    margin-left: 30px
+    padding-bottom: 40px
+    .show
+      padding: 10px
+
+      .actions
+        width: 11%
+        margin: 10px auto -7px
+
+    .tabbable
+      margin-top: 10px
+      .nav
+        margin-bottom: 0
+      .tab-content
+        .media
+          padding: 16px 0  9px 0
+          margin-top: 0
+          &:first-child
+            padding-top: 10px
+          .actions
+            width: 100%
+            display: inline-block
+            margin-bottom: 10px
+            .post_time_ago
+              display: inline-block
+              font-size: 11px
+            .to_comment,
+            .to_like
+              display: inline-block
+              font-size: 12px
+              margin-left: 5px
+            .audience
+              display: inline-block
+              font-size: 12px
+              margin-left: 7px
+            .tooltip
+              width: 28%
+              margin-top: 26px 0px 0px 53px
+              .audience_logo
+                display: inline-block
+                width: auto
+                padding: 4px
+
+  .details
+    @extend .hidden-phone
+    width: 21.8%
+    float: left 
+    margin-left: 30px
+    h4
+      margin-bottom: 5px
+    .tabbable
+      ul
+        margin-bottom: 0px
+ 
+    .tab-content
+      padding-bottom: 20px
+      padding-top: 10px
+
+
+#document-info
+  .counters
+    margin-left: 10px
+    .counter
+      display: inline
+  .description,
+  .tags,
+  .autor,
+  .dates
+    margin-left: 10px
+
+
+#picture_description
+  height: 200px
+ 
+#document-edit
+  margin-left: 8px
+  .fcbk
+    margin-bottom: 20px
+  input
+    &[type="submit"]
+      float: right
+
+
+#comments
+  div.new_comment
+    margin-top: 10px
+    min-height: 100px
+    height: auto
+    width: 90%
+    float: right
+    .avatar
+      float: right
+      width: 11%
+    form.new_comment
+      float: right
+      margin-right: 4px
+      min-height: 80px
+      display: inline-block
+      width: 83.8%
+      margin-top: 3px
+      input
+        &[type="submit"]
+          float: right
+          display: inline-block !important
+     

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

@@ -0,0 +1,21 @@
+@import "jplayer.blue.monday"
+
+
+#jp_interface_audio_290
+  border: none
+
+div.jp-progress
+  div.jp-seek-bar
+    background: none
+
+    div.jp-play-bar
+      background: none black
+
+
+.jp-interface
+  border: none !important
+
+
+div.jp-playlist
+  border: none
+

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

@@ -0,0 +1,10 @@
+#new_post
+  .document_description
+    @include border-radius(5px)
+    resize: none
+  input
+    &[type="text"]
+      @include border-radius(5px)
+  label
+    font-weight: bold
+    letter-spacing: 1px

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

@@ -0,0 +1,67 @@
+@import "jplayer.blue.monday"
+
+div.jp-audio
+  width: 100%
+  div.jp-type-single,
+  div.jp-progress 
+    top: 2px  !important
+    left: 8px  !important
+    width: 97%  !important
+    height: 60%   !important
+
+
+#jp_interface_audio_290
+  height: 118px
+
+div.jp-progress
+  @include size (100%, 75px)
+  @include centered
+
+  div.jp-seek-bar
+    width: 100%
+    .waveform
+      float: left
+
+.jp-interface
+  height: 125px !important
+
+
+a.jp-play,
+a.jp-pause
+  left: 4px !important
+
+
+a.jp-play,
+a.jp-pause,
+a.jp-mute,
+a.jp-unmute, 
+  top: 80px !important
+  left: -2px !important
+
+a.jp-mute,
+a.jp-unmute, 
+  top: 93px !important
+  left: 45px !important
+
+.jp-volume-bar
+  top: 98px !important
+  left: 45px !important
+
+
+div.jp-duration,
+div.jp-current-time,
+  top: 89px !important 
+  left: 137px !important
+  width: 100px !important
+
+
+
+div.jp-audio 
+div.jp-type-single 
+div.jp-volume-bar 
+  top: 93px !important
+  left: 72px !important
+
+
+div.jp-playlist
+  margin-bottom: 10px

data/app/assets/stylesheets/social_stream/documents/timeline/layout/_wallinput.css.sass

@@ -0,0 +1,10 @@
+#new_post
+  .document_description
+    width: 96%
+    padding: 1% 2%
+  input
+    &[type="text"]
+      @include border-radius(5px)
+  label
+    margin-bottom: -2px
+    padding-left: 5px

data/app/assets/stylesheets/social_stream-documents.css.sass

@@ -0,0 +1,49 @@
+@import "social_stream/documents/responsive/responsive-1200px-min"
+@import "social_stream/documents/responsive/responsive-768px-979px"
+@import "social_stream/documents/responsive/responsive-767px-max"
+
+
+
+
+@import "social_stream/documents/show/show"
+
+@import "social_stream/documents/show/layout/show"
+
+
+
+
+@import "social_stream/documents/create/new"
+
+@import "social_stream/documents/create/layout/new"
+
+
+
+
+@import "social_stream/documents/explore/explore-documents"
+
+@import "social_stream/documents/explore/layout/explore-documents"
+
+
+
+
+@import "social_stream/documents/search/header"
+
+@import "social_stream/documents/search/layout/header"
+
+
+
+
+@import "social_stream/documents/documents/documents"
+
+@import "social_stream/documents/documents/layout/documents"
+
+
+
+
+@import "social_stream/documents/timeline/wallinput"
+
+@import "social_stream/documents/timeline/layout/wallinput"
+
+@import "social_stream/documents/timeline/audios"
+
+@import "social_stream/documents/timeline/layout/audios"

data/app/controllers/documents_controller.rb

@@ -8,9 +8,7 @@ class DocumentsController < ApplicationController
       format.html {
         collection
 
-        if params[:no_layout].present?
-          render :layout => false
-        end
+        render collection if request.xhr?
       }
 
       format.json { render :json => collection }
@@ -21,7 +19,20 @@ class DocumentsController < ApplicationController
     super do |format|
       format.json { render :json => resource }
       format.js
-      format.all {redirect_to request.referer || home_path}
+      format.all {
+        if resource.new_record?
+          render action: :new
+        else
+          redirect = 
+            ( request.referer.present? ?
+              ( request.referer =~ /new$/ ?
+                resource :
+                request.referer ) :
+              home_path )
+
+          redirect_to redirect
+        end
+      }
     end
   end
 
@@ -66,7 +77,7 @@ class DocumentsController < ApplicationController
   private
 
   def allowed_params
-    [:file]
+    [ :file ]
   end
 
   class << self

data/app/decorators/social_stream/base/activity_object_decorator.rb

@@ -0,0 +1 @@
+ActivityObject.send :include, SocialStream::Documents::Models::ActivityObject

data/app/helpers/documents_helper.rb

@@ -1,30 +1,47 @@
 module DocumentsHelper
-
-  FORMATS = ["msword","vnd.ms-powerpoint","msexcel","rar","zip","mp3","plain","pdf"]
-  
-  
   #size can be any of the names that the document has size for
   def thumb_for(document, size)
-    image_tag document.thumb(size, self)
+    image_tag thumb_file_for(document, size)
   end
-  
+
   def thumb_file_for(document, size)
-    document.thumb(size, self)
+    style = document.class.attachment_definitions[:file][:styles]
+
+    format = style.respond_to?('[]') && style[:format] || document.format
+
+    if style
+      polymorphic_path document, format: format, style: size
+    else
+      icon document, size
+    end
   end
-  
-  def image_tag_for (document)
-    image_tag download_document_path document, 
-              :id => dom_id(document) + "_img"
+
+  # Return the right icon based on {#document}'s mime type
+  def icon document, size = 50
+    "<i class=\"icon_file_#{ size }-#{ icon_mime_type document }\"></i>".html_safe
   end
-  
-  def link_for_wall(document)
-    format = Mime::Type.lookup(document.file_content_type)
 
-    polymorphic_path(document, :format => format, :style => 'thumbwall')
+  # Find the right class for the icon of this document, based on its format
+  def icon_mime_type document
+    if SocialStream::Documents.icon_mime_types[:subtypes].include?(document.format)
+      document.format
+    elsif SocialStream::Documents.icon_mime_types[:types].include?(document.mime_type_type_sym)
+      document.mime_type_type_sym
+    else
+      SocialStream::Documents.icon_mime_types[:default]
+    end
   end
   
-  def show_view_for(document)
-    render :partial => document.class.to_s.pluralize.downcase + '/' + document.class.to_s.downcase + "_show",
-           :locals => {document.class.to_s.downcase.to_sym => document}
+  def document_details_tab_class(document, tab)
+    editing = document && document.errors.present?
+
+    case tab
+    when :edit
+      editing ? 'active' : ''
+    when :info
+      editing ? '' : 'active'
+    else
+      ''
+    end
   end
 end

data/app/models/audio.rb

@@ -3,7 +3,7 @@ class Audio < Document
                     :url => '/:class/:id.:content_type_extension',
                     :path => ':rails_root/documents/:class/:id_partition/:style',
                     :styles => SocialStream::Documents.audio_styles,
-                    :processors => [ :ffmpeg ]
+                    :processors => [ :ffmpeg, :waveform ]
   
   process_in_background :file    
   
@@ -13,9 +13,4 @@ class Audio < Document
     indexes file_file_name, :as => :file_name
   end 
               
-  # Thumbnail file
-  def thumb(size, helper)
-      "#{ size.to_s }/audio.png"
-  end
-  
 end

data/app/models/document.rb

@@ -1,8 +1,6 @@
 class Document < ActiveRecord::Base
   include SocialStream::Models::Object
 
-  IMAGE_FORMATS = ["doc","ppt","xls","rar","zip","mpeg","plain","pdf"]
-
   has_attached_file :file, 
                     :url => '/:class/:id.:content_type_extension',
                     :path => ':rails_root/documents/:class/:id_partition/:style/:filename.:extension'
@@ -24,46 +22,43 @@ class Document < ActiveRecord::Base
   
   class << self 
     def new(*args)
-      if !(self.name == "Document")
-        return super
-       end 
+      # If already called from subtype, continue through the stack
+      return super if self.name != "Document"
+
       doc = super
       
-      if(doc.file_content_type.nil?)
-        return doc
-      end
-      
-      if !(doc.file_content_type =~ /^image.*/).nil?
-        return Picture.new *args
-      end
+      return doc if doc.file_content_type.blank?
       
-      if !(doc.file_content_type =~ /^audio.*/).nil?
-        return Audio.new *args
+      if klass = lookup_subtype_class(doc)
+        return klass.new *args
       end
-      
-      if !(doc.file_content_type =~ /^video.*/).nil?
-        return Video.new *args
+
+      doc
+    end
+
+    # Searches for the suitable class based on its mime type
+    def lookup_subtype_class(doc)
+      SocialStream::Documents.subtype_classes_mime_types.each_pair do |klass, mime_types|
+        return klass.to_s.classify.constantize if mime_types.include?(doc.mime_type.to_sym)
       end
-      
-      return doc
+
+      nil
     end
   end
 
+  # The Mime::Type of this document's file
   def mime_type
     Mime::Type.lookup(file_content_type)
   end
 
-  def format
-    mime_type.to_sym
+  # The type part of the {#mime_type}
+  def mime_type_type_sym
+    mime_type.to_s.split('/').first.to_sym
   end
 
-  # Thumbnail file
-  def thumb(size, helper)
-    if format && IMAGE_FORMATS.include?(format.to_s)
-      "#{ size.to_s }/#{ format }.png"
-    else
-      "#{ size.to_s }/default.png"
-    end
+  # {#mime_type}'s symbol
+  def format
+    mime_type.to_sym
   end
 
  # JSON, generic version for most documents

data/app/models/picture.rb

@@ -9,23 +9,4 @@ class Picture < Document
 
     indexes file_file_name, :as => :file_name
   end    
-
-  # Thumbnail file
-  def thumb(size, helper)
-    case size
-      when 16
-        "#{ size.to_s }/photo.png"
-      when 48
-        helper.picture_path self, :format => format, :style => 'thumb48sq'
-      when 80
-        helper.picture_path self, :format => format, :style => 'midwall'
-      when 130
-        helper.picture_path self, :format => format, :style => 'thumbwall'
-      when 500
-        helper.picture_path self, :format => format, :style => 'preview'
-      when 1000
-        helper.picture_path self, :format => format, :style => 'original'
-    end
-  end
-      
 end

data/app/models/video.rb

@@ -14,11 +14,6 @@ class Video < Document
     indexes file_file_name, :as => :file_name
   end
                       
-  # Thumbnail file
-  def thumb(size, helper)
-      "#{ size.to_s }/video.png"
-  end
-
  # JSON, special edition for video files
   def as_json(options = nil)
     {:id => id,

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

@@ -1,11 +1,2 @@
-<%= 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>
+<%= render partial: 'common_documents/document',
+           object: audio %>

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

@@ -1,39 +1,44 @@
-<div class="audio-format-links">
+<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 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">
+            <%= image_tag document_path(audio, format: :png, style: :waveform), class: 'waveform' %>
             <div class="jp-play-bar"></div>
           </div>
         </div>
-        <div class="jp-volume-bar">
-          <div class="jp-volume-bar-value"></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 class="jp-current-time"></div>
-        <div class="jp-duration"></div>
       </div>
       <div id="jp_playlist_<%= dom_id audio %>" class="jp-playlist"></div>
     </div>

data/app/views/audios/_audio_processing.html.erb

@@ -1,9 +1,9 @@
-<div class="attachment_thumb">
-  <%= thumb_for(audio, 16) %>
+<div class="thumb">
+  <%= icon audio, 70 %>
 </div>
-<div class="attachment_text">
-  <div class="title">
+<div class="text">
+  <h6>
     <%= audio.title %>
-  </div>
+  </h6>
   <div class="processing_text"><%= t('audio.processing')%></div>
 </div>

data/app/views/audios/_quick_search_result.html.erb

@@ -0,0 +1,3 @@
+<%= render partial: "common_documents/quick_search_result", 
+           object: audio,
+           as: :document %>

data/app/views/audios/_search_result.html.erb

@@ -0,0 +1 @@
+<%= render audio %>

data/app/views/audios/_timeline.html.erb

@@ -0,0 +1,11 @@
+<%= div_for audio 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/app/views/audios/index.html.erb

@@ -1 +1,3 @@
-<%= render :partial => 'common_documents/index', :locals => { :documents => @audios } %>
+<section id="audios">
+  <%= render :partial => 'common_documents/index', :locals => { :documents => @audios } %>
+</section>

data/app/views/common_documents/_document.html.erb

@@ -0,0 +1,18 @@
+<%= div_for document do %>
+  <div class="thumb">
+    <%= link_to icon(document, 50), document, :title => document.file_file_name %>
+  </div>
+  <div class="brifing">
+    <h5>
+      <%= link_to truncate(document.title, :length => 15), document %>
+    </h5>
+
+    <div class="author">
+      <%= raw t('document.by', author: link_to(document.author.name, document.author_subject)) %>
+    </div>
+
+    <%= render partial: 'objects/counters', locals: { object: document } %>
+
+  </div>
+<% end %>
+

data/app/views/common_documents/_filter.html.erb

@@ -0,0 +1 @@
+<%= text_field_tag :q, nil,:autocomplete => :off, :placeholder => t('document.filter') %>