ems 0.0.2 → 0.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. data/app/controllers/ems/ems_controller.rb +5 -0
  2. data/app/views/ems/articles/_form.html.haml +2 -3
  3. data/app/views/ems/globals/_asset.html.haml +1 -1
  4. data/app/views/ems/globals/_lead_image.html.haml +4 -0
  5. data/app/views/ems/news/_form.html.haml +1 -2
  6. data/app/views/ems/reports/_form.html.haml +4 -0
  7. data/lib/ems/version.rb +1 -1
  8. metadata +2 -1
data/app/controllers/ems/ems_controller.rb CHANGED
@@ -3,6 +3,11 @@ module Ems
3
3
  skip_authorization_check :only => [:index]
4
4
 
5
5
  def index
6
+ # Workaround for active admin routing problem.
7
+ # see:
8
+ # http://stackoverflow.com/questions/10684566/mountable-engine-routing-with-active-admin-on-rails
9
+ # @todo find a nicer solution for this problem.
10
+ render :layout => 'ems/application'
6
11
  end
7
12
 
8
13
  end
data/app/views/ems/articles/_form.html.haml CHANGED
@@ -9,9 +9,8 @@
9
9
  %li
10
10
  = f.input :standfirst, :input_html => { :rows => 4 }
11
11
 
12
- %li
13
- = f.input :image
14
-
12
+ = render "ems/globals/lead_image", :form => f
13
+
15
14
  %li
16
15
  #button-bar.input-buttons
17
16
  = f.label :content
data/app/views/ems/globals/_asset.html.haml CHANGED
@@ -23,4 +23,4 @@
23
23
  = form.label "Add new asset"
24
24
  .input-push.asset-add
25
25
  = @assetField
26
- = @titleField
26
+ / = @titleField
data/app/views/ems/globals/_lead_image.html.haml ADDED
@@ -0,0 +1,4 @@
1
+ %li
2
+ = form.label "Lead image"
3
+ .input-push.asset-add
4
+ = form.input_field :image
data/app/views/ems/news/_form.html.haml CHANGED
@@ -9,8 +9,7 @@
9
9
  %li
10
10
  = f.input :standfirst, :input_html => { :rows => 4 }
11
11
 
12
- %li
13
- = f.input :image
12
+ = render "ems/globals/lead_image", :form => f
14
13
 
15
14
  %li
16
15
  #button-bar.input-buttons
data/app/views/ems/reports/_form.html.haml CHANGED
@@ -9,6 +9,10 @@
9
9
  %li
10
10
  = f.input :standfirst, :input_html => { :rows => 4 }
11
11
 
12
+ = render "ems/globals/lead_image", :form => f
13
+
14
+
15
+
12
16
  %li
13
17
  #button-bar.input-buttons
14
18
  = f.label :content
data/lib/ems/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Ems
2
- VERSION = "0.0.2"
2
+ VERSION = "0.0.3"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ems
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.2
4
+ version: 0.0.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -368,6 +368,7 @@ files:
368
368
  - app/views/ems/channels/show.html.haml
369
369
  - app/views/ems/ems/index.html.haml
370
370
  - app/views/ems/globals/_asset.html.haml
371
+ - app/views/ems/globals/_lead_image.html.haml
371
372
  - app/views/ems/news/_form.html.haml
372
373
  - app/views/ems/news/edit.html.haml
373
374
  - app/views/ems/news/index.html.haml