comfortable_mexican_sofa 1.8.0 → 1.8.1

data/.gitignore

@@ -11,5 +11,6 @@ rdoc
 public/*
 Gemfile.lock
 .rvmrc
+.ruby-version
 /.sass-cache
 /coverage

data/README.md

@@ -1,5 +1,5 @@
-# ComfortableMexicanSofa (Rails 3 CMS Engine) 
-[![Build Status](https://travis-ci.org/comfy/comfortable-mexican-sofa.png?branch=master)](https://travis-ci.org/comfy/comfortable-mexican-sofa) [![Dependency Status](https://gemnasium.com/comfy/comfortable-mexican-sofa.png)](https://gemnasium.com/comfy/comfortable-mexican-sofa) [![Code Climate](https://codeclimate.com/github/comfy/comfortable-mexican-sofa.png)](https://codeclimate.com/github/comfy/comfortable-mexican-sofa) [![Coverage Status](https://coveralls.io/repos/comfy/comfortable-mexican-sofa/badge.png?branch=master)](https://coveralls.io/r/comfy/comfortable-mexican-sofa)
+# ComfortableMexicanSofa (Rails 3 CMS Engine)
+[![Gem Version](https://badge.fury.io/rb/comfortable_mexican_sofa.png)](http://rubygems.org/gems/comfortable_mexican_sofa) [![Build Status](https://travis-ci.org/comfy/comfortable-mexican-sofa.png?branch=master)](https://travis-ci.org/comfy/comfortable-mexican-sofa) [![Dependency Status](https://gemnasium.com/comfy/comfortable-mexican-sofa.png)](https://gemnasium.com/comfy/comfortable-mexican-sofa) [![Code Climate](https://codeclimate.com/github/comfy/comfortable-mexican-sofa.png)](https://codeclimate.com/github/comfy/comfortable-mexican-sofa) [![Coverage Status](https://coveralls.io/repos/comfy/comfortable-mexican-sofa/badge.png?branch=master)](https://coveralls.io/r/comfy/comfortable-mexican-sofa)
 
 ComfortableMexicanSofa is a powerful CMS Engine for your Rails 3 applications.
 
@@ -60,6 +60,12 @@ For more information please [see Wiki pages](https://github.com/comfy/comfortabl
 
 ![Sofa's Page Edit View](https://github.com/comfy/comfortable-mexican-sofa/raw/master/doc/preview.png)
 
+Help and Contact
+----------------
+
+GoogleGroups: http://groups.google.com/group/comfortable-mexican-sofa
+Twitter: [@GroceryBagHead](http://twitter.com/#!/GroceryBagHead)
+
 ---
 
 ComfortableMexicanSofa is released under the [MIT license](https://github.com/comfy/comfortable-mexican-sofa/raw/master/LICENSE) 

data/app/assets/javascripts/comfortable_mexican_sofa/application.js.coffee

@@ -130,18 +130,28 @@ window.CMS.categories = ->
 
 
 window.CMS.uploader = ->
-  action = $('.file-uploader form').attr('action')
-  $('.file-uploader input[type=file]').change ->
-    files = $($(this).get(0).files)
-    files.each (i, file) ->
-      xhr = new XMLHttpRequest()
-      xhr.onreadystatechange = (e) ->
-        if (xhr.readyState == 4 && xhr.status == 200)
-          eval(xhr.responseText)
-      xhr.open('POST', action, true)
-      xhr.setRequestHeader('Accept', 'application/javascript')
-      xhr.setRequestHeader('X-CSRF-Token', $('meta[name=csrf-token]').attr('content'))
-      xhr.setRequestHeader('Content-Type', file.content_type || file.type)
-      xhr.setRequestHeader('X-File-Name', file.name)
-      xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest')
-      xhr.send(file)
+  form    = $('.file-uploader form')
+  iframe  = $('iframe#file-upload-frame')
+  
+  $('input[type=file]', form).change -> form.submit()
+    
+  iframe.load -> upload_loaded()
+  
+  upload_loaded = ->
+    i = iframe[0]
+    d = if i.contentDocument
+      i.contentDocument
+    else if i.contentWindow
+      i.contentWindow.document
+    else
+      i.document
+    
+    if d.body.innerHTML
+      raw_string  = d.body.innerHTML
+      json_string = raw_string.match(/\{(.|\n)*\}/)[0]
+      json = $.parseJSON(json_string)
+      files = $($('<div/>').html(json.view).text()).hide()
+      $('.uploaded-files').prepend(files)
+      files.map ->
+        $(this).fadeIn()
+  

data/app/assets/stylesheets/comfortable_mexican_sofa/base.css.sass

@@ -128,6 +128,8 @@ body#comfy
               margin: 0
               font-size: 11px
               width: 100%
+    iframe#file-upload-frame
+      display: none
     
   // -- Common Elements -----------------------------------------------------
   table.table, ul.list
@@ -145,7 +147,7 @@ body#comfy
           display: none
       &:hover .dragger
         display: block
-    .category
+    div.category
       display: inline-block
       vertical-align: top
       font-size: 11px

data/app/controllers/cms_admin/files_controller.rb

@@ -2,73 +2,64 @@ class CmsAdmin::FilesController < CmsAdmin::BaseController
   
   skip_before_filter :load_fixtures
   
-  before_filter :load_file, :only => [:edit, :update, :destroy]
+  before_filter :build_file,  :only => [:new, :create]
+  before_filter :load_file,   :only => [:edit, :update, :destroy]
   
   def index
-    return redirect_to :action => :new if @site.files.count == 0
-    @files = @site.files.includes(:categories).for_category(params[:category]).all(:order => 'cms_files.position')
+    @files = @site.files.includes(:categories).for_category(params[:category]).order('cms_files.position')
+    
+    if params[:ajax]
+      files = @files.images.collect do |file|
+        { :thumb  => file.file.url(:cms_thumb),
+          :image  => file.file.url }
+      end
+      render :json => files
+    else
+      return redirect_to :action => :new if @site.files.count == 0
+    end
   end
   
   def new
-    @file = @site.files.new
+    render
   end
 
   def create
-    respond_to do |format|
-      format.html do
-        @file = @site.files.new
-        file_array  = params[:file][:file] || [nil]
-        label       = params[:file][:label]
-        
-        file_array.each_with_index do |file, i|
-          file_params = params[:file].merge(:file => file)
-          if file_array.size > 1 && file_params[:label].present?
-            label = file_params[:label] + " #{i + 1}"
-          end
-          @file = @site.files.create!(file_params.merge(:label => label))
-        end
+    @files = []
+    
+    # Sometimes params[:file] comes in as a single file object
+    unless params[:file].is_a?(Hash)
+      uploaded_file = params[:file]
+      params[:file] = { }
+      params[:file][:file] = [uploaded_file]
+    end
+    
+    file_array  = params[:file][:file] || [nil]
+    label       = params[:file][:label]
         
-        flash[:success] = I18n.t('cms.files.created')
-        redirect_to :action => :edit, :id => @file
-      end
-      format.js do
-        # FIX: No idea why this cannot be simulated in the test
-        io = Rails.env.test??
-          request.env['RAW_POST_DATA'].clone :
-          request.env['rack.input'].clone
-        # Unfortunately, this ends up copying the data twice.
-        # Once from the stream to the tempfile here, and second, in
-        # the file to another tempfile down in PaperClip UploadFileAdapter..
-        file = Tempfile.new(request.env["HTTP_X_FILE_NAME"])
-        file.binmode
-        # FileUtils.copy_stream ends up throwing Conversion Errors from ASCII-8BIT to UTF-8
-        # FileUtils.copy_stream(io, file)
-        while data = io.read(16*1024)
-          file.write(data)
-        end
-        file.rewind
-        # We use a delegation class on the file returned
-        upload = ActionDispatch::Http::UploadedFile.new(
-          :filename => request.env['HTTP_X_FILE_NAME'],
-          :tempfile => file,
-          :type     => request.env['CONTENT_TYPE'],
-          :head     => request.headers # Not really needed
-        )
-        @file = @site.files.create!(
-          (params[:file] || { }).merge(:file => upload)
-        )
+    file_array.each_with_index do |file, i|
+      file_params = params[:file].merge(:file => file)
+      if file_array.size > 1 && file_params[:label].present?
+        label = file_params[:label] + " #{i + 1}"
       end
+      @file = @site.files.create!(file_params.merge(:label => label))
+      @files << @file
     end
+    
+    if params[:ajax]
+      view = render_to_string(:partial => 'cms_admin/files/file', :collection => @files, :layout => false)
+      render :json => {:filelink => @file.file.url, :view => view.gsub("\n", '')}
+    else
+      flash[:success] = I18n.t('cms.files.created')
+      redirect_to :action => :edit, :id => @file
+    end
+    
   rescue ActiveRecord::RecordInvalid
     logger.detailed_error($!)
-    respond_to do |format|
-      format.html do
-        flash.now[:error] = I18n.t('cms.files.creation_failure')
-        render :action => :new
-      end
-      format.js do
-        render :nothing => true
-      end
+    if params[:ajax]
+      render :nothing => true, :status => :unprocessable_entity
+    else
+      flash.now[:error] = I18n.t('cms.files.creation_failure')
+      render :action => :new
     end
   end
   
@@ -103,6 +94,10 @@ class CmsAdmin::FilesController < CmsAdmin::BaseController
   end
   
 protected
+
+  def build_file
+    @file = @site.files.new
+  end
   
   def load_file
     @file = @site.files.find(params[:id])

data/app/views/cms_admin/files/_file.html.haml

@@ -1,6 +1,5 @@
 .file{:class => "#{dom_id(file)} #{file.is_image?? 'image' : nil}"}
   .file-name
-    
     = link_to cms_admin_site_file_path(@site, file), :method => :delete, :remote => true, :data => {:confirm => t('.are_you_sure')}, :class => 'delete' do
       %i.icon-remove-circle
     = link_to file.file_file_name, file.file.url, :target => '_blank', :class => 'filename'

data/app/views/cms_admin/files/_index.html.haml

@@ -2,11 +2,13 @@
 - files_scope = (type == 'image') ? @site.files.images : @site.files
 
 .box.file-uploader
-  = form_for :file, :url => cms_admin_site_files_path(@site), :html => {:multipart => true} do |form|
+  = form_for :file, :url => cms_admin_site_files_path(@site, :ajax => true), :html => {:multipart => true, :target => 'file-upload-frame'} do |form|
     %span.btn.btn-file
       = t('.button')
       = form.file_field :file, :multiple => true, :id => nil
   
   .uploaded-files
     - files_scope.order(:label).each do |file|
-      = render :partial => 'cms_admin/files/file', :object => file
+      = render :partial => 'cms_admin/files/file', :object => file
+      
+  %iframe#file-upload-frame{:name => 'file-upload-frame', :src => ''}

data/app/views/cms_admin/files/destroy.js.coffee

@@ -0,0 +1,2 @@
+$(".file.<%= dom_id(@file) %>").fadeOut 'slow', ->
+  $(this).remove()

data/app/views/cms_admin/pages/_form.html.haml

@@ -28,7 +28,7 @@
 
 = render :partial => 'form_blocks'
 
-= form.check_box :is_published, :label => 'Published'
+= form.check_box :is_published, :label => t('.is_published')
 
 .form-actions
   = form.submit t('.preview'), :name => 'preview', :id => nil, :class => 'btn'

data/app/views/cms_admin/revisions/show.html.haml

@@ -8,7 +8,7 @@
 - content_for :right_column do
   .box.revisions
     - @record.revisions.each do |revision|
-      = active_link_to revision.created_at, :id => revision.id
+      = active_link_to l(revision.created_at), :id => revision.id
       
 
 %table.table

data/app/views/cms_admin/sites/_form.html.haml

@@ -3,7 +3,7 @@
 = form.text_field :hostname
 = form.text_field :path
 = form.select :locale, ComfortableMexicanSofa.config.locales.to_a.collect{|l| [l[1], l[0]]}
-= form.check_box :is_mirrored
+= form.check_box :is_mirrored, :label => t('.is_mirrored')
 
 .form-actions
   = form.submit t(@site.new_record?? '.create' : '.update'), :class => 'btn btn-primary'

data/app/views/layouts/cms_admin/_body.html.haml

@@ -11,4 +11,6 @@
     .center-column
       = render :partial => 'layouts/cms_admin/center'
       
-      = render :partial => 'layouts/cms_admin/footer'
+      = render :partial => 'layouts/cms_admin/footer'
+  
+  = render :partial => 'layouts/cms_admin/footer_js'

data/app/views/layouts/cms_admin/_footer.html.haml

@@ -1,7 +1,3 @@
 .body-footer
   = link_to 'ComfortableMexicanSofa', 'https://github.com/comfy', :target => '_blank'
-  %span.version= ComfortableMexicanSofa::VERSION
-
-- if content_for(:javascript)
-  :javascript
-    #{yield :javascript}
+  %span.version= ComfortableMexicanSofa::VERSION

data/app/views/layouts/cms_admin/_footer_js.html.haml

@@ -0,0 +1,7 @@
+- if content_for(:javascript)
+  :javascript
+    #{yield :javascript}
+    
+- if @site && !@site.new_record?
+  :javascript
+    CMS.file_upload_path = "#{cms_admin_site_files_path(@site)}"

data/config/locales/de.yml

@@ -121,6 +121,7 @@ de:
       form:
         create: Erstelle Web-Site
         update: Web-Site speichern
+        is_mirrored: Gespiegelt
 
     layouts:
       index:
@@ -162,6 +163,7 @@ de:
         preview: Vorschau
         create: Erstelle Seite
         update: Seite speichern
+        is_published: Veröffentlicht
       form_blocks:
         no_tags: |-
           Layout has hat keine Inhalt-Tags definiert.<br/>

data/config/locales/en.yml

@@ -121,6 +121,7 @@ en:
       form:
         create: Create Site
         update: Update Site
+        is_mirrored: Mirrored
         
     layouts:
       index:
@@ -162,6 +163,7 @@ en:
         preview: Preview
         create: Create Page
         update: Update Page
+        is_published: Published
       form_blocks:
         no_tags: |-
           Layout has no content tags defined.<br/>

data/config/locales/es.yml

@@ -121,6 +121,7 @@ es:
       form:
         create: Crear Sitio
         update: Actualizar Sitio
+        is_mirrored: Espejo
 
     layouts:
       index:
@@ -162,6 +163,7 @@ es:
         preview: Vista Previa
         create: Crear Página
         update: Actualizar Página
+        is_published: Publicada
       form_blocks:
         no_tags: |-
           La plantilla no tiene etiquetas de contenido definidas.<br/>

data/config/locales/fr.yml

@@ -2,8 +2,8 @@
 fr:
   # -- Models ---------------------------------------------------------------
   attributes:
-    label: Label
-    slug: Slug
+    label: Nom
+    slug: Identifiant
     parent_id: Parent
     content: Contenu
     identifier: Identifiant
@@ -12,30 +12,30 @@ fr:
       cms/site: Site
       cms/layout: Mise en page
       cms/page: Page
-      cms/snippet: Snippet
+      cms/snippet: Fragment
       cms/file: Fichier
     attributes:
       cms/site:
         identifier: Identifiant
-        hostname: Hostname
-        path: Chemin d'accès
-        locale: Langage
+        hostname: Nom d'hôte
+        path: Chemin
+        locale: Langue
         is_mirrored: En miroir
       cms/layout:
         identifier: Identifiant
-        label: Nom de la Mise en page
-        app_layout: Mise en page Application
-        parent_id: Mise en page Parent
-        css: Feuille de Style CSS
+        label: Nom de la mise en page
+        app_layout: Mise en page de l'application
+        parent_id: Mise en page parent
+        css: Feuille de style
         js: Javascript
       cms/page:
-        label: Label
+        label: Nom de la page
         layout_id: Mise en page
-        slug: Slug
-        target_page_id: Rediriger vers Page
+        slug: Identifiant
+        target_page_id: Rediriger vers
         is_published: Publié
       cms/file:
-        file: File
+        file: Fichier
         description: Description
       cms/snippet:
         identifier: Identifiant
@@ -43,59 +43,59 @@ fr:
   # -- Controllers ----------------------------------------------------------
   cms:
     base:
-      site_not_found: Site non trouvé
-      fixtures_enabled: Jeu de données Test activé. Toutes les modifications seront supprimées.
+      site_not_found: Site introuvable
+      fixtures_enabled: Fixtures activés. Toutes les modifications seront supprimées.
 
     sites:
       created: Site créé
-      creation_failure: Echec de la création du site
+      creation_failure: Échec de la création du site
       updated: Site modifié
-      update_failure: Echec de la modification du site
+      update_failure: Échec de la modification du site
       deleted: Site supprimé
-      not_found: Site non trouvé
+      not_found: Site introuvable
       
     layouts:
       created: Mise en page créée
-      creation_failure: Echec de la création de la Mise en page
+      creation_failure: Échec de la création de la mise en page
       updated: Mise en page modifiée
-      update_failure: Echec de la modification de la mise en page
+      update_failure: Échec de la modification de la mise en page
       deleted: Mise en page supprimée
-      not_found: Mise en page non trouvée
+      not_found: Mise en page introuvable
       
     pages:
       created: Page créée
-      creation_failure: Echec de la création de la page
+      creation_failure: Échec de la création de la page
       updated: Page modifiée
-      update_failure: Echec de la modification de la page
+      update_failure: Échec de la modification de la page
       deleted: Page supprimée
-      not_found: Page non trouvée
-      layout_not_found: Aucune Mise ne page disponible. SVP créez en une.
+      not_found: Page introuvable
+      layout_not_found: Aucune mise en page disponible. Créez-en une nouvelle.
       
     snippets:
-      created: Snippet créé
-      creation_failure: Echec de la création du snippet
-      updated: Snippet modifié
-      update_failure: Echec de la modification du snippet
-      deleted: Snippet supprimé
-      not_found: Snippet non trouvé
+      created: Fragment créé
+      creation_failure: Échec de la création du fragment
+      updated: Fragment modifié
+      update_failure: Échec de la modification du fragment
+      deleted: Fragment supprimé
+      not_found: Fragment introuvable
       
     revisions:
-      reverted: Contenu Reverted
-      record_not_found: Enregistrement non trouvé
-      not_found: Revision non trouvée
+      reverted: Contenu restauré
+      record_not_found: Enregistrement introuvable
+      not_found: Révision introuvable
       
     files:
       created: Fichier téléchargé
-      creation_failure: Echec deu téléchargement de fichier
+      creation_failure: Échec du téléchargement du fichier
       updated: Fichier modifié
-      update_failure: Echec de la modification du fichier
+      update_failure: Échec de la modification du fichier
       deleted: Fichier supprimé
-      not_found: Fichier non trouvé
+      not_found: Fichier introuvable
       
     content:
-      site_not_found: Site non trouvé
-      layout_not_found: Mise en page non trouvée
-      page_not_found: Page non trouvée
+      site_not_found: Site introuvable
+      layout_not_found: Mise en page introuvable
+      page_not_found: Page introuvable
   
   # -- Views ----------------------------------------------------------------
   cms_admin:
@@ -103,125 +103,127 @@ fr:
       sites: Sites
       layouts: Mises en page
       pages: Pages
-      snippets: Snippets
+      snippets: Fragments
       files: Fichiers
       
     sites:
       index:
         title: Sites
-        new_link: Créer Nouveau Site
-        select: Sélectionner Site
+        new_link: Nouveau site
+        select: Sélectionner ce site
         edit: Modifier
         delete: Supprimer
-        are_you_sure: Confirmez-vous la suppression de ce site?
+        are_you_sure: Êtes-vous sûr de vouloir supprimer ce site ?
       new:
-        title: Nouveau Site
+        title: Nouveau site
       edit:
-        title: Modification Site
+        title: Modification du site
       form:
-        create: Créer Site
-        update: Modifier Site
+        create: Créer le site
+        update: Modifier le site
+        is_mirrored: En miroir
         
     layouts:
       index:
-        title: Layouts
-        new_link: Créer Nouveau Layout
+        title: Mises en page
+        new_link: Nouvelle mise en page
       index_branch:
-        add_child_layout: Ajouter Mise en page Enfant
+        add_child_layout: Ajouter une mise en page enfant
         edit: Modifier
         delete: Supprimer
-        are_you_sure: Confirmez-vous la suppression?
+        are_you_sure: Êtes-vous sûr de vouloir supprimer cette mise en page ?
       new:
-        title: Nouvelle Mise en page
+        title: Nouvelle mise en page
       edit:
-        title: Modification Mise en page
-        revision: Révision
+        title: Modification de la mise en page
+        revision: révision
       form:
-        select_parent_layout: Sélection Mise en page Parent
-        select_app_layout: Sélection Mise en page Application
-        create: Créer Mise en page
-        update: Modifier Mise en page
+        select_parent_layout: Sélectionner une mise en page parent
+        select_app_layout: Sélectionner une mise en page de l'application
+        create: Créer la mise en page
+        update: Modifier la mise en page
       
     pages:
       index:
         title: Pages
-        new_link: Créer Nouvelle Page
+        new_link: Nouvelle page
       index_branch:
         toggle: Basculer
-        add_child_page: Ajouter Page Enfant
+        add_child_page: Ajouter une page enfant
         edit: Modifier
         delete: Supprimer
-        are_you_sure: Confirmez-vous la suppression?
+        are_you_sure: Êtes-vous sûr de vouloir supprimer cette page ?
       new:
-        title: Nouvelle Page
+        title: Nouvelle page
       edit:
-        title: Modification Page
-        revision: Révision
+        title: Modification de la page
+        revision: révision
       form:
-        select_target_page: Sans Redirection
+        select_target_page: Pas de redirection
         preview: Prévisualiser
-        create: Créer Page
-        update: Modifier Page
+        create: Créer la page
+        update: Modifier la page
+        is_published: Publié
       form_blocks:
         no_tags: |-
           Mise en page sans aucun tag de contenu.<br/>
-          Modifiez le contenu pour y ajouter un tag de page ou de champs. Par exemple: <code>{{cms:page:content}}</code>
+          Modifiez le contenu pour y ajouter un tag de page ou de champ. Exemple : <code>{{cms:page:content}}</code>
       
     snippets:
       index:
-        title: Snippets
-        new_link: Créer Nouveau Snippet
+        title: Fragments
+        new_link: Nouveau fragment
         edit: Modifier
         delete: Supprimer
-        are_you_sure: Confirmez-vous la suppression?
+        are_you_sure: Êtes-vous sûr de vouloir supprimer ce fragment ?
       new:
-        title: Nouveau Snippet
+        title: Nouveau fragment
       edit:
-        title: Modification Snippet
-        revision: Révision
+        title: Modification du fragment
+        revision: révision
       form:
-        create: Créer Snippet
-        update: Modifier Snippet
+        create: Créer le fragment
+        update: Modifier le fragment
           
     revisions:
       show:
-        title: Révisions pour
-        revision: Révision
-        full_path: Chemin d'accès complet
-        slug: Nom unique
-        update: Update to this Révision
+        title: "Révisions :"
+        revision: révision
+        full_path: Chemin complet 
+        slug: Identifiant
+        update: Restaurer cette révision
         current: Actuel
       
     files:
       index:
         title: Fichiers
-        new_link: Télécharger Nouveau Fichier
+        new_link: Nouveau fichier
         edit: Modifier
         delete: Supprimer
-        are_you_sure: Confirmez-vous la suppression?
-        button: Télécharger Fichiers
+        are_you_sure: Êtes-vous sûr de vouloir supprimer ce fichier ?
+        button: Ajouter des fichiers
       new:
-        title: Nouveau Fichier
+        title: Nouveau fichier
       edit:
-        title: Modification Fichier
+        title: Modification du fichier
       form:
         current_file: Fichier actuel
-        create: Télécharger Fichier
-        update: Modifier Fichier
+        create: Envoyer
+        update: Modifier le fichier
       page_form:
-        are_you_sure: Confirmez-vous la suppression?
+        are_you_sure: Êtes-vous sûr de vouloir supprimer ce fichier ?
       file:
-        are_you_sure: Confirmez-vous la suppression?
+        are_you_sure: Êtes-vous sûr de vouloir supprimer ce fichier ?
         
     categories:
       index:
         label: Catégories
-        edit: Modifier
-        done: Effectué
+        edit: Modifier les catégories
+        done: Terminé
         all: Tout
         add: Ajouter
       show:
-        are_you_sure: Confirmez-vous la suppression?
+        are_you_sure: Êtes-vous sûr de vouloir supprimer cette catégorie ?
       edit:
         save: Enregistrer
       form:
@@ -229,6 +231,6 @@ fr:
         
     dialogs:
       image:
-        insert: Insérer Image
+        insert: Insérer une image
       link:
-        create: Créer Lien
+        create: Insérer un lien

data/config/locales/ja.yml

@@ -121,7 +121,8 @@ ja:
       form:
         create: サイトを作成
         update: サイトを更新
-        
+        is_mirrored: ミラーリング済み
+
     layouts:
       index:
         title: レイアウト
@@ -162,6 +163,7 @@ ja:
         preview: プレビュー
         create: ページを作成
         update: ページを更新
+        is_published: パブリッシュ済み
       form_blocks:
         no_tags: |-
           レイアウトにはコンテンツタグが定義されていません。<br/>

data/config/locales/pl.yml

@@ -121,6 +121,7 @@ pl:
       form:
         create: Utwórz witrynę
         update: Uaktualnij witrynę
+        is_mirrored: Mirror
         
     layouts:
       index:
@@ -162,6 +163,7 @@ pl:
         preview: Podgląd
         create: Utwórz stronę
         update: Uaktualnij stronę
+        is_published: Opublikowana
       form_blocks:
         no_tags: |-
           Szablon nie ma zdefiniowanych tagów<br/>

data/config/locales/pt-BR.yml

@@ -121,6 +121,7 @@ pt-BR:
       form:
         create: Criar Site
         update: Atualizar Site
+        is_mirrored: Espelhado
         
     layouts:
       index:
@@ -162,6 +163,7 @@ pt-BR:
         preview: Pré-visualização
         create: Criar Página
         update: Atualizar Página
+        is_published: Publicada
       form_blocks:
         no_tags: |-
           O leiaute não possui tags de conteúdo definidas.<br/>

data/config/locales/ru.yml

@@ -121,6 +121,7 @@ ru:
       form:
         create: Создать сайт
         update: Обновить сайт
+        is_mirrored: Синхронизирован с другими сайтами
 
     layouts:
       index:
@@ -162,6 +163,7 @@ ru:
         preview: Предпросмотр
         create: Создать страницу
         update: Обновить страницу
+        is_published: Опубликована
       form_blocks:
         no_tags: |-
           Шаблон не содержит ни одного контент-тега.<br/>

data/config/locales/sv.yml

@@ -121,6 +121,7 @@ sv:
       form:
         create: Skapa Site
         update: Uppdatera Site
+        is_mirrored: Speglad
         
     layouts:
       index:
@@ -162,6 +163,7 @@ sv:
         preview: Förhandsgranska
         create: Skapa sida
         update: Uppdatera sida
+        is_published: Publicerad
       form_blocks:
         no_tags: |-
           Layout har inga innehållstaggar definierade.<br/>

data/config/locales/zh-CN.yml

@@ -121,6 +121,7 @@ zh-CN:
       form:
         create: 创建站点
         update: 更新站点
+        is_mirrored: 镜像
 
     layouts:
       index:
@@ -162,6 +163,7 @@ zh-CN:
         preview: 预览
         create: 创建页面
         update: 更新页面
+        is_published: 发布
       form_blocks:
         no_tags: |-
           布局中没有定义内容标签。<br/>

data/lib/comfortable_mexican_sofa/version.rb

@@ -1,3 +1,3 @@
 module ComfortableMexicanSofa
-  VERSION = "1.8.0"
+  VERSION = "1.8.1"
 end

data/test/functional/cms_admin/files_controller_test.rb

@@ -31,6 +31,17 @@ class CmsAdmin::FilesControllerTest < ActionController::TestCase
     assert_equal 0, assigns(:files).count
   end
   
+  def test_get_index_as_ajax
+    get :index, :site_id => cms_sites(:default), :ajax => true
+    assert_response :success
+    r = JSON.parse(response.body)
+    file = cms_files(:default)
+    assert_equal [{
+      'thumb' => file.file.url(:cms_thumb),
+      'image' => file.file.url
+    }], r
+  end
+  
   def test_get_new
     site = cms_sites(:default)
     get :new, :site_id => site
@@ -61,7 +72,7 @@ class CmsAdmin::FilesControllerTest < ActionController::TestCase
       post :create, :site_id => cms_sites(:default), :file => {
         :label        => 'Test File',
         :description  => 'Test Description',
-        :file         => [fixture_file_upload('files/image.jpg', "image/jpeg")]
+        :file         => [fixture_file_upload('files/image.jpg', 'image/jpeg')]
       }
       assert_response :redirect
       file = Cms::File.last
@@ -90,8 +101,8 @@ class CmsAdmin::FilesControllerTest < ActionController::TestCase
         :label        => 'Test File',
         :description  => 'Test Description',
         :file         => [
-          fixture_file_upload('files/image.jpg', "image/jpeg"),
-          fixture_file_upload('files/image.gif', "image/gif")
+          fixture_file_upload('files/image.jpg', 'image/jpeg'),
+          fixture_file_upload('files/image.gif', 'image/gif')
         ]
       }
       assert_response :redirect
@@ -110,18 +121,36 @@ class CmsAdmin::FilesControllerTest < ActionController::TestCase
     end
   end
   
-  def test_create_as_xhr
-    request.env['HTTP_X_FILE_NAME'] = 'image.jpg'
-    request.env['CONTENT_TYPE'] = 'image/jpeg'
-    request.env['RAW_POST_DATA'] = File.open(File.expand_path('../../fixtures/files/image.jpg', File.dirname(__FILE__)))
-    
+  def test_create_as_ajax
     assert_difference 'Cms::File.count' do
-      xhr :post, :create, :site_id => cms_sites(:default)
+      post :create,
+        :ajax     => true,
+        :site_id  => cms_sites(:default),
+        :file     => {
+          :file => [fixture_file_upload('files/image.jpg', 'image/jpeg')]
+        }
       assert_response :success
-      
       file = Cms::File.last
-      assert_equal 'image.jpg', file.file_file_name
-      assert_equal 'image/jpeg', file.file_content_type
+      r = JSON.parse(response.body)
+      assert_equal file.file.url, r['filelink']
+      assert_present r['view']
+    end
+  end
+  
+  def test_create_as_ajax_failure
+    assert_no_difference 'Cms::File.count' do
+      post :create, :ajax => true, :site_id => cms_sites(:default), :file => { }
+      assert_response :unprocessable_entity
+    end
+  end
+  
+  def test_create_as_ajax_as_single_file
+    assert_difference 'Cms::File.count' do
+      post :create,
+        :ajax     => true,
+        :site_id  => cms_sites(:default),
+        :file     => fixture_file_upload('files/image.jpg', 'image/jpeg')
+      assert_response :success
     end
   end
   

data/test/functional/cms_admin/layouts_controller_test.rb

@@ -24,7 +24,7 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
     assert_equal '{{ cms:page:content:text }}', assigns(:layout).content
     assert_template :new
     assert_select "form[action=/cms-admin/sites/#{site.id}/layouts]"
-    assert_select "form[action='/cms-admin/sites/#{site.id}/files']"
+    assert_select "form[action='/cms-admin/sites/#{site.id}/files?ajax=true']"
   end
 
   def test_get_edit

data/test/functional/cms_admin/pages_controller_test.rb

@@ -43,7 +43,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     assert_template :new
     assert_select "form[action=/cms-admin/sites/#{site.id}/pages]"
     assert_select "select[data-url=/cms-admin/sites/#{site.id}/pages/0/form_blocks]"
-    assert_select "form[action='/cms-admin/sites/#{site.id}/files']"
+    assert_select "form[action='/cms-admin/sites/#{site.id}/files?ajax=true']"
   end
 
   def test_get_new_with_field_datetime

data/test/functional/cms_admin/snippets_controller_test.rb

@@ -41,7 +41,7 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
     assert assigns(:snippet)
     assert_template :new
     assert_select "form[action=/cms-admin/sites/#{site.id}/snippets]"
-    assert_select "form[action='/cms-admin/sites/#{site.id}/files']"
+    assert_select "form[action='/cms-admin/sites/#{site.id}/files?ajax=true']"
   end
 
   def test_get_edit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -231,8 +231,7 @@ files:
 - app/views/cms_admin/files/_form.html.haml
 - app/views/cms_admin/files/_index.html.haml
 - app/views/cms_admin/files/_page_form.html.haml
-- app/views/cms_admin/files/create.js.erb
-- app/views/cms_admin/files/destroy.js.erb
+- app/views/cms_admin/files/destroy.js.coffee
 - app/views/cms_admin/files/edit.html.haml
 - app/views/cms_admin/files/index.html.haml
 - app/views/cms_admin/files/new.html.haml
@@ -264,6 +263,7 @@ files:
 - app/views/layouts/cms_admin/_body.html.haml
 - app/views/layouts/cms_admin/_center.html.haml
 - app/views/layouts/cms_admin/_footer.html.haml
+- app/views/layouts/cms_admin/_footer_js.html.haml
 - app/views/layouts/cms_admin/_head.html.haml
 - app/views/layouts/cms_admin/_left.html.haml
 - app/views/layouts/cms_admin/_right.html.haml

data/app/views/cms_admin/files/create.js.erb

@@ -1,3 +0,0 @@
-$('.uploaded-files').prepend(
-  '<%= escape_javascript(render :partial => "file", :object => @file ) %>'
-);

data/app/views/cms_admin/files/destroy.js.erb

@@ -1,3 +0,0 @@
-$(".file.<%= dom_id(@file) %>").fadeOut('slow', function(){
-  $(this).remove()
-})