social_stream-documents 0.4.2 → 0.4.3

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

@@ -51,10 +51,9 @@
 }
 
 #new_document{
-	margin-top: 10px;
-	margin-left: 15px;
-	margin-bottom: 10px;
+	margin-left: 10px;
 	clear: both;
+	padding-top: 5px;
 	text-align: left;
 }
 
@@ -68,13 +67,19 @@
 	overflow: hidden;
   border: 1px solid transparent;
   padding: 5px;
+  position: relative;
 }
 
-.attachment_tile img{
+.attachment_tile_thumb img{
   width: 48px;
   height: 48px;
 }
 
+.attachment_tile_tipsy{
+  position: absolute;
+  top: 0px;
+  right: 9px;
+}
 
 .attachment_tile:hover{
 	border: 1px solid $main-color;
@@ -95,6 +100,43 @@
 	background-color: #e0edf2;
 }
 
+.attachment_tile_tipsy_menu.tipsy {
+  padding-top: 0px;
+  display: none;
+}
+.attachment_tile_tipsy_menu.tipsy .tipsy-arrow {
+  display: none;
+}
+.attachment_tile_tipsy_menu.tipsy .tipsy-inner {
+  background-color: $text-over-main;
+  border-radius: 0px;
+  -moz-border-radius: 0px;
+  -webkit-border-radius: 0px;
+  padding:0px;
+}
+.attachment_tile_tipsy_menu.tipsy .actions {
+  border-bottom: 1px solid $main-color;
+  text-align: left;
+}
+.attachment_tile_tipsy_menu.tipsy .actions .action {
+  border: 1px solid $main-color;
+  border-bottom: 0px;
+  padding:5px;
+  width: 80px;
+}
+.attachment_tile_tipsy_menu.tipsy .actions .action:hover {
+  background-color: $secondary-color;
+}
+.attachment_tile_tipsy_menu.tipsy .actions a:hover {
+  text-decoration: none;
+}
+.attachment_tile_tipsy_menu.tipsy .actions .action img {
+  vertical-align: middle;
+  padding-bottom: 3px;
+  padding-right: 3px;
+  padding-left: 3px;
+  display: inline-block;
+}
 #repository_filter {
   margin-left: 10px;
 }

data/app/controllers/documents_controller.rb

@@ -82,7 +82,7 @@ class DocumentsController < InheritedResources::Base
     if params[:query].present? 
       @activities = @activities.joins(:activity_objects => :document).where('documents.title LIKE ?', get_search_query)
     end
-    @activities.page(params[:page]).per(PER_PAGE)
+    @activities = @activities.page(params[:page]).per(PER_PAGE)
   end
 
   class << self

data/app/views/common/_document_info.html.erb

@@ -25,7 +25,9 @@
   <br class="clearfloat" />
   <div id="actions">
     <%= link_to content_tag(:span,image_tag("btn/download.png") + t('document.actions.download'), :class => :action), download_document_path(document) %>
-    <%= link_to content_tag(:span,image_tag("btn/edit.png") + t('document.actions.edit'), :class => :action, :id => :document_edit_action), "javascript:toggleDocumentEdit();" %>
+    <% 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:toggleDocumentEdit();" %>
+    <% 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',
         :scope => document.post_activity.direct_object.class.to_s.underscore), :method => :delete %>

data/app/views/common/_edit_form.html.erb

@@ -47,3 +47,11 @@
   </div>
   <% end %>
 </div>
+
+<% if params[:editing].present? and params[:editing].eql?"true" and document.post_activity.edit_object_by?(current_subject) %>
+  <%= javascript_tag do %>
+    $(document).ready(function(){
+      toggleDocumentEdit();
+    });
+  <% end %>
+<% end %>

data/app/views/common/_headers.html.erb

@@ -21,9 +21,7 @@
 <br class="clearfloat" />
 <div class="space_center"></div>
 <div id="repository_filter">
-  <form action="<%= search_path%>" method="get" id="repository_filter">
     <%= text_field_tag :filter_query, nil,:autocomplete => :off, :id => :repository_filter_input %>
-  </form>
   <div id="order_by"><%= t('repository.order.by') %>: <%= t('repository.order.last_modified') %> · <%= t('repository.order.most_popular') %>  </div>
 </div>
 <div class="space_center"></div>

data/app/views/common/_index.html.erb

@@ -5,7 +5,7 @@
 
 <% @activities.each do |a| %>
 <% document = a.activity_objects.first.document %>
-<div class="attachment_tile">
+<div class="attachment_tile" id="<%= dom_id(document)%>">
   <div class="attachment_tile_thumb">
     <%= link_to thumb_for(document,48),
     {:controller => "documents", :action => "show", :id => document},
@@ -13,6 +13,22 @@
     :title => document.file_file_name,
     :path => document_path(document) %>
   </div>
+  <div class="attachment_tile_tipsy">
+    <%= link_to image_tag("btn/btn_down.png"),
+    "javascript:;"  %>
+    <div class="tipsy_content" style="display:none;">
+      <div class="actions">        
+        <%= link_to content_tag(:div,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(:div,image_tag("btn/edit.png") + t('document.actions.edit'), :class => :action, :id => :document_edit_action), document_path(document, :editing => true) %>
+        <% end %>
+        <% if document.post_activity.delete_object_by?(current_subject) %>
+          <%= link_to content_tag(:div,image_tag("btn/error.png") + t('document.actions.delete'), :class => :action), document.post_activity.direct_object , :confirm => t('confirm_delete',
+            :scope => document.post_activity.direct_object.class.to_s.underscore), :method => :delete %>
+        <% end %>
+      </div>
+    </div>
+  </div>
   <div class="attachment_tile_text">
     <%= link_to truncate_name(document.file_file_name,:length => 15),
     {:controller => "documents", :action => "show", :id => document},
@@ -21,6 +37,21 @@
     :path => document_path(document) %>
   </div>
 </div>
+<%= javascript_tag do %>
+$(document).ready(function(){
+  $('#<%= dom_id(document)%> .attachment_tile_tipsy a').tipsy({
+    delayIn: 0,   
+    delayOut: 1000, 
+    gravity: 'nw', 
+    className: 'attachment_tile_tipsy_menu',
+    html: true,
+    hoverable: true,
+    title: function(){
+      return $('#<%= dom_id(document)%> .attachment_tile_tipsy .tipsy_content').html();
+    }
+  });
+});
+<% end %>
 <% end %> 
 
 <% if @activities.size == DocumentsController::PER_PAGE %>
@@ -33,3 +64,5 @@
 <% unless params[:no_layout].present? %>
   </div>
 <% end %> 
+
+

data/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.4.2".freeze
+    VERSION = "0.4.3".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.9.25')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.27')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   s.add_runtime_dependency('paperclip','2.3.11')
   s.add_runtime_dependency('delayed_paperclip','>= 0.7.2')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-documents
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - "V\xC3\xADctor S\xC3\xA1nchez Belmar"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-04 00:00:00 +01:00
+date: 2011-11-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 13
         segments: 
         - 0
         - 9
-        - 25
-        version: 0.9.25
+        - 27
+        version: 0.9.27
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency