pageflow 0.3.0 → 0.4.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 (54) hide show
  1. checksums.yaml +8 -8
  2. data/admins/pageflow/membership.rb +1 -2
  3. data/admins/pageflow/user.rb +1 -1
  4. data/app/assets/javascripts/pageflow/editor/base.js +1 -0
  5. data/app/assets/javascripts/pageflow/editor/collections/chapter_pages_collection.js +36 -0
  6. data/app/assets/javascripts/pageflow/editor/collections/mixins/files_collection.js +2 -1
  7. data/app/assets/javascripts/pageflow/editor/collections/mixins/ordered_collection.js +17 -0
  8. data/app/assets/javascripts/pageflow/editor/collections/subset_collection.js +0 -2
  9. data/app/assets/javascripts/pageflow/editor/controllers/sidebar_controller.js +5 -2
  10. data/app/assets/javascripts/pageflow/editor/models/chapter.js +3 -25
  11. data/app/assets/javascripts/pageflow/editor/models/encoding_confirmation.js +40 -6
  12. data/app/assets/javascripts/pageflow/editor/models/page.js +7 -5
  13. data/app/assets/javascripts/pageflow/editor/routers/sidebar_router.js +1 -0
  14. data/app/assets/javascripts/pageflow/editor/templates/blank_entry.jst.ejs +8 -0
  15. data/app/assets/javascripts/pageflow/editor/templates/confirm_encoding.jst.ejs +8 -2
  16. data/app/assets/javascripts/pageflow/editor/templates/file_item.jst.ejs +1 -0
  17. data/app/assets/javascripts/pageflow/editor/templates/publish_entry.jst.ejs +6 -0
  18. data/app/assets/javascripts/pageflow/editor/views/blank_entry_view.js +4 -0
  19. data/app/assets/javascripts/pageflow/editor/views/confirm_encoding_view.js +10 -4
  20. data/app/assets/javascripts/pageflow/editor/views/confirmable_file_item_view.js +1 -0
  21. data/app/assets/javascripts/pageflow/editor/views/entry_preview_view.js +2 -1
  22. data/app/assets/javascripts/pageflow/editor/views/file_item_view.js +8 -0
  23. data/app/assets/javascripts/pageflow/editor/views/publish_entry_view.js +5 -1
  24. data/app/assets/javascripts/pageflow/editor/views/sortable_collection_view.js +8 -4
  25. data/app/assets/stylesheets/pageflow/editor/base.css.scss +2 -1
  26. data/app/assets/stylesheets/pageflow/editor/blank_entry.css.scss +46 -0
  27. data/app/assets/stylesheets/pageflow/editor/confirm_encoding.css.scss +84 -0
  28. data/app/assets/stylesheets/pageflow/editor/dialogs.css.scss +1 -1
  29. data/app/assets/stylesheets/pageflow/editor/files.css.scss +5 -0
  30. data/app/assets/stylesheets/pageflow/editor/publish_entry.css.scss +15 -0
  31. data/app/assets/stylesheets/pageflow/navigation_bar.css.scss +5 -5
  32. data/app/assets/stylesheets/pageflow/player_controls.css.scss +2 -6
  33. data/app/assets/stylesheets/pageflow/themes/default/anchors.css.scss +2 -2
  34. data/app/assets/stylesheets/pageflow/themes/default/page.css.scss +1 -0
  35. data/app/controllers/pageflow/application_controller.rb +4 -0
  36. data/app/controllers/pageflow/editor/encoding_confirmations_controller.rb +1 -1
  37. data/app/helpers/pageflow/admin/memberships_helper.rb +52 -0
  38. data/app/helpers/pageflow/admin/users_helper.rb +9 -0
  39. data/app/helpers/pageflow/entries_helper.rb +26 -10
  40. data/app/models/pageflow/entry.rb +1 -0
  41. data/app/views/admin/memberships/_form.html.erb +2 -2
  42. data/app/views/pageflow/editor/entries/_entry.json.jbuilder +2 -0
  43. data/app/views/pageflow/editor/entry_publications/check.json.jbuilder +1 -0
  44. data/app/views/pageflow/entries/_navigation.html.erb +1 -7
  45. data/app/views/pageflow/entries/_social_meta_tags.html.erb +1 -1
  46. data/app/views/pageflow/entries/navigation/_bar_top.html.erb +1 -9
  47. data/app/views/pageflow/entries/navigation/_credits_box_content.html.erb +5 -0
  48. data/config/locales/editor/blank_entry.yml +9 -0
  49. data/lib/pageflow/user_mixin.rb +4 -0
  50. data/lib/pageflow/version.rb +1 -1
  51. metadata +658 -652
  52. data/app/assets/stylesheets/pageflow/editor/confirmable_files.css.scss +0 -67
  53. data/app/helpers/pageflow/application_helper.rb +0 -4
  54. data/app/helpers/pageflow/users_helper.rb +0 -15
@@ -1,67 +0,0 @@
1
- ul.confirmable_files {
2
- margin-bottom: 15px;
3
-
4
- li {
5
- background-color: #eee;
6
- margin-bottom: 2px;
7
- position: relative;
8
- padding: 10px 10px 0 30px;
9
- white-space: nowrap;
10
- overflow: hidden;
11
- height: 23px;
12
- }
13
-
14
- input[type=checkbox] {
15
- display: block;
16
- position: absolute;
17
- top: 10px;
18
- left: 10px;
19
- width: auto;
20
- height: auto;
21
- }
22
-
23
- .file_name {
24
- position: absolute;
25
- left: 30px;
26
- top: 9px;
27
- right: 100px;
28
- overflow: hidden;
29
- text-overflow: ellipsis;
30
-
31
- font-weight: normal;
32
- font-size: 13px;
33
- }
34
-
35
- .duration {
36
- position: absolute;
37
- right: 50px;
38
- top: 9px;
39
- }
40
-
41
- .actions {
42
- position: absolute;
43
- right: 10px;
44
- top: 3px;
45
- text-align: right;
46
-
47
- a {
48
- float: left;
49
- margin-left: 5px;
50
- }
51
- }
52
-
53
- a.remove {
54
- @include icon-only-button(#aaa);
55
- @include trash-icon;
56
- }
57
- }
58
-
59
- button.confirm_encoding {
60
- @include icon-button;
61
- @include check-icon;
62
-
63
- &.checking {
64
- @include arrows-ccw-icon;
65
- @include background-icon-animation(blink);
66
- }
67
- }
@@ -1,4 +0,0 @@
1
- module Pageflow
2
- module ApplicationHelper
3
- end
4
- end
@@ -1,15 +0,0 @@
1
- module Pageflow
2
- module UsersHelper
3
- def collection_for_user_roles
4
- User.roles_accessible_by(current_ability).index_by { |role| t(role, :scope => 'admin.users.roles') }
5
- end
6
-
7
- def user_collection_for_parent(parent)
8
- if parent.is_a?(Entry)
9
- parent.account.users - parent.users
10
- else
11
- parent.account.users
12
- end
13
- end
14
- end
15
- end