classiccms 0.6.4 → 0.6.5

data/lib/classiccms/controllers/cms.rb

@@ -95,8 +95,8 @@ module Classiccms
       image.file.name = params[:Filedata][:filename]
       if !image.save
         file = Document.new
-        file.file = params[:Filedata][:tempfile].read
-        file.file.name = params[:Filedata][:filename]
+        file.file = image.file.data
+        file.file.name = image.file.name
         file.save
       end
 
@@ -107,7 +107,6 @@ module Classiccms
     end
     post '/file/destroy' do
       image = Image.where(:id => params[:id]).first
-      p image
       if image != nil
         image.destroy
       else

data/lib/classiccms/models/base.rb

@@ -41,6 +41,42 @@ class ImageType
     end
   end
 end
+class DocumentType
+  attr_reader :document_id
+
+  def initialize(document_id)
+    @document_id
+  end
+
+  class << self
+
+    # Get the object as it was stored in the database, and instantiate
+    # this custom class from it.
+    def demongoize(object_id)
+      document = Document.where(:id => object_id).first
+      if document != nil
+        document.file
+      else
+        Dragonfly[:file].fetch_file(File.join(Dir.pwd, 'public/not_found.jpeg'))
+      end
+    end
+
+    # Takes any possible object and converts it to how it would be
+    # stored in the database.
+    def mongoize(object_id)
+      object_id
+    end
+
+    # Converts the object that was supplied to a criteria and converts it
+    # into a database friendly form.
+    def evolve(object)
+      case object
+      when FileType then object.mongoize
+      else object
+      end
+    end
+  end
+end
 
 class Base
   include Mongoid::Document

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

@@ -2,18 +2,17 @@
 $ ->
   new Browser
 
-
-
 class Browser
   constructor: ->
     @input = $('#input').first().val()
+    @type = $('#type').first().val()
+
     @p =
       images:   '.images'
       image:    'img'
       destroy:  '.destroy'
       button:   '#file_upload'
     @listen()
- 
   listen: ->
     $('#edit_bg').slideDown()
     @set_upload_button()
@@ -24,6 +23,7 @@ class Browser
 
   add_tooltip: ->
     $('[rel=tooltip]').tooltip();
+
   change_window: (id)->
     console.log id
     $('.menu li').removeClass('active')
@@ -37,12 +37,15 @@ class Browser
   select: () ->
     $('.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)
+      ckeditor = $('input[name=return]').first().val()
+      if ckeditor.length > 0
+        window.opener.CKEDITOR.tools.callFunction(ckeditor, url)
+      else if @type == 'document'
+        window.opener.$j('#' + @input).first().val($(event.currentTarget).attr('id'))
+        window.opener.$j('#' + @input + '_preview').empty().append($(event.currentTarget).attr('name'))
       else
-        window.opener.$('#' + @input).first().val($(event.currentTarget).attr('id'))
-        window.opener.$("##{@input}_preview img").attr('src', $(event.currentTarget).attr('src'))
+        window.opener.$j('#' + @input).first().val($(event.currentTarget).attr('id'))
+        window.opener.$j('#' + @input + '_preview img').attr('src', $(event.currentTarget).attr('src'))
       self.close()
 
   destroy: () ->

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

@@ -35,57 +35,13 @@ class Sort
         $j.post '/cms/sort', {section: section, order: order}
     }
 
-class Image
-  #needs a rewrite
+class Image 
   constructor: (input) ->
-    @input = input
-    @p =
-      images:   '#iki #edit_bg .images'
-      image:    '#iki #edit_bg .images .image img'
-      destroy:  '#iki #edit_bg .images .image .destroy'
-      button:   '#iki #file_upload'
-
-    window.open('/cms/ckeditor/files?input='+$(@input).attr('id'),'upload','width=960,height=750,left=200,top=100,screenX=200,screenY=100')
-    @listen()
+    window.open('/cms/ckeditor/files?input='+$(input).attr('id')+'&type=image','upload','width=960,height=750,left=200,top=100,screenX=200,screenY=100')
 
-  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()
-
-  destroy: () ->
-    $j(@p.images + ' .image').live 'mouseover mouseout', (event) =>
-      if (event.type == 'mouseover')
-        $j(event.currentTarget).find('.destroy').show()
-      else
-        $j(event.currentTarget).find('.destroy').hide()
-    $j(@p.destroy).click (event) =>
-      id = $j(event.currentTarget).parent().attr('id')
-      $j('.images').find('#' + id).hide()
-      $j.post '/cms/image/destroy', {id: id}
-
-  select: () ->
-    $j(@p.image).click (event) =>
-      $j(@p.image).parent().removeClass('selected')
-      $j(event.currentTarget).parent().addClass('selected')
-      $j(@input).val($j(event.currentTarget).parent().attr('id'))
-      $j('#edit_bg.popup').slideUp()
-      @form.slideDown()
-
-  set_upload_button: ->
-    if($j('#file_upload').length != 0)
-      $j('#file_upload').uploadify
-        'swf'      : '/cms/js/uploadify/uploadify.swf'
-        'uploader' : '/cms/upload/image'
-        'onUploadSuccess' : (file, data, response) =>
-          $j(data).replaceAll(@p.images)
-          @select()
-          @destroy()
+class Document 
+  constructor: (input) ->
+    window.open('/cms/ckeditor/files?input='+$(input).attr('id')+'&type=document','upload','width=960,height=750,left=200,top=100,screenX=200,screenY=100')
 
 
 class TopPanel
@@ -103,6 +59,7 @@ class TopPanel
       destroy:       '#iki #edit_box #edit_bottom_nav .delete'
       destroy_label: '#iki .delete_item'
       image_select:  '#iki .image_select'
+      document_select:  '#iki .document_select'
 
     @listen()
     @show()
@@ -113,6 +70,7 @@ class TopPanel
     $j(@p.create).click => @create('/cms/save')
     $j(@p.destroy).click (event) => @destroy('/cms/destroy', $j(event.target).attr('id'))
     $j(@p.image_select).click => new Image($j(event.target).next())
+    $j(@p.document_select).click => new Document($j(event.target).next())
     @delete_button_hover()
   
   menu_switch: (object) ->
@@ -172,7 +130,7 @@ class TopPanel
 class Editor
   constructor: ->
     @p =
-      textarea: '#edit_box textarea'
+      textarea: '#iki textarea'
       buttons: '#iki .cke_button a'
       config: {
         skin : 'kama',
@@ -203,6 +161,7 @@ class Editor
       $j(this).attr('title', title)
   add: ->
     $j(@p.textarea).each (index, element) =>
+      console.log 'wooh woop'
       $j(element).ckeditor(@p.config)
     @hover()
   remove: ->

data/lib/classiccms/version.rb

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

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

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

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

@@ -7,8 +7,8 @@
         %th Grootte
     %tbody
       - Document.all.each do |document|
-        %tr.item{:id => document.id, :url => document.file.url}
-          %td= document.file.name
+        %tr{:id => document.id}
+          %td.name.item{:id => document.id, :url => document.file.url, :name => document.file.name}= document.file.name
           %td= document.created_at.strftime('%d-%m-%Y')
           %td
             %button.btn.btn-mini.btn-danger.destroy{:style => 'position: absolute;', :type => 'button', :'data-original-title' => 'Verwijder', :rel => 'tooltip', :'data-id' => document.id}

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

@@ -14,7 +14,7 @@
         - when 'input'
           %input{:type=> 'text', :name=> name, :value=> record[key], :class=>"textfield", :type=> "text"}
         - when 'textarea'
-          %textarea{:id => key, :name=> name}= record[key]
+          %textarea{:id => key+rand(1...100).to_s, :name=> name}= record[key]
         - when 'date'
           - record[key] = Date.today if record[key] == nil
           %select{:name=>"[#{model}][#{key}(3i)]"}
@@ -33,6 +33,10 @@
 
           %p{:id => "file_#{key}_preview", :style => 'float:left; clear:left;'}
             %img{:src => record.send(key).thumb('50x50').url}
+        - when 'document'
+          %p.document_select Selecteer bestand
+          %input{:type => 'hidden', :id => "file_#{key}", :name=> name, :value => record[key]}
+          %p{:id => "file_#{key}_preview", :style => 'float:left; clear:left;'}= record.send(key).name
 
         - when 'images'
   - if record.new_record?

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

@@ -3,4 +3,4 @@
     .span{:style => 'margin-bottom: 20px;', :id => image.id}
       %button.btn.btn-mini.btn-danger.destroy{:style => 'position: absolute;', :type => 'button', :'data-original-title' => 'Verwijder', :rel => 'tooltip', :'data-id' => image.id}
         %i.icon-trash.icon-white
-      %img.img-rounded.item{:style => 'height: 113px;', :id => image.id, :src => image.file.process(:thumb, '113x113#').url, :url => image.file.url}
+      %img.img-rounded.item{:style => 'height: 113px;', :id => image.id, :src => image.file.process(:thumb, '113x113#').url, :url => image.file.url, :name => image.file.name}

metadata

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