social_stream-documents 0.4.6 → 0.4.7

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

@@ -1 +1 @@
-<%=render(:partial => 'common/index') %>
+<%=render(:partial => 'common_documents/index') %>

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

@@ -1,2 +1,2 @@
-<%= render :partial => 'common/show',
+<%= render :partial => 'common_documents/show',
            :locals  => { :document => @audio } %>

data/app/views/{common → common_documents}/_document_info.html.erb

@@ -40,4 +40,4 @@
     <br class="clearfloat" />
   </div>
 </div>
-<%= render :partial => "common/edit_form", :locals => {:document => document} %> 
+<%= render :partial => "common_documents/edit_form", :locals => {:document => document} %> 

data/app/views/{common → common_documents}/_index.html.erb

@@ -1,5 +1,5 @@
 <% unless params[:no_layout].present? %>
-  <%= render :partial => "common/headers" %>
+  <%= render :partial => "common_documents/headers" %>
   <div id="documents_grid">
 <% end %> 
 

data/app/views/{common → common_documents}/_show.html.erb

@@ -28,7 +28,7 @@
 
 <%= show_view_for document %>
 
-<%= render :partial => "common/document_info", :locals => {:document => document} %>
+<%= render :partial => "common_documents/document_info", :locals => {:document => document} %>
 
 <div id="document_comments">
   <%= render :partial => 'activities/comments', :locals => { :activity => document.post_activity } %>

data/app/views/documents/index.html.erb

@@ -1 +1 @@
-<%=render(:partial => 'common/index') %>
+<%=render(:partial => 'common_documents/index') %>

data/app/views/documents/show.html.erb

@@ -1,2 +1,2 @@
-<%= render :partial => 'common/show',
+<%= render :partial => 'common_documents/show',
            :locals  => { :document => @document } %>

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

@@ -1 +1 @@
-<%=render(:partial => 'common/index') %>
+<%=render(:partial => 'common_documents/index') %>

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

@@ -1,2 +1,2 @@
-<%= render :partial => 'common/show',
+<%= render :partial => 'common_documents/show',
            :locals  => { :document => @picture } %>

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

@@ -1 +1 @@
-<%=render(:partial => 'common/index') %>
+<%=render(:partial => 'common_documents/index') %>

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

@@ -1,2 +1,2 @@
-<%= render :partial => 'common/show',
+<%= render :partial => 'common_documents/show',
            :locals  => { :document => @video } %>

data/config/locales/en.yml

@@ -14,8 +14,8 @@ en:
       details: "Details"
       download: "Download"
       edit: "Edit"
-    all: "All documents"
-    confirm_delete: "Delete document?"
+    all: "All files"
+    confirm_delete: "Delete file?"
     form:
       title: "File"
     info:
@@ -28,8 +28,8 @@ en:
         title: "Upload"
       title:
         title: "Title"
-    mine: "My documents"
-    msg: "Uploaded a document:"
+    mine: "My files"
+    msg: "Uploaded a file:"
     name: "file"
     not_mine: "Documents"
     one: "a file"
@@ -52,7 +52,7 @@ en:
   resource:
     all: "All Resources"
     confirm_delete: "Delete resource?"
-    title: "Files"
+    title: "Resources"
     mine: "My resources"
     msg: "Uploaded a resource:"
     not_mine: "Resources"

data/config/locales/es.yml

@@ -14,8 +14,8 @@ es:
       details: "Detalles"
       download: "Descargar"
       edit: "Editar"
-    all: "Todos los documentos"
-    confirm_delete: "¿Borrar documento?"
+    all: "Todos los ficheros"
+    confirm_delete: "¿Borrar fichero?"
     form:
       title: "Fichero"
     info:
@@ -28,11 +28,11 @@ es:
         title: "Subir"
       title:
         title: "Título"
-    mine: "Mis documentos"
-    msg: "Subió un documento:"
-    name: "documento"
+    mine: "Mis ficheros"
+    msg: "Subió un fichero:"
+    name: "fichero"
     not_mine: "Documentos"
-    one: "un documento"
+    one: "un fichero"
     simple_all: "Todos"
     title: "Documentos"
   picture:
@@ -52,7 +52,7 @@ es:
   resource:
     all: "Todos los recursos"
     confirm_delete: "¿Borrar recursos?"
-    title: "Archivos"
+    title: "Recursos"
     mine: "Mis recursos"
     msg: "Subió un recurso:"
     not_mine: "Recursos"

data/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.4.6".freeze
+    VERSION = "0.4.7".freeze
   end
 end

data/lib/social_stream/toolbar_config/documents.rb

@@ -5,10 +5,10 @@ module SocialStream
         items = super
 
         items << {
-          :key => :resources,
-          :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("resource.title"),
+          :key => :documents,
+          :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("document.title"),
           :url => polymorphic_path([subject, Document.new]),
-          :options => {:link => {:id => "resources_menu"}}
+          :options => {:link => {:id => "documents_menu"}}
         }
       end
       
@@ -16,10 +16,10 @@ module SocialStream
         items = super
 
         items << {
-          :key => :resources,
-          :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("resource.title"),
+          :key => :documents,
+          :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("document.title"),
           :url => polymorphic_path([current_subject, Document.new]),
-          :options => {:link => {:id => "resources_menu"}}
+          :options => {:link => {:id => "documents_menu"}}
         }
       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.34')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.35')
   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: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 4
-  - 6
-  version: 0.4.6
+  - 7
+  version: 0.4.7
 platform: ruby
 authors: 
 - "V\xC3\xADctor S\xC3\xA1nchez Belmar"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-18 00:00:00 +01:00
+date: 2011-11-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 127
+        hash: 125
         segments: 
         - 0
         - 9
-        - 34
-        version: 0.9.34
+        - 35
+        version: 0.9.35
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -256,17 +256,16 @@ files:
 - app/views/audios/index.html.erb
 - app/views/audios/index.js.erb
 - app/views/audios/show.html.erb
-- app/views/common/_document_info.html.erb
-- app/views/common/_edit_form.html.erb
-- app/views/common/_headers.html.erb
-- app/views/common/_index.html.erb
-- app/views/common/_show.html.erb
+- app/views/common_documents/_document_info.html.erb
+- app/views/common_documents/_edit_form.html.erb
+- app/views/common_documents/_headers.html.erb
+- app/views/common_documents/_index.html.erb
+- app/views/common_documents/_show.html.erb
 - app/views/documents/_document.html.erb
 - app/views/documents/_document_focus_search.html.erb
 - app/views/documents/_document_global_search.html.erb
 - app/views/documents/_document_show.html.erb
 - app/views/documents/_document_with_details.html.erb
-- app/views/documents/_header.html.erb
 - app/views/documents/_new_activity.html.erb
 - app/views/documents/_new_activity_fields.html.erb
 - app/views/documents/destroy.js.erb

data/app/views/documents/_header.html.erb

@@ -1,5 +0,0 @@
-<% content_for :headers do %>
-        <%= stylesheet_link_tag "documents" %>
-<% end %>
-
-<%= image_tag("btn/document.png", :class => "size_19px") %> <%=t('resource.title')%>