ecm_downloads2 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2686ef3583e0d0e5e86e716d9b196b3e55d1abdf
-  data.tar.gz: 5c2510f057fea98156706db7de6a6aa007dcdf2b
+  metadata.gz: 9e98577d017dc309342a2f23200aae085cbd737e
+  data.tar.gz: e1af520faeaffc7b564967af5019df69053aca30
 SHA512:
-  metadata.gz: 2bed6fd14d17e4164ee857d1f092adf0f5e5d762833956a4a5b3b536040cbd3e2ac512a14d91d10a0aef04112dd2bf61d9384c867b1f665bc152f4f36b9a4282
-  data.tar.gz: 1c31c3d99bb6ff4b802bc2a90798173f703d36dedb54eeade77f6ad9f26044b199030faf5fd982bd008c2070eda79b56d4ca4cced518b5c4e0870339308d146a
+  metadata.gz: 3276c76926725bfd84f43f8609c44dab7e68b00ad7247fbf0b36e4b309c7d3650e31d4c09ed5a8067bce603815cfe181a173604450cd98d0908482889cdf76ed
+  data.tar.gz: 806c4ebc0a10b0a5a29787e9b7e18745027a97e5df9e899dca5a4dfb9dd96f2aeed8bdc20daf160172bf7083cf536c7db898af4ba738cc52e771ad9139e21f84

data/README.rdoc

@@ -38,6 +38,15 @@ Add the routes:
   # config/routes.rb
   Ecm::Downloads::Routing.routes(self)
 
+Add the helpers to your application controller:
+
+    # app/controllers/application_controller.rb
+    class ApplicationController < ActionController::Base
+      helper Ecm::Downloads::DownloadCategoryHelper
+      helper Ecm::Downloads::DownloadHelper
+      ...
+    end
+
 == Optional: Generate locale files
 
 You may want to copy the locales to your app:

data/app/decorators/ecm/downloads/download_category_decorator.rb

@@ -1,8 +1,11 @@
 module Ecm::Downloads
   class DownloadCategoryDecorator < Draper::Decorator
-    # delegate :root?, :parent_id, :persisted?
     delegate_all
 
+    def display_code
+      "<%= render_download_category '#{name}' %>"
+    end
+
     def ecm_downloads_downloads_count_label
       h.content_tag(:span, ecm_downloads_downloads_count, class: 'badge')
     end
@@ -14,5 +17,13 @@ module Ecm::Downloads
     def tree_name
       name
     end
+
+    def index_name
+      if self.root?
+        "[#{self.locale}] #{self.name}"
+      else
+        "#{'&#160;&#160;&#160;&#160;' * self.level} |--&#160;#{self.name}".html_safe
+      end
+    end
   end
 end

data/app/decorators/ecm/downloads/download_decorator.rb

@@ -17,5 +17,9 @@ module Ecm::Downloads
     def tree_name
       name
     end
+
+    def display_code
+      "<%= render_download '#{self.name}' %>"
+    end
   end
 end

data/app/helpers/ecm/downloads/download_category_helper.rb

@@ -1,11 +1,18 @@
 module Ecm::Downloads
   module DownloadCategoryHelper
     def render_download_category(download_category_name, options = {})
-      download_category = DownloadCategory.where(:name => download_category_name).first
+      download_category = DownloadCategory.where(:name => download_category_name).first.decorate
       if download_category.nil?
         I18n.t('ecm.downloads.download_category.messages.not_found', :name => download_category_name)
       else
-        render download_category
+        begin
+          o = '<notextile>'
+          o << render(download_category)
+          o << '</notextile>'
+          return o.html_safe
+        rescue => e
+          raise e
+        end
       end
     end
   end

data/app/helpers/ecm/downloads/download_helper.rb

@@ -1,11 +1,18 @@
 module Ecm::Downloads
   module DownloadHelper
     def render_download(download_name, options = {})
-      download = Download.where(:name => download_name).first
+      download = Download.where(:name => download_name).first.decorate
       if download.nil?
         I18n.t('ecm.downloads.download.messages.not_found', :name => download_name)
       else
-        render download
+        begin
+          o = '<notextile>'
+          o << render(download)
+          o << '</notextile>'
+          return o.html_safe
+        rescue => e
+          raise e
+        end
       end
     end
   end

data/app/models/ecm/downloads/download.rb

@@ -70,7 +70,7 @@ class Ecm::Downloads::Download < ActiveRecord::Base
   validates :name, :presence => true
   validates_attachment :asset, presence => true
   do_not_validate_attachment_file_type :asset
-  # public methods
+
 
   def human
     name
@@ -80,8 +80,8 @@ class Ecm::Downloads::Download < ActiveRecord::Base
     human
   end
 
-  # private methods
   private
+
   def fix_updated_position
     Rails.logger.debug "Fixing positions for #{self.to_s} (Moving to last)"
     add_to_list_bottom

data/app/models/ecm/downloads/download_category.rb

@@ -43,37 +43,11 @@ class Ecm::Downloads::DownloadCategory < ActiveRecord::Base
   validates :locale, :absence => true,
                      :unless => :root?
 
-  # public methods
-
-  # public methods
-
-  def display_code
-    "<%= render_download_category '#{self.name}' %>"
-  end
-
   def human
     name
   end
 
-  def index_name
-    if self.root?
-      "[#{self.locale}] #{self.name}"
-    else
-      "#{'&#160;&#160;&#160;&#160;' * self.level} |--&#160;#{self.name}".html_safe
-    end
-  end
-
   def to_s
     name
   end
-
-  # def tree_name
-  #   root_prefix = (self.root?) ? "[#{self.locale}] " : ""
-
-  #   if ecm_downloads_downloads_count < 1
-  #     "#{root_prefix}#{to_s}"
-  #   else
-  #     "#{root_prefix}#{to_s} (#{ecm_downloads_downloads_count})"
-  #   end
-  # end
 end

data/app/views/ecm/downloads/download_categories/_download_category.html.erb

@@ -7,14 +7,14 @@
     </div>
   <% end %>
 
-  <%= render partial: 'table', locals: { download_categories: Ecm::Downloads::DownloadCategoryDecorator.decorate_collection(download_category.descendants) } %>
+  <%= render partial: 'ecm/downloads/download_categories/table', locals: { download_categories: Ecm::Downloads::DownloadCategoryDecorator.decorate_collection(download_category.descendants) } %>
 
   <div class="download_category-downloads item_list">
-    <h2><%= Ecm::Downloads::DownloadCategory.human_attribute_name(:ecm_downloads_downloads) %></h2>
+
     <% if download_category.ecm_downloads_downloads.published.count == 0 %>
       <p><%= t('ecm.downloads.download_category.messages.no_downloads_available') %></p>
     <% else %>
-      <%= render partial: 'ecm/downloads/downloads/table', locals: { downloads: download_category.ecm_downloads_downloads.published } %>
+      <%= render partial: 'ecm/downloads/downloads/table_in_download_category', locals: { downloads: download_category.ecm_downloads_downloads.published } %>
     <% end %>
   </div>
 </div>

data/app/views/ecm/downloads/download_categories/_table.html.erb

@@ -1,7 +1,7 @@
 <div class="table-responsive">
   <table class="<%= Ecm::Downloads::Configuration.download_categories_table_classes %>">
     <tbody>
-      <%= render partial: 'download_category_in_table', collection: download_categories, as: :download_category %>
+      <%= render partial: 'ecm/downloads/download_categories/download_category_in_table', collection: download_categories, as: :download_category %>
     </tbody>
   </table>
 </div>

data/app/views/ecm/downloads/download_categories/show.html.erb

@@ -4,6 +4,6 @@
 <% if @download_category.root? %>
   <%= link_to(t('ecm.downloads.download_category.actions.back_to_index'), ecm_downloads_download_categories_path, class: 'btn btn-default') if respond_to?(:ecm_downloads_download_categories_path) %>
 <% else %>
-  <%= link_to(Ecm::Downloads::DownloadCategory.human_attribute_name(:parent), @download_category.parent, class: 'btn btn-default') %>
+  <%= link_to(t('ecm.downloads.views.actions.back'), @download_category.parent, class: 'btn btn-default') %>
 <% end %>
 </div>

data/app/views/ecm/downloads/downloads/_download.html.erb

@@ -1,4 +1,4 @@
-<h1><%= download.human %></h1>
+<h3><%= download.human %></h3>
 
 <div class="description bottom-margin-1">
   <%= download.description %>

data/app/views/ecm/downloads/downloads/_table_in_download_category.html.erb

@@ -0,0 +1,12 @@
+<div class="panel panel-primary">
+  <div class="panel-heading">
+    <h3 class="panel-title"><%= Ecm::Downloads::DownloadCategory.human_attribute_name(:ecm_downloads_downloads) %></h3>
+  </div>
+  <div class="table-responsive">
+    <table class="<%= Ecm::Downloads::Configuration.downloads_table_classes %>">
+      <tbody>
+        <%= render partial: 'ecm/downloads/downloads/download_in_table', collection: downloads, as: :download %>
+      </tbody>
+    </table>
+  </div>
+</div>

data/config/locales/ecm.downloads.download.de.yml

@@ -13,6 +13,8 @@ de:
         description: Beschreibung
         ecm_downloads_download_category: Download Kategorie
         ecm_downloads_download_category_id: Download Kategorie
+        filesize: Dateigröße
+        link: Link
         locale: Sprache
         name: Name
         position: Position

data/config/locales/ecm.downloads.download.en.yml

@@ -13,6 +13,8 @@ en:
         description: description
         ecm_downloads_download_category: download category
         ecm_downloads_download_category_id: download category
+        filesize: filesize
+        link: link
         locale: locale
         name: name
         position: position

data/config/locales/ecm.downloads.download_category.de.yml

@@ -10,6 +10,7 @@ de:
         ecm_downloads_downloads: Downloads
         ecm_downloads_downloads_count: Downloads
         lft: Links
+        link: Link
         locale: Sprache
         name: Name
         parent: Über Kategorie

data/config/locales/ecm.downloads.download_category.en.yml

@@ -10,6 +10,7 @@ en:
         ecm_downloads_downloads: downloads
         ecm_downloads_downloads_count: downloads
         lft: left
+        link: link
         locale: locale
         name: name
         parent: parent

data/lib/ecm/downloads/active_admin/ecm_downloads_download_categories.rb

@@ -3,6 +3,8 @@ if defined?(ActiveAdmin)
   include ActiveAdmin::AwesomeNestedSet::Helper
 
   ActiveAdmin.register Ecm::Downloads::DownloadCategory do
+    decorate_with Ecm::Downloads::DownloadCategoryDecorator
+
     # menu entry settings
     menu :parent => I18n.t('ecm.downloads.active_admin.menu')
 
@@ -41,7 +43,7 @@ if defined?(ActiveAdmin)
       f.inputs do
         f.semantic_errors *f.object.errors.keys
       end
-      
+
       f.inputs do
         f.input :parent, :as => :select,
                          :collection => nested_set_options(Ecm::Downloads::DownloadCategory, f.object) { |dc| "#{'-' * dc.depth} #{dc.name}" }
@@ -104,7 +106,7 @@ if defined?(ActiveAdmin)
 
       panel Ecm::Downloads::DownloadCategory.human_attribute_name(:link) do
         div do
-          ecm_downloads_download_category_path(I18n.locale, ecm_downloads_download_category)
+          ecm_downloads_download_category_path(ecm_downloads_download_category)
         end
       end
 

data/lib/ecm/downloads/active_admin/ecm_downloads_downloads.rb

@@ -2,6 +2,8 @@ include ActiveAdmin::ActsAsList::Helper
 include ActsAsPublished::ActiveAdminHelper
 
 ActiveAdmin.register Ecm::Downloads::Download do
+  decorate_with Ecm::Downloads::DownloadDecorator
+
   # acts as list
   sortable_member_actions
 
@@ -46,4 +48,36 @@ ActiveAdmin.register Ecm::Downloads::Download do
     column :created_at
     actions
   end
+
+  show :title => :to_s do
+    attributes_table do
+      row :ecm_downloads_download_category
+      row :name
+      row :published_at
+      row :asset_file_name
+      row :filesize
+      row :asset_content_type
+      row :asset_fingerprint
+      row :created_at
+      row :updated_at
+    end
+
+    panel Ecm::Downloads::Download.human_attribute_name(:description) do
+      div do
+        ecm_downloads_download.description
+      end
+    end
+
+    panel Ecm::Downloads::Download.human_attribute_name(:display_code) do
+      div do
+        ecm_downloads_download.display_code
+      end
+    end
+
+    panel Ecm::Downloads::Download.human_attribute_name(:link) do
+      div do
+        ecm_downloads_download_path(ecm_downloads_download)
+      end
+    end
+  end
 end if defined?(ActiveAdmin)

data/lib/ecm/downloads/version.rb

@@ -1,6 +1,6 @@
 module Ecm
   module Downloads
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_downloads2
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -439,6 +439,7 @@ files:
 - app/views/ecm/downloads/downloads/_download.html.erb
 - app/views/ecm/downloads/downloads/_download_in_table.html.erb
 - app/views/ecm/downloads/downloads/_table.html.erb
+- app/views/ecm/downloads/downloads/_table_in_download_category.html.erb
 - app/views/ecm/downloads/downloads/index.html.erb
 - app/views/ecm/downloads/downloads/show.html.erb
 - config/locales/active_admin.patch.de.yml