classiccms 0.6.1 → 0.6.2

data/lib/classiccms/controllers/cms.rb

@@ -90,21 +90,32 @@ module Classiccms
       end
       return errors
     end
-    post '/upload/image' do
+    post '/upload' do
       image = Image.new
       image.file = params[:Filedata][:tempfile].read
       image.file.name = params[:Filedata][:filename]
-      image.save
-      show :images
+      if !image.save
+        file = Document.new
+        file.file = params[:Filedata][:tempfile].read
+        file.file.name = params[:Filedata][:filename]
+        file.save
+      end
+
+      return show(:images) + show(:files)
     end
     get '/images' do
       show :browse
     end
-    post '/image/destroy' do
-      image = Image.find(params[:id])
-      image.destroy
+    post '/file/destroy' do
+      image = Image.where(:id => params[:id]).first
+      p image
+      if image != nil
+        image.destroy
+      else
+        Document.where(:id => params[:id]).first.destroy
+      end
     end
-    get '/ckeditor/images' do
+    get '/ckeditor/files' do
       show :ckeditor
     end
 

data/lib/classiccms/models/base.rb

@@ -17,7 +17,12 @@ class ImageType
     # Get the object as it was stored in the database, and instantiate
     # this custom class from it.
     def demongoize(object_id)
-      Image.find(object_id).file
+      image = Image.where(:id => object_id).first
+      if image != nil
+        image.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

data/lib/classiccms/models/image.rb

@@ -1,5 +1,6 @@
 class Image
   include Mongoid::Document
+  include Mongoid::Timestamps
 
   field :file_uid
   field :file_name
@@ -7,3 +8,14 @@ class Image
   file_accessor :file
   validates_property :format, :of => :file, :in => [:jpg, :jpeg, :png, :gif]
 end
+
+class Document
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :file_uid
+  field :file_name
+
+  file_accessor :file
+  #validates_property :format, :of => :file
+end

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

@@ -1,46 +1,72 @@
+
 $ ->
-  new Image
+  new Browser
+
 
-class Image
+
+class Browser
   constructor: ->
     @p =
       images:   '.images'
-      image:    '.images .image img'
-      destroy:  '.images .image .destroy'
+      image:    'img'
+      destroy:  '.destroy'
       button:   '#file_upload'
     @listen()
-
+ 
   listen: ->
     $('#edit_bg').slideDown()
     @set_upload_button()
     @select()
     @destroy()
+    @add_tooltip()
+    $('ul.menu li').click (event) =>  @change_window($(event.currentTarget).attr('id'))
+
+  add_tooltip: ->
+    $('[rel=tooltip]').tooltip();
+  change_window: (id)->
+    console.log id
+    $('.menu li').removeClass('active')
+    $('#' + id).addClass('active')
+    if id == 'images'
+      $('.files').hide()
+    else
+      $('.images').hide()
+    $('.'+id).show()
 
   select: () ->
-    $('img').click ->
+    $('.item').click ->
       input = $('input').first().val()
       url = $(this).attr('url')
-      window.opener.CKEDITOR.tools.callFunction(input, url)
+      if input.length > 0
+        window.opener.CKEDITOR.tools.callFunction(input, url)
+      else
+        window.opener.$('#file_select').val($(this).attr('id'))
       self.close()
 
   destroy: () ->
-    $(@p.images + ' .image').live 'mouseover mouseout', (event) =>
-      if (event.type == 'mouseover')
-        $(event.currentTarget).find('.destroy').show()
-      else
-        $(event.currentTarget).find('.destroy').hide()
     $(@p.destroy).click (event) =>
-      id = $(event.currentTarget).parent().attr('id')
-      $('.images').find('#' + id).hide()
-      $.post '/cms/image/destroy', {id: id}
+      id = $(event.currentTarget).attr('data-id')
+      $('#' + id).hide()
+      $.post '/cms/file/destroy', {id: id}
 
   set_upload_button: ->
     if($('#file_upload').length != 0)
       $('#file_upload').uploadify
+        'buttonClass' : 'btn btn-info'
+        'buttonText'  : 'upload bestanden'
         'swf'      : '/cms/js/uploadify/uploadify.swf'
-        'uploader' : '/cms/upload/image'
+        'uploader' : '/cms/upload'
+        'queueID'  : 'file_queue'
+        'onSelect' : (file) =>
+          console.log(file)
+          $('#progress').append("<div class='alert alert-info' id='file-#{file.index}'><strong>"+ file.name + "</strong><button class='close' type='button' date-dismiss='alert'>x</button></div>")
+        'onUploadComplete' : (file) =>
+          $("#progress #file-#{file.index}").hide();
         'onUploadSuccess' : (file, data, response) =>
-          $(data).replaceAll(@p.images)
+          $('.wrapper').empty().append(data)
+          #$(data).replaceAll('.wrapper')
           @select()
           @destroy()
+          @add_tooltip()
+          @change_window($('ul.menu li.active').first().attr('id'))
 

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

@@ -1,3 +1,5 @@
+go = ()->
+  console.log 'woohoo'
 class Cms
   constructor: ->
     @input = 'input[name=cms]'
@@ -40,7 +42,9 @@ class Image
       images:   '#iki #edit_bg .images'
       image:    '#iki #edit_bg .images .image img'
       destroy:  '#iki #edit_bg .images .image .destroy'
-      button:   '#iki #edit_bg #file_upload'
+      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()
 
   listen: ->
@@ -171,9 +175,10 @@ class Editor
           { name: 'links', items : [ 'Link','Unlink','-'] },
           { name: 'tools', items : [ 'Maximize' ] }
         ],
-        filebrowserBrowseUrl : '/cms/ckeditor/images',
-        filebrowserWindowWidth : '640',
-        filebrowserWindowHeight : '480'
+        filebrowserBrowseUrl : '/cms/ckeditor/files',
+        filebrowserImageBrowseUrl : '/cms/ckeditor/files?Type=Images',
+        filebrowserWindowWidth : '960',
+        filebrowserWindowHeight : '750'
       }
   hover: ->
     $j(@p.buttons).mouseenter ->

data/lib/classiccms/version.rb

@@ -1,3 +1,3 @@
 module Classiccms #:nodoc
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

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

@@ -1,3 +1,6 @@
 #edit_bg.popup
   = show :images
+  - if params[:Type] != 'Images'
+    .test
+
   %input{:type => 'hidden', :id => 'file_upload', :name=> 'file_upload'}

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

@@ -3,21 +3,41 @@
   %head
     %meta{:'http-equiv' => 'Content-Type', :content => 'text/html; charset=utf-8'}
     %title 
-
-    %link{:rel=>'stylesheet', :href=>'/cms/css/reset.css', :type=> 'text/css'}
-    %link{:rel=>'stylesheet', :href=>'/cms/css/fonts.css', :type=> 'text/css'}
-    %link{:rel=>'stylesheet', :href=>'/cms/css/icons.css', :type=> 'text/css'}
-    %link{:rel=>'stylesheet', :href=>'/cms/css/popup.css', :type=> 'text/css'}
-    %link{:rel=>'stylesheet', :href=>'/cms/css/scrollbar.css', :type=> 'text/css'}
-    %link{:rel=>'stylesheet', :href=>'/cms/css/style.css', :type=> 'text/css'}
-    %link{:rel=>'stylesheet', :href=>'/cms/css/images.css', :type=> 'text/css'}
-
+    
+    %link{:rel=>'stylesheet', :href=>'/cms/bootstrap/css/bootstrap.min.css', :type=> 'text/css'}
+    /%link{:rel=>'stylesheet', :href=>'/cms/css/reset.css', :type=> 'text/css'}
+    /%link{:rel=>'stylesheet', :href=>'/cms/css/fonts.css', :type=> 'text/css'}
+    /%link{:rel=>'stylesheet', :href=>'/cms/css/icons.css', :type=> 'text/css'}
+    /%link{:rel=>'stylesheet', :href=>'/cms/css/popup.css', :type=> 'text/css'}
+    /%link{:rel=>'stylesheet', :href=>'/cms/css/scrollbar.css', :type=> 'text/css'}
+    /%link{:rel=>'stylesheet', :href=>'/cms/css/style.css', :type=> 'text/css'}
+    /%link{:rel=>'stylesheet', :href=>'/cms/css/images.css', :type=> 'text/css'}
+  %body#iki
+    .container{:style => 'margin-top: 20px'}
+      .row
+        .span4
+          - if request.params[:Type] != 'images'
+            .well.well-small
+              %ul.menu.nav.nav-list.bs-docs-sidenav
+                %li.active#images
+                  %a{:href => '#images'}
+                    %i.icon-camera
+                    Foto's
+                %li#files
+                  %a{:href => '#files'}
+                    %i.icon-file
+                    Bestanden
+          .well.well-small
+            %input{:type => 'hidden', :id => 'file_upload', :name=> 'file_upload'}
+            %input{:type => 'hidden', :name => 'return', :value => params[:CKEditorFuncNum]}
+            %br
+          .well.well-small#progress
+        .span7
+          .well.well-small.wrapper
+            = show :images
+            = show :files
+    /---- load js ----/
     %script{:type=>'text/javascript', :src=>'http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js'}
+    %script{:type=>'text/javascript', :src=>'/cms/bootstrap/js/bootstrap.min.js'}
     %script{:type=>'text/javascript', :src=>'/cms/js/uploadify/jquery.uploadify-3.1.min.js'}
     %script{:type=>'text/javascript', :src=>'/cms/js/images.js'}
-  %body
-    #iki
-      %input{:type => 'hidden', :name => 'return', :value => params[:CKEditorFuncNum]}
-      = show :browse
-
-

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

@@ -1,5 +1,6 @@
-.images
+.images{:style => 'display: inline-block;'}
   - Image.all.each do |image|
-    .image{:class => '', :id => image.id}
-      .destroy
-      %img{:src => image.file.process(:thumb, '113x113#').url, :url => image.file.url}
+    .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}

metadata

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