activoate 0.7.5 → 0.7.9

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 (14) hide show
  1. data/README +1 -1
  2. data/app/assets/javascripts/activo.js.coffee +1 -1
  3. data/app/assets/stylesheets/{activo.css → activo.css.sass} +3 -1
  4. data/app/helpers/{activo_helper.rb → activoate_helper.rb} +1 -1
  5. data/lib/activoate/version.rb +1 -1
  6. data/lib/generators/activoate/activoated/activoated_generator.rb +2 -2
  7. data/lib/generators/activoate/activoated/templates/view_edit.html.erb +1 -1
  8. data/lib/generators/activoate/activoated/templates/view_new.html.erb +1 -1
  9. data/lib/generators/activoate/activoated/templates/view_show.html.erb +1 -1
  10. data/lib/generators/activoate/activoated/templates/view_show_attrtastic.html.erb +1 -1
  11. data/lib/generators/activoate/activoated/templates/view_sidebar.html.erb +5 -5
  12. data/lib/generators/activoate/activoated/templates/view_tables.html.erb +8 -4
  13. data/lib/generators/activoate/activoated/templates/view_text.html.erb +1 -1
  14. metadata +5 -5
data/README CHANGED
@@ -1,4 +1,4 @@
1
- # Activoate 0.7.2 #
1
+ # Activoate 0.7.9 #
2
2
 
3
3
  We're setting up this repository, more info soon!
4
4
 
data/app/assets/javascripts/activo.js.coffee CHANGED
@@ -13,4 +13,4 @@
13
13
  $(document).ready =>
14
14
  $('#destroy-toggle').click ->
15
15
  state = $(this).is(':checked')
16
- $('[name="destroy[]"]').attr('checked', state)
16
+ $('[name="destroy_ids[]"]').attr('checked', state)
data/app/assets/stylesheets/{activo.css → activo.css.sass} RENAMED
@@ -7,4 +7,6 @@
7
7
  *= require_self
8
8
  */
9
9
 
10
- /* Write here your css for overriding the theme's rules */
10
+ .control
11
+ &.within-form
12
+ margin-top: -5px
data/app/helpers/{activo_helper.rb → activoate_helper.rb} RENAMED
@@ -1,4 +1,4 @@
1
- module ActivoHelper
1
+ module ActivoateHelper
2
2
 
3
3
  # Get or set the page title
4
4
  #
data/lib/activoate/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Activoate
2
- VERSION = "0.7.5"
2
+ VERSION = "0.7.9"
3
3
  end
data/lib/generators/activoate/activoated/activoated_generator.rb CHANGED
@@ -108,11 +108,11 @@ module Activoate
108
108
  'view_edit.html.erb' => File.join('app/views', @controller_file_path, "edit.html.#{options.engine}"),
109
109
  form_file_name => File.join('app/views', @controller_file_path, "_form.html.#{options.engine}"),
110
110
  show_file_name => File.join('app/views', @controller_file_path, "show.html.#{options.engine}"),
111
- 'view_sidebar.html.erb' => File.join('app/views', "shared", "_sidebar.html.#{options.engine}")
111
+ 'view_sidebar.html.erb' => File.join('app/views', "application", "_sidebar.html.#{options.engine}")
112
112
  },
113
113
  'text' => {
114
114
  'view_text.html.erb' => File.join('app/views', @controller_file_path, "show.html.#{options.engine}"),
115
- 'view_sidebar.html.erb' => File.join('app/views', "shared", "_sidebar.html.#{options.engine}")
115
+ 'view_sidebar.html.erb' => File.join('app/views', "application", "_sidebar.html.#{options.engine}")
116
116
  }
117
117
  }
118
118
  selected_views = views[options.themed_type]
data/lib/generators/activoate/activoated/templates/view_edit.html.erb CHANGED
@@ -12,4 +12,4 @@
12
12
  </div>
13
13
  </div>
14
14
 
15
- <%% content_for :sidebar, render(:partial => 'shared/sidebar') -%>
15
+ <%% content_for :sidebar, render(:partial => 'sidebar') -%>
data/lib/generators/activoate/activoated/templates/view_new.html.erb CHANGED
@@ -13,4 +13,4 @@
13
13
  </div>
14
14
  </div>
15
15
 
16
- <%% content_for :sidebar, render(:partial => 'shared/sidebar') -%>
16
+ <%% content_for :sidebar, render(:partial => 'sidebar') -%>
data/lib/generators/activoate/activoated/templates/view_show.html.erb CHANGED
@@ -23,4 +23,4 @@
23
23
  </div>
24
24
  </div>
25
25
 
26
- <%% content_for :sidebar, render(:partial => 'shared/sidebar') -%>
26
+ <%% content_for :sidebar, render(:partial => 'sidebar') -%>
data/lib/generators/activoate/activoated/templates/view_show_attrtastic.html.erb CHANGED
@@ -30,4 +30,4 @@
30
30
  </div>
31
31
  </div>
32
32
 
33
- <%% content_for :sidebar, render(:partial => 'shared/sidebar') -%>
33
+ <%% content_for :sidebar, render(:partial => 'sidebar') -%>
data/lib/generators/activoate/activoated/templates/view_sidebar.html.erb CHANGED
@@ -1,13 +1,13 @@
1
1
  <div class="block notice">
2
- <h3>Simple Block</h3>
2
+ <h3>Default Sidebar</h3>
3
3
  <div class="content">
4
- <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
4
+ <p>This file is located in /app/views/application/sidebar.html.<%= options.engine %>. It is meant to be used only when there's no "sidebar.html.<%= options.engine %>" file on the controller's view folder.</p>
5
5
  </div>
6
6
  </div>
7
7
  <div class="block">
8
- <h3>Links</h3>
8
+ <h3>Useful links</h3>
9
9
  <ul class="navigation">
10
- <li><a href="#">Link 1</a></li>
11
- <li><a href="#">Link 2</a></li>
10
+ <li><a href="#">Home</a></li>
11
+ <li><a href="#">Profile</a></li>
12
12
  </ul>
13
13
  </div>
data/lib/generators/activoate/activoated/templates/view_tables.html.erb CHANGED
@@ -5,8 +5,9 @@
5
5
  <%% end %>
6
6
  <div class="content">
7
7
  <% if options.mass_destroy %>
8
- <%%= controls do |c| %>
9
- <%% c.item delete_button(users_path(@user), true) %>
8
+ <%%= form_tag("/<%= plural_resource_name %>/mass_destroy", :name => "destroy-<%= resource_name %>-form", :method => "delete") %>
9
+ <%%= controls({ :class => 'within-form' }) do |c| %>
10
+ <%% c.item submit_button(t("activoate.delete", :default => 'Delete'), 'cross') %>
10
11
  <%% end %>
11
12
  <%- end -%>
12
13
  <h2 class="title"><%%= t("activoate.all", :default => "All") %> <%= plural_model_name %></h2>
@@ -28,7 +29,7 @@
28
29
  <%% @<%= plural_resource_name %>.each do |<%= resource_name %>| -%>
29
30
  <tr class="<%%= cycle("odd", "even") %>">
30
31
  <% if options.mass_destroy %>
31
- <td class="first"><input type="checkbox" id="destroy-<%= resource_name %>-<%%= <%= resource_name %>.id %>" name="destroy[]" value="<%%= <%= resource_name %>.id %>" /></td>
32
+ <td class="first"><input type="checkbox" id="destroy-<%= resource_name %>-<%%= <%= resource_name %>.id %>" name="destroy_ids[]" value="<%%= <%= resource_name %>.id %>" /></td>
32
33
  <td><%%= <%= resource_name %>.id %></td>
33
34
  <% else %>
34
35
  <td><%%= <%= resource_name %>.id %></td>
@@ -55,7 +56,10 @@
55
56
  <% end %>
56
57
  </div>
57
58
  </div>
59
+ <% if options.mass_destroy %>
60
+ </form>
61
+ <%- end -%>
58
62
  </div>
59
63
  </div>
60
64
 
61
- <%% content_for :sidebar, render(:partial => 'shared/sidebar') -%>
65
+ <%% content_for :sidebar, render(:partial => 'sidebar') -%>
data/lib/generators/activoate/activoated/templates/view_text.html.erb CHANGED
@@ -15,4 +15,4 @@
15
15
  </div>
16
16
  </div>
17
17
 
18
- <%% content_for :sidebar, render(:partial => 'shared/sidebar') -%>
18
+ <%% content_for :sidebar, render(:partial => 'sidebar') -%>
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: activoate
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.5
4
+ version: 0.7.9
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2011-12-14 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &70164905980620 !ruby/object:Gem::Requirement
16
+ requirement: &70179652541540 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
21
21
  version: 3.0.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70164905980620
24
+ version_requirements: *70179652541540
25
25
  description: Helps to use Activo 2 theme on Rails 3 applications and provides handy
26
26
  helpers and generators to use with formtastic/attrtastic
27
27
  email:
@@ -99,7 +99,7 @@ files:
99
99
  - app/assets/javascripts/activo/jquery.uniform.min.js
100
100
  - app/assets/javascripts/users.js.coffee
101
101
  - app/assets/stylesheets/.DS_Store
102
- - app/assets/stylesheets/activo.css
102
+ - app/assets/stylesheets/activo.css.sass
103
103
  - app/assets/stylesheets/activo/attrtastic_changes.sass
104
104
  - app/assets/stylesheets/activo/base.css
105
105
  - app/assets/stylesheets/activo/fonts.sass
@@ -123,7 +123,7 @@ files:
123
123
  - app/assets/stylesheets/application.css
124
124
  - app/assets/stylesheets/scaffolds.css.scss
125
125
  - app/assets/stylesheets/users.css.scss
126
- - app/helpers/activo_helper.rb
126
+ - app/helpers/activoate_helper.rb
127
127
  - config.ru
128
128
  - lib/activoate.rb
129
129
  - lib/activoate/engine.rb