typus 3.1.0.rc4 → 3.1.0.rc5

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 (71) hide show
  1. data/Gemfile +2 -0
  2. data/app/assets/images/{typus/blank.gif → blank.gif} +0 -0
  3. data/app/assets/images/{typus/fancy_close.png → fancy_close.png} +0 -0
  4. data/app/assets/images/{typus/fancy_loading.png → fancy_loading.png} +0 -0
  5. data/app/assets/images/{typus/fancy_nav_left.png → fancy_nav_left.png} +0 -0
  6. data/app/assets/images/{typus/fancy_nav_right.png → fancy_nav_right.png} +0 -0
  7. data/app/assets/images/{typus/fancy_shadow_e.png → fancy_shadow_e.png} +0 -0
  8. data/app/assets/images/{typus/fancy_shadow_n.png → fancy_shadow_n.png} +0 -0
  9. data/app/assets/images/{typus/fancy_shadow_ne.png → fancy_shadow_ne.png} +0 -0
  10. data/app/assets/images/{typus/fancy_shadow_nw.png → fancy_shadow_nw.png} +0 -0
  11. data/app/assets/images/{typus/fancy_shadow_s.png → fancy_shadow_s.png} +0 -0
  12. data/app/assets/images/{typus/fancy_shadow_se.png → fancy_shadow_se.png} +0 -0
  13. data/app/assets/images/{typus/fancy_shadow_sw.png → fancy_shadow_sw.png} +0 -0
  14. data/app/assets/images/{typus/fancy_shadow_w.png → fancy_shadow_w.png} +0 -0
  15. data/app/assets/images/{typus/fancy_title_left.png → fancy_title_left.png} +0 -0
  16. data/app/assets/images/{typus/fancy_title_main.png → fancy_title_main.png} +0 -0
  17. data/app/assets/images/{typus/fancy_title_over.png → fancy_title_over.png} +0 -0
  18. data/app/assets/images/{typus/fancy_title_right.png → fancy_title_right.png} +0 -0
  19. data/app/assets/images/{typus/fancybox-x.png → fancybox-x.png} +0 -0
  20. data/app/assets/images/{typus/fancybox-y.png → fancybox-y.png} +0 -0
  21. data/app/assets/images/{typus/fancybox.png → fancybox.png} +0 -0
  22. data/app/assets/javascripts/typus.js +7 -0
  23. data/app/assets/javascripts/typus/application.js +3 -7
  24. data/app/assets/stylesheets/typus.css +7 -0
  25. data/app/assets/stylesheets/typus/application.css +11 -6
  26. data/app/controllers/admin/resources_controller.rb +6 -1
  27. data/app/helpers/admin/filters_helper.rb +1 -5
  28. data/app/helpers/admin/form_helper.rb +14 -12
  29. data/app/helpers/admin/relationships_helper.rb +15 -13
  30. data/app/helpers/admin/resources_helper.rb +2 -3
  31. data/app/helpers/admin/sidebar_helper.rb +2 -2
  32. data/app/helpers/admin/table_helper.rb +10 -14
  33. data/app/views/admin/base/user_guide.html.erb +1 -1
  34. data/app/views/admin/resources/index.html.erb +1 -1
  35. data/app/views/admin/resources/new.html.erb +1 -1
  36. data/app/views/admin/shared/_head.html.erb +2 -2
  37. data/app/views/admin/templates/_selector.html.erb +1 -7
  38. data/config/locales/typus.ca.models.yml +8 -8
  39. data/config/locales/typus.ca.yml +1 -2
  40. data/config/locales/typus.de.yml +1 -2
  41. data/config/locales/typus.el.yml +1 -2
  42. data/config/locales/typus.es.yml +1 -2
  43. data/config/locales/typus.fr.yml +1 -2
  44. data/config/locales/typus.hu.yml +1 -2
  45. data/config/locales/typus.it.yml +1 -2
  46. data/config/locales/typus.locale.yml.template +1 -2
  47. data/config/locales/typus.pt-BR.yml +1 -2
  48. data/config/locales/typus.ru.yml +1 -2
  49. data/config/locales/typus.zh-CN.yml +1 -2
  50. data/lib/generators/templates/config/initializers/typus_authentication.rb +2 -2
  51. data/lib/generators/typus/migration_generator.rb +1 -1
  52. data/lib/support/active_record.rb +1 -5
  53. data/lib/typus.rb +2 -2
  54. data/lib/typus/authentication/session.rb +5 -5
  55. data/lib/typus/controller/headless.rb +1 -1
  56. data/lib/typus/controller/trash.rb +2 -1
  57. data/lib/typus/orm/active_record/user/instance_methods.rb +1 -1
  58. data/lib/typus/orm/base.rb +1 -1
  59. data/lib/typus/version.rb +1 -1
  60. data/test/app/controllers/admin/posts_controller_test.rb +4 -4
  61. data/test/fixtures/rails_app/app/controllers/admin/assets_controller.rb +1 -1
  62. data/test/fixtures/rails_app/app/controllers/admin/entries_controller.rb +3 -0
  63. data/test/fixtures/rails_app/app/models/entry.rb +12 -0
  64. data/test/fixtures/rails_app/app/models/post.rb +20 -12
  65. data/test/fixtures/rails_app/db/schema.rb +1 -0
  66. data/test/lib/support/active_record_test.rb +46 -108
  67. data/test/lib/typus_test.rb +4 -4
  68. data/typus.gemspec +2 -1
  69. metadata +41 -30
  70. data/app/assets/javascripts/typus/custom.js +0 -2
  71. data/app/assets/stylesheets/typus/custom.css +0 -11
@@ -122,12 +122,12 @@ class TypusTest < ActiveSupport::TestCase
122
122
  assert Typus.respond_to?("user_class_name=")
123
123
  end
124
124
 
125
- test "user_fk returns default value" do
126
- assert Typus.user_fk.eql?("typus_user_id")
125
+ test "user_foreign_key returns default value" do
126
+ assert Typus.user_foreign_key.eql?("typus_user_id")
127
127
  end
128
128
 
129
- test "user_fk setter presence" do
130
- assert Typus.respond_to?("user_fk=")
129
+ test "user_foreign_key setter presence" do
130
+ assert Typus.respond_to?("user_foreign_key=")
131
131
  end
132
132
 
133
133
  end
@@ -22,8 +22,9 @@ Gem::Specification.new do |s|
22
22
  s.add_development_dependency "jquery-rails"
23
23
  s.add_development_dependency "paperclip"
24
24
  s.add_development_dependency "rack-cache"
25
+ s.add_development_dependency "rails-trash"
25
26
 
26
27
  s.add_dependency "jquery-rails"
27
28
  s.add_dependency "kaminari"
28
- s.add_dependency "rails", "~> 3.1.0.rc2"
29
+ s.add_dependency "rails", "~> 3.1.0.rc3"
29
30
  end
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: typus
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease: 6
5
- version: 3.1.0.rc4
5
+ version: 3.1.0.rc5
6
6
  platform: ruby
7
7
  authors:
8
8
  - Francesc Esplugas
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2011-06-09 00:00:00 Z
13
+ date: 2011-06-10 00:00:00 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: dragonfly
@@ -57,7 +57,7 @@ dependencies:
57
57
  type: :development
58
58
  version_requirements: *id004
59
59
  - !ruby/object:Gem::Dependency
60
- name: jquery-rails
60
+ name: rails-trash
61
61
  prerelease: false
62
62
  requirement: &id005 !ruby/object:Gem::Requirement
63
63
  none: false
@@ -65,10 +65,10 @@ dependencies:
65
65
  - - ">="
66
66
  - !ruby/object:Gem::Version
67
67
  version: "0"
68
- type: :runtime
68
+ type: :development
69
69
  version_requirements: *id005
70
70
  - !ruby/object:Gem::Dependency
71
- name: kaminari
71
+ name: jquery-rails
72
72
  prerelease: false
73
73
  requirement: &id006 !ruby/object:Gem::Requirement
74
74
  none: false
@@ -79,16 +79,27 @@ dependencies:
79
79
  type: :runtime
80
80
  version_requirements: *id006
81
81
  - !ruby/object:Gem::Dependency
82
- name: rails
82
+ name: kaminari
83
83
  prerelease: false
84
84
  requirement: &id007 !ruby/object:Gem::Requirement
85
85
  none: false
86
86
  requirements:
87
- - - ~>
87
+ - - ">="
88
88
  - !ruby/object:Gem::Version
89
- version: 3.1.0.rc2
89
+ version: "0"
90
90
  type: :runtime
91
91
  version_requirements: *id007
92
+ - !ruby/object:Gem::Dependency
93
+ name: rails
94
+ prerelease: false
95
+ requirement: &id008 !ruby/object:Gem::Requirement
96
+ none: false
97
+ requirements:
98
+ - - ~>
99
+ - !ruby/object:Gem::Version
100
+ version: 3.1.0.rc3
101
+ type: :runtime
102
+ version_requirements: *id008
92
103
  description: Ruby on Rails Admin Panel (Engine) to allow trusted users edit structured content.
93
104
  email:
94
105
  - core@typuscms.com
@@ -104,33 +115,33 @@ files:
104
115
  - MIT-LICENSE
105
116
  - README.md
106
117
  - Rakefile
107
- - app/assets/images/typus/blank.gif
108
- - app/assets/images/typus/fancy_close.png
109
- - app/assets/images/typus/fancy_loading.png
110
- - app/assets/images/typus/fancy_nav_left.png
111
- - app/assets/images/typus/fancy_nav_right.png
112
- - app/assets/images/typus/fancy_shadow_e.png
113
- - app/assets/images/typus/fancy_shadow_n.png
114
- - app/assets/images/typus/fancy_shadow_ne.png
115
- - app/assets/images/typus/fancy_shadow_nw.png
116
- - app/assets/images/typus/fancy_shadow_s.png
117
- - app/assets/images/typus/fancy_shadow_se.png
118
- - app/assets/images/typus/fancy_shadow_sw.png
119
- - app/assets/images/typus/fancy_shadow_w.png
120
- - app/assets/images/typus/fancy_title_left.png
121
- - app/assets/images/typus/fancy_title_main.png
122
- - app/assets/images/typus/fancy_title_over.png
123
- - app/assets/images/typus/fancy_title_right.png
124
- - app/assets/images/typus/fancybox-x.png
125
- - app/assets/images/typus/fancybox-y.png
126
- - app/assets/images/typus/fancybox.png
118
+ - app/assets/images/blank.gif
119
+ - app/assets/images/fancy_close.png
120
+ - app/assets/images/fancy_loading.png
121
+ - app/assets/images/fancy_nav_left.png
122
+ - app/assets/images/fancy_nav_right.png
123
+ - app/assets/images/fancy_shadow_e.png
124
+ - app/assets/images/fancy_shadow_n.png
125
+ - app/assets/images/fancy_shadow_ne.png
126
+ - app/assets/images/fancy_shadow_nw.png
127
+ - app/assets/images/fancy_shadow_s.png
128
+ - app/assets/images/fancy_shadow_se.png
129
+ - app/assets/images/fancy_shadow_sw.png
130
+ - app/assets/images/fancy_shadow_w.png
131
+ - app/assets/images/fancy_title_left.png
132
+ - app/assets/images/fancy_title_main.png
133
+ - app/assets/images/fancy_title_over.png
134
+ - app/assets/images/fancy_title_right.png
135
+ - app/assets/images/fancybox-x.png
136
+ - app/assets/images/fancybox-y.png
137
+ - app/assets/images/fancybox.png
138
+ - app/assets/javascripts/typus.js
127
139
  - app/assets/javascripts/typus/application.js
128
- - app/assets/javascripts/typus/custom.js
129
140
  - app/assets/javascripts/typus/jquery.application.js
130
141
  - app/assets/javascripts/typus/jquery.rails.autocomplete.js
131
142
  - app/assets/javascripts/typus/jquery.searchField.js
143
+ - app/assets/stylesheets/typus.css
132
144
  - app/assets/stylesheets/typus/application.css
133
- - app/assets/stylesheets/typus/custom.css
134
145
  - app/assets/stylesheets/typus/pagination.css
135
146
  - app/assets/stylesheets/typus/reset.css
136
147
  - app/assets/stylesheets/typus/screen.css
@@ -1,2 +0,0 @@
1
- // Place your application-specific JavaScript functions and classes for
2
- // the admin panel here.
@@ -1,11 +0,0 @@
1
- /* Place your application-specific stylesheets for the admin panel here */
2
-
3
- /*
4
- .logo {
5
- height: 50px;
6
- width: 150px;
7
- background: transparent url(/images/logo.gif) no-repeat;
8
- text-indent: -10000px;
9
- }
10
-
11
- */