ems 0.1.1 → 0.1.2

data/app/models/ems/news.rb

@@ -50,7 +50,7 @@ module Ems
     has_and_belongs_to_many :reports, :join_table => 'ems_news_reports'
     accepts_nested_attributes_for :reports
     
-    has_attached_file :image, :styles => {:image228x126 => "228x126"}
+    has_attached_file :image, :styles => { :image564x252 => "564x252#", :image312x189 => "312x189#", :image312x126 => "312x126", :image228x126 => "228x126"}
     
     has_many :assets, :as => :assetable
     accepts_nested_attributes_for :assets, :allow_destroy => true    

data/app/views/ems/articles/_form.html.haml

@@ -11,10 +11,7 @@
 
         = render "ems/globals/lead_image", :form => f, :imageName => @article.image.url
 
-        %li
-          #button-bar.input-buttons
-          = f.label :content
-          = f.input_field :content, :data => {:wmd => "article_content"}
+        = render "ems/globals/content_editor", :form => f, :type=>"article"
 
         = render "ems/globals/asset", :form => f
 

data/app/views/ems/globals/_asset.html.haml

@@ -18,9 +18,11 @@
         - else
           %span.asset-blank
             - @assetField = builder.file_field :asset
+            - @errorField = builder.error :asset
             / - @titleField = builder.input_field :title, :placeholder => "Enter image title"
 %li
   = form.label "Add new asset"
   .input-push.asset-add
     = @assetField
-    / = @titleField
+    / = @titleField
+  = @errorField

data/app/views/ems/globals/_content_editor.html.haml

@@ -0,0 +1,5 @@
+%li
+  #button-bar.input-buttons
+  = form.label :content
+  = form.input_field :content, :data => {:wmd => "#{type}_content"}
+  = form.error :content

data/app/views/ems/news/_form.html.haml

@@ -11,11 +11,8 @@
 
         = render "ems/globals/lead_image", :form => f, :imageName => @news.image.url
 
-        %li
-          #button-bar.input-buttons
-          = f.label :content
-          = f.input_field :content, :data => {:wmd => "news_content"}
-          
+        = render "ems/globals/content_editor", :form => f, :type=>"news"
+
         = render "ems/globals/asset", :form => f
 
 

data/app/views/ems/reports/_form.html.haml

@@ -11,18 +11,13 @@
 
         = render "ems/globals/lead_image", :form => f, :imageName => @report.image.url
 
-
-
-        %li
-          #button-bar.input-buttons
-          = f.label :content
-          = f.input_field :content, :data => {:wmd => "report_content"}
+        = render "ems/globals/content_editor", :form => f, :type=>"report"
 
         %li
           = f.input :download_cta
         %li
           = f.input :report
-          
+
         = render "ems/globals/asset", :form => f
 
 

data/app/views/layouts/ems/application.html.haml

@@ -24,4 +24,4 @@
 
       %footer#footer
         %p
-          \© The Beans Group #{Time.now.year}
+          \Powered by EMS #{Ems::VERSION}

data/lib/ems/version.rb

@@ -1,3 +1,3 @@
 module Ems
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/kramdown/parser/bean_kramdown/oembed.rb

@@ -59,7 +59,7 @@ module Kramdown
       def add_oembed(el, href, title, alt_text = nil)
         
         providers = {
-          :twitter         => "https://api.twitter.com/1/statuses/oembed.json?url=%s",
+          :twitter         => "https://api.twitter.com/1/statuses/oembed.json?url=%s&lang=en",
           :youtube         => "http://www.youtube.com/oembed?url=%s&format=json&maxwidth=550",
           :flickr          => "http://flickr.com/services/oembed?url=%s&maxwidth=460&format=json&maxwidth=550",
           :vidler          => "http://lab.viddler.com/services/oembed/?url=%s&type=simple&format=json",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ems
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -384,6 +384,7 @@ files:
 - app/views/ems/channels/show.html.haml
 - app/views/ems/ems/index.html.haml
 - app/views/ems/globals/_asset.html.haml
+- app/views/ems/globals/_content_editor.html.haml
 - app/views/ems/globals/_lead_image.html.haml
 - app/views/ems/news/_form.html.haml
 - app/views/ems/news/edit.html.haml