typus 3.1.0.rc13 → 3.1.0.rc14

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 (72) hide show
  1. data/README.md +6 -0
  2. data/app/{themes/default/assets → assets}/javascripts/typus.js +0 -0
  3. data/app/{themes/default/assets → assets}/javascripts/typus/application.js +0 -0
  4. data/app/{themes/default/assets → assets}/javascripts/typus/jquery.application.js +0 -0
  5. data/app/{themes/default/assets → assets}/stylesheets/typus.css +0 -0
  6. data/app/{themes/default/assets → assets}/stylesheets/typus/application.css +0 -0
  7. data/app/{themes/default/assets → assets}/stylesheets/typus/pagination.css +0 -0
  8. data/app/{themes/default/assets → assets}/stylesheets/typus/reset.css +0 -0
  9. data/app/{themes/default/assets → assets}/stylesheets/typus/screen.css +0 -0
  10. data/app/helpers/admin/base_helper.rb +10 -1
  11. data/app/{themes/default/views → views}/admin/account/forgot_password.html.erb +0 -0
  12. data/app/{themes/default/views → views}/admin/account/new.html.erb +0 -0
  13. data/app/{themes/default/views → views}/admin/base/user_guide.html.erb +0 -0
  14. data/app/{themes/default/views → views}/admin/dashboard/_applications.html.erb +0 -0
  15. data/app/{themes/default/views → views}/admin/dashboard/_sidebar.html.erb +0 -0
  16. data/app/{themes/default/views → views}/admin/dashboard/show.html.erb +0 -0
  17. data/app/{themes/default/views → views}/admin/dashboard/styles.html.erb +0 -0
  18. data/app/{themes/default/views → views}/admin/mailer/reset_password_link.text.erb +0 -0
  19. data/app/{themes/default/views → views}/admin/resources/_edit.html.erb +0 -0
  20. data/app/{themes/default/views → views}/admin/resources/_form.html.erb +0 -0
  21. data/app/{themes/default/views → views}/admin/resources/_form_javascripts.html.erb +0 -0
  22. data/app/{themes/default/views → views}/admin/resources/_index.html.erb +0 -0
  23. data/app/{themes/default/views → views}/admin/resources/_new.html.erb +0 -0
  24. data/app/{themes/default/views → views}/admin/resources/_show.html.erb +0 -0
  25. data/app/{themes/default/views → views}/admin/resources/edit.html.erb +0 -0
  26. data/app/{themes/default/views → views}/admin/resources/index.html.erb +0 -0
  27. data/app/{themes/default/views → views}/admin/resources/new.html.erb +0 -0
  28. data/app/{themes/default/views → views}/admin/resources/show.html.erb +0 -0
  29. data/app/{themes/default/views → views}/admin/session/new.html.erb +0 -0
  30. data/app/{themes/default/views → views}/admin/shared/_head.html.erb +0 -0
  31. data/app/{themes/default/views → views}/admin/templates/README.md +0 -0
  32. data/app/{themes/default/views → views}/admin/templates/_belongs_to.html.erb +0 -0
  33. data/app/{themes/default/views → views}/admin/templates/_belongs_to_with_autocomplete.html.erb +0 -0
  34. data/app/{themes/default/views → views}/admin/templates/_boolean.html.erb +0 -0
  35. data/app/{themes/default/views → views}/admin/templates/_date.html.erb +0 -0
  36. data/app/{themes/default/views → views}/admin/templates/_datetime.html.erb +0 -0
  37. data/app/{themes/default/views → views}/admin/templates/_dragonfly.html.erb +0 -0
  38. data/app/{themes/default/views → views}/admin/templates/_dragonfly_preview.html.erb +0 -0
  39. data/app/{themes/default/views → views}/admin/templates/_has_n.html.erb +0 -0
  40. data/app/{themes/default/views → views}/admin/templates/_has_one.html.erb +0 -0
  41. data/app/{themes/default/views → views}/admin/templates/_paperclip.html.erb +0 -0
  42. data/app/{themes/default/views → views}/admin/templates/_paperclip_preview.html.erb +0 -0
  43. data/app/{themes/default/views → views}/admin/templates/_password.html.erb +0 -0
  44. data/app/{themes/default/views → views}/admin/templates/_position.html.erb +0 -0
  45. data/app/{themes/default/views → views}/admin/templates/_profile_sidebar.html.erb +0 -0
  46. data/app/{themes/default/views → views}/admin/templates/_selector.html.erb +0 -0
  47. data/app/{themes/default/views → views}/admin/templates/_string.html.erb +0 -0
  48. data/app/{themes/default/views → views}/admin/templates/_string_with_preview.html.erb +0 -0
  49. data/app/{themes/default/views → views}/admin/templates/_text.html.erb +0 -0
  50. data/app/{themes/default/views → views}/admin/templates/_text_with_ckeditor.html.erb +0 -0
  51. data/app/{themes/default/views → views}/admin/templates/_text_with_ckeditor_and_assets.html.erb +0 -0
  52. data/app/{themes/default/views → views}/admin/templates/_time.html.erb +0 -0
  53. data/app/{themes/default/views → views}/admin/templates/_tree.html.erb +0 -0
  54. data/app/{themes/default/views → views}/helpers/admin/base/_apps.html.erb +0 -0
  55. data/app/{themes/default/views → views}/helpers/admin/base/_flash_message.html.erb +0 -0
  56. data/app/views/helpers/admin/base/_header.html.erb +7 -0
  57. data/app/{themes/default/views → views}/helpers/admin/base/_login_info.html.erb +0 -0
  58. data/app/{themes/default/views → views}/helpers/admin/dashboard/_resources.html.erb +0 -0
  59. data/app/{themes/default/views → views}/helpers/admin/resources/_actions.html.erb +0 -0
  60. data/app/{themes/default/views → views}/helpers/admin/resources/_errors.html.erb +0 -0
  61. data/app/{themes/default/views → views}/helpers/admin/resources/_filters.html.erb +0 -0
  62. data/app/{themes/default/views → views}/helpers/admin/resources/_search.html.erb +0 -0
  63. data/app/{themes/default/views → views}/helpers/admin/resources/_sidebar.html.erb +0 -0
  64. data/app/{themes/default/views → views}/helpers/admin/resources/_table.html.erb +0 -0
  65. data/app/{themes/default/views → views}/layouts/admin/base.html.erb +0 -0
  66. data/app/{themes/default/views → views}/layouts/admin/headless.html.erb +0 -0
  67. data/app/{themes/default/views → views}/layouts/admin/session.html.erb +0 -0
  68. data/lib/typus/engine.rb +0 -3
  69. data/lib/typus/version.rb +1 -1
  70. data/typus.gemspec +1 -0
  71. metadata +97 -84
  72. data/app/themes/default/views/helpers/admin/base/_header.html.erb +0 -7
data/README.md CHANGED
@@ -42,6 +42,12 @@ Update your bundle, run the generator and start the application server:
42
42
 
43
43
  and go to <http://0.0.0.0:3000/admin>.
44
44
 
45
+ ## Development
46
+
47
+ To clone repository and initialize submodules:
48
+
49
+ $ git clone --recursive git://github.com/typus/typus.git
50
+
45
51
  ## Links
46
52
 
47
53
  - [Documentation](https://github.com/typus/typus/wiki)
@@ -5,7 +5,16 @@ module Admin::BaseHelper
5
5
  end
6
6
 
7
7
  def header
8
- render "helpers/admin/base/header"
8
+ locals = { :admin_title => admin_title }
9
+ render "helpers/admin/base/header", locals
10
+ end
11
+
12
+ def admin_title
13
+ if defined?(Admin::Setting)
14
+ Admin::Setting.admin_title || Typus.admin_title
15
+ else
16
+ Typus.admin_title
17
+ end
9
18
  end
10
19
 
11
20
  def has_root_path?
@@ -0,0 +1,7 @@
1
+ <h1 class="logo">
2
+ <% if has_root_path? %>
3
+ <%= link_to admin_title, main_app.root_path, :title => Typus::I18n.t("View site") %>
4
+ <% else %>
5
+ <%= admin_title %>
6
+ <% end %>
7
+ </h1>
@@ -1,8 +1,5 @@
1
1
  module Admin
2
2
  class Engine < Rails::Engine
3
3
 
4
- paths["app/assets"] << "app/themes/default/assets"
5
- paths["app/views"] << "app/themes/default/views"
6
-
7
4
  end
8
5
  end
@@ -1,3 +1,3 @@
1
1
  module Typus
2
- VERSION = "3.1.0.rc13"
2
+ VERSION = "3.1.0.rc14"
3
3
  end
@@ -29,5 +29,6 @@ Gem::Specification.new do |s|
29
29
 
30
30
  s.add_dependency "jquery-rails"
31
31
  s.add_dependency "kaminari"
32
+ s.add_dependency "sass-rails", "~> 3.1.0.rc.2"
32
33
  s.add_dependency "rails", "~> 3.1.0.rc4"
33
34
  end
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: 3.1.0.rc13
4
+ version: 3.1.0.rc14
5
5
  prerelease: 6
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,12 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-07-07 00:00:00.000000000Z
12
+ date: 2011-07-13 00:00:00.000000000 +02:00
13
+ default_executable:
13
14
  dependencies:
14
15
  - !ruby/object:Gem::Dependency
15
16
  name: dragonfly
16
- requirement: &2153129580 !ruby/object:Gem::Requirement
17
+ requirement: &2153351380 !ruby/object:Gem::Requirement
17
18
  none: false
18
19
  requirements:
19
20
  - - ~>
@@ -21,10 +22,10 @@ dependencies:
21
22
  version: '0.9'
22
23
  type: :development
23
24
  prerelease: false
24
- version_requirements: *2153129580
25
+ version_requirements: *2153351380
25
26
  - !ruby/object:Gem::Dependency
26
27
  name: jquery-rails
27
- requirement: &2153129140 !ruby/object:Gem::Requirement
28
+ requirement: &2153350800 !ruby/object:Gem::Requirement
28
29
  none: false
29
30
  requirements:
30
31
  - - ! '>='
@@ -32,10 +33,10 @@ dependencies:
32
33
  version: '0'
33
34
  type: :development
34
35
  prerelease: false
35
- version_requirements: *2153129140
36
+ version_requirements: *2153350800
36
37
  - !ruby/object:Gem::Dependency
37
38
  name: paperclip
38
- requirement: &2153128580 !ruby/object:Gem::Requirement
39
+ requirement: &2153350220 !ruby/object:Gem::Requirement
39
40
  none: false
40
41
  requirements:
41
42
  - - ! '>='
@@ -43,10 +44,10 @@ dependencies:
43
44
  version: '0'
44
45
  type: :development
45
46
  prerelease: false
46
- version_requirements: *2153128580
47
+ version_requirements: *2153350220
47
48
  - !ruby/object:Gem::Dependency
48
49
  name: rack-cache
49
- requirement: &2153127680 !ruby/object:Gem::Requirement
50
+ requirement: &2153349680 !ruby/object:Gem::Requirement
50
51
  none: false
51
52
  requirements:
52
53
  - - ! '>='
@@ -54,10 +55,10 @@ dependencies:
54
55
  version: '0'
55
56
  type: :development
56
57
  prerelease: false
57
- version_requirements: *2153127680
58
+ version_requirements: *2153349680
58
59
  - !ruby/object:Gem::Dependency
59
60
  name: rails-trash
60
- requirement: &2153125960 !ruby/object:Gem::Requirement
61
+ requirement: &2153349040 !ruby/object:Gem::Requirement
61
62
  none: false
62
63
  requirements:
63
64
  - - ~>
@@ -65,10 +66,10 @@ dependencies:
65
66
  version: 1.1.1
66
67
  type: :development
67
68
  prerelease: false
68
- version_requirements: *2153125960
69
+ version_requirements: *2153349040
69
70
  - !ruby/object:Gem::Dependency
70
71
  name: jquery-rails
71
- requirement: &2153125020 !ruby/object:Gem::Requirement
72
+ requirement: &2153348500 !ruby/object:Gem::Requirement
72
73
  none: false
73
74
  requirements:
74
75
  - - ! '>='
@@ -76,10 +77,10 @@ dependencies:
76
77
  version: '0'
77
78
  type: :runtime
78
79
  prerelease: false
79
- version_requirements: *2153125020
80
+ version_requirements: *2153348500
80
81
  - !ruby/object:Gem::Dependency
81
82
  name: kaminari
82
- requirement: &2153124140 !ruby/object:Gem::Requirement
83
+ requirement: &2153347860 !ruby/object:Gem::Requirement
83
84
  none: false
84
85
  requirements:
85
86
  - - ! '>='
@@ -87,10 +88,21 @@ dependencies:
87
88
  version: '0'
88
89
  type: :runtime
89
90
  prerelease: false
90
- version_requirements: *2153124140
91
+ version_requirements: *2153347860
92
+ - !ruby/object:Gem::Dependency
93
+ name: sass-rails
94
+ requirement: &2153347200 !ruby/object:Gem::Requirement
95
+ none: false
96
+ requirements:
97
+ - - ~>
98
+ - !ruby/object:Gem::Version
99
+ version: 3.1.0.rc.2
100
+ type: :runtime
101
+ prerelease: false
102
+ version_requirements: *2153347200
91
103
  - !ruby/object:Gem::Dependency
92
104
  name: rails
93
- requirement: &2153123580 !ruby/object:Gem::Requirement
105
+ requirement: &2153346560 !ruby/object:Gem::Requirement
94
106
  none: false
95
107
  requirements:
96
108
  - - ~>
@@ -98,7 +110,7 @@ dependencies:
98
110
  version: 3.1.0.rc4
99
111
  type: :runtime
100
112
  prerelease: false
101
- version_requirements: *2153123580
113
+ version_requirements: *2153346560
102
114
  description: Ruby on Rails Admin Panel (Engine) to allow trusted users edit structured
103
115
  content.
104
116
  email:
@@ -112,6 +124,14 @@ files:
112
124
  - MIT-LICENSE
113
125
  - README.md
114
126
  - Rakefile
127
+ - app/assets/javascripts/typus.js
128
+ - app/assets/javascripts/typus/application.js
129
+ - app/assets/javascripts/typus/jquery.application.js
130
+ - app/assets/stylesheets/typus.css
131
+ - app/assets/stylesheets/typus/application.css
132
+ - app/assets/stylesheets/typus/pagination.css
133
+ - app/assets/stylesheets/typus/reset.css
134
+ - app/assets/stylesheets/typus/screen.css
115
135
  - app/controllers/admin/account_controller.rb
116
136
  - app/controllers/admin/base_controller.rb
117
137
  - app/controllers/admin/dashboard_controller.rb
@@ -144,71 +164,63 @@ files:
144
164
  - app/helpers/admin/resources/table_helper.rb
145
165
  - app/helpers/admin/resources_helper.rb
146
166
  - app/mailers/admin/mailer.rb
147
- - app/themes/default/assets/javascripts/typus.js
148
- - app/themes/default/assets/javascripts/typus/application.js
149
- - app/themes/default/assets/javascripts/typus/jquery.application.js
150
- - app/themes/default/assets/stylesheets/typus.css
151
- - app/themes/default/assets/stylesheets/typus/application.css
152
- - app/themes/default/assets/stylesheets/typus/pagination.css
153
- - app/themes/default/assets/stylesheets/typus/reset.css
154
- - app/themes/default/assets/stylesheets/typus/screen.css
155
- - app/themes/default/views/admin/account/forgot_password.html.erb
156
- - app/themes/default/views/admin/account/new.html.erb
157
- - app/themes/default/views/admin/base/user_guide.html.erb
158
- - app/themes/default/views/admin/dashboard/_applications.html.erb
159
- - app/themes/default/views/admin/dashboard/_sidebar.html.erb
160
- - app/themes/default/views/admin/dashboard/show.html.erb
161
- - app/themes/default/views/admin/dashboard/styles.html.erb
162
- - app/themes/default/views/admin/mailer/reset_password_link.text.erb
163
- - app/themes/default/views/admin/resources/_edit.html.erb
164
- - app/themes/default/views/admin/resources/_form.html.erb
165
- - app/themes/default/views/admin/resources/_form_javascripts.html.erb
166
- - app/themes/default/views/admin/resources/_index.html.erb
167
- - app/themes/default/views/admin/resources/_new.html.erb
168
- - app/themes/default/views/admin/resources/_show.html.erb
169
- - app/themes/default/views/admin/resources/edit.html.erb
170
- - app/themes/default/views/admin/resources/index.html.erb
171
- - app/themes/default/views/admin/resources/new.html.erb
172
- - app/themes/default/views/admin/resources/show.html.erb
173
- - app/themes/default/views/admin/session/new.html.erb
174
- - app/themes/default/views/admin/shared/_head.html.erb
175
- - app/themes/default/views/admin/templates/README.md
176
- - app/themes/default/views/admin/templates/_belongs_to.html.erb
177
- - app/themes/default/views/admin/templates/_belongs_to_with_autocomplete.html.erb
178
- - app/themes/default/views/admin/templates/_boolean.html.erb
179
- - app/themes/default/views/admin/templates/_date.html.erb
180
- - app/themes/default/views/admin/templates/_datetime.html.erb
181
- - app/themes/default/views/admin/templates/_dragonfly.html.erb
182
- - app/themes/default/views/admin/templates/_dragonfly_preview.html.erb
183
- - app/themes/default/views/admin/templates/_has_n.html.erb
184
- - app/themes/default/views/admin/templates/_has_one.html.erb
185
- - app/themes/default/views/admin/templates/_paperclip.html.erb
186
- - app/themes/default/views/admin/templates/_paperclip_preview.html.erb
187
- - app/themes/default/views/admin/templates/_password.html.erb
188
- - app/themes/default/views/admin/templates/_position.html.erb
189
- - app/themes/default/views/admin/templates/_profile_sidebar.html.erb
190
- - app/themes/default/views/admin/templates/_selector.html.erb
191
- - app/themes/default/views/admin/templates/_string.html.erb
192
- - app/themes/default/views/admin/templates/_string_with_preview.html.erb
193
- - app/themes/default/views/admin/templates/_text.html.erb
194
- - app/themes/default/views/admin/templates/_text_with_ckeditor.html.erb
195
- - app/themes/default/views/admin/templates/_text_with_ckeditor_and_assets.html.erb
196
- - app/themes/default/views/admin/templates/_time.html.erb
197
- - app/themes/default/views/admin/templates/_tree.html.erb
198
- - app/themes/default/views/helpers/admin/base/_apps.html.erb
199
- - app/themes/default/views/helpers/admin/base/_flash_message.html.erb
200
- - app/themes/default/views/helpers/admin/base/_header.html.erb
201
- - app/themes/default/views/helpers/admin/base/_login_info.html.erb
202
- - app/themes/default/views/helpers/admin/dashboard/_resources.html.erb
203
- - app/themes/default/views/helpers/admin/resources/_actions.html.erb
204
- - app/themes/default/views/helpers/admin/resources/_errors.html.erb
205
- - app/themes/default/views/helpers/admin/resources/_filters.html.erb
206
- - app/themes/default/views/helpers/admin/resources/_search.html.erb
207
- - app/themes/default/views/helpers/admin/resources/_sidebar.html.erb
208
- - app/themes/default/views/helpers/admin/resources/_table.html.erb
209
- - app/themes/default/views/layouts/admin/base.html.erb
210
- - app/themes/default/views/layouts/admin/headless.html.erb
211
- - app/themes/default/views/layouts/admin/session.html.erb
167
+ - app/views/admin/account/forgot_password.html.erb
168
+ - app/views/admin/account/new.html.erb
169
+ - app/views/admin/base/user_guide.html.erb
170
+ - app/views/admin/dashboard/_applications.html.erb
171
+ - app/views/admin/dashboard/_sidebar.html.erb
172
+ - app/views/admin/dashboard/show.html.erb
173
+ - app/views/admin/dashboard/styles.html.erb
174
+ - app/views/admin/mailer/reset_password_link.text.erb
175
+ - app/views/admin/resources/_edit.html.erb
176
+ - app/views/admin/resources/_form.html.erb
177
+ - app/views/admin/resources/_form_javascripts.html.erb
178
+ - app/views/admin/resources/_index.html.erb
179
+ - app/views/admin/resources/_new.html.erb
180
+ - app/views/admin/resources/_show.html.erb
181
+ - app/views/admin/resources/edit.html.erb
182
+ - app/views/admin/resources/index.html.erb
183
+ - app/views/admin/resources/new.html.erb
184
+ - app/views/admin/resources/show.html.erb
185
+ - app/views/admin/session/new.html.erb
186
+ - app/views/admin/shared/_head.html.erb
187
+ - app/views/admin/templates/README.md
188
+ - app/views/admin/templates/_belongs_to.html.erb
189
+ - app/views/admin/templates/_belongs_to_with_autocomplete.html.erb
190
+ - app/views/admin/templates/_boolean.html.erb
191
+ - app/views/admin/templates/_date.html.erb
192
+ - app/views/admin/templates/_datetime.html.erb
193
+ - app/views/admin/templates/_dragonfly.html.erb
194
+ - app/views/admin/templates/_dragonfly_preview.html.erb
195
+ - app/views/admin/templates/_has_n.html.erb
196
+ - app/views/admin/templates/_has_one.html.erb
197
+ - app/views/admin/templates/_paperclip.html.erb
198
+ - app/views/admin/templates/_paperclip_preview.html.erb
199
+ - app/views/admin/templates/_password.html.erb
200
+ - app/views/admin/templates/_position.html.erb
201
+ - app/views/admin/templates/_profile_sidebar.html.erb
202
+ - app/views/admin/templates/_selector.html.erb
203
+ - app/views/admin/templates/_string.html.erb
204
+ - app/views/admin/templates/_string_with_preview.html.erb
205
+ - app/views/admin/templates/_text.html.erb
206
+ - app/views/admin/templates/_text_with_ckeditor.html.erb
207
+ - app/views/admin/templates/_text_with_ckeditor_and_assets.html.erb
208
+ - app/views/admin/templates/_time.html.erb
209
+ - app/views/admin/templates/_tree.html.erb
210
+ - app/views/helpers/admin/base/_apps.html.erb
211
+ - app/views/helpers/admin/base/_flash_message.html.erb
212
+ - app/views/helpers/admin/base/_header.html.erb
213
+ - app/views/helpers/admin/base/_login_info.html.erb
214
+ - app/views/helpers/admin/dashboard/_resources.html.erb
215
+ - app/views/helpers/admin/resources/_actions.html.erb
216
+ - app/views/helpers/admin/resources/_errors.html.erb
217
+ - app/views/helpers/admin/resources/_filters.html.erb
218
+ - app/views/helpers/admin/resources/_search.html.erb
219
+ - app/views/helpers/admin/resources/_sidebar.html.erb
220
+ - app/views/helpers/admin/resources/_table.html.erb
221
+ - app/views/layouts/admin/base.html.erb
222
+ - app/views/layouts/admin/headless.html.erb
223
+ - app/views/layouts/admin/session.html.erb
212
224
  - config/locales/typus.ca.models.yml
213
225
  - config/locales/typus.ca.yml
214
226
  - config/locales/typus.de.models.yml
@@ -317,6 +329,7 @@ files:
317
329
  - vendor/assets/jquery-searchField/jquery.searchField.js
318
330
  - vendor/assets/jquery-tokeninput/jquery.tokeninput.js
319
331
  - vendor/assets/jquery-tokeninput/token-input.css
332
+ has_rdoc: true
320
333
  homepage: http://core.typuscms.com/
321
334
  licenses: []
322
335
  post_install_message:
@@ -337,7 +350,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
337
350
  version: 1.3.1
338
351
  requirements: []
339
352
  rubyforge_project: typus
340
- rubygems_version: 1.8.5
353
+ rubygems_version: 1.6.2
341
354
  signing_key:
342
355
  specification_version: 3
343
356
  summary: Effortless backend interface for Ruby on Rails applications. (Admin scaffold
@@ -1,7 +0,0 @@
1
- <h1 class="logo">
2
- <% if has_root_path? %>
3
- <%= link_to Typus.admin_title, main_app.root_path, :title => Typus::I18n.t("View site") %>
4
- <% else %>
5
- <%= Typus.admin_title %>
6
- <% end %>
7
- </h1>