typus 0.9.31 → 0.9.32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (15) hide show
  1. data/VERSION +1 -1
  2. data/app/controllers/admin/master_controller.rb +2 -0
  3. data/app/controllers/typus_controller.rb +2 -0
  4. data/app/helpers/admin/table_helper.rb +2 -2
  5. data/app/helpers/typus_helper.rb +1 -1
  6. data/app/views/admin/dashboard/_sidebar.html.erb +0 -2
  7. data/app/views/admin/shared/_feedback.html.erb +6 -0
  8. data/app/views/admin/shared/_footer.html.erb +2 -1
  9. data/app/views/layouts/admin.html.erb +7 -6
  10. data/config/locales/de.yml +4 -1
  11. data/config/locales/es.yml +4 -1
  12. data/config/locales/language.yml.template +4 -0
  13. data/generators/typus/typus_generator.rb +2 -1
  14. data/typus.gemspec +3 -2
  15. metadata +3 -2
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.9.31
1
+ 0.9.32
data/app/controllers/admin/master_controller.rb CHANGED
@@ -1,5 +1,7 @@
1
1
  class Admin::MasterController < ApplicationController
2
2
 
3
+ skip_filter filter_chain
4
+
3
5
  unloadable
4
6
 
5
7
  layout 'admin'
data/app/controllers/typus_controller.rb CHANGED
@@ -1,5 +1,7 @@
1
1
  class TypusController < ApplicationController
2
2
 
3
+ skip_filter filter_chain
4
+
3
5
  unloadable
4
6
 
5
7
  layout :select_layout
data/app/helpers/admin/table_helper.rb CHANGED
@@ -13,7 +13,7 @@ module Admin::TableHelper
13
13
  items.each do |item|
14
14
 
15
15
  html << <<-HTML
16
- <tr class="#{cycle('even', 'odd')}" id="item_#{item.id}">
16
+ <tr class="#{cycle('even', 'odd')} #{item.class.name.underscore}" id="#{dom_id(item)}" name="item_#{item.id}">
17
17
  HTML
18
18
 
19
19
  fields.each do |key, value|
@@ -162,7 +162,7 @@ module Admin::TableHelper
162
162
 
163
163
  def typus_table_string_field(attribute, item, link_options = {})
164
164
  <<-HTML
165
- <td>#{item.send(attribute)}</td>
165
+ <td class='#{attribute}'>#{item.send(attribute)}</td>
166
166
  HTML
167
167
  end
168
168
 
data/app/helpers/typus_helper.rb CHANGED
@@ -31,7 +31,7 @@ module TypusHelper
31
31
 
32
32
  html << <<-HTML
33
33
  <tr class="#{cycle('even', 'odd')}">
34
- <td>#{link_to klass.typus_human_name.pluralize, admin_items_path}<br /><small>#{klass.typus_description}</small></td>
34
+ <td>#{link_to klass.typus_human_name.pluralize, admin_items_path}<br /><small>#{_(klass.typus_description) if !klass.typus_description.nil?}</small></td>
35
35
  <td class="right"><small>
36
36
  #{link_to _("Add"), new_admin_item_path if @current_user.can_perform?(klass, 'create')}
37
37
  </small></td>
data/app/views/admin/dashboard/_sidebar.html.erb CHANGED
@@ -1,7 +1,5 @@
1
1
  <h2>Welcome to Typus!</h2>
2
2
 
3
- <p>Documentation is available <%= link_to 'here', 'http://intraducibles.com/projects/typus', :rel => 'external' %>.</p>
4
-
5
3
  <p>If you need help don't hesitate in joining the <%= link_to 'mailing list', 'http://groups.google.com/group/typus', :rel => 'external' %>.</p>
6
4
 
7
5
  <p>Replace this sidebar dropping a file named <code>_sidebar.html.erb</code> on the <code>app/views/admin/dashboard</code> folder.</p>
data/app/views/admin/shared/_feedback.html.erb ADDED
@@ -0,0 +1,6 @@
1
+ <p>
2
+ <%= link_to _("Submit a bug report"), 'http://typus.lighthouseapp.com/projects/16954-typus/tickets/new', :rel => 'external' %> &#183;
3
+ <%= link_to _("Documentation"), 'http://intraducibles.com/projects/typus', :rel => 'external' %> &#183;
4
+ <%= mail_to "hello@intraducibles.com", _("Send us feedback") %> &#183;
5
+ <%= link_to _("License"), "http://intraducibles.com/projects/typus/mit-license", :rel => 'external' %>
6
+ </p>
data/app/views/admin/shared/_footer.html.erb CHANGED
@@ -1 +1,2 @@
1
- <p><%= link_to 'Typus', 'http://intraducibles.com/projects/typus', :rel => 'external' %> is the effortless backend interface for <%= link_to 'Ruby on Rails', 'http://rubyonrails.org/', :rel => 'external' %> applications.</p>
1
+ <p><%= link_to 'Typus', 'http://intraducibles.com/projects/typus', :rel => 'external' %> is the effortless backend interface for <%= link_to 'Ruby on Rails', 'http://rubyonrails.org/', :rel => 'external' %> applications.<br />
2
+ Developed by <%= link_to 'intraducibles.com', 'http://intraducibles.com', :rel => 'external' %> with your <%= link_to 'help', 'http://intraducibles.com/projects/typus/contribute', :rel => 'external' %>.</p>
data/app/views/layouts/admin.html.erb CHANGED
@@ -14,12 +14,6 @@
14
14
  <%= stylesheet_link_tag 'admin/jquery.fancybox', :media => 'screen' %>
15
15
  <%= yield :stylesheets -%>
16
16
 
17
- <%= javascript_include_tag 'admin/application' %>
18
- <%= javascript_include_tag 'admin/jquery-1.3.2.min' %>
19
- <%= javascript_include_tag 'admin/jquery.fancybox-1.2.1.min' %>
20
- <%= include_tiny_mce_if_needed if defined?(TinyMCE) -%>
21
- <%= yield :javascripts -%>
22
-
23
17
  </head>
24
18
 
25
19
  <body>
@@ -64,12 +58,19 @@
64
58
  <%= typus_block :location => 'shared', :partial => 'footer' %>
65
59
  </div>
66
60
  <div class="right">
61
+ <%= typus_block :location => 'shared', :partial => 'feedback' %>
67
62
  </div>
68
63
  <div class="clear"></div>
69
64
  </div>
70
65
 
71
66
  </div>
72
67
 
68
+ <%= javascript_include_tag 'admin/application' %>
69
+ <%= javascript_include_tag 'admin/jquery-1.3.2.min' %>
70
+ <%= javascript_include_tag 'admin/jquery.fancybox-1.2.1.min' %>
71
+ <%= include_tiny_mce_if_needed if defined?(TinyMCE) -%>
72
+ <%= yield :javascripts -%>
73
+
73
74
  </body>
74
75
 
75
76
  </html>
data/config/locales/de.yml CHANGED
@@ -99,4 +99,7 @@ de:
99
99
  "{{model}} filtered by {{filtered_by}}": "{{model}} gefiltert nach {{filtered_by}}"
100
100
  "True": "Richtig"
101
101
  "False": "Falsch"
102
- "Are you sure you want to sign out and end your session?": "Wollen Sie sich abmelden und die Sitzung beenden?"
102
+ "Are you sure you want to sign out and end your session?": "Wollen Sie sich abmelden und die Sitzung beenden?"
103
+ "License": "Lizenz"
104
+ "Documentation": "Dokumentation"
105
+ "Send us feedback": "Senden Sie uns Ihr Feedback"
data/config/locales/es.yml CHANGED
@@ -99,4 +99,7 @@ es:
99
99
  "{{model}} filtered by {{filtered_by}}": "{{model}} filtrados por {{filtered_by}}"
100
100
  "True": "Verdadero"
101
101
  "False": "Falso"
102
- "Are you sure you want to sign out and end your session?":
102
+ "Are you sure you want to sign out and end your session?":
103
+ "License": "Licencia"
104
+ "Documentation": "Documentación"
105
+ "Submit a bug report": "Reporta un error"
data/config/locales/language.yml.template CHANGED
@@ -20,6 +20,7 @@
20
20
  "Create entry":
21
21
  "Dashboard":
22
22
  "Do you want to cancel it?":
23
+ "Documentation":
23
24
  "Down":
24
25
  "Edit":
25
26
  "Email":
@@ -36,6 +37,7 @@
36
37
  "Last 30 days":
37
38
  "Last name":
38
39
  "Last few days":
40
+ "License":
39
41
  "Logged as":
40
42
  "Login":
41
43
  "New":
@@ -56,12 +58,14 @@
56
58
  "Roles":
57
59
  "Search":
58
60
  "Search by":
61
+ "Send us feedback":
59
62
  "Setup":
60
63
  "Show":
61
64
  "Sign in":
62
65
  "Sign out":
63
66
  "Sign up":
64
67
  "Status":
68
+ "Submit a bug report":
65
69
  "System Users Administration":
66
70
  "That doesn't seem like a valid email address":
67
71
  "The email and/or password you entered is invalid":
data/generators/typus/typus_generator.rb CHANGED
@@ -19,7 +19,8 @@ class TypusGenerator < Rails::Generator::Base
19
19
  active_record_model_with_sti = klass.superclass.superclass.equal?(ActiveRecord::Base)
20
20
  ar_models << klass if active_record_model || active_record_model_with_sti
21
21
  rescue Exception => error
22
- puts "=> [typus] #{error.message} on '#{class_name}'."
22
+ puts "=> [typus] #{error.message} on '#{model.class.name}'."
23
+ exit
23
24
  end
24
25
  end
25
26
 
data/typus.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{typus}
8
- s.version = "0.9.31"
8
+ s.version = "0.9.32"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Francesc Esplugas"]
12
- s.date = %q{2009-09-30}
12
+ s.date = %q{2009-10-02}
13
13
  s.description = %q{Effortless backend interface for Ruby on Rails applications. (Admin scaffold generator.)}
14
14
  s.email = %q{francesc@intraducibles.com}
15
15
  s.extra_rdoc_files = [
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
36
36
  "app/views/admin/resources/index.html.erb",
37
37
  "app/views/admin/resources/new.html.erb",
38
38
  "app/views/admin/resources/show.html.erb",
39
+ "app/views/admin/shared/_feedback.html.erb",
39
40
  "app/views/admin/shared/_footer.html.erb",
40
41
  "app/views/admin/shared/_pagination.html.erb",
41
42
  "app/views/admin/templates/_boolean.html.erb",
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: typus
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.31
4
+ version: 0.9.32
5
5
  platform: ruby
6
6
  authors:
7
7
  - Francesc Esplugas
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2009-09-30 00:00:00 +02:00
12
+ date: 2009-10-02 00:00:00 +02:00
13
13
  default_executable:
14
14
  dependencies: []
15
15
 
@@ -42,6 +42,7 @@ files:
42
42
  - app/views/admin/resources/index.html.erb
43
43
  - app/views/admin/resources/new.html.erb
44
44
  - app/views/admin/resources/show.html.erb
45
+ - app/views/admin/shared/_feedback.html.erb
45
46
  - app/views/admin/shared/_footer.html.erb
46
47
  - app/views/admin/shared/_pagination.html.erb
47
48
  - app/views/admin/templates/_boolean.html.erb