Minor improvements, fix error in locales and bump version.

.gitignore

@@ -7,3 +7,4 @@
 tmp
 nbproject
 *.swp
+*.gem

Rakefile

@@ -1,5 +1,3 @@
-require File.expand_path('../../config/application', __FILE__)
-
 require 'rubygems'
 require 'rake'
 require 'rake/testtask'
@@ -28,4 +26,4 @@ RSpec::Core::RakeTask.new
 # require 'cucumber/rake/task'
 # Cucumber::Rake::Task.new do |t|
 #   t.cucumber_opts = %w{--format pretty}
-# end
+# end

app/views/shared/_editor.html.erb

@@ -24,7 +24,7 @@
 <script type="text/javascript" charset="utf-8">
 	var <%= editor_id %>_editor = new YAHOO.widget.Editor('<%= editor_id %>', {
 		height: '350px',
-		width: '790px',
+		width: 'auto',
 		animate: true,
 		handleSubmit: true,
 		toolbar: {
@@ -108,26 +108,20 @@
 			            { type: 'push', label: 'HTML Link CTRL + SHIFT + L', value: 'createlink', disabled: true },
 			            { type: 'push', label: '<%= t("editor.insert_image") %>', value: 'insertimage' }
 			        ]
+			    },
+			    { type: 'separator' },
+			    { group: 'uploaditem', label: '<%= t("editor.upload_file") %>',
+			        buttons: [
+			            { type: 'push', label: '<%= t("editor.upload_image") %>', value: 'imageUpload' },
+		              { type: 'push', label: '<%= t("editor.upload_file") %>', value: 'fileUpload' }
+			        ]
 			    }
+
 			]
 		}
 	});
 
-	<%= editor_id %>_editor.on('toolbarLoaded', function() {
-		var imageUploadConfig = {
-			type: 'push',
-			label: '<%= t("editor.upload_image") %>',
-			value: 'imageUpload'
-		};
-		<%= editor_id %>_editor.toolbar.addButtonToGroup(imageUploadConfig, 'insertitem');
-
-		var fileUploadConfig = {
-			type: 'push',
-			label: '<%= t("editor.upload_file") %>',
-			value: 'fileUpload'
-		};
-		<%= editor_id %>_editor.toolbar.addButtonToGroup(fileUploadConfig, 'insertitem');
-	});
+
 
 	<%= editor_id %>_editor.addListener('editorContentLoaded', function() {
 		$(".yui-toolbar-imageUpload").upload({

config/locales/en.yml

@@ -10,7 +10,7 @@ en:
     insert_item: Insert Item
     insert_image: Insert Image
     upload_image: Upload Image
-    upload_image: Upload File
+    upload_file: Upload File
     show_more_fields: Show more fields
     hide_more_fields: Hide more fields
     switch_simple: Switch to Simple Editor

config/locales/ru.yml

@@ -9,7 +9,7 @@ ru:
     insert_item: Вставка
     insert_image: Вставить картинки по адресу
     upload_image: Загрузить картинку
-    upload_image: Загрузить файл
+    upload_file: Загрузить файл
     show_more_fields: Показать дополнительные поля
     hide_more_fields: Скрыть дополнительные поля
     switch_simple: Переключиться на простой редактор

spree_editor.gemspec

@@ -1,17 +1,18 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_editor'
-  s.version     = '1.0.0'
+  s.version     = '0.30.1'
   s.summary     = 'Add gem summary here'
   #s.description = 'Add (optional) gem description here'
   s.required_ruby_version = '>= 1.8.7'
 
-  # s.author            = 'David Heinemeier Hansson'
+  s.author            = 'divineforest'
   # s.email             = '[email protected]'
-  # s.homepage          = 'http://www.rubyonrails.org'
+  s.homepage          = 'http://github.com/divineforest/spree_editor'
   # s.rubyforge_project = 'actionmailer'
 
-  s.files        = Dir['CHANGELOG', 'README.md', 'LICENSE', 'lib/**/*', 'app/**/*']
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_path = 'lib'
   s.requirements << 'none'