radiant-reader-extension 3.0.0.rc4 → 3.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (100) hide show
  1. data/README.md +105 -38
  2. data/Rakefile +4 -4
  3. data/app/controllers/accounts_controller.rb +24 -11
  4. data/app/controllers/admin/groups_controller.rb +15 -0
  5. data/app/controllers/admin/memberships_controller.rb +13 -7
  6. data/app/controllers/admin/messages_controller.rb +1 -0
  7. data/app/controllers/admin/permissions_controller.rb +15 -8
  8. data/app/controllers/groups_controller.rb +6 -4
  9. data/app/controllers/password_resets_controller.rb +1 -1
  10. data/app/controllers/reader_action_controller.rb +7 -51
  11. data/app/controllers/reader_sessions_controller.rb +9 -11
  12. data/app/helpers/reader_helper.rb +23 -3
  13. data/app/models/group.rb +45 -16
  14. data/app/models/message.rb +4 -11
  15. data/app/models/permission.rb +4 -0
  16. data/app/models/reader.rb +61 -26
  17. data/app/models/reader_notifier.rb +2 -2
  18. data/app/models/reader_page.rb +9 -5
  19. data/app/views/accounts/{_memberships.html.haml → _choose_memberships.html.haml} +0 -0
  20. data/app/views/accounts/_form.html.haml +9 -11
  21. data/app/views/accounts/_preamble.html.haml +14 -0
  22. data/app/views/accounts/_profile_form.html.haml +13 -29
  23. data/app/views/accounts/dashboard.html.haml +0 -1
  24. data/app/views/accounts/edit.html.haml +3 -3
  25. data/app/views/accounts/edit_profile.html.haml +10 -10
  26. data/app/views/admin/groups/_chooser.html.haml +8 -0
  27. data/app/views/admin/groups/_form.html.haml +7 -5
  28. data/app/views/admin/groups/_group.html.haml +29 -0
  29. data/app/views/admin/groups/index.html.haml +2 -28
  30. data/app/views/admin/groups/show.html.haml +3 -2
  31. data/app/views/admin/memberships/_reader.html.haml +2 -6
  32. data/app/views/admin/messages/_form.html.haml +10 -11
  33. data/app/views/admin/messages/_list_function.haml +2 -3
  34. data/app/views/admin/messages/{index.haml → index.html.haml} +21 -11
  35. data/app/views/admin/pages/_page_groups.html.haml +5 -11
  36. data/app/views/admin/permissions/_page.html.haml +6 -12
  37. data/app/views/admin/reader_configuration/edit.html.haml +2 -0
  38. data/app/views/admin/reader_configuration/show.html.haml +2 -0
  39. data/app/views/groups/_group.html.haml +12 -0
  40. data/app/views/groups/show.html.haml +10 -3
  41. data/app/views/readers/_description.html.haml +3 -0
  42. data/app/views/readers/_groups.html.haml +9 -0
  43. data/app/views/{accounts → readers}/_links.html.haml +2 -2
  44. data/app/views/readers/_list.html.haml +23 -0
  45. data/app/views/{accounts/_groups.html.haml → readers/_memberships.html.haml} +0 -1
  46. data/app/views/{accounts/_reader.html.haml → readers/_mugshot.html.haml} +1 -1
  47. data/app/views/readers/_people.html.haml +6 -0
  48. data/app/views/readers/_profile.html.haml +30 -0
  49. data/app/views/readers/_reader.html.haml +28 -0
  50. data/app/views/readers/index.html.haml +20 -0
  51. data/app/views/{accounts → readers}/show.html.haml +1 -2
  52. data/app/views/shared/_standard_reader_parts.html.haml +1 -1
  53. data/app/views/shared/not_allowed.html.haml +16 -0
  54. data/config/initializers/formats.rb +1 -2
  55. data/config/initializers/radiant_config.rb +5 -2
  56. data/config/locales/en.yml +181 -140
  57. data/config/routes.rb +25 -16
  58. data/db/migrate/001_create_readers.rb +0 -1
  59. data/db/migrate/20090921125653_reader_messages.rb +0 -1
  60. data/db/migrate/20090921125654_group_messages.rb +0 -1
  61. data/db/migrate/20110812111934_groups_nested_set.rb +19 -0
  62. data/db/migrate/20110814070858_message_has_many_groups.rb +14 -0
  63. data/db/migrate/20110905194602_group_ancestry.rb +23 -0
  64. data/lib/controller_extensions.rb +49 -0
  65. data/lib/grouped_model.rb +49 -8
  66. data/lib/grouped_page.rb +17 -5
  67. data/lib/message_tags.rb +21 -3
  68. data/lib/radiant-reader-extension.rb +1 -1
  69. data/lib/reader_admin_ui.rb +7 -8
  70. data/lib/reader_tags.rb +1 -1
  71. data/lib/site_controller_extensions.rb +7 -18
  72. data/public/images/furniture/csv.png +0 -0
  73. data/public/images/furniture/csv_tiny.png +0 -0
  74. data/public/images/furniture/vcard.png +0 -0
  75. data/public/images/furniture/vcard_tiny.png +0 -0
  76. data/public/javascripts/admin/reader.js +22 -1
  77. data/public/stylesheets/sass/admin/reader_group.sass +23 -22
  78. data/public/stylesheets/sass/reader.sass +81 -17
  79. data/radiant-reader-extension.gemspec +3 -1
  80. data/reader_extension.rb +7 -9
  81. data/spec/controllers/accounts_controller_spec.rb +8 -22
  82. data/spec/controllers/admin/messages_controller_spec.rb +0 -12
  83. data/spec/datasets/readers_dataset.rb +41 -38
  84. data/spec/lib/reader_tags_spec.rb +1 -1
  85. data/spec/models/group_spec.rb +89 -22
  86. data/spec/models/message_spec.rb +1 -1
  87. data/spec/models/reader_notifier_spec.rb +1 -1
  88. data/spec/models/reader_page_spec.rb +34 -18
  89. data/spec/models/reader_spec.rb +0 -1
  90. data/spec/spec.opts +4 -3
  91. metadata +51 -28
  92. data/app/views/accounts/_contributions.html.haml +0 -2
  93. data/app/views/accounts/_description.html.haml +0 -2
  94. data/app/views/accounts/_list.html.haml +0 -17
  95. data/app/views/accounts/_profile.html.haml +0 -29
  96. data/app/views/accounts/index.html.haml +0 -23
  97. data/app/views/groups/_all.html.haml +0 -10
  98. data/app/views/site/not_allowed.html.haml +0 -4
  99. data/db/migrate/20100922152338_lock_versions.rb +0 -9
  100. data/db/migrate/20101004074945_unlock_version.rb +0 -9
data/app/views/accounts/_list.html.haml DELETED
@@ -1,17 +0,0 @@
1
- - readers ||= @readers
2
-
3
- - if readers.any?
4
- - if readers.respond_to?(:previous_page) && readers.previous_page
5
- = pagination_and_summary_for(readers, t('reader_extension.person'))
6
-
7
- - if readers.size > 1
8
- - columns = [readers[0..readers.size/2], readers[readers.size/2+1..readers.size]]
9
- - else
10
- - columns = [readers]
11
- - columns.each do |readers|
12
- %div.column
13
- = render :partial => 'accounts/reader', :collection => readers
14
-
15
- - if readers.respond_to?(:next_page) && readers.next_page
16
- = pagination_and_summary_for(readers, t('reader_extension.person'))
17
-
data/app/views/accounts/_profile.html.haml DELETED
@@ -1,29 +0,0 @@
1
- - if Radiant.config['reader.share_details?']
2
- - reader ||= @reader
3
-
4
- - if reader.unshareable?
5
- - if reader == current_reader
6
- %p.warning
7
- = t('reader_extension.you_are_not_shared')
8
- - else
9
- %h3
10
- = t('reader_extension.directory.contact')
11
- %ul
12
- - if email = reader.email
13
- %li
14
- = t("reader_extension.directory.email") + ': '
15
- = email_link email
16
-
17
- - %w{phone mobile}.each do |field|
18
- - if value = reader.send(field.to_sym)
19
- %li
20
- = t("reader_extension.directory.#{field}") + ': '
21
- = value
22
-
23
- = reader.postal_address.to_html
24
-
25
- %p
26
- - if reader == current_reader
27
- = link_to t('reader_extension.check_vcard'), reader_url(reader, :format => :vcard), :class => 'vcard'
28
- - else
29
- = link_to t('reader_extension.directory.vcard_link'), reader_url(reader, :format => :vcard), :class => 'vcard'
data/app/views/accounts/index.html.haml DELETED
@@ -1,23 +0,0 @@
1
- - content_for :introduction do
2
- %p
3
- =t('reader_extension.readers_introduction')
4
-
5
- - content_for :breadcrumbs do
6
- = link_to t('reader_extension.home').titlecase, '/'
7
- = t('reader_extension.separator')
8
- = t('reader_extension.people').titlecase
9
-
10
- - content_for :title do
11
- = t('reader_extension.people').titlecase
12
-
13
- = render :partial => 'shared/standard_reader_parts'
14
-
15
- - content_for :sidebar do
16
- = render_region :sidebar
17
-
18
- - content_for :main do
19
- = render_region :main
20
-
21
-
22
-
23
- = yield :main
data/app/views/groups/_all.html.haml DELETED
@@ -1,10 +0,0 @@
1
- - groups = Group.visible_to(current_reader)
2
- - if groups.any?
3
- %h3
4
- = t('reader_extension.groups')
5
- %ul.groups
6
- - groups.each do |group|
7
- %li
8
- = link_to_group(group)
9
-
10
-
data/app/views/site/not_allowed.html.haml DELETED
@@ -1,4 +0,0 @@
1
- %h1
2
- = t('reader_extension.access_denied')
3
- %p
4
- = t('reader_extension.page_private')
data/db/migrate/20100922152338_lock_versions.rb DELETED
@@ -1,9 +0,0 @@
1
- class LockVersions < ActiveRecord::Migration
2
- def self.up
3
- add_column :readers, :lock_version, :integer, :default => 0
4
- end
5
-
6
- def self.down
7
- remove_column :readers, :lock_version
8
- end
9
- end
data/db/migrate/20101004074945_unlock_version.rb DELETED
@@ -1,9 +0,0 @@
1
- class UnlockVersion < ActiveRecord::Migration
2
- def self.up
3
- remove_column :readers, :lock_version
4
- end
5
-
6
- def self.down
7
- add_column :readers, :lock_version, :integer, :default => 0
8
- end
9
- end