classiccms 0.6.3 → 0.6.4

data/lib/classiccms/public/js/images.coffee

@@ -6,6 +6,7 @@ $ ->
 
 class Browser
   constructor: ->
+    @input = $('#input').first().val()
     @p =
       images:   '.images'
       image:    'img'
@@ -34,13 +35,14 @@ class Browser
     $('.'+id).show()
 
   select: () ->
-    $('.item').click ->
-      input = $('input').first().val()
-      url = $(this).attr('url')
+    $('.item').click (event)=>
+      url = $(event.currentTarget).attr('url')
+      input = $('input[name=return]').first().val()
       if input.length > 0
         window.opener.CKEDITOR.tools.callFunction(input, url)
       else
-        window.opener.$('#file_select').val($(this).attr('id'))
+        window.opener.$('#' + @input).first().val($(event.currentTarget).attr('id'))
+        window.opener.$("##{@input}_preview img").attr('src', $(event.currentTarget).attr('src'))
       self.close()
 
   destroy: () ->

data/lib/classiccms/public/js/index.coffee

@@ -36,6 +36,7 @@ class Sort
     }
 
 class Image
+  #needs a rewrite
   constructor: (input) ->
     @input = input
     @p =
@@ -48,14 +49,14 @@ class Image
     @listen()
 
   listen: ->
-    $j('#edit_bg').slideUp()
-    $j.get '/cms/images', (data) =>
-      @form = $j('#edit_bg')
-      $j('#edit_bg').after(data)
-      @set_upload_button()
-      $j('#' + @input.val()).addClass('selected')
-      @select()
-      @destroy()
+    #$j('#edit_bg').slideUp()
+    #$j.get '/cms/images', (data) =>
+    #  @form = $j('#edit_bg')
+    #  $j('#edit_bg').after(data)
+    #  @set_upload_button()
+    #  $j('#' + @input.val()).addClass('selected')
+    #  @select()
+    #  @destroy()
 
   destroy: () ->
     $j(@p.images + ' .image').live 'mouseover mouseout', (event) =>

data/lib/classiccms/scaffold/config/application.rb

@@ -3,4 +3,7 @@ module Classiccms
   $app = Dragonfly[:file].configure_with(:imagemagick)
   $app.define_macro_on_include(Mongoid::Document, :file_accessor)  
   $app.server.url_format = '/files/:job/:basename.:format'
-end
+  $app.configure do |c|
+    c.allow_fetch_file = true
+  end
+end

data/lib/classiccms/scaffold/config.ru

@@ -4,7 +4,7 @@ require 'bundler'
 Bundler.require
 Classiccms.boot
 
-
+use Dragonfly::Middleware, :file
 run Rack::URLMap.new({
   '/'    => Classiccms::WebsiteController,
   '/cms' => Classiccms::CMSController,

data/lib/classiccms/version.rb

@@ -1,3 +1,3 @@
 module Classiccms #:nodoc
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/lib/classiccms/views/cms/ckeditor.haml

@@ -13,6 +13,7 @@
     /%link{:rel=>'stylesheet', :href=>'/cms/css/style.css', :type=> 'text/css'}
     /%link{:rel=>'stylesheet', :href=>'/cms/css/images.css', :type=> 'text/css'}
   %body#iki
+    %input{:type => 'hidden', :id => 'input', :value => params[:input]}
     .container{:style => 'margin-top: 20px'}
       .row
         .span4

data/lib/classiccms/views/cms/form.haml

@@ -29,7 +29,10 @@
             = select_options info.options[:options], record[key]
         - when 'image'
           %p.image_select Selecteer image
-          %input{:type => 'hidden', :id => 'file_select', :name=> name, :value => record[key]}
+          %input{:type => 'hidden', :id => "file_#{key}", :name=> name, :value => record[key]}
+
+          %p{:id => "file_#{key}_preview", :style => 'float:left; clear:left;'}
+            %img{:src => record.send(key).thumb('50x50').url}
 
         - when 'images'
   - if record.new_record?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: classiccms
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
+date: 2012-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec