Merge pull request locomotivecms#152 from frisoft/master

Bugfix: import and italian localization update.

config/locales/admin_ui.it.yml

@@ -16,6 +16,7 @@ it:
         welcome: Benvenuto, %{name}
         see: Vedi il sito web
         switch: Passa ad un altro sito
+        help: Aiuto
         logout: Esci
       menu:
         contents: Contenuti

lib/locomotive/import/pages.rb

@@ -105,10 +105,12 @@ def assign_editable_elements(page, elements)
           next if element.nil?
 
           if element.respond_to?(:source)
-            asset_path = File.join(theme_path, 'public', attributes['content'])
+            unless attributes['content'].blank?
+              asset_path = File.join(theme_path, 'public', attributes['content'])
 
-            if File.exists?(asset_path)
-              element.source = File.open(asset_path)
+              if File.exists?(asset_path)
+                element.source = File.open(asset_path)
+              end
             end
           else
             element.content = attributes['content']

spec/lib/locomotive/import_spec.rb

@@ -73,6 +73,11 @@
       page = @site.pages.where(:title => 'Contact').first
       page.find_editable_element('content', 'office').source_filename.should == 'office.jpg'
     end
+
+    it 'sets the empty editable file for a page from the site config file' do
+      page = @site.pages.where(:title => 'Contact').first
+      page.find_editable_element('content', 'office2').source_filename.should be_nil
+    end
 
     it 'inserts templatized page' do
       page = @site.pages.where(:templatized => true).first
@@ -126,4 +131,4 @@
   end
 
 
-end
+end