social_stream-documents 0.7.0 → 0.8.0

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

@@ -18,15 +18,23 @@
 
 .attachment_text
 {
-	line-height: 20px;
-	height: auto;
-	font-size:13px;
+        float: left;
+	font-size:11px;
+	margin-bottom: 3px;
+	text-align: left;
+	width: 310px;
+}
+
+.attachment_text .title
+{
+        font-weight: bold;
+	margin: 10px 0 3px 0;
 }
 
 .attachment_text_link
 {
 	color: #2A3890;
-	padding-left: 10px;
+	text-decoration: underline;
 }
 
 .attachment_text audio
@@ -46,7 +54,7 @@
 	/*width: 10%;*/
 	float: left;
 	/*height: 50px;*/
-  padding-right:5px;
+	padding-right:5px;
 	vertical-align: middle;
 }
 
@@ -278,3 +286,20 @@
   width: 100%;
   text-align: center;
 }
+
+/* Uploaded images, audio and vids */
+.picture_thumbnail_show {
+  padding: 10px;
+}
+
+.picture_thumbnail_show, .picture_thumbnail_show img {
+  position: relative;
+  float: left;
+  max-height: 100px;
+  width: 130px;
+}
+
+.attachment_thumb {
+  position: relative;
+  float: left;
+} 

data/app/helpers/documents_helper.rb

@@ -20,7 +20,7 @@ module DocumentsHelper
   def link_for_wall(document)
     format = Mime::Type.lookup(document.file_content_type)
 
-    polymorphic_path(document, :format => format, :style => 'thumb0')
+    polymorphic_path(document, :format => format, :style => 'thumbwall')
   end
   
   def show_view_for(document)

data/app/models/picture.rb

@@ -2,8 +2,9 @@ class Picture < Document
   has_attached_file :file, 
                     :url => '/:class/:id.:extension',
                     :path => ':rails_root/documents/:class/:id_partition/:style',
-                    :styles => {:thumb  => ["48x48#"],
-                                :thumb0 => ["130x80#"]
+                    :styles => {:thumb48sq  => ["48x48"],
+                                :thumbwall => ["130x97#"],
+                                :preview => ["500>"]
                                }                              
                                
   define_index do
@@ -14,17 +15,19 @@ class Picture < Document
     
     has created_at
   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 => 'thumb'   
+        helper.picture_path self, :format => format, :style => 'thumb48sq'
       when 130
-        helper.picture_path self, :format => format, :style => 'thumb0'    
+        helper.picture_path self, :format => format, :style => 'thumbwall'
+      when 500
+        helper.picture_path self, :format => format, :style => 'preview'
     end
   end
-    
-  
+      
 end

data/app/models/video.rb

@@ -5,8 +5,8 @@ class Video < Document
                     :styles => {
                       :webm => {:format => 'webm'},
                       :flv  => { :format => 'flv' },
-                      :thumb  => {:geometry => "48x48" , :format => 'png', :time => 5},
-                      :thumb0 => {:geometry => "130x80", :format => 'png', :time => 5}
+                      :thumb48sq  => {:geometry => "48x48" , :format => 'png', :time => 5},
+                      :thumbwall => {:geometry => "130x97#", :format => 'png', :time => 5}
                     },
                     :processors => [:ffmpeg]
                     

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

@@ -1,29 +1,24 @@
 <%= div_for picture, :class => 'content_size' do %>
 
-  <div class="attachment_thumb picture_link">
-    <%= link_to thumb_for(picture, 16),
-                 picture_path(picture),
-                :type => picture.type, 
-            		:title => picture.title,
-            		:path => document_path(picture) %>
-  </div>
-  
-  <div class="attachment_text picture_summary_class picture_link">
-  	<%= t('picture.msg') %>
-  	<%= link_to "\""+picture.title+"\"", 
-                picture_path(picture),
-                :alt => picture.title,
-               	:type => picture.type,
-               	:path => document_path(picture),
-                :class => "attachment_text_link" %>
-  </div>
-  
   <div class="picture_link picture_thumbnail_show">
     <%= link_to thumb_for(picture, 130),
                 download_document_path(picture),
-        :type => picture.type, 
-		:title => picture.title,
-		:path => document_path(picture) %>
+        :type => picture.type,
+                :title => picture.title,
+                :path => document_path(picture) %>
+  </div>
+
+  <div class="attachment_text picture_summary_class">
+        <div class="title"> 
+  	  <%= picture.title %>
+        </div>
+	<%= picture.description %>
+        <%= link_to t('picture.msg'),
+              picture_path(picture),
+              :alt => t('picture.msg'),
+              :type => picture.type,
+              :path => document_path(picture),
+              :class => "attachment_text_link picture_link" %>
   </div>
 <% end %>
 

data/app/views/pictures/_picture_show.html.erb

@@ -1,6 +1,6 @@
 <%= div_for picture, :class => 'content_size' do %>
   <div class="picture_show">
-    <%= link_to image_tag_for(picture),
+    <%= link_to thumb_for(picture, 500),
         download_document_path(picture),
         :id => dom_id(picture) + "_a",
         :type => picture.type, 
@@ -12,7 +12,6 @@
 
 <%= javascript_tag do %>
   $(document).ready(function() {
-    $("#<%= dom_id picture %> #<%= dom_id picture %>_img").aeImageResize({ height: 500, width: 500 });
     $("#<%= dom_id picture %> #<%= dom_id picture %>_a").lightBox({ 
       maxHeight: 920,
       maxWidth: 920,
@@ -23,4 +22,4 @@
       imageBlank: '../assets/lightbox-blank.gif'});    
       
   })  
-<% end %>
+<% end %>

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

@@ -9,7 +9,7 @@
   video,
   :class => "attachment_text_link" %>
   <div id="video_thumbnail_<%= video.id%>" class="video_thumbnail_class">
-    <%= image_tag(video_path(video, :format => :png, :style => 'thumb0'), :class => "video_thumbnail_image", :alt => "")%> <div id="<%= video.id%>" class="video_thumbnail_play_over"></div>
+    <%= 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>
   <div id="full_video_<%= video.id%>" class="jp-video jp-video-270p">
     <div class="jp-type-single">
@@ -47,4 +47,4 @@
       <div id="jp_playlist_<%= video.id%>" class="jp-playlist"></div>
     </div>
   </div>
-</div>
+</div>

data/config/locales/en.yml

@@ -43,7 +43,7 @@ en:
     confirm_delete: "Delete picture?"
     title: "Pictures"
     mine: "My pictures"  
-    msg: "Uploaded a picture:"
+    msg: "See details..."
     name: "picture"
     not_mine: "Pictures"
     one: "a picture"

data/config/locales/es.yml

@@ -43,7 +43,7 @@ es:
     confirm_delete: "¿Borrar imagen?"
     title: "Imágenes"
     mine: "Mis imágenes"
-    msg: "Subió una imagen:"
+    msg: "Ver detalles..."
     name: "imagen"
     not_mine: "Imágenes"
     one: "una imagen"

data/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.7.0".freeze
+    VERSION = "0.8.0".freeze
   end
 end

data/social_stream-documents.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.12.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.13.0')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   # Waiting for version > 2.4.5, which fixes:
   # https://github.com/thoughtbot/paperclip/issues/293

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-documents
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-11 00:00:00.000000000Z
+date: 2012-01-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &70784500 !ruby/object:Gem::Requirement
+  requirement: &81110600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70784500
+  version_requirements: *81110600
 - !ruby/object:Gem::Dependency
   name: paperclip-ffmpeg
-  requirement: &70783900 !ruby/object:Gem::Requirement
+  requirement: &81110050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70783900
+  version_requirements: *81110050
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70783600 !ruby/object:Gem::Requirement
+  requirement: &81109530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -44,10 +44,10 @@ dependencies:
         version: 2.3.11
   type: :runtime
   prerelease: false
-  version_requirements: *70783600
+  version_requirements: *81109530
 - !ruby/object:Gem::Dependency
   name: delayed_paperclip
-  requirement: &70783320 !ruby/object:Gem::Requirement
+  requirement: &81108650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -55,10 +55,10 @@ dependencies:
         version: 0.7.2
   type: :runtime
   prerelease: false
-  version_requirements: *70783320
+  version_requirements: *81108650
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70783090 !ruby/object:Gem::Requirement
+  requirement: &81107460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70783090
+  version_requirements: *81107460
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70782730 !ruby/object:Gem::Requirement
+  requirement: &81106510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70782730
+  version_requirements: *81106510
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70782400 !ruby/object:Gem::Requirement
+  requirement: &81105640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *70782400
+  version_requirements: *81105640
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &70782100 !ruby/object:Gem::Requirement
+  requirement: &81104640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *70782100
+  version_requirements: *81104640
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70781840 !ruby/object:Gem::Requirement
+  requirement: &81104060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,7 +110,7 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *70781840
+  version_requirements: *81104060
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.