locomotive_cms 0.0.2.9 → 0.0.3.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (80) hide show
  1. data/Gemfile +1 -0
  2. data/app/controllers/admin/accounts_controller.rb +5 -11
  3. data/app/controllers/admin/asset_collections_controller.rb +5 -46
  4. data/app/controllers/admin/assets_controller.rb +12 -30
  5. data/app/controllers/admin/base_controller.rb +15 -19
  6. data/app/controllers/admin/content_types_controller.rb +1 -46
  7. data/app/controllers/admin/contents_controller.rb +15 -42
  8. data/app/controllers/admin/current_sites_controller.rb +10 -11
  9. data/app/controllers/admin/custom_fields_controller.rb +1 -1
  10. data/app/controllers/admin/layouts_controller.rb +2 -46
  11. data/app/controllers/admin/memberships_controller.rb +5 -18
  12. data/app/controllers/admin/my_accounts_controller.rb +11 -9
  13. data/app/controllers/admin/pages_controller.rb +6 -45
  14. data/app/controllers/admin/sitemaps_controller.rb +16 -0
  15. data/app/controllers/admin/sites_controller.rb +12 -19
  16. data/app/controllers/admin/snippets_controller.rb +2 -45
  17. data/app/controllers/admin/theme_assets_controller.rb +13 -54
  18. data/app/helpers/admin/assets_helper.rb +1 -1
  19. data/app/helpers/admin/base_helper.rb +2 -2
  20. data/app/helpers/admin/pages_helper.rb +13 -0
  21. data/app/models/membership.rb +4 -1
  22. data/app/models/page.rb +8 -1
  23. data/app/models/page_part.rb +1 -4
  24. data/app/views/admin/asset_collections/_asset.html.haml +1 -1
  25. data/app/views/admin/asset_collections/edit.html.haml +7 -7
  26. data/app/views/admin/asset_collections/new.html.haml +1 -1
  27. data/app/views/admin/assets/_form.html.haml +1 -1
  28. data/app/views/admin/assets/edit.html.haml +3 -3
  29. data/app/views/admin/assets/new.html.haml +2 -2
  30. data/app/views/admin/content_types/edit.html.haml +1 -1
  31. data/app/views/admin/contents/edit.html.haml +1 -1
  32. data/app/views/admin/contents/index.html.haml +1 -1
  33. data/app/views/admin/contents/new.html.haml +1 -1
  34. data/app/views/admin/current_sites/edit.html.haml +3 -3
  35. data/app/views/admin/layouts/edit.html.haml +2 -2
  36. data/app/views/admin/layouts/index.html.haml +1 -1
  37. data/app/views/admin/my_accounts/edit.html.haml +3 -3
  38. data/app/views/admin/pages/edit.html.haml +1 -1
  39. data/app/views/admin/pages/index.html.haml +1 -1
  40. data/app/views/admin/shared/_head.html.haml +1 -1
  41. data/app/views/admin/shared/menu/_assets.html.haml +2 -2
  42. data/app/views/admin/sitemaps/show.xml.builder +18 -0
  43. data/app/views/admin/snippets/edit.html.haml +2 -2
  44. data/app/views/admin/snippets/index.html.haml +1 -1
  45. data/app/views/admin/theme_assets/_form.html.haml +9 -9
  46. data/app/views/admin/theme_assets/edit.html.haml +4 -4
  47. data/app/views/admin/theme_assets/index.html.haml +1 -1
  48. data/app/views/admin/theme_assets/new.html.haml +1 -1
  49. data/app/views/layouts/admin/application.html.haml +1 -0
  50. data/config/initializers/locomotive.rb +21 -0
  51. data/config/locales/admin_ui_en.yml +2 -66
  52. data/config/locales/admin_ui_fr.yml +0 -64
  53. data/config/locales/flash.en.yml +116 -0
  54. data/config/locales/flash.fr.yml +116 -0
  55. data/config/routes.rb +3 -0
  56. data/lib/generators/locomotive/copy_assets/copy_assets_generator.rb +14 -0
  57. data/lib/generators/locomotive/install/install_generator.rb +15 -2
  58. data/lib/generators/locomotive/install/templates/README +17 -0
  59. data/lib/locomotive.rb +3 -0
  60. data/lib/locomotive/admin_responder.rb +28 -0
  61. data/lib/locomotive/inherited_resources.rb +46 -0
  62. data/lib/locomotive/liquid/drops/page.rb +1 -1
  63. data/lib/locomotive/liquid/filters/text.rb +1 -1
  64. data/lib/locomotive/liquid/tags/nav.rb +7 -4
  65. data/public/images/admin/icons/actions.png +0 -0
  66. data/public/images/admin/menu/icons/assets.png +0 -0
  67. data/public/javascripts/admin/application.js +3 -0
  68. data/public/javascripts/admin/pages.js +1 -1
  69. data/public/javascripts/admin/plugins/shortcut.js +55 -0
  70. data/public/stylesheets/admin/application.css +1 -1
  71. data/public/stylesheets/admin/buttons.css +8 -13
  72. data/public/stylesheets/admin/formtastic_changes.css +1 -2
  73. data/public/stylesheets/admin/layout.css +24 -12
  74. data/public/stylesheets/admin/menu.css +3 -3
  75. data/spec/factories.rb +1 -1
  76. data/spec/lib/locomotive/liquid/tags/nav_spec.rb +11 -2
  77. data/spec/models/membership_spec.rb +5 -4
  78. data/spec/models/page_spec.rb +10 -8
  79. metadata +30 -6
  80. data/lib/generators/locomotive/assets/assets_generator.rb +0 -16
metadata CHANGED
@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 0
8
- - 2
9
- - 9
10
- version: 0.0.2.9
8
+ - 3
9
+ - 1
10
+ version: 0.0.3.1
11
11
  platform: ruby
12
12
  authors:
13
13
  - Didier Lafforgue
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2010-07-09 00:00:00 +02:00
18
+ date: 2010-07-15 00:00:00 +02:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
@@ -281,6 +281,20 @@ dependencies:
281
281
  version: "0"
282
282
  requirement: *id020
283
283
  prerelease: false
284
+ - !ruby/object:Gem::Dependency
285
+ type: :runtime
286
+ name: inherited_resources
287
+ version_requirements: &id021 !ruby/object:Gem::Requirement
288
+ requirements:
289
+ - - "="
290
+ - !ruby/object:Gem::Version
291
+ segments:
292
+ - 1
293
+ - 1
294
+ - 2
295
+ version: 1.1.2
296
+ requirement: *id021
297
+ prerelease: false
284
298
  description: a brand new CMS system with super sexy UI and cool features (alpha version for now)
285
299
  email:
286
300
  - didier@nocoffee.fr
@@ -310,6 +324,7 @@ files:
310
324
  - app/controllers/admin/passwords_controller.rb
311
325
  - app/controllers/admin/rendering_controller.rb
312
326
  - app/controllers/admin/sessions_controller.rb
327
+ - app/controllers/admin/sitemaps_controller.rb
313
328
  - app/controllers/admin/sites_controller.rb
314
329
  - app/controllers/admin/snippets_controller.rb
315
330
  - app/controllers/admin/theme_assets_controller.rb
@@ -389,6 +404,7 @@ files:
389
404
  - app/views/admin/shared/menu/_assets.html.haml
390
405
  - app/views/admin/shared/menu/_contents.html.haml
391
406
  - app/views/admin/shared/menu/_settings.html.haml
407
+ - app/views/admin/sitemaps/show.xml.builder
392
408
  - app/views/admin/sites/_form.html.haml
393
409
  - app/views/admin/sites/new.html.haml
394
410
  - app/views/admin/snippets/_form.html.haml
@@ -429,13 +445,17 @@ files:
429
445
  - config/locales/default_fr.yml
430
446
  - config/locales/devise.en.yml
431
447
  - config/locales/devise.fr.yml
448
+ - config/locales/flash.en.yml
449
+ - config/locales/flash.fr.yml
432
450
  - config/mongoid.yml
433
451
  - config/routes.rb
434
452
  - lib/core_ext.rb
435
- - lib/generators/locomotive/assets/assets_generator.rb
453
+ - lib/generators/locomotive/copy_assets/copy_assets_generator.rb
436
454
  - lib/generators/locomotive/install/install_generator.rb
455
+ - lib/generators/locomotive/install/templates/README
437
456
  - lib/generators/locomotive/install/templates/locomotive.rb
438
457
  - lib/locomotive.rb
458
+ - lib/locomotive/admin_responder.rb
439
459
  - lib/locomotive/carrierwave.rb
440
460
  - lib/locomotive/carrierwave/base.rb
441
461
  - lib/locomotive/carrierwave/patches.rb
@@ -447,6 +467,7 @@ files:
447
467
  - lib/locomotive/httparty.rb
448
468
  - lib/locomotive/httparty/patches.rb
449
469
  - lib/locomotive/httparty/webservice.rb
470
+ - lib/locomotive/inherited_resources.rb
450
471
  - lib/locomotive/liquid.rb
451
472
  - lib/locomotive/liquid/db_file_system.rb
452
473
  - lib/locomotive/liquid/drops/asset_collections.rb
@@ -522,6 +543,7 @@ files:
522
543
  - public/images/admin/form/item-popup.png
523
544
  - public/images/admin/form/item.png
524
545
  - public/images/admin/form/pen.png
546
+ - public/images/admin/icons/actions.png
525
547
  - public/images/admin/icons/filetype/medium/AC3.png
526
548
  - public/images/admin/icons/filetype/medium/ACE.png
527
549
  - public/images/admin/icons/filetype/medium/ADE.png
@@ -751,6 +773,7 @@ files:
751
773
  - public/images/admin/menu/green-bg.png
752
774
  - public/images/admin/menu/green-border.png
753
775
  - public/images/admin/menu/icons/add.png
776
+ - public/images/admin/menu/icons/assets.png
754
777
  - public/images/admin/menu/icons/bullet.png
755
778
  - public/images/admin/menu/icons/folder.png
756
779
  - public/images/admin/menu/icons/settings.png
@@ -835,6 +858,7 @@ files:
835
858
  - public/javascripts/admin/plugins/plupload/plupload.silverlight.min.js
836
859
  - public/javascripts/admin/plugins/plupload/plupload.silverlight.xap
837
860
  - public/javascripts/admin/plugins/scrollTo.js
861
+ - public/javascripts/admin/plugins/shortcut.js
838
862
  - public/javascripts/admin/plugins/tiny_mce/langs/en.js
839
863
  - public/javascripts/admin/plugins/tiny_mce/license.txt
840
864
  - public/javascripts/admin/plugins/tiny_mce/plugins/advhr/css/advhr.css
@@ -1183,7 +1207,7 @@ files:
1183
1207
  - LICENSE
1184
1208
  - README.textile
1185
1209
  has_rdoc: true
1186
- homepage: http://github.com/did/locomotive
1210
+ homepage: http://www.locomotiveapp.org
1187
1211
  licenses: []
1188
1212
 
1189
1213
  post_install_message:
data/lib/generators/locomotive/assets/assets_generator.rb DELETED
@@ -1,16 +0,0 @@
1
- module Locomotive
2
- class AssetsGenerator < Rails::Generators::Base
3
-
4
- def self.source_root
5
- puts "(before) source_root = #{@_locomotive_source_root}"
6
- @_locomotive_source_root ||= File.expand_path("../../../../../", __FILE__)
7
- puts "(after) source_root = #{@_locomotive_source_root}"
8
- @_locomotive_source_root
9
- end
10
-
11
- def copy_public_files
12
- directory "public", "public", :recursive => true
13
- end
14
-
15
- end
16
- end