cmor_files 0.0.54.pre → 0.0.59.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a95d17cb60910105b23d478f6c5f6da7ffcb02761a353485b7c8ea4452ac915d
-  data.tar.gz: 8fc8b16b6dba1504ae0498056543855810a47c7127c6bab36f602b247b10917b
+  metadata.gz: acee5a135cac1afacc3116fe809c1da48ee1a63c2ddb3486789368a7d91ac1ed
+  data.tar.gz: e80877f393ad8fe48ca230641d7f8b28e3a20548367f1dff9cf9b48fee4ef109
 SHA512:
-  metadata.gz: b6073f504c35588b87722fd8900ed388628ad4a36c9c7253ce1c9a5af96aaa8bb72712cbd003f5fa3f18a9cc56efed035891f4e235b997692bf7d81d76f8b033
-  data.tar.gz: 99118a3eb349d61aef8a9ee024e5457ff4a4c013781fda6b5dc8d664dd72edbc66e773039711b74927637642c3d9344eeedb2d0ea660b4a6a1b9921cb7ff694e
+  metadata.gz: 173df29e329d9d0188cec32a07b8a1c88573340d5385c06fe79fca414bc43e73c664b0fec0fab2da5f31416754529561903f224129a720413c17aa842d92f828
+  data.tar.gz: c39555e64ad3757424fda55e9ed915f94f26ce77da20e511495afe7a23ea273ab20b48dca23c2f5d73da09a54fbac15ca290e2a643126479e185982f1868af7c

data/app/models/cmor/files/file_detail.rb

@@ -16,5 +16,9 @@ module Cmor::Files
     friendly_id :title, use: :slugged
 
     validates :identifier, uniqueness: { scope: [ :folder_id ] }, allow_blank: true, allow_nil: true
+
+    def label
+      title.presence || asset&.blob&.filename&.to_s&.truncate(64).presence
+    end
   end
 end

data/app/view_helpers/cmor/files/application_view_helper.rb

@@ -11,7 +11,7 @@ module Cmor
       # Example:
       #
       #     # app/views/layouts/application.html.haml
-      #     = files_helper(self).render_download(identifier: 'Quick reference manual')
+      #     = files_helper(self).render_file(identifier: 'Quick reference manual')
       #
       def render_file(identifier:)
         resource = Cmor::Files::FileDetail.published.where(identifier: identifier).first
@@ -21,6 +21,24 @@ module Cmor
           render resource: resource
         end
       end
+
+      # Example:
+      #
+      #     # app/views/layouts/application.html.haml
+      #     = files_helper(self).render_folder(identifier: 'Manuals')
+      #
+      def render_folder(identifier:)
+        resource = Cmor::Files::Folder.published.where(identifier: identifier).first
+        if resource.nil?
+          "Could not find published folder with identifier: '#{identifier}'."
+        else
+          render resource: resource
+        end
+      end
+
+      def asset_download_button_label(asset)
+        "#{c.t(".download")} (#{asset.blob.content_type.split('/').last}, #{c.number_to_human_size(asset.blob.byte_size)})"
+      end
     end
   end
 end

data/app/views/cmor/files/application_view_helper/_render_folder.html.haml

@@ -0,0 +1,14 @@
+.row
+  .col-12
+    %h4= resource.name
+
+.row
+  .col-12
+    .table-responsive
+      = collection_table(collection: resource.file_details, resource_class: Cmor::Files::FileDetail, header: false) do |table|
+        = table.column :label
+        = table.column :actions, html: "text-right" do |resource|
+          - capture_haml do
+            .text-right
+              = link_to(main_app.url_for(resource.asset), class: 'btn btn-primary') do
+                = files_helper(self).asset_download_button_label(resource.asset)

data/app/views/cmor/files/folders/index.html.haml

@@ -5,5 +5,5 @@
     = collection_table(collection: @collection, resource_class: resource_class) do |t|
       = t.column :name
       = t.column :assets_count
-      = t.column :actions do |resource|
+      = t.column :actions, title: false do |resource|
         - link_to(t('.show'), [resource], class: 'btn btn-primary')

data/app/views/cmor/files/folders/show.html.haml

@@ -1,15 +1,19 @@
-%h1= @resource.name
+.row
+  .col-12
+    %h1= @resource.name
 
 .row
   .col-12
-    = collection_table(collection: @resource.file_details, resource_class: Cmor::Files::FileDetail, header: false) do |table|
-      = table.column :filename do |resource|
-        - resource.asset.blob.filename
-      = table.column :blob_byte_size do |resource|
-        - number_to_human_size(resource.asset.blob.byte_size)
-      = table.column :actions do |resource|
-        - capture_haml do
-          = link_to(t('.download'), main_app.url_for(resource.asset), class: 'btn btn-primary')
+    .table-responsive
+      = collection_table(collection: @resource.file_details, resource_class: Cmor::Files::FileDetail, header: false) do |table|
+        = table.column :label
+        = table.column :blob_byte_size do |resource|
+          - number_to_human_size(resource.asset.blob.byte_size)
+        = table.column :actions do |resource|
+          - capture_haml do
+            .text-right
+              = link_to(main_app.url_for(resource.asset), class: 'btn btn-primary') do
+                = files_helper(self).asset_download_button_label(resource.asset)
 
 
 .row.mt-4

data/config/locales/de.yml

@@ -18,8 +18,11 @@ de:
         id: ID
         asset: Datei
         asset_id: Datei
+        asset_permanent_path: Permanenter Datei-Pfad
+        asset_permanent_url: Permanente Datei-URL
         blob_byte_size: Dateigröße
         blob_checksum: Checksumme
+        blob_content_type: Dateityp
         blob_created_at: Datei erstellt am
         blob_filename: Dateiname
         description: Beschreibung
@@ -27,6 +30,7 @@ de:
         folder: Ordner
         folder_id: Ordner
         identifier: Bezeichner
+        label: Label
         position: Position
         published: Veröffentlicht
         published_at: Veröffentlicht am
@@ -36,12 +40,14 @@ de:
         updated_at: Aktualisiert am
       cmor/files/folder:
         id: ID
+        append_assets: Dateien hinzufügen
         assets: Dateien
         assets_count: Dateien
         description: Beschreibung
         identifier: Bezeichner
         locale: Sprache
         name: Name
+        overwrite_assets: Dateien ersetzen
         position: Position
         published: Veröffentlicht
         published_at: Veröffentlicht am

data/config/locales/en.yml

@@ -18,8 +18,11 @@ en:
         id: ID
         asset: Asset
         asset_id: Asset
+        asset_permanent_path: Permanent asset path
+        asset_permanent_url: Permanent asset ur
         blob_byte_size: Filesize
         blob_checksum: Checksum
+        blob_content_type: Content-Type
         blob_created_at: File created at
         blob_filename: Filename
         description: Description
@@ -27,6 +30,7 @@ en:
         folder: Folder
         folder_id: Folder
         identifier: Identifier
+        label: Label
         position: Position
         published: Published
         published_at: Published at
@@ -36,12 +40,14 @@ en:
         updated_at: Updated at
       cmor/files/folder:
         id: ID
+        append_assets: Append files
         assets: Files
         assets_count: Files
         description: Description
         identifier: Identifier
         locale: Locale
         name: Name
+        overwrite_assets: Overwrite files
         position: Position
         published: Published
         published_at: Published at

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmor_files
 version: !ruby/object:Gem::Version
-  version: 0.0.54.pre
+  version: 0.0.59.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.54.pre
+        version: 0.0.59.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.54.pre
+        version: 0.0.59.pre
 - !ruby/object:Gem::Dependency
   name: cmor_core_frontend
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.54.pre
+        version: 0.0.59.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.54.pre
+        version: 0.0.59.pre
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -401,6 +401,7 @@ files:
 - app/models/cmor/files/folder.rb
 - app/view_helpers/cmor/files/application_view_helper.rb
 - app/views/cmor/files/application_view_helper/_render_file.html.haml
+- app/views/cmor/files/application_view_helper/_render_folder.html.haml
 - app/views/cmor/files/file_details/index.html.haml
 - app/views/cmor/files/file_details/show.html.haml
 - app/views/cmor/files/folders/index.html.haml
@@ -451,7 +452,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Cmor Files Module.