pageflow 0.1.0 → 0.2.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of pageflow might be problematic. Click here for more details.

Files changed (183) hide show
  1. checksums.yaml +8 -8
  2. data/admins/pageflow/accounts.rb +17 -49
  3. data/admins/pageflow/entry.rb +13 -6
  4. data/app/assets/fonts/pageflow/entypo.eot +0 -0
  5. data/app/assets/fonts/pageflow/entypo.svg +834 -0
  6. data/app/assets/fonts/pageflow/entypo.ttf +0 -0
  7. data/app/assets/fonts/pageflow/entypo.woff +0 -0
  8. data/app/assets/fonts/pageflow/fontawesome-webfont.eot +0 -0
  9. data/app/assets/fonts/pageflow/fontawesome-webfont.otf +0 -0
  10. data/app/assets/fonts/pageflow/fontawesome-webfont.svg +504 -0
  11. data/app/assets/fonts/pageflow/fontawesome-webfont.ttf +0 -0
  12. data/app/assets/fonts/pageflow/fontawesome-webfont.woff +0 -0
  13. data/app/assets/images/pageflow/themes/default/audio_sprite.png +0 -0
  14. data/app/assets/images/pageflow/themes/default/image_sprite.png +0 -0
  15. data/app/assets/images/pageflow/themes/default/internal_links_sprite.png +0 -0
  16. data/app/assets/images/pageflow/themes/default/loading_spinner.png +0 -0
  17. data/app/assets/images/pageflow/themes/default/loading_spinner_bg.png +0 -0
  18. data/app/assets/images/pageflow/themes/default/logo_header.png +0 -0
  19. data/app/assets/images/pageflow/themes/default/logo_header_invert.png +0 -0
  20. data/app/assets/images/pageflow/themes/default/scroll_indicator_sprite.png +0 -0
  21. data/app/assets/images/pageflow/themes/default/text_sprite.png +0 -0
  22. data/app/assets/images/pageflow/themes/default/video_sprite.png +0 -0
  23. data/app/assets/javascripts/pageflow/editor/base.js +1 -0
  24. data/app/assets/javascripts/pageflow/editor/collections/mixins/files_collection.js +11 -0
  25. data/app/assets/javascripts/pageflow/editor/collections/subset_collection.js +11 -0
  26. data/app/assets/javascripts/pageflow/editor/controllers/sidebar_controller.js +8 -1
  27. data/app/assets/javascripts/pageflow/editor/initializers/setup_config.js +3 -0
  28. data/app/assets/javascripts/pageflow/editor/models/audio_file.js +1 -0
  29. data/app/assets/javascripts/pageflow/editor/models/chapter.js +1 -0
  30. data/app/assets/javascripts/pageflow/editor/models/configuration.js +1 -0
  31. data/app/assets/javascripts/pageflow/editor/models/encoding_confirmation.js +45 -0
  32. data/app/assets/javascripts/pageflow/editor/models/entry.js +6 -14
  33. data/app/assets/javascripts/pageflow/editor/models/entry_publication.js +40 -0
  34. data/app/assets/javascripts/pageflow/editor/models/file_stage.js +5 -0
  35. data/app/assets/javascripts/pageflow/editor/models/image_file.js +5 -0
  36. data/app/assets/javascripts/pageflow/editor/models/mixins/encoded_file.js +31 -14
  37. data/app/assets/javascripts/pageflow/editor/models/mixins/files_count_watcher.js +4 -0
  38. data/app/assets/javascripts/pageflow/editor/models/mixins/stage_provider.js +2 -2
  39. data/app/assets/javascripts/pageflow/editor/models/other_entry.js +1 -0
  40. data/app/assets/javascripts/pageflow/editor/models/page.js +1 -0
  41. data/app/assets/javascripts/pageflow/editor/models/video_file.js +1 -0
  42. data/app/assets/javascripts/pageflow/editor/routers/sidebar_router.js +2 -0
  43. data/app/assets/javascripts/pageflow/editor/templates/confirm_encoding.jst.ejs +15 -0
  44. data/app/assets/javascripts/pageflow/editor/templates/confirmable_file_item.jst.ejs +7 -0
  45. data/app/assets/javascripts/pageflow/editor/templates/{quota_decorator.jst.ejs → entry_publication_quota_decorator.jst.ejs} +1 -1
  46. data/app/assets/javascripts/pageflow/editor/templates/files_explorer.jst.ejs +5 -3
  47. data/app/assets/javascripts/pageflow/editor/templates/notifications.jst.ejs +6 -1
  48. data/app/assets/javascripts/pageflow/editor/views/confirm_encoding_view.js +76 -0
  49. data/app/assets/javascripts/pageflow/editor/views/confirmable_file_item_view.js +42 -0
  50. data/app/assets/javascripts/pageflow/editor/views/entry_publication_quota_decorator_view.js +49 -0
  51. data/app/assets/javascripts/pageflow/editor/views/file_meta_data_item_view.js +1 -1
  52. data/app/assets/javascripts/pageflow/editor/views/file_stage_item_view.js +1 -0
  53. data/app/assets/javascripts/pageflow/editor/views/file_thumbnail_view.js +2 -1
  54. data/app/assets/javascripts/pageflow/editor/views/files_explorer_view.js +3 -3
  55. data/app/assets/javascripts/pageflow/editor/views/input_view.js +2 -2
  56. data/app/assets/javascripts/pageflow/editor/views/inputs/select_input_view.js +1 -1
  57. data/app/assets/javascripts/pageflow/editor/views/notifications_view.js +12 -1
  58. data/app/assets/javascripts/pageflow/editor/views/publish_entry_view.js +5 -4
  59. data/app/assets/javascripts/pageflow/page_types/video.js +0 -1
  60. data/app/assets/javascripts/pageflow/widgets/player_controls.js +1 -1
  61. data/app/assets/stylesheets/pageflow/editor/base.css.scss +1 -0
  62. data/app/assets/stylesheets/pageflow/editor/confirmable_files.css.scss +67 -0
  63. data/app/assets/stylesheets/pageflow/editor/file_stages.css.scss +5 -0
  64. data/app/assets/stylesheets/pageflow/editor/file_thumbnails.css.scss +10 -0
  65. data/app/assets/stylesheets/pageflow/editor/files.css.scss +3 -1
  66. data/app/assets/stylesheets/pageflow/editor/files_explorer.css.scss +30 -2
  67. data/app/assets/stylesheets/pageflow/editor/files_gallery.css.scss +1 -2
  68. data/app/assets/stylesheets/pageflow/editor/notifications.css.scss +18 -1
  69. data/app/assets/stylesheets/pageflow/editor/quotas.css.scss +1 -1
  70. data/app/assets/stylesheets/pageflow/editor/tabs_view.css.scss +2 -0
  71. data/app/assets/stylesheets/pageflow/mixins.css.scss +2 -1
  72. data/app/assets/stylesheets/pageflow/mixins/icons.css.scss +4 -308
  73. data/app/assets/stylesheets/pageflow/mixins/icons/entypo.css.scss +295 -0
  74. data/app/assets/stylesheets/pageflow/mixins/icons/fontawesome.css.scss +520 -0
  75. data/app/assets/stylesheets/pageflow/mixins/label.css.scss +5 -0
  76. data/app/assets/stylesheets/pageflow/themes/default.css.scss +11 -0
  77. data/app/assets/stylesheets/pageflow/themes/default/anchors.css.scss +3 -8
  78. data/app/assets/stylesheets/pageflow/themes/default/loading_spinner.css.scss +96 -9
  79. data/app/assets/stylesheets/pageflow/themes/default/navigation.css.scss +128 -183
  80. data/app/assets/stylesheets/pageflow/themes/default/overview.css.scss +48 -6
  81. data/app/assets/stylesheets/pageflow/themes/default/page.css.scss +3 -6
  82. data/app/assets/stylesheets/pageflow/themes/default/player_controls.css.scss +31 -0
  83. data/app/controllers/concerns/pageflow/quota_verification.rb +4 -4
  84. data/app/controllers/pageflow/editor/encoding_confirmations_controller.rb +45 -0
  85. data/app/controllers/pageflow/editor/entry_publications_controller.rb +48 -0
  86. data/app/controllers/pageflow/entries_controller.rb +8 -3
  87. data/app/controllers/pageflow/revisions_controller.rb +0 -10
  88. data/app/controllers/pageflow/video_files_controller.rb +7 -1
  89. data/app/helpers/pageflow/config_helper.rb +9 -0
  90. data/app/helpers/pageflow/entries_helper.rb +3 -3
  91. data/app/helpers/pageflow/pages_helper.rb +2 -2
  92. data/app/helpers/pageflow/quota_helper.rb +1 -1
  93. data/app/jobs/pageflow/poll_meta_data_from_zencoder_job.rb +9 -0
  94. data/app/jobs/pageflow/poll_zencoder_job.rb +3 -3
  95. data/app/jobs/pageflow/request_meta_data_from_zencoder_job.rb +14 -0
  96. data/app/jobs/pageflow/submit_file_to_zencoder_job.rb +0 -2
  97. data/app/models/pageflow/account.rb +9 -4
  98. data/app/models/pageflow/audio_file.rb +2 -0
  99. data/app/models/pageflow/draft_entry.rb +5 -1
  100. data/app/models/pageflow/edit_lock.rb +2 -0
  101. data/app/models/pageflow/encoding_confirmation.rb +40 -0
  102. data/app/models/pageflow/entry.rb +3 -3
  103. data/app/models/pageflow/entry_publication.rb +27 -0
  104. data/app/models/pageflow/page.rb +6 -6
  105. data/app/models/pageflow/published_entry.rb +3 -3
  106. data/app/models/pageflow/theming.rb +20 -0
  107. data/app/models/pageflow/video_file.rb +2 -0
  108. data/app/state_machines/pageflow/encoded_file_state_machine.rb +41 -1
  109. data/app/views/admin/accounts/_account_details.html.arb +5 -0
  110. data/app/views/admin/accounts/_entries_panel.html.arb +15 -0
  111. data/app/views/admin/accounts/_form.html.erb +18 -0
  112. data/app/views/admin/accounts/_theming_details.html.arb +6 -0
  113. data/app/views/admin/accounts/_users_panel.html.arb +15 -0
  114. data/app/views/admin/entries/_links.html.arb +3 -2
  115. data/app/views/admin/users/_form.html.erb +2 -2
  116. data/app/views/admin/users/_quota_exhausted.html.erb +1 -0
  117. data/app/views/pageflow/config/_editor_seeds.json.jbuilder +2 -0
  118. data/app/views/pageflow/editor/encoding_confirmations/_summary.html.erb +1 -0
  119. data/app/views/pageflow/editor/encoding_confirmations/check.json.jbuilder +3 -0
  120. data/app/views/pageflow/editor/entry_publications/check.json.jbuilder +11 -0
  121. data/app/views/pageflow/editor/quotas/{_published_entries_exceeded.html.erb → _published_entries_exhausted.html.erb} +1 -1
  122. data/app/views/pageflow/entries/_entry.html.erb +1 -1
  123. data/app/views/pageflow/entries/_navigation.html.erb +2 -2
  124. data/app/views/pageflow/entries/_social_meta_tags.html.erb +2 -2
  125. data/app/views/pageflow/entries/_theming.css.erb +1 -0
  126. data/app/views/pageflow/entries/edit.html.erb +3 -1
  127. data/app/views/pageflow/entries/navigation/_bar_top.html.erb +2 -2
  128. data/app/views/pageflow/entries/show.css.erb +3 -1
  129. data/app/views/pageflow/entries/show.html.erb +13 -13
  130. data/config/initializers/page_type_helpers.rb +1 -0
  131. data/config/locales/activerecord.de.yml +41 -22
  132. data/config/locales/admin/accounts.yml +0 -1
  133. data/config/locales/admin/entries.yml +6 -2
  134. data/config/locales/admin/themings.yml +7 -0
  135. data/config/locales/admin/users/me.de.yml +2 -2
  136. data/config/locales/editor.de.yml +9 -3
  137. data/config/locales/quotas.de.yml +1 -1
  138. data/config/routes.rb +34 -27
  139. data/db/migrate/20140624135420_create_themings.rb +15 -0
  140. data/db/migrate/20140624135421_create_themings_for_existing_accounts.rb +26 -0
  141. data/db/migrate/20140624135422_change_theme_references_to_theming_references.rb +45 -0
  142. data/db/migrate/20140624135423_remove_attributes_from_themes.rb +10 -0
  143. data/db/migrate/20140624135424_create_accounts_themes_join_table.rb +8 -0
  144. data/db/migrate/20140624135425_move_cname_from_account_to_theming.rb +21 -0
  145. data/db/migrate/20140625184800_drop_themes.rb +14 -0
  146. data/db/migrate/20140704110631_add_confirmed_by_to_encoded_files.rb +6 -0
  147. data/lib/generators/pageflow/initializer/templates/pageflow.rb +9 -0
  148. data/lib/generators/pageflow/theme/theme_generator.rb +28 -0
  149. data/lib/pageflow.rb +9 -2
  150. data/lib/pageflow/ability_mixin.rb +1 -1
  151. data/lib/pageflow/built_in_page_type.rb +1 -1
  152. data/lib/pageflow/configuration.rb +49 -6
  153. data/lib/pageflow/engine.rb +11 -1
  154. data/lib/pageflow/quota.rb +42 -15
  155. data/lib/pageflow/quotas.rb +15 -0
  156. data/lib/pageflow/seeds.rb +12 -16
  157. data/lib/pageflow/theme.rb +14 -0
  158. data/lib/pageflow/themes.rb +25 -0
  159. data/lib/pageflow/user_mixin.rb +1 -1
  160. data/lib/pageflow/version.rb +1 -1
  161. data/lib/pageflow/zencoder_meta_data_output_definition.rb +23 -0
  162. data/spec/factories/accounts.rb +9 -0
  163. data/spec/factories/audio_files.rb +46 -0
  164. data/spec/factories/chapters.rb +21 -0
  165. data/spec/factories/edit_locks.rb +11 -0
  166. data/spec/factories/entries.rb +33 -0
  167. data/spec/factories/file_usages.rb +8 -0
  168. data/spec/factories/folders.rb +8 -0
  169. data/spec/factories/image_files.rb +38 -0
  170. data/spec/factories/invited_user.rb +10 -0
  171. data/spec/factories/memberships.rb +8 -0
  172. data/spec/factories/pages.rb +14 -0
  173. data/spec/factories/revisions.rb +22 -0
  174. data/spec/factories/themings.rb +8 -0
  175. data/spec/factories/users.rb +39 -0
  176. data/spec/factories/video_files.rb +46 -0
  177. metadata +103 -39
  178. data/app/assets/javascripts/pageflow/editor/models/quota.js +0 -18
  179. data/app/assets/javascripts/pageflow/editor/views/quota_decorator_view.js +0 -45
  180. data/app/controllers/pageflow/editor/quotas_controller.rb +0 -13
  181. data/app/models/pageflow/theme.rb +0 -4
  182. data/app/views/admin/users/_quota_exceeded.html.erb +0 -1
  183. data/app/views/pageflow/editor/quotas/show.json.jbuilder +0 -5
@@ -1,3 +1,3 @@
1
1
  module Pageflow
2
- VERSION = "0.1.0"
2
+ VERSION = "0.2.0"
3
3
  end
@@ -0,0 +1,23 @@
1
+ module Pageflow
2
+ class ZencoderMetaDataOutputDefinition < ZencoderOutputDefinition
3
+ attr_reader :file
4
+
5
+ def initialize(file, options = {})
6
+ super(options)
7
+ @file = file
8
+ end
9
+
10
+ def input_s3_url
11
+ @file.attachment_s3_url
12
+ end
13
+
14
+ def outputs
15
+ [
16
+ {
17
+ :label => 'stub',
18
+ :clip_length => 1
19
+ }
20
+ ]
21
+ end
22
+ end
23
+ end
@@ -0,0 +1,9 @@
1
+ FactoryGirl.define do
2
+ factory :account, :class => Pageflow::Account do
3
+ name "Account Name"
4
+
5
+ after(:build) do |account|
6
+ account.default_theming ||= build(:theming, :account => account)
7
+ end
8
+ end
9
+ end
@@ -0,0 +1,46 @@
1
+ module Pageflow
2
+ FactoryGirl.define do
3
+ factory :audio_file, :class => AudioFile do
4
+ entry
5
+ uploader { create(:user) }
6
+
7
+ attachment_on_s3 File.open(Engine.root.join('spec', 'fixtures', 'et.ogg'))
8
+
9
+ ignore do
10
+ used_in nil
11
+ end
12
+
13
+ before(:create) do |file, evaluator|
14
+ file.entry = evaluator.used_in.entry if evaluator.used_in
15
+ end
16
+
17
+ after(:create) do |file, evaluator|
18
+ create(:file_usage, :file => file, :revision => evaluator.used_in) if evaluator.used_in
19
+ end
20
+
21
+ trait :on_filesystem do
22
+ attachment_on_filesystem File.open(Engine.root.join('spec', 'fixtures', 'et.ogg'))
23
+ attachment_on_s3 nil
24
+ state 'not_uploaded_to_s3'
25
+ end
26
+
27
+ trait :upload_to_s3_failed do
28
+ attachment_on_filesystem File.open(Engine.root.join('spec', 'fixtures', 'et.ogg'))
29
+ attachment_on_s3 nil
30
+ state 'upload_to_s3_failed'
31
+ end
32
+
33
+ trait :waiting_for_confirmation do
34
+ state 'waiting_for_confirmation'
35
+ end
36
+
37
+ trait :encoding_failed do
38
+ state 'encoding_failed'
39
+ end
40
+
41
+ trait :encoded do
42
+ state 'encoded'
43
+ end
44
+ end
45
+ end
46
+ end
@@ -0,0 +1,21 @@
1
+ # Read about factories at https://github.com/thoughtbot/factory_girl
2
+
3
+ module Pageflow
4
+ FactoryGirl.define do
5
+ factory :chapter, :class => Chapter do
6
+ revision
7
+
8
+ ignore do
9
+ entry nil
10
+ end
11
+
12
+ before(:create) do |chapter, evaluator|
13
+ chapter.revision = evaluator.entry.draft if evaluator.entry
14
+ end
15
+ end
16
+
17
+ factory :valid_chapter, :class => Chapter do
18
+ title "Introduction"
19
+ end
20
+ end
21
+ end
@@ -0,0 +1,11 @@
1
+ # Read about factories at https://github.com/thoughtbot/factory_girl
2
+
3
+ module Pageflow
4
+ FactoryGirl.define do
5
+ factory :edit_lock, :class => EditLock do
6
+ user nil
7
+ entry { build(:entry) }
8
+ updated_at { Time.now }
9
+ end
10
+ end
11
+ end
@@ -0,0 +1,33 @@
1
+ module Pageflow
2
+ FactoryGirl.define do
3
+ sequence :title do |n|
4
+ "Entry #{n}"
5
+ end
6
+
7
+ factory :entry, :class => Entry do
8
+ title
9
+
10
+ account
11
+
12
+ after(:build) do |entry|
13
+ entry.theming ||= entry.account.default_theming
14
+ end
15
+
16
+ # inline membership creation
17
+
18
+ ignore do
19
+ with_member nil
20
+ end
21
+
22
+ after(:create) do |entry, evaluator|
23
+ create(:membership, :entry => entry, :user => evaluator.with_member) if evaluator.with_member
24
+ end
25
+
26
+ trait :published do
27
+ after(:create) do |entry|
28
+ create(:revision, :published, :entry => entry)
29
+ end
30
+ end
31
+ end
32
+ end
33
+ end
@@ -0,0 +1,8 @@
1
+ module Pageflow
2
+ FactoryGirl.define do
3
+ factory :file_usage, :class => FileUsage do
4
+ revision nil
5
+ file nil
6
+ end
7
+ end
8
+ end
@@ -0,0 +1,8 @@
1
+ module Pageflow
2
+ FactoryGirl.define do
3
+ factory :folder, :class => Folder do
4
+ name "some folder"
5
+ account
6
+ end
7
+ end
8
+ end
@@ -0,0 +1,38 @@
1
+ module Pageflow
2
+ FactoryGirl.define do
3
+ factory :image_file, :class => ImageFile do
4
+ entry
5
+ uploader { create(:user) }
6
+
7
+ attachment File.open(Engine.root.join('spec', 'fixtures', 'image.jpg'))
8
+ state 'processed'
9
+
10
+ ignore do
11
+ used_in nil
12
+ end
13
+
14
+ before(:create) do |file, evaluator|
15
+ file.entry = evaluator.used_in.entry if evaluator.used_in
16
+ end
17
+
18
+ after(:create) do |file, evaluator|
19
+ create(:file_usage, :file => file, :revision => evaluator.used_in) if evaluator.used_in
20
+ end
21
+
22
+ trait :unprocessed do
23
+ unprocessed_attachment File.open(Engine.root.join('spec', 'fixtures', 'image.jpg'))
24
+ processed_attachment nil
25
+ state 'not_processed'
26
+ end
27
+
28
+ trait :failed do
29
+ unprocessed_attachment File.open(Engine.root.join('spec', 'fixtures', 'image.jpg'))
30
+ processed_attachment nil
31
+ state 'processing_failed'
32
+ end
33
+
34
+ trait :encoded do
35
+ end
36
+ end
37
+ end
38
+ end
@@ -0,0 +1,10 @@
1
+ module Pageflow
2
+ FactoryGirl.define do
3
+ factory :invited_user, :class => InvitedUser do
4
+ email
5
+ first_name "Edison"
6
+ last_name "Editor"
7
+ account
8
+ end
9
+ end
10
+ end
@@ -0,0 +1,8 @@
1
+ module Pageflow
2
+ FactoryGirl.define do
3
+ factory :membership, :class => Membership do
4
+ user
5
+ entry
6
+ end
7
+ end
8
+ end
@@ -0,0 +1,14 @@
1
+ module Pageflow
2
+ FactoryGirl.define do
3
+ factory :page, :class => Page do
4
+ chapter
5
+ template "background_image"
6
+ configuration({})
7
+ end
8
+
9
+ factory :valid_page, :class => Page do
10
+ template "background_image"
11
+ configuration({})
12
+ end
13
+ end
14
+ end
@@ -0,0 +1,22 @@
1
+ module Pageflow
2
+ FactoryGirl.define do
3
+ factory :revision, :class => Revision do
4
+ entry
5
+
6
+ trait :frozen do
7
+ frozen_at { 1.day.ago }
8
+ end
9
+
10
+ trait :published do
11
+ frozen
12
+ creator { create(:user) }
13
+ published_at { 1.day.ago }
14
+ end
15
+
16
+ trait :depublished do
17
+ published
18
+ published_until { 1.day.ago }
19
+ end
20
+ end
21
+ end
22
+ end
@@ -0,0 +1,8 @@
1
+ module Pageflow
2
+ FactoryGirl.define do
3
+ factory :theming, :class => Pageflow::Theming do
4
+ account
5
+ theme_name 'default'
6
+ end
7
+ end
8
+ end
@@ -0,0 +1,39 @@
1
+ module Pageflow
2
+ FactoryGirl.define do
3
+ sequence :email do |n|
4
+ "person#{n}@example.com"
5
+ end
6
+
7
+ factory :user do
8
+ email
9
+ first_name 'John'
10
+ last_name 'Doe'
11
+
12
+ password '@qwert12345'
13
+ password_confirmation { password }
14
+
15
+ account
16
+
17
+ trait :editor do
18
+ end
19
+
20
+ trait :account_manager do
21
+ role 'account_manager'
22
+ end
23
+
24
+ trait :admin do
25
+ role 'admin'
26
+ end
27
+
28
+ trait :suspended do
29
+ suspended_at { 1.hour.ago }
30
+ end
31
+ end
32
+
33
+ factory :valid_user, :class => User do
34
+ email
35
+ first_name "Edison"
36
+ last_name "Editor"
37
+ end
38
+ end
39
+ end
@@ -0,0 +1,46 @@
1
+ module Pageflow
2
+ FactoryGirl.define do
3
+ factory :video_file, :class => VideoFile do
4
+ entry
5
+ uploader { create(:user) }
6
+
7
+ attachment_on_s3 File.open(Engine.root.join('spec', 'fixtures', 'video.mp4'))
8
+ state 'encoded'
9
+
10
+ ignore do
11
+ used_in nil
12
+ end
13
+
14
+ before(:create) do |file, evaluator|
15
+ file.entry = evaluator.used_in.entry if evaluator.used_in
16
+ end
17
+
18
+ after(:create) do |file, evaluator|
19
+ create(:file_usage, :file => file, :revision => evaluator.used_in) if evaluator.used_in
20
+ end
21
+
22
+ trait :on_filesystem do
23
+ attachment_on_filesystem File.open(Engine.root.join('spec', 'fixtures', 'video.mp4'))
24
+ attachment_on_s3 nil
25
+ state 'not_uploaded_to_s3'
26
+ end
27
+
28
+ trait :upload_to_s3_failed do
29
+ attachment_on_filesystem File.open(Engine.root.join('spec', 'fixtures', 'video.mp4'))
30
+ attachment_on_s3 nil
31
+ state 'upload_to_s3_failed'
32
+ end
33
+
34
+ trait :waiting_for_confirmation do
35
+ state 'waiting_for_confirmation'
36
+ end
37
+
38
+ trait :encoding_failed do
39
+ state 'encoding_failed'
40
+ end
41
+
42
+ trait :encoded do
43
+ end
44
+ end
45
+ end
46
+ end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pageflow
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0
4
+ version: 0.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Codevise Solutions Ltd
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-05-16 00:00:00.000000000 Z
11
+ date: 2014-07-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -84,16 +84,16 @@ dependencies:
84
84
  name: resque-scheduler
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ! '>='
87
+ - - ~>
88
88
  - !ruby/object:Gem::Version
89
- version: '0'
89
+ version: 2.5.5
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ! '>='
94
+ - - ~>
95
95
  - !ruby/object:Gem::Version
96
- version: '0'
96
+ version: 2.5.5
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: resque-logger
99
99
  requirement: !ruby/object:Gem::Requirement
@@ -210,16 +210,16 @@ dependencies:
210
210
  name: state_machine_job
211
211
  requirement: !ruby/object:Gem::Requirement
212
212
  requirements:
213
- - - ! '>='
213
+ - - ~>
214
214
  - !ruby/object:Gem::Version
215
- version: '0'
215
+ version: '0.2'
216
216
  type: :runtime
217
217
  prerelease: false
218
218
  version_requirements: !ruby/object:Gem::Requirement
219
219
  requirements:
220
- - - ! '>='
220
+ - - ~>
221
221
  - !ruby/object:Gem::Version
222
- version: '0'
222
+ version: '0.2'
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: paperclip
225
225
  requirement: !ruby/object:Gem::Requirement
@@ -266,72 +266,72 @@ dependencies:
266
266
  name: videojs_rails
267
267
  requirement: !ruby/object:Gem::Requirement
268
268
  requirements:
269
- - - ! '>='
269
+ - - '='
270
270
  - !ruby/object:Gem::Version
271
- version: '0'
271
+ version: 4.1.0
272
272
  type: :runtime
273
273
  prerelease: false
274
274
  version_requirements: !ruby/object:Gem::Requirement
275
275
  requirements:
276
- - - ! '>='
276
+ - - '='
277
277
  - !ruby/object:Gem::Version
278
- version: '0'
278
+ version: 4.1.0
279
279
  - !ruby/object:Gem::Dependency
280
280
  name: jquery-rails
281
281
  requirement: !ruby/object:Gem::Requirement
282
282
  requirements:
283
- - - ! '>='
283
+ - - ~>
284
284
  - !ruby/object:Gem::Version
285
- version: '0'
285
+ version: '3.0'
286
286
  type: :runtime
287
287
  prerelease: false
288
288
  version_requirements: !ruby/object:Gem::Requirement
289
289
  requirements:
290
- - - ! '>='
290
+ - - ~>
291
291
  - !ruby/object:Gem::Version
292
- version: '0'
292
+ version: '3.0'
293
293
  - !ruby/object:Gem::Dependency
294
294
  name: jquery-ui-rails
295
295
  requirement: !ruby/object:Gem::Requirement
296
296
  requirements:
297
- - - ! '>='
297
+ - - ~>
298
298
  - !ruby/object:Gem::Version
299
- version: '0'
299
+ version: '4.2'
300
300
  type: :runtime
301
301
  prerelease: false
302
302
  version_requirements: !ruby/object:Gem::Requirement
303
303
  requirements:
304
- - - ! '>='
304
+ - - ~>
305
305
  - !ruby/object:Gem::Version
306
- version: '0'
306
+ version: '4.2'
307
307
  - !ruby/object:Gem::Dependency
308
308
  name: jquery-layout-rails
309
309
  requirement: !ruby/object:Gem::Requirement
310
310
  requirements:
311
- - - ! '>='
311
+ - - ~>
312
312
  - !ruby/object:Gem::Version
313
- version: '0'
313
+ version: 0.1.0
314
314
  type: :runtime
315
315
  prerelease: false
316
316
  version_requirements: !ruby/object:Gem::Requirement
317
317
  requirements:
318
- - - ! '>='
318
+ - - ~>
319
319
  - !ruby/object:Gem::Version
320
- version: '0'
320
+ version: 0.1.0
321
321
  - !ruby/object:Gem::Dependency
322
322
  name: jquery-fileupload-rails
323
323
  requirement: !ruby/object:Gem::Requirement
324
324
  requirements:
325
- - - ! '>='
325
+ - - ~>
326
326
  - !ruby/object:Gem::Version
327
- version: '0'
327
+ version: 0.4.1
328
328
  type: :runtime
329
329
  prerelease: false
330
330
  version_requirements: !ruby/object:Gem::Requirement
331
331
  requirements:
332
- - - ! '>='
332
+ - - ~>
333
333
  - !ruby/object:Gem::Version
334
- version: '0'
334
+ version: 0.4.1
335
335
  - !ruby/object:Gem::Dependency
336
336
  name: backbone-rails
337
337
  requirement: !ruby/object:Gem::Requirement
@@ -445,7 +445,7 @@ dependencies:
445
445
  - !ruby/object:Gem::Version
446
446
  version: '1.2'
447
447
  - !ruby/object:Gem::Dependency
448
- name: sqlite3
448
+ name: mysql2
449
449
  requirement: !ruby/object:Gem::Requirement
450
450
  requirements:
451
451
  - - ! '>='
@@ -635,6 +635,15 @@ files:
635
635
  - app/assets/fonts/pageflow/FranklinGothic-Hvy-webfont.svg
636
636
  - app/assets/fonts/pageflow/FranklinGothic-Hvy-webfont.ttf
637
637
  - app/assets/fonts/pageflow/FranklinGothic-Hvy-webfont.woff
638
+ - app/assets/fonts/pageflow/entypo.eot
639
+ - app/assets/fonts/pageflow/entypo.svg
640
+ - app/assets/fonts/pageflow/entypo.ttf
641
+ - app/assets/fonts/pageflow/entypo.woff
642
+ - app/assets/fonts/pageflow/fontawesome-webfont.eot
643
+ - app/assets/fonts/pageflow/fontawesome-webfont.otf
644
+ - app/assets/fonts/pageflow/fontawesome-webfont.svg
645
+ - app/assets/fonts/pageflow/fontawesome-webfont.ttf
646
+ - app/assets/fonts/pageflow/fontawesome-webfont.woff
638
647
  - app/assets/fonts/pageflow/sourcesanspro-bold-webfont.eot
639
648
  - app/assets/fonts/pageflow/sourcesanspro-bold-webfont.svg
640
649
  - app/assets/fonts/pageflow/sourcesanspro-bold-webfont.ttf
@@ -776,13 +785,16 @@ files:
776
785
  - app/assets/javascripts/pageflow/editor/initializers/edit_lock.js
777
786
  - app/assets/javascripts/pageflow/editor/initializers/files_polling.js
778
787
  - app/assets/javascripts/pageflow/editor/initializers/setup_collections.js
788
+ - app/assets/javascripts/pageflow/editor/initializers/setup_config.js
779
789
  - app/assets/javascripts/pageflow/editor/initializers/setup_page_types.js
780
790
  - app/assets/javascripts/pageflow/editor/models/audio_file.js
781
791
  - app/assets/javascripts/pageflow/editor/models/chapter.js
782
792
  - app/assets/javascripts/pageflow/editor/models/configuration.js
783
793
  - app/assets/javascripts/pageflow/editor/models/edit_lock.js
784
794
  - app/assets/javascripts/pageflow/editor/models/edit_lock_container.js
795
+ - app/assets/javascripts/pageflow/editor/models/encoding_confirmation.js
785
796
  - app/assets/javascripts/pageflow/editor/models/entry.js
797
+ - app/assets/javascripts/pageflow/editor/models/entry_publication.js
786
798
  - app/assets/javascripts/pageflow/editor/models/file_stage.js
787
799
  - app/assets/javascripts/pageflow/editor/models/file_usage.js
788
800
  - app/assets/javascripts/pageflow/editor/models/image_file.js
@@ -797,19 +809,21 @@ files:
797
809
  - app/assets/javascripts/pageflow/editor/models/mixins/transient_references.js
798
810
  - app/assets/javascripts/pageflow/editor/models/other_entry.js
799
811
  - app/assets/javascripts/pageflow/editor/models/page.js
800
- - app/assets/javascripts/pageflow/editor/models/quota.js
801
812
  - app/assets/javascripts/pageflow/editor/models/video_file.js
802
813
  - app/assets/javascripts/pageflow/editor/renderer.js
803
814
  - app/assets/javascripts/pageflow/editor/routers/sidebar_router.js
804
815
  - app/assets/javascripts/pageflow/editor/sync.js
805
816
  - app/assets/javascripts/pageflow/editor/templates/back_button_decorator.jst.ejs
806
817
  - app/assets/javascripts/pageflow/editor/templates/chapter_item.jst.ejs
818
+ - app/assets/javascripts/pageflow/editor/templates/confirm_encoding.jst.ejs
819
+ - app/assets/javascripts/pageflow/editor/templates/confirmable_file_item.jst.ejs
807
820
  - app/assets/javascripts/pageflow/editor/templates/edit_chapter.jst.ejs
808
821
  - app/assets/javascripts/pageflow/editor/templates/edit_entry.jst.ejs
809
822
  - app/assets/javascripts/pageflow/editor/templates/edit_meta_data.jst.ejs
810
823
  - app/assets/javascripts/pageflow/editor/templates/edit_page.jst.ejs
811
824
  - app/assets/javascripts/pageflow/editor/templates/embedded/page_link.jst.ejs
812
825
  - app/assets/javascripts/pageflow/editor/templates/entry_preview.jst.ejs
826
+ - app/assets/javascripts/pageflow/editor/templates/entry_publication_quota_decorator.jst.ejs
813
827
  - app/assets/javascripts/pageflow/editor/templates/explorer_file_item.jst.ejs
814
828
  - app/assets/javascripts/pageflow/editor/templates/file_item.jst.ejs
815
829
  - app/assets/javascripts/pageflow/editor/templates/file_meta_data_item.jst.ejs
@@ -838,7 +852,6 @@ files:
838
852
  - app/assets/javascripts/pageflow/editor/templates/other_entry_item.jst.ejs
839
853
  - app/assets/javascripts/pageflow/editor/templates/page_item.jst.ejs
840
854
  - app/assets/javascripts/pageflow/editor/templates/publish_entry.jst.ejs
841
- - app/assets/javascripts/pageflow/editor/templates/quota_decorator.jst.ejs
842
855
  - app/assets/javascripts/pageflow/editor/templates/select_button.jst.ejs
843
856
  - app/assets/javascripts/pageflow/editor/templates/tabs_view.jst.ejs
844
857
  - app/assets/javascripts/pageflow/editor/views/audio_file_item_view.js
@@ -854,6 +867,8 @@ files:
854
867
  - app/assets/javascripts/pageflow/editor/views/configuration_editors/groups/options.js
855
868
  - app/assets/javascripts/pageflow/editor/views/configuration_editors/internal_links.js
856
869
  - app/assets/javascripts/pageflow/editor/views/configuration_editors/video.js
870
+ - app/assets/javascripts/pageflow/editor/views/confirm_encoding_view.js
871
+ - app/assets/javascripts/pageflow/editor/views/confirmable_file_item_view.js
857
872
  - app/assets/javascripts/pageflow/editor/views/draggable_page_item_view.js
858
873
  - app/assets/javascripts/pageflow/editor/views/edit_chapter_view.js
859
874
  - app/assets/javascripts/pageflow/editor/views/edit_entry_view.js
@@ -863,6 +878,7 @@ files:
863
878
  - app/assets/javascripts/pageflow/editor/views/embedded/background_image_embedded_view.js
864
879
  - app/assets/javascripts/pageflow/editor/views/embedded/page_link_embedded_view.js
865
880
  - app/assets/javascripts/pageflow/editor/views/entry_preview_view.js
881
+ - app/assets/javascripts/pageflow/editor/views/entry_publication_quota_decorator_view.js
866
882
  - app/assets/javascripts/pageflow/editor/views/explorer_file_item_view.js
867
883
  - app/assets/javascripts/pageflow/editor/views/file_item_view.js
868
884
  - app/assets/javascripts/pageflow/editor/views/file_meta_data_item_view.js
@@ -899,7 +915,6 @@ files:
899
915
  - app/assets/javascripts/pageflow/editor/views/page_preview_view.js
900
916
  - app/assets/javascripts/pageflow/editor/views/page_thumbnail_view.js
901
917
  - app/assets/javascripts/pageflow/editor/views/publish_entry_view.js
902
- - app/assets/javascripts/pageflow/editor/views/quota_decorator_view.js
903
918
  - app/assets/javascripts/pageflow/editor/views/select_button_view.js
904
919
  - app/assets/javascripts/pageflow/editor/views/sortable_collection_view.js
905
920
  - app/assets/javascripts/pageflow/editor/views/tabs_view.js
@@ -972,6 +987,7 @@ files:
972
987
  - app/assets/stylesheets/pageflow/base.css.scss
973
988
  - app/assets/stylesheets/pageflow/editor/base.css.scss
974
989
  - app/assets/stylesheets/pageflow/editor/colors.css.scss
990
+ - app/assets/stylesheets/pageflow/editor/confirmable_files.css.scss
975
991
  - app/assets/stylesheets/pageflow/editor/dialogs.css.scss
976
992
  - app/assets/stylesheets/pageflow/editor/embedded.css.scss
977
993
  - app/assets/stylesheets/pageflow/editor/failures.css.scss
@@ -1010,6 +1026,9 @@ files:
1010
1026
  - app/assets/stylesheets/pageflow/mixins/hidden_text.css.scss
1011
1027
  - app/assets/stylesheets/pageflow/mixins/hover.css.scss
1012
1028
  - app/assets/stylesheets/pageflow/mixins/icons.css.scss
1029
+ - app/assets/stylesheets/pageflow/mixins/icons/entypo.css.scss
1030
+ - app/assets/stylesheets/pageflow/mixins/icons/fontawesome.css.scss
1031
+ - app/assets/stylesheets/pageflow/mixins/label.css.scss
1013
1032
  - app/assets/stylesheets/pageflow/mixins/pageflow.css.scss
1014
1033
  - app/assets/stylesheets/pageflow/mixins/pressed.css.scss
1015
1034
  - app/assets/stylesheets/pageflow/mixins/shadow.css.scss
@@ -1037,6 +1056,7 @@ files:
1037
1056
  - app/assets/stylesheets/pageflow/themes/default/navigation.css.scss
1038
1057
  - app/assets/stylesheets/pageflow/themes/default/overview.css.scss
1039
1058
  - app/assets/stylesheets/pageflow/themes/default/page.css.scss
1059
+ - app/assets/stylesheets/pageflow/themes/default/player_controls.css.scss
1040
1060
  - app/assets/stylesheets/pageflow/video_player.css.scss
1041
1061
  - app/controllers/concerns/pageflow/edit_locking.rb
1042
1062
  - app/controllers/concerns/pageflow/quota_verification.rb
@@ -1044,11 +1064,12 @@ files:
1044
1064
  - app/controllers/pageflow/chapters_controller.rb
1045
1065
  - app/controllers/pageflow/edit_locks_controller.rb
1046
1066
  - app/controllers/pageflow/editor/audio_files_controller.rb
1067
+ - app/controllers/pageflow/editor/encoding_confirmations_controller.rb
1047
1068
  - app/controllers/pageflow/editor/entries_controller.rb
1069
+ - app/controllers/pageflow/editor/entry_publications_controller.rb
1048
1070
  - app/controllers/pageflow/editor/file_usages_controller.rb
1049
1071
  - app/controllers/pageflow/editor/files_controller.rb
1050
1072
  - app/controllers/pageflow/editor/image_files_controller.rb
1051
- - app/controllers/pageflow/editor/quotas_controller.rb
1052
1073
  - app/controllers/pageflow/editor/video_files_controller.rb
1053
1074
  - app/controllers/pageflow/entries_controller.rb
1054
1075
  - app/controllers/pageflow/pages_controller.rb
@@ -1057,6 +1078,7 @@ files:
1057
1078
  - app/helpers/pageflow/admin/revisions_helper.rb
1058
1079
  - app/helpers/pageflow/application_helper.rb
1059
1080
  - app/helpers/pageflow/background_image_helper.rb
1081
+ - app/helpers/pageflow/config_helper.rb
1060
1082
  - app/helpers/pageflow/entries_helper.rb
1061
1083
  - app/helpers/pageflow/files_helper.rb
1062
1084
  - app/helpers/pageflow/folders_helper.rb
@@ -1068,8 +1090,10 @@ files:
1068
1090
  - app/helpers/pageflow/render_json_helper.rb
1069
1091
  - app/helpers/pageflow/stub_page_configuration.rb
1070
1092
  - app/helpers/pageflow/users_helper.rb
1093
+ - app/jobs/pageflow/poll_meta_data_from_zencoder_job.rb
1071
1094
  - app/jobs/pageflow/poll_zencoder_job.rb
1072
1095
  - app/jobs/pageflow/process_image_file_job.rb
1096
+ - app/jobs/pageflow/request_meta_data_from_zencoder_job.rb
1073
1097
  - app/jobs/pageflow/submit_file_to_zencoder_job.rb
1074
1098
  - app/jobs/pageflow/upload_file_to_s3_job.rb
1075
1099
  - app/mailers/pageflow/user_mailer.rb
@@ -1080,7 +1104,9 @@ files:
1080
1104
  - app/models/pageflow/chapter.rb
1081
1105
  - app/models/pageflow/draft_entry.rb
1082
1106
  - app/models/pageflow/edit_lock.rb
1107
+ - app/models/pageflow/encoding_confirmation.rb
1083
1108
  - app/models/pageflow/entry.rb
1109
+ - app/models/pageflow/entry_publication.rb
1084
1110
  - app/models/pageflow/file_usage.rb
1085
1111
  - app/models/pageflow/folder.rb
1086
1112
  - app/models/pageflow/image_file.rb
@@ -1090,12 +1116,17 @@ files:
1090
1116
  - app/models/pageflow/page.rb
1091
1117
  - app/models/pageflow/published_entry.rb
1092
1118
  - app/models/pageflow/revision.rb
1093
- - app/models/pageflow/theme.rb
1119
+ - app/models/pageflow/theming.rb
1094
1120
  - app/models/pageflow/video_file.rb
1095
1121
  - app/models/pageflow/with_file_usage_extension.rb
1096
1122
  - app/models/pageflow/zencoder_attachment.rb
1097
1123
  - app/state_machines/pageflow/encoded_file_state_machine.rb
1098
1124
  - app/state_machines/pageflow/image_file_state_machine.rb
1125
+ - app/views/admin/accounts/_account_details.html.arb
1126
+ - app/views/admin/accounts/_entries_panel.html.arb
1127
+ - app/views/admin/accounts/_form.html.erb
1128
+ - app/views/admin/accounts/_theming_details.html.arb
1129
+ - app/views/admin/accounts/_users_panel.html.arb
1099
1130
  - app/views/admin/entries/_attributes_table.html.arb
1100
1131
  - app/views/admin/entries/_links.html.arb
1101
1132
  - app/views/admin/entries/_members.html.arb
@@ -1103,7 +1134,7 @@ files:
1103
1134
  - app/views/admin/memberships/_form.html.erb
1104
1135
  - app/views/admin/revisions/_form.html.erb
1105
1136
  - app/views/admin/users/_form.html.erb
1106
- - app/views/admin/users/_quota_exceeded.html.erb
1137
+ - app/views/admin/users/_quota_exhausted.html.erb
1107
1138
  - app/views/admin/users/delete_me.html.erb
1108
1139
  - app/views/admin/users/me.html.erb
1109
1140
  - app/views/components/pageflow/admin/custom_scopes_renderer.rb
@@ -1114,17 +1145,20 @@ files:
1114
1145
  - app/views/layouts/pageflow/_loading_spinner_inline_script.html.erb
1115
1146
  - app/views/layouts/pageflow/_meta_tags.html.erb
1116
1147
  - app/views/layouts/pageflow/application.html.erb
1148
+ - app/views/pageflow/config/_editor_seeds.json.jbuilder
1117
1149
  - app/views/pageflow/devise/mailer/confirmation_instructions.html.erb
1118
1150
  - app/views/pageflow/devise/mailer/reset_password_instructions.html.erb
1119
1151
  - app/views/pageflow/devise/mailer/unlock_instructions.html.erb
1120
1152
  - app/views/pageflow/editor/audio_files/_audio_file.json.jbuilder
1153
+ - app/views/pageflow/editor/encoding_confirmations/_summary.html.erb
1154
+ - app/views/pageflow/editor/encoding_confirmations/check.json.jbuilder
1121
1155
  - app/views/pageflow/editor/entries/_entry.json.jbuilder
1122
1156
  - app/views/pageflow/editor/entries/index.json.jbuilder
1157
+ - app/views/pageflow/editor/entry_publications/check.json.jbuilder
1123
1158
  - app/views/pageflow/editor/files/create.json.jbuilder
1124
1159
  - app/views/pageflow/editor/files/index.json.jbuilder
1125
1160
  - app/views/pageflow/editor/image_files/_image_file.json.jbuilder
1126
- - app/views/pageflow/editor/quotas/_published_entries_exceeded.html.erb
1127
- - app/views/pageflow/editor/quotas/show.json.jbuilder
1161
+ - app/views/pageflow/editor/quotas/_published_entries_exhausted.html.erb
1128
1162
  - app/views/pageflow/editor/video_files/_video_file.json.jbuilder
1129
1163
  - app/views/pageflow/entries/_analytics.html.erb
1130
1164
  - app/views/pageflow/entries/_entry.html.erb
@@ -1137,6 +1171,7 @@ files:
1137
1171
  - app/views/pageflow/entries/_overview.html.erb
1138
1172
  - app/views/pageflow/entries/_skip_links.html.erb
1139
1173
  - app/views/pageflow/entries/_social_meta_tags.html.erb
1174
+ - app/views/pageflow/entries/_theming.css.erb
1140
1175
  - app/views/pageflow/entries/edit.html.erb
1141
1176
  - app/views/pageflow/entries/navigation/_bar_bottom.html.erb
1142
1177
  - app/views/pageflow/entries/navigation/_bar_top.html.erb
@@ -1171,6 +1206,7 @@ files:
1171
1206
  - config/locales/admin/entries.yml
1172
1207
  - config/locales/admin/folders.de.yml
1173
1208
  - config/locales/admin/revisions.yml
1209
+ - config/locales/admin/themings.yml
1174
1210
  - config/locales/admin/users.yml
1175
1211
  - config/locales/admin/users/delete_me.de.yml
1176
1212
  - config/locales/admin/users/me.de.yml
@@ -1189,6 +1225,14 @@ files:
1189
1225
  - config/spring.rb
1190
1226
  - db/migrate/20140418225525_setup_schema.rb
1191
1227
  - db/migrate/20140418240000_add_attributes_to_users.rb
1228
+ - db/migrate/20140624135420_create_themings.rb
1229
+ - db/migrate/20140624135421_create_themings_for_existing_accounts.rb
1230
+ - db/migrate/20140624135422_change_theme_references_to_theming_references.rb
1231
+ - db/migrate/20140624135423_remove_attributes_from_themes.rb
1232
+ - db/migrate/20140624135424_create_accounts_themes_join_table.rb
1233
+ - db/migrate/20140624135425_move_cname_from_account_to_theming.rb
1234
+ - db/migrate/20140625184800_drop_themes.rb
1235
+ - db/migrate/20140704110631_add_confirmed_by_to_encoded_files.rb
1192
1236
  - lib/active_admin/patches/views/attributes_table.rb
1193
1237
  - lib/active_admin/patches/views/table_for.rb
1194
1238
  - lib/generators/pageflow/active_admin_menu/active_admin_menu_generator.rb
@@ -1211,6 +1255,7 @@ files:
1211
1255
  - lib/generators/pageflow/resque/templates/resque_mailer.rb
1212
1256
  - lib/generators/pageflow/routes/routes_generator.rb
1213
1257
  - lib/generators/pageflow/seeds/seeds_generator.rb
1258
+ - lib/generators/pageflow/theme/theme_generator.rb
1214
1259
  - lib/generators/pageflow/user/user_generator.rb
1215
1260
  - lib/pageflow.rb
1216
1261
  - lib/pageflow/ability_mixin.rb
@@ -1220,15 +1265,34 @@ files:
1220
1265
  - lib/pageflow/hooks.rb
1221
1266
  - lib/pageflow/page_type.rb
1222
1267
  - lib/pageflow/quota.rb
1268
+ - lib/pageflow/quotas.rb
1223
1269
  - lib/pageflow/seeds.rb
1270
+ - lib/pageflow/theme.rb
1271
+ - lib/pageflow/themes.rb
1224
1272
  - lib/pageflow/user_mixin.rb
1225
1273
  - lib/pageflow/version.rb
1226
1274
  - lib/pageflow/view_component.rb
1227
1275
  - lib/pageflow/zencoder_api.rb
1228
1276
  - lib/pageflow/zencoder_audio_output_definition.rb
1277
+ - lib/pageflow/zencoder_meta_data_output_definition.rb
1229
1278
  - lib/pageflow/zencoder_output_definition.rb
1230
1279
  - lib/pageflow/zencoder_video_output_definition.rb
1231
1280
  - lib/tasks/pageflow_tasks.rake
1281
+ - spec/factories/accounts.rb
1282
+ - spec/factories/audio_files.rb
1283
+ - spec/factories/chapters.rb
1284
+ - spec/factories/edit_locks.rb
1285
+ - spec/factories/entries.rb
1286
+ - spec/factories/file_usages.rb
1287
+ - spec/factories/folders.rb
1288
+ - spec/factories/image_files.rb
1289
+ - spec/factories/invited_user.rb
1290
+ - spec/factories/memberships.rb
1291
+ - spec/factories/pages.rb
1292
+ - spec/factories/revisions.rb
1293
+ - spec/factories/themings.rb
1294
+ - spec/factories/users.rb
1295
+ - spec/factories/video_files.rb
1232
1296
  - vendor/assets/javascripts/audio5.min.js
1233
1297
  - vendor/assets/javascripts/cocktail.js
1234
1298
  - vendor/assets/javascripts/html5shiv-printshiv.js