radiant-downloads-extension 0.5.1 → 0.5.2

data/Rakefile

@@ -9,7 +9,6 @@ begin
     gem.authors = ["spanner"]
     gem.add_dependency "radiant", ">= 0.9.0"
     gem.add_dependency 'radiant-reader_group-extension'
-    gem.add_dependency 'paperclip'
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. This is only required if you plan to package downloads as a gem."

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/app/controllers/admin/downloads_controller.rb

@@ -1,3 +1,4 @@
 class Admin::DownloadsController < Admin::ResourceController
-
+  paginate_models
+  
 end

data/app/views/admin/downloads/index.html.haml

@@ -1,32 +1,31 @@
-- include_stylesheet 'admin/downloads'
-
-%h1 Authorised Downloads
-
-%table#downloads.index{:cellpadding => "0", :cellspacing => "0", :border => "0"}
-  %thead
-    %tr
-      %th.download Title
-      %th.file File
-      %th.groups Visible to groups
-      %th.actions
-  %tbody
-    - if @downloads.empty?
+#downloads_table.outset      
+  %table#downloads.index{:cellpadding => "0", :cellspacing => "0", :border => "0"}
+    %thead
       %tr
-        %td.note{:colspan => "4"} 
-          No downloads for you, sonny
-    - else
-      - @downloads.each do |dl|
-        %tr{:class => "node level-1"}
-          %td.download
-            = link_to dl.name, edit_admin_download_url(dl)
-          %td.file
-            = link_to dl.document_file_name, download_url(dl)
-            = number_to_human_size(dl.document_file_size)
-          %td.groups
-            = dl.groups.map {|g| link_to g.name, admin_group_url(g) }.join(', ')
-          %td.remove
-            =  link_to( image('remove', :alt => 'Remove Download'), :action => 'destroy', :id => dl, :confirm => "are you sure you want to completely remove #{dl.name}?")
-
+        %th.download Title
+        %th.file File
+        %th.groups Visible to groups
+        %th.actions
+    %tbody
+      - if @downloads.empty?
+        %tr
+          %td.note{:colspan => "4"} 
+            No downloads for you, sonny
+      - else
+        - @downloads.each do |dl|
+          %tr
+            %td.name
+              = link_to dl.name, edit_admin_download_url(dl)
+            %td.file
+              = link_to dl.document_file_name, download_url(dl)
+              = number_to_human_size(dl.document_file_size)
+            %td.groups
+              = dl.groups.map {|g| link_to g.name, admin_group_url(g) }.join(', ')
+            %td.actions
+              =  link_to( image('minus') + ' delete', admin_download_url(dl), :method => :delete, :class => 'action', :confirm => "are you sure you want to completely remove #{dl.name}?")
 
-%p
-  = link_to(image('new-file', :alt => 'New download'), :action => 'new')
+#actions
+  = pagination_for @downloads
+  %ul
+    %li
+      = link_to image('plus') + " " + "new download", new_admin_download_url

data/downloads_extension.rb

@@ -3,7 +3,7 @@
 require 'paperclip'
 
 class DownloadsExtension < Radiant::Extension
-  version "0.5.1"
+  version "0.5.2"
   description "Controlled file access using nginx's local redirects. Requires reader and reader_group extensions."
   url "http://www.spanner.org/radiant/downloads"
     
@@ -12,9 +12,14 @@ class DownloadsExtension < Radiant::Extension
     Page.send :include, DownloadTags
     UserActionObserver.instance.send :add_observer!, Download 
 
+    unless defined? admin.downloads
+      Radiant::AdminUI.send :include, DownloadUI
+      Radiant::AdminUI.load_download_extension_regions
+    end
+
     if respond_to?(:tab)
-      tab("Content") do
-        add_item("Downloads", "/admin/readers/downloads")
+      tab("Readers") do
+        add_item("Downloads", "/admin/readers/downloads", :before => 'Settings')
       end
     else
       admin.tabs.add "Downloads", "/admin/readers/downloads", :visibility => [:all]

data/lib/download_ui.rb

@@ -8,10 +8,13 @@ module DownloadUI
 
       def load_default_regions_with_download
         load_default_regions_without_download
-        @download = load_default_download_regions
+        load_download_extension_regions
       end
-
       alias_method_chain :load_default_regions, :download
+      
+      def load_download_extension_regions
+        @download = load_default_download_regions
+      end
 
       protected
 

data/radiant-downloads-extension.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-downloads-extension}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
@@ -34,7 +34,6 @@ Gem::Specification.new do |s|
      "lib/download_tags.rb",
      "lib/download_ui.rb",
      "lib/tasks/downloads_extension_tasks.rake",
-     "public/stylesheets/admin/downloads.css",
      "radiant-downloads-extension.gemspec",
      "spec/controllers/downloads_controller_spec.rb",
      "spec/datasets/download_groups_dataset.rb",
@@ -71,16 +70,13 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<radiant>, [">= 0.9.0"])
       s.add_runtime_dependency(%q<radiant-reader_group-extension>, [">= 0"])
-      s.add_runtime_dependency(%q<paperclip>, [">= 0"])
     else
       s.add_dependency(%q<radiant>, [">= 0.9.0"])
       s.add_dependency(%q<radiant-reader_group-extension>, [">= 0"])
-      s.add_dependency(%q<paperclip>, [">= 0"])
     end
   else
     s.add_dependency(%q<radiant>, [">= 0.9.0"])
     s.add_dependency(%q<radiant-reader_group-extension>, [">= 0"])
-    s.add_dependency(%q<paperclip>, [">= 0"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-downloads-extension
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - spanner
@@ -48,20 +48,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: paperclip
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
 description: Controlled, secure file access with group-based access control.
 email: will@spanner.org
 executables: []
@@ -89,7 +75,6 @@ files:
 - lib/download_tags.rb
 - lib/download_ui.rb
 - lib/tasks/downloads_extension_tasks.rake
-- public/stylesheets/admin/downloads.css
 - radiant-downloads-extension.gemspec
 - spec/controllers/downloads_controller_spec.rb
 - spec/datasets/download_groups_dataset.rb

data/public/stylesheets/admin/downloads.css

@@ -1,25 +0,0 @@
-/* submenu admin */
-
-#content table.index .node .download {
-  font-size:115%;
-  font-weight:bold;
-}
-
-#content table.index .node .download a {
-  color: black;
-}
-
-#content .form-area .user select {
-  font-family:Georgia,Palatino,"Times New Roman",Times,serif;
-  font-size:150%;
-  width:60%;
-}
-
-#content .form-area p.description {
-  margin-top: 10px;
-}
-
-#content .form-area span.formnote {
-  color: #7d796c;
-  font-size: 85%;
-}