pageflow 0.10.0 → 0.11.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 (426) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +181 -0
  3. data/README.md +11 -37
  4. data/admins/pageflow/accounts.rb +20 -2
  5. data/admins/pageflow/entry.rb +55 -30
  6. data/admins/pageflow/membership.rb +1 -0
  7. data/admins/pageflow/revisions.rb +2 -0
  8. data/admins/pageflow/user.rb +25 -16
  9. data/app/assets/images/pageflow/editor/blank_entry/logo.png +0 -0
  10. data/app/assets/images/pageflow/themes/default/close_button_sprite.png +0 -0
  11. data/app/assets/images/pageflow/themes/default/favicon.ico +0 -0
  12. data/app/assets/images/pageflow/{touch_indicator.png → themes/default/indicators/hidden_text.png} +0 -0
  13. data/app/assets/images/pageflow/{touch_indicator_invert.png → themes/default/indicators/hidden_text_invert.png} +0 -0
  14. data/app/assets/images/pageflow/{scroll_down_indicator.png → themes/default/indicators/scroll_down.png} +0 -0
  15. data/app/assets/images/pageflow/{scroll_down_indicator_invert.png → themes/default/indicators/scroll_down_invert.png} +0 -0
  16. data/app/assets/images/pageflow/themes/default/loading_spinner/logo.png +0 -0
  17. data/app/assets/images/pageflow/themes/default/logo_header.png +0 -0
  18. data/app/assets/images/pageflow/themes/default/logo_header_invert.png +0 -0
  19. data/app/assets/images/pageflow/themes/default/logo_print.png +0 -0
  20. data/app/assets/images/pageflow/{menu_mobile_imprint.png → themes/default/mobile_navigation/imprint_sprite.png} +0 -0
  21. data/app/assets/images/pageflow/{menu_mobile_sprite3.png → themes/default/mobile_navigation/index_sprite.png} +0 -0
  22. data/app/assets/images/pageflow/{mobile_sharing.png → themes/default/mobile_navigation/sharing_icons_sprite.png} +0 -0
  23. data/app/assets/images/pageflow/{menu_mobile_sharing.png → themes/default/mobile_navigation/sharing_sprite.png} +0 -0
  24. data/app/assets/images/pageflow/{chapter_bottom.png → themes/default/overview_chapter_borders/bottom.png} +0 -0
  25. data/app/assets/images/pageflow/{chapter_end.png → themes/default/overview_chapter_borders/end.png} +0 -0
  26. data/app/assets/images/pageflow/{chapter_start.png → themes/default/overview_chapter_borders/start.png} +0 -0
  27. data/app/assets/images/pageflow/{chapter_bg.png → themes/default/overview_chapter_borders/tile.png} +0 -0
  28. data/app/assets/images/pageflow/{chapter_top.png → themes/default/overview_chapter_borders/top.png} +0 -0
  29. data/app/assets/images/pageflow/themes/default/{audio_sprite.png → page_type_pictograms/audio/sprite.png} +0 -0
  30. data/app/assets/images/pageflow/themes/default/page_type_pictograms/audio/wide.png +0 -0
  31. data/app/assets/images/pageflow/themes/default/{image_sprite.png → page_type_pictograms/audio_loop/sprite.png} +0 -0
  32. data/app/assets/images/pageflow/themes/default/page_type_pictograms/audio_loop/wide.png +0 -0
  33. data/app/assets/images/pageflow/themes/default/page_type_pictograms/background_image/sprite.png +0 -0
  34. data/app/assets/images/pageflow/themes/default/page_type_pictograms/background_image/wide.png +0 -0
  35. data/app/assets/images/pageflow/themes/default/page_type_pictograms/background_video/sprite.png +0 -0
  36. data/app/assets/images/pageflow/themes/default/page_type_pictograms/background_video/wide.png +0 -0
  37. data/app/assets/images/pageflow/themes/default/{video_sprite.png → page_type_pictograms/video/sprite.png} +0 -0
  38. data/app/assets/images/pageflow/themes/default/page_type_pictograms/video/wide.png +0 -0
  39. data/app/assets/images/pageflow/themes/default/player_controls/slim/scroller_mask.png +0 -0
  40. data/app/assets/images/pageflow/themes/default/{loading_small.png → player_controls_loading_spinner.png} +0 -0
  41. data/app/assets/images/pageflow/themes/default/{video_controls.png → player_controls_sprite.png} +0 -0
  42. data/app/assets/images/pageflow/{menu-arrow-short.png → themes/legacy/menu-arrow-short.png} +0 -0
  43. data/app/assets/images/pageflow/themes/legacy/menu_mobile_imprint.png +0 -0
  44. data/app/assets/images/pageflow/themes/legacy/menu_mobile_sharing.png +0 -0
  45. data/app/assets/images/pageflow/themes/legacy/menu_mobile_sprite3.png +0 -0
  46. data/app/assets/images/pageflow/themes/legacy/mobile_sharing.png +0 -0
  47. data/app/assets/images/pageflow/{page_thumbnail_mask.png → themes/legacy/page_thumbnail_mask.png} +0 -0
  48. data/app/assets/images/pageflow/themes/legacy/scroll_down_indicator.png +0 -0
  49. data/app/assets/images/pageflow/themes/legacy/scroll_down_indicator_invert.png +0 -0
  50. data/app/assets/images/pageflow/{scroll_indicator_sprite.png → themes/legacy/scroll_indicator_sprite.png} +0 -0
  51. data/app/assets/images/pageflow/themes/legacy/touch_indicator.png +0 -0
  52. data/app/assets/images/pageflow/themes/legacy/touch_indicator_invert.png +0 -0
  53. data/app/assets/images/pageflow/{volume_control_sprite.png → themes/legacy/volume_control_sprite.png} +0 -0
  54. data/app/assets/javascripts/pageflow/admin.js +2 -0
  55. data/app/assets/javascripts/pageflow/admin/entries.js +1 -1
  56. data/app/assets/javascripts/pageflow/base.js +2 -0
  57. data/app/assets/javascripts/pageflow/browser/agent.js +36 -0
  58. data/app/assets/javascripts/pageflow/browser/facebook.js +10 -0
  59. data/app/assets/javascripts/pageflow/browser/ios_platform.js +1 -4
  60. data/app/assets/javascripts/pageflow/editor/models/theming.js +4 -0
  61. data/app/assets/javascripts/pageflow/editor/views/edit_meta_data_view.js +17 -3
  62. data/app/assets/javascripts/pageflow/editor/views/editor_view.js +21 -0
  63. data/app/assets/javascripts/pageflow/editor/views/entry_preview_view.js +1 -0
  64. data/app/assets/javascripts/pageflow/focus_outline.js +44 -0
  65. data/app/assets/javascripts/pageflow/highlighted_page.js +10 -4
  66. data/app/assets/javascripts/pageflow/links.js +0 -7
  67. data/app/assets/javascripts/pageflow/page_types/audio.js +13 -0
  68. data/app/assets/javascripts/pageflow/page_types/mixins/info_box.js +5 -2
  69. data/app/assets/javascripts/pageflow/page_types/video.js +65 -59
  70. data/app/assets/javascripts/pageflow/ready.js +4 -2
  71. data/app/assets/javascripts/pageflow/slideshow.js +1 -0
  72. data/app/assets/javascripts/pageflow/slideshow/atmo.js +1 -1
  73. data/app/assets/javascripts/pageflow/slideshow/hide_text.js +5 -1
  74. data/app/assets/javascripts/pageflow/slideshow/page_widget.js +17 -0
  75. data/app/assets/javascripts/pageflow/slideshow/scroll_indicator.js +27 -0
  76. data/app/assets/javascripts/pageflow/slideshow/scroll_indicator_widget.js +53 -10
  77. data/app/assets/javascripts/pageflow/slideshow/scroller_widget.js +8 -1
  78. data/app/assets/javascripts/pageflow/ui/views/inputs/slider_input_view.js +15 -4
  79. data/app/assets/javascripts/pageflow/widgets.js +9 -0
  80. data/app/assets/javascripts/pageflow/widgets/auto_hide_player_controls.js +59 -0
  81. data/app/assets/javascripts/pageflow/widgets/header.js +11 -7
  82. data/app/assets/javascripts/pageflow/widgets/hide_content_during_playback.js +68 -0
  83. data/app/assets/javascripts/pageflow/widgets/loading_spinner.js +2 -0
  84. data/app/assets/javascripts/pageflow/widgets/mark_with_played_states.js +23 -0
  85. data/app/assets/javascripts/pageflow/widgets/multimedia_alert.js +2 -0
  86. data/app/assets/javascripts/pageflow/widgets/navigation.js +3 -5
  87. data/app/assets/javascripts/pageflow/widgets/navigation_mobile.js +2 -0
  88. data/app/assets/javascripts/pageflow/widgets/overview.js +2 -1
  89. data/app/assets/javascripts/pageflow/widgets/page_navigation_list.js +7 -3
  90. data/app/assets/javascripts/pageflow/widgets/player_controls.js +24 -19
  91. data/app/assets/javascripts/pageflow/widgets/share_menu.js +5 -4
  92. data/app/assets/stylesheets/pageflow/{admin.css.scss → admin.scss} +7 -5
  93. data/app/assets/stylesheets/pageflow/admin/{columns.css.scss → columns.scss} +0 -0
  94. data/app/assets/stylesheets/pageflow/admin/embedded_index_table.scss +14 -0
  95. data/app/assets/stylesheets/pageflow/admin/{entries.css.scss → entries.scss} +7 -11
  96. data/app/assets/stylesheets/pageflow/admin/entries/{folders.css.scss → folders.scss} +0 -0
  97. data/app/assets/stylesheets/pageflow/admin/entries/index_table.scss +15 -0
  98. data/app/assets/stylesheets/pageflow/admin/entries/{user_badge_list.css.scss → user_badge_list.scss} +0 -0
  99. data/app/assets/stylesheets/pageflow/admin/filters.scss +3 -0
  100. data/app/assets/stylesheets/pageflow/admin/icon_button.scss +25 -0
  101. data/app/assets/stylesheets/pageflow/admin/icon_link.scss +31 -0
  102. data/app/assets/stylesheets/pageflow/admin/publication_state_indicator.scss +18 -0
  103. data/app/assets/stylesheets/pageflow/admin/{quotas.css.scss → quotas.scss} +0 -0
  104. data/app/assets/stylesheets/pageflow/admin/{tabs_view.css.scss → tabs_view.scss} +3 -2
  105. data/app/assets/stylesheets/pageflow/admin/tooltip_bubble.scss +30 -0
  106. data/app/assets/stylesheets/pageflow/{animations.css.scss → animations.scss} +0 -0
  107. data/app/assets/stylesheets/pageflow/animations/{blink.css.scss → blink.scss} +0 -0
  108. data/app/assets/stylesheets/pageflow/animations/{bounce.css.scss → bounce.scss} +0 -0
  109. data/app/assets/stylesheets/pageflow/animations/{fade.css.scss → fade.scss} +0 -0
  110. data/app/assets/stylesheets/pageflow/animations/{loading.css.scss → loading.scss} +0 -0
  111. data/app/assets/stylesheets/pageflow/animations/{scroll.css.scss → scroll.scss} +0 -0
  112. data/app/assets/stylesheets/pageflow/{application_with_simulated_media_queries.css.scss → application_with_simulated_media_queries.scss} +0 -0
  113. data/app/assets/stylesheets/pageflow/{base.css.scss → base.scss} +15 -5
  114. data/app/assets/stylesheets/pageflow/{delayed_text_fade_in.css.scss → delayed_text_fade_in.scss} +0 -0
  115. data/app/assets/stylesheets/pageflow/editor/{back_button_decorator.css.scss → back_button_decorator.scss} +0 -0
  116. data/app/assets/stylesheets/pageflow/editor/{background_positioning.css.scss → background_positioning.scss} +0 -0
  117. data/app/assets/stylesheets/pageflow/editor/{base.css.scss → base.scss} +3 -1
  118. data/app/assets/stylesheets/pageflow/editor/{blank_entry.css.scss → blank_entry.scss} +6 -4
  119. data/app/assets/stylesheets/pageflow/editor/{colors.css.scss → colors.scss} +0 -0
  120. data/app/assets/stylesheets/pageflow/editor/{confirm_encoding.css.scss → confirm_encoding.scss} +0 -0
  121. data/app/assets/stylesheets/pageflow/editor/{dialogs.css.scss → dialogs.scss} +0 -0
  122. data/app/assets/stylesheets/pageflow/editor/{disabled_atmo_indicator.css.scss → disabled_atmo_indicator.scss} +0 -0
  123. data/app/assets/stylesheets/pageflow/editor/{drop_down_button.css.scss → drop_down_button.scss} +0 -0
  124. data/app/assets/stylesheets/pageflow/editor/{failures.css.scss → failures.scss} +0 -0
  125. data/app/assets/stylesheets/pageflow/editor/{file_meta_data.css.scss → file_meta_data.scss} +0 -0
  126. data/app/assets/stylesheets/pageflow/editor/{file_stages.css.scss → file_stages.scss} +0 -0
  127. data/app/assets/stylesheets/pageflow/editor/{file_thumbnails.css.scss → file_thumbnails.scss} +0 -0
  128. data/app/assets/stylesheets/pageflow/editor/{files.css.scss → files.scss} +0 -0
  129. data/app/assets/stylesheets/pageflow/editor/{files_explorer.css.scss → files_explorer.scss} +0 -0
  130. data/app/assets/stylesheets/pageflow/editor/{files_gallery.css.scss → files_gallery.scss} +0 -0
  131. data/app/assets/stylesheets/pageflow/editor/{help.css.scss → help.scss} +0 -0
  132. data/app/assets/stylesheets/pageflow/editor/{indicators.css.scss → indicators.scss} +0 -0
  133. data/app/assets/stylesheets/pageflow/editor/{inputs.css.scss → inputs.scss} +0 -0
  134. data/app/assets/stylesheets/pageflow/editor/inputs/{reference.css.scss → reference.scss} +0 -0
  135. data/app/assets/stylesheets/pageflow/editor/{list.css.scss → list.scss} +0 -0
  136. data/app/assets/stylesheets/pageflow/editor/{loading.css.scss → loading.scss} +0 -0
  137. data/app/assets/stylesheets/pageflow/editor/{locked.css.scss → locked.scss} +0 -0
  138. data/app/assets/stylesheets/pageflow/editor/{manage_files.css.scss → manage_files.scss} +0 -0
  139. data/app/assets/stylesheets/pageflow/editor/{menu.css.scss → menu.scss} +0 -0
  140. data/app/assets/stylesheets/pageflow/editor/{notifications.css.scss → notifications.scss} +0 -0
  141. data/app/assets/stylesheets/pageflow/editor/{other_entry_item.css.scss → other_entry_item.scss} +0 -0
  142. data/app/assets/stylesheets/pageflow/editor/{outline.css.scss → outline.scss} +0 -0
  143. data/app/assets/stylesheets/pageflow/editor/{page_links.css.scss → page_links.scss} +0 -0
  144. data/app/assets/stylesheets/pageflow/editor/{page_selection.css.scss → page_selection.scss} +0 -0
  145. data/app/assets/stylesheets/pageflow/editor/{publish_entry.css.scss → publish_entry.scss} +0 -0
  146. data/app/assets/stylesheets/pageflow/editor/{quotas.css.scss → quotas.scss} +0 -0
  147. data/app/assets/stylesheets/pageflow/editor/{select_button.css.scss → select_button.scss} +0 -0
  148. data/app/assets/stylesheets/pageflow/editor/{storyline_picker.css.scss → storyline_picker.scss} +0 -0
  149. data/app/assets/stylesheets/pageflow/editor/unsupported_browser_hint.scss +15 -0
  150. data/app/assets/stylesheets/pageflow/editor/{widgets.css.scss → widgets.scss} +0 -0
  151. data/app/assets/stylesheets/pageflow/editor/{wysihtml5.css.scss → wysihtml5.scss} +0 -0
  152. data/app/assets/stylesheets/pageflow/{entries.css.scss → entries.scss} +16 -58
  153. data/app/assets/stylesheets/pageflow/focus_outline.scss +23 -0
  154. data/app/assets/stylesheets/pageflow/{fonts.css.scss → fonts.scss} +0 -0
  155. data/app/assets/stylesheets/pageflow/{header.css.scss → header.scss} +0 -0
  156. data/app/assets/stylesheets/pageflow/{hide_text.css.scss → hide_text.scss} +4 -6
  157. data/app/assets/stylesheets/pageflow/{ie9.css.scss → ie9.scss} +2 -1
  158. data/app/assets/stylesheets/pageflow/jquery_ui.scss +26 -0
  159. data/app/assets/stylesheets/pageflow/{loading_spinner.css.scss → loading_spinner.scss} +0 -0
  160. data/app/assets/stylesheets/pageflow/{lt_ie9.css.scss → lt_ie9.scss} +0 -4
  161. data/app/assets/stylesheets/pageflow/{mixins.css.scss → mixins.scss} +2 -0
  162. data/app/assets/stylesheets/pageflow/mixins/{background_icons.css.scss → background_icons.scss} +13 -1
  163. data/app/assets/stylesheets/pageflow/mixins/{breakpoints.css.scss → breakpoints.scss} +0 -0
  164. data/app/assets/stylesheets/pageflow/mixins/{buttons.css.scss → buttons.scss} +0 -0
  165. data/app/assets/stylesheets/pageflow/mixins/{hidden_text.css.scss → hidden_text.scss} +0 -0
  166. data/app/assets/stylesheets/pageflow/mixins/{hover.css.scss → hover.scss} +0 -0
  167. data/app/assets/stylesheets/pageflow/mixins/{icons.css.scss → icons.scss} +4 -4
  168. data/app/assets/stylesheets/pageflow/mixins/icons/{entypo.css.scss → entypo.scss} +0 -0
  169. data/app/assets/stylesheets/pageflow/mixins/icons/{fontawesome.css.scss → fontawesome.scss} +1 -1
  170. data/app/assets/stylesheets/pageflow/mixins/ie_fixes.scss +4 -0
  171. data/app/assets/stylesheets/pageflow/mixins/{label.css.scss → label.scss} +0 -0
  172. data/app/assets/stylesheets/pageflow/mixins/map_to_css.scss +5 -0
  173. data/app/assets/stylesheets/pageflow/mixins/{pageflow.css.scss → pageflow.scss} +9 -1
  174. data/app/assets/stylesheets/pageflow/mixins/{pressed.css.scss → pressed.scss} +0 -0
  175. data/app/assets/stylesheets/pageflow/mixins/{shadow.css.scss → shadow.scss} +6 -1
  176. data/app/assets/stylesheets/pageflow/mixins/{text_size_adjust.css.scss → text_size_adjust.scss} +0 -0
  177. data/app/assets/stylesheets/pageflow/mixins/{unselectable.css.scss → unselectable.scss} +0 -0
  178. data/app/assets/stylesheets/pageflow/{multimedia_alert.css.scss → multimedia_alert.scss} +1 -0
  179. data/app/assets/stylesheets/pageflow/{navigation_bar.css.scss → navigation_bar.scss} +7 -199
  180. data/app/assets/stylesheets/pageflow/{navigation_mobile.css.scss → navigation_mobile.scss} +1 -20
  181. data/app/assets/stylesheets/pageflow/{overview.css.scss → overview.scss} +6 -32
  182. data/app/assets/stylesheets/pageflow/{page.css.scss → page.scss} +1 -47
  183. data/app/assets/stylesheets/pageflow/{page_transitions.css.scss → page_transitions.scss} +0 -0
  184. data/app/assets/stylesheets/pageflow/page_transitions/{crossfade.css.scss → crossfade.scss} +0 -0
  185. data/app/assets/stylesheets/pageflow/page_transitions/{cut.css.scss → cut.scss} +0 -0
  186. data/app/assets/stylesheets/pageflow/page_transitions/{fade.css.scss → fade.scss} +0 -0
  187. data/app/assets/stylesheets/pageflow/page_transitions/{fade_to_black.css.scss → fade_to_black.scss} +0 -0
  188. data/app/assets/stylesheets/pageflow/page_transitions/{scroll.css.scss → scroll.scss} +0 -0
  189. data/app/assets/stylesheets/pageflow/page_transitions/{scroll_in.css.scss → scroll_in.scss} +0 -0
  190. data/app/assets/stylesheets/pageflow/page_transitions/{scroll_in_right.css.scss → scroll_in_right.scss} +0 -0
  191. data/app/assets/stylesheets/pageflow/page_transitions/{scroll_left.css.scss → scroll_left.scss} +0 -0
  192. data/app/assets/stylesheets/pageflow/page_transitions/{scroll_right.css.scss → scroll_right.scss} +0 -0
  193. data/app/assets/stylesheets/pageflow/{page_types.css.scss → page_types.scss} +0 -0
  194. data/app/assets/stylesheets/pageflow/page_types/{audio.css.scss → audio.scss} +0 -15
  195. data/app/assets/stylesheets/pageflow/page_types/{audio_loop.css.scss → audio_loop.scss} +0 -0
  196. data/app/assets/stylesheets/pageflow/page_types/{background-image.css.scss → background-image.scss} +0 -0
  197. data/app/assets/stylesheets/pageflow/page_types/{background-video.css.scss → background-video.scss} +0 -0
  198. data/app/assets/stylesheets/pageflow/page_types/video.scss +116 -0
  199. data/app/assets/stylesheets/pageflow/page_types/video/content_hiding.scss +32 -0
  200. data/app/assets/stylesheets/pageflow/{print_view.css.scss → print_view.scss} +0 -0
  201. data/app/assets/stylesheets/pageflow/{skip_links.css.scss → skip_links.scss} +0 -9
  202. data/app/assets/stylesheets/pageflow/{slideshow.css.scss → slideshow.scss} +7 -7
  203. data/app/assets/stylesheets/pageflow/{subshare.css.scss → subshare.scss} +0 -0
  204. data/app/assets/stylesheets/pageflow/{text_variants.css.scss → text_variants.scss} +0 -0
  205. data/app/assets/stylesheets/pageflow/themes/default.scss +1 -0
  206. data/app/assets/stylesheets/pageflow/themes/default/README.md +26 -0
  207. data/app/assets/stylesheets/pageflow/themes/default/anchors.scss +24 -0
  208. data/app/assets/stylesheets/pageflow/themes/default/animations.scss +2 -0
  209. data/app/assets/stylesheets/pageflow/themes/default/animations/rotate.scss +9 -0
  210. data/app/assets/stylesheets/pageflow/themes/default/animations/rotate_and_blink.scss +16 -0
  211. data/app/assets/stylesheets/pageflow/themes/default/{base.css.scss → base.scss} +10 -2
  212. data/app/assets/stylesheets/pageflow/themes/default/built_in_page_types.scss +5 -0
  213. data/app/assets/stylesheets/pageflow/themes/default/definitions.scss +9 -0
  214. data/app/assets/stylesheets/pageflow/themes/default/functions/icon_font_options.scss +8 -0
  215. data/app/assets/stylesheets/pageflow/themes/default/indicators.scss +28 -0
  216. data/app/assets/stylesheets/pageflow/themes/default/indicators/colors.scss +47 -0
  217. data/app/assets/stylesheets/pageflow/themes/default/indicators/icons/default.scss +45 -0
  218. data/app/assets/stylesheets/pageflow/themes/default/indicators/icons/icon_font.scss +26 -0
  219. data/app/assets/stylesheets/pageflow/themes/default/indicators/icons/sprite.scss +38 -0
  220. data/app/assets/stylesheets/pageflow/themes/default/indicators/typography.scss +3 -0
  221. data/app/assets/stylesheets/pageflow/themes/default/indicators/widget_margins.scss +3 -0
  222. data/app/assets/stylesheets/pageflow/themes/default/loading_spinner.scss +90 -0
  223. data/app/assets/stylesheets/pageflow/themes/default/logo.scss +54 -0
  224. data/app/assets/stylesheets/pageflow/themes/default/logo/variant/background_image.scss +37 -0
  225. data/app/assets/stylesheets/pageflow/themes/default/logo/variant/watermark.scss +90 -0
  226. data/app/assets/stylesheets/pageflow/themes/default/mixins/indicator_typography.scss +30 -0
  227. data/app/assets/stylesheets/pageflow/themes/default/mixins/sprite_icons.scss +87 -0
  228. data/app/assets/stylesheets/pageflow/themes/default/mixins/typography.scss +7 -0
  229. data/app/assets/stylesheets/pageflow/themes/default/mobile_navigation.scss +104 -0
  230. data/app/assets/stylesheets/pageflow/themes/default/navigation.scss +102 -0
  231. data/app/assets/stylesheets/pageflow/themes/default/navigation/credits.scss +7 -0
  232. data/app/assets/stylesheets/pageflow/themes/default/navigation/dimensions.scss +87 -0
  233. data/app/assets/stylesheets/pageflow/themes/default/navigation/icons/icon_font.scss +232 -0
  234. data/app/assets/stylesheets/pageflow/themes/default/navigation/icons/sprite.scss +124 -0
  235. data/app/assets/stylesheets/pageflow/themes/default/navigation/menu_boxes.scss +99 -0
  236. data/app/assets/stylesheets/pageflow/themes/default/navigation/separator_lines.scss +21 -0
  237. data/app/assets/stylesheets/pageflow/themes/default/navigation/share_box.scss +28 -0
  238. data/app/assets/stylesheets/pageflow/themes/default/navigation/typography.scss +40 -0
  239. data/app/assets/stylesheets/pageflow/themes/default/navigation/volume_control.scss +17 -0
  240. data/app/assets/stylesheets/pageflow/themes/default/navigation/widget_margin.scss +19 -0
  241. data/app/assets/stylesheets/pageflow/themes/default/overview.scss +43 -0
  242. data/app/assets/stylesheets/pageflow/themes/default/overview/chapter_border_images.scss +70 -0
  243. data/app/assets/stylesheets/pageflow/themes/default/overview/chapter_numbers.scss +14 -0
  244. data/app/assets/stylesheets/pageflow/themes/default/overview/colors.scss +100 -0
  245. data/app/assets/stylesheets/pageflow/themes/default/overview/icons/icon_font.scss +50 -0
  246. data/app/assets/stylesheets/pageflow/themes/default/overview/icons/sprite.scss +25 -0
  247. data/app/assets/stylesheets/pageflow/themes/default/overview/typography.scss +61 -0
  248. data/app/assets/stylesheets/pageflow/themes/default/page.scss +237 -0
  249. data/app/assets/stylesheets/pageflow/themes/default/page/anchors.scss +19 -0
  250. data/app/assets/stylesheets/pageflow/themes/default/player_controls.scss +30 -0
  251. data/app/assets/stylesheets/pageflow/themes/default/player_controls/classic.scss +36 -0
  252. data/app/assets/stylesheets/pageflow/themes/default/player_controls/classic/close_button.scss +52 -0
  253. data/app/assets/stylesheets/pageflow/themes/default/player_controls/classic/container.scss +48 -0
  254. data/app/assets/stylesheets/pageflow/themes/default/player_controls/classic/control_bar.scss +222 -0
  255. data/app/assets/stylesheets/pageflow/themes/default/player_controls/classic/control_bar/timestamp_position/right.scss +22 -0
  256. data/app/assets/stylesheets/pageflow/themes/default/player_controls/classic/control_bar/timestamp_position/split.scss +22 -0
  257. data/app/assets/stylesheets/pageflow/themes/default/player_controls/classic/icons/icon_font.scss +87 -0
  258. data/app/assets/stylesheets/pageflow/themes/default/player_controls/classic/icons/sprite.scss +59 -0
  259. data/app/assets/stylesheets/pageflow/themes/default/player_controls/classic/info_box.scss +137 -0
  260. data/app/assets/stylesheets/pageflow/themes/default/player_controls/slim.scss +21 -0
  261. data/app/assets/stylesheets/pageflow/themes/default/player_controls/slim/close_button.scss +38 -0
  262. data/app/assets/stylesheets/pageflow/themes/default/player_controls/slim/container.scss +50 -0
  263. data/app/assets/stylesheets/pageflow/themes/default/player_controls/slim/control_bar.scss +249 -0
  264. data/app/assets/stylesheets/pageflow/themes/default/player_controls/slim/info_box.scss +112 -0
  265. data/app/assets/stylesheets/pageflow/themes/default/player_controls/slim/scroller.scss +21 -0
  266. data/app/assets/stylesheets/pageflow/themes/default/player_controls/vjs_mapping.scss +86 -0
  267. data/app/assets/stylesheets/pageflow/themes/default/player_controls/widget_margins.scss +10 -0
  268. data/app/assets/stylesheets/pageflow/themes/default/slideshow.scss +3 -0
  269. data/app/assets/stylesheets/pageflow/themes/default/variables.scss +4 -0
  270. data/app/assets/stylesheets/pageflow/themes/default/variables/standard.scss +33 -0
  271. data/app/assets/stylesheets/pageflow/themes/default/variables/widgets.scss +28 -0
  272. data/app/assets/stylesheets/pageflow/themes/default/video_player.scss +1 -0
  273. data/app/assets/stylesheets/pageflow/themes/default/video_player/vjs_base.scss +121 -0
  274. data/app/assets/stylesheets/pageflow/themes/default/video_wrapper.scss +14 -0
  275. data/app/assets/stylesheets/pageflow/themes/legacy.scss +8 -0
  276. data/app/assets/stylesheets/pageflow/themes/legacy/indicators.scss +64 -0
  277. data/app/assets/stylesheets/pageflow/themes/legacy/navigation.scss +262 -0
  278. data/app/assets/stylesheets/pageflow/themes/legacy/navigation_mobile.scss +52 -0
  279. data/app/assets/stylesheets/pageflow/themes/legacy/overview.scss +50 -0
  280. data/app/assets/stylesheets/pageflow/themes/legacy/page.scss +48 -0
  281. data/app/assets/stylesheets/pageflow/themes/legacy/page_types.scss +2 -0
  282. data/app/assets/stylesheets/pageflow/themes/legacy/page_types/audio.scss +5 -0
  283. data/app/assets/stylesheets/pageflow/{page_types/video.css.scss → themes/legacy/page_types/video.scss} +4 -109
  284. data/app/assets/stylesheets/pageflow/{player_controls.css.scss → themes/legacy/player_controls.scss} +13 -12
  285. data/app/assets/stylesheets/pageflow/{video_player.css.scss → themes/legacy/video_player.scss} +0 -0
  286. data/app/assets/stylesheets/pageflow/{ui.css.scss → ui.scss} +0 -0
  287. data/app/assets/stylesheets/pageflow/ui/{forms.css.scss → forms.scss} +0 -0
  288. data/app/assets/stylesheets/pageflow/ui/input/{extended_select_input.css.scss → extended_select_input.scss} +0 -0
  289. data/app/assets/stylesheets/pageflow/ui/{tabs_view.css.scss → tabs_view.scss} +0 -0
  290. data/app/controllers/pageflow/application_controller.rb +8 -2
  291. data/app/controllers/pageflow/entries_controller.rb +6 -6
  292. data/app/helpers/pageflow/admin/entries_helper.rb +15 -0
  293. data/app/helpers/pageflow/admin/form_helper.rb +14 -0
  294. data/app/helpers/pageflow/admin/users_helper.rb +9 -0
  295. data/app/helpers/pageflow/entries_helper.rb +3 -2
  296. data/app/helpers/pageflow/info_box_helper.rb +17 -5
  297. data/app/helpers/pageflow/navigation_bar_helper.rb +11 -0
  298. data/app/helpers/pageflow/social_share_helper.rb +16 -3
  299. data/app/helpers/pageflow/social_share_links_helper.rb +32 -0
  300. data/app/helpers/pageflow/widgets_helper.rb +1 -1
  301. data/app/mailers/pageflow/user_mailer.rb +3 -1
  302. data/app/models/concerns/pageflow/entry_publication_states.rb +63 -0
  303. data/app/models/pageflow/account.rb +2 -2
  304. data/app/models/pageflow/draft_entry.rb +5 -1
  305. data/app/models/pageflow/entry.rb +7 -11
  306. data/app/models/pageflow/invited_user.rb +16 -6
  307. data/app/models/pageflow/overview_button.rb +19 -0
  308. data/app/models/pageflow/published_entry.rb +7 -2
  309. data/app/models/pageflow/revision.rb +4 -1
  310. data/app/models/pageflow/theming.rb +13 -0
  311. data/app/views/admin/accounts/_form.html.erb +13 -1
  312. data/app/views/admin/accounts/_theming_details.html.arb +3 -0
  313. data/app/views/admin/entries/_attributes_table.html.arb +1 -1
  314. data/app/views/admin/entries/_links.html.arb +11 -3
  315. data/app/views/admin/features/_form.html.erb +1 -1
  316. data/app/views/admin/memberships/_form.html.erb +1 -1
  317. data/app/views/admin/revisions/_form.html.erb +1 -1
  318. data/app/views/admin/users/_form.html.erb +1 -1
  319. data/app/views/admin/users/delete_me.html.erb +1 -1
  320. data/app/views/admin/users/me.html.erb +5 -6
  321. data/app/views/components/pageflow/admin/embedded_index_table.rb +67 -10
  322. data/app/views/components/pageflow/admin/entries_tab.rb +6 -9
  323. data/app/views/components/pageflow/admin/entry_publication_state_indicator.rb +26 -0
  324. data/app/views/components/pageflow/admin/icon_link_to.rb +21 -0
  325. data/app/views/components/pageflow/admin/members_tab.rb +19 -12
  326. data/app/views/components/pageflow/admin/revisions_tab.rb +1 -1
  327. data/app/views/components/pageflow/admin/users_tab.rb +6 -10
  328. data/app/views/pageflow/admin/users/_cannot_delete.html.erb +3 -0
  329. data/app/views/pageflow/admin/users/_may_delete.html.erb +6 -0
  330. data/app/views/pageflow/admin/widgets/_fields.html.erb +1 -1
  331. data/app/views/pageflow/config/_editor_seeds.json.jbuilder +3 -0
  332. data/app/views/pageflow/editor/entries/_entry.json.jbuilder +5 -1
  333. data/app/views/pageflow/editor/entries/_unsupported_browser_hint.html.erb +5 -0
  334. data/app/views/pageflow/editor/themings/_theming.json.jbuilder +1 -0
  335. data/app/views/pageflow/entries/_loading_spinner.html.erb +3 -1
  336. data/app/views/pageflow/entries/_navigation.html.erb +1 -1
  337. data/app/views/pageflow/entries/edit.html.erb +1 -0
  338. data/app/views/pageflow/entries/navigation/_bar_top.html.erb +1 -6
  339. data/app/views/pageflow/entries/navigation/_overview_button.html.erb +8 -0
  340. data/app/views/pageflow/entries/navigation/_page.html.erb +1 -2
  341. data/app/views/pageflow/entries/share_menu/_facebook_link.html.erb +4 -11
  342. data/app/views/pageflow/entries/share_menu/_google_link.html.erb +4 -11
  343. data/app/views/pageflow/entries/share_menu/_twitter_link.html.erb +4 -11
  344. data/app/views/pageflow/pages/templates/_audio.html.erb +6 -3
  345. data/app/views/pageflow/pages/templates/_video.html.erb +5 -2
  346. data/app/views/pageflow/social_share/_entry_meta_tags.html.erb +8 -8
  347. data/app/views/pageflow/social_share/_image_tags.html.erb +3 -3
  348. data/app/views/pageflow/social_share/_page_meta_tags.html.erb +9 -9
  349. data/app/views/pageflow/user_mailer/invitation.html.erb +2 -2
  350. data/app/views/pageflow/user_mailer/invitation.text.erb +1 -1
  351. data/app/views/pageflow/widgets/_placeholder.html.erb +1 -0
  352. data/config/initializers/active_admin_patches.rb +10 -0
  353. data/config/initializers/widget_types.rb +3 -0
  354. data/config/locales/de.yml +38 -2
  355. data/config/locales/en.yml +39 -3
  356. data/db/migrate/20160131222203_add_cache_counters.rb +23 -0
  357. data/db/migrate/20160225075853_add_overview_button_enabled_to_revisions.rb +5 -0
  358. data/db/migrate/20160310080213_add_edited_at_to_entries.rb +9 -0
  359. data/db/migrate/20160425192648_add_index_for_revision_publication_timestamps.rb +5 -0
  360. data/db/migrate/20160617123557_add_meta_fields_to_theming.rb +7 -0
  361. data/db/migrate/20160715105408_add_share_url_to_revisions.rb +5 -0
  362. data/lib/generators/pageflow/active_admin_initializer/active_admin_initializer_generator.rb +24 -0
  363. data/lib/generators/pageflow/assets/assets_generator.rb +5 -3
  364. data/lib/generators/pageflow/assets/templates/{application.css.scss → application.scss} +0 -0
  365. data/lib/generators/pageflow/assets/templates/{editor.css.scss → editor.scss} +0 -0
  366. data/lib/generators/pageflow/cancan/cancan_generator.rb +4 -8
  367. data/lib/generators/pageflow/error_pages/error_pages_generator.rb +27 -0
  368. data/lib/generators/pageflow/error_pages/templates/404.html +15 -0
  369. data/lib/generators/pageflow/error_pages/templates/fonts/sourcesanspro-bold-webfont.eot +0 -0
  370. data/lib/generators/pageflow/error_pages/templates/fonts/sourcesanspro-bold-webfont.svg +245 -0
  371. data/lib/generators/pageflow/error_pages/templates/fonts/sourcesanspro-bold-webfont.ttf +0 -0
  372. data/lib/generators/pageflow/error_pages/templates/fonts/sourcesanspro-bold-webfont.woff +0 -0
  373. data/lib/generators/pageflow/error_pages/templates/fonts/sourcesanspro-regular-webfont.eot +0 -0
  374. data/lib/generators/pageflow/error_pages/templates/fonts/sourcesanspro-regular-webfont.svg +245 -0
  375. data/lib/generators/pageflow/error_pages/templates/fonts/sourcesanspro-regular-webfont.ttf +0 -0
  376. data/lib/generators/pageflow/error_pages/templates/fonts/sourcesanspro-regular-webfont.woff +0 -0
  377. data/lib/generators/pageflow/error_pages/templates/images/bg.jpg +0 -0
  378. data/lib/generators/pageflow/error_pages/templates/stylesheets/main.css +40 -0
  379. data/lib/generators/pageflow/initializer/initializer_generator.rb +2 -0
  380. data/lib/generators/pageflow/initializer/templates/pageflow.rb +0 -3
  381. data/lib/generators/pageflow/install/install_generator.rb +2 -0
  382. data/lib/generators/pageflow/procfile/procfile_generator.rb +15 -0
  383. data/lib/generators/pageflow/procfile/templates/Procfile +3 -0
  384. data/lib/generators/pageflow/resque/resque_generator.rb +2 -0
  385. data/lib/generators/pageflow/routes/routes_generator.rb +2 -0
  386. data/lib/generators/pageflow/seeds/seeds_generator.rb +2 -0
  387. data/lib/generators/pageflow/theme/templates/themes/%name%.scss.tt +4 -0
  388. data/lib/generators/pageflow/theme/templates/themes/%name%/variables.scss.tt +10 -0
  389. data/lib/generators/pageflow/theme/theme_generator.rb +10 -18
  390. data/lib/generators/pageflow/user/user_generator.rb +2 -0
  391. data/lib/pageflow.rb +4 -0
  392. data/lib/pageflow/ability_mixin.rb +4 -0
  393. data/lib/pageflow/active_admin_patches/views/attributes_table.rb +31 -0
  394. data/lib/pageflow/active_admin_patches/views/pages/base.rb +14 -0
  395. data/lib/pageflow/active_admin_patches/views/table_for.rb +42 -0
  396. data/lib/pageflow/built_in_widget_type.rb +9 -1
  397. data/lib/pageflow/configuration.rb +17 -0
  398. data/lib/pageflow/engine.rb +6 -4
  399. data/lib/pageflow/theme.rb +4 -0
  400. data/lib/pageflow/user_mixin.rb +10 -10
  401. data/lib/pageflow/version.rb +1 -1
  402. data/spec/factories/revisions.rb +18 -0
  403. metadata +386 -203
  404. data/app/assets/images/pageflow/anchor_black.png +0 -0
  405. data/app/assets/images/pageflow/anchor_green.png +0 -0
  406. data/app/assets/images/pageflow/anchor_white.png +0 -0
  407. data/app/assets/images/pageflow/menu_mobile_sprite.png +0 -0
  408. data/app/assets/images/pageflow/menu_mobile_sprite2.png +0 -0
  409. data/app/assets/images/pageflow/themes/default/arrow_left_sprite.png +0 -0
  410. data/app/assets/images/pageflow/themes/default/arrow_right_sprite.png +0 -0
  411. data/app/assets/images/pageflow/themes/default/close_sprite.png +0 -0
  412. data/app/assets/images/pageflow/themes/default/loading_spinner.png +0 -0
  413. data/app/assets/images/pageflow/themes/default/loading_spinner_bg.png +0 -0
  414. data/app/assets/images/pageflow/themes/default/scroll_indicator_sprite.png +0 -0
  415. data/app/assets/stylesheets/pageflow/jquery_ui.css.scss +0 -16
  416. data/app/assets/stylesheets/pageflow/themes/default.css.scss +0 -1
  417. data/app/assets/stylesheets/pageflow/themes/default/anchors.css.scss +0 -56
  418. data/app/assets/stylesheets/pageflow/themes/default/loading_spinner.css.scss +0 -146
  419. data/app/assets/stylesheets/pageflow/themes/default/navigation.css.scss +0 -277
  420. data/app/assets/stylesheets/pageflow/themes/default/overview.css.scss +0 -134
  421. data/app/assets/stylesheets/pageflow/themes/default/page.css.scss +0 -276
  422. data/app/assets/stylesheets/pageflow/themes/default/player_controls.css.scss +0 -31
  423. data/app/assets/stylesheets/pageflow/themes/default/variables.css.scss +0 -20
  424. data/lib/active_admin/patches/views/attributes_table.rb +0 -20
  425. data/lib/active_admin/patches/views/pages/base.rb +0 -8
  426. data/lib/active_admin/patches/views/table_for.rb +0 -32
@@ -1,5 +1,6 @@
1
1
  pageflow.HighlightedPage = pageflow.Object.extend({
2
- initialize: function(entryData) {
2
+ initialize: function(entryData, options) {
3
+ this.customNavigationBarMode = options && options.customNavigationBarMode;
3
4
  this.entry = entryData;
4
5
  },
5
6
 
@@ -28,7 +29,12 @@ pageflow.HighlightedPage = pageflow.Object.extend({
28
29
  },
29
30
 
30
31
  getNavigationBarMode: function(storylineId) {
31
- return this.entry.getStorylineConfiguration(storylineId).navigation_bar_mode;
32
+ if (this.customNavigationBarMode) {
33
+ return this.customNavigationBarMode(storylineId, this.entry);
34
+ }
35
+ else {
36
+ return this.entry.getStorylineConfiguration(storylineId).navigation_bar_mode;
37
+ }
32
38
  },
33
39
 
34
40
  getChapterPagesUntil: function(pagePermaId) {
@@ -43,6 +49,6 @@ pageflow.HighlightedPage = pageflow.Object.extend({
43
49
  }
44
50
  });
45
51
 
46
- pageflow.HighlightedPage.create = function() {
47
- return new pageflow.HighlightedPage(pageflow.entryData);
52
+ pageflow.HighlightedPage.create = function(options) {
53
+ return new pageflow.HighlightedPage(pageflow.entryData, options);
48
54
  };
@@ -1,17 +1,10 @@
1
1
  pageflow.links = {
2
2
  setup: function() {
3
- this.preventFocusRectOnClick();
4
3
  this.ensureClickOnEnterKeyPress();
5
4
  this.setupContentSkipLinks();
6
5
  this.ensureTargetBlankForContentLinks();
7
6
  },
8
7
 
9
- preventFocusRectOnClick: function() {
10
- $('body').on('click mousedown', 'a, [tabindex]', function() {
11
- $(this).blur();
12
- });
13
- },
14
-
15
8
  ensureClickOnEnterKeyPress: function() {
16
9
  $('body').on('keypress', 'a, [tabindex]', function(e) {
17
10
  if (e.which == 13) {
@@ -20,6 +20,9 @@ pageflow.pageType.register('audio', _.extend({
20
20
  //
21
21
 
22
22
  this._ensureAudioPlayer(pageElement, configuration);
23
+ pageElement.find('.audioPage').markWithPlayedStates('reset', {
24
+ autoplay: configuration.autoplay !== false
25
+ });
23
26
 
24
27
  var that = this;
25
28
 
@@ -118,5 +121,15 @@ pageflow.pageType.register('audio', _.extend({
118
121
 
119
122
  pageElement.find('.player_mute').muteButton();
120
123
  pageElement.find('.player_skip').skipPageButton();
124
+
125
+ pageElement.find('.audioPage')
126
+ .markWithPlayedStates()
127
+ .markWithPlayedStates('attach', this.audioPlayer);
128
+
129
+ pageElement
130
+ .hideContentDuringPlayback({
131
+ scrollIndicator: this.scrollIndicator
132
+ })
133
+ .hideContentDuringPlayback('attach', this.audioPlayer);
121
134
  }
122
135
  }, pageflow.volumeFade, pageflow.infoBox, pageflow.commonPageCssClasses));
@@ -9,6 +9,9 @@ pageflow.infoBox = {
9
9
  infoBox.find('h3').html(configuration.get('additional_title') || '');
10
10
  infoBox.find('p').html(configuration.get('additional_description') || '');
11
11
 
12
- infoBox.toggleClass('empty', !configuration.get('additional_description') && !configuration.get('additional_title'));
12
+ infoBox.toggleClass('empty', !configuration.get('additional_description') &&
13
+ !configuration.get('additional_title'));
14
+ infoBox.toggleClass('title_empty', !configuration.get('additional_title'));
15
+ infoBox.toggleClass('description_empty', !configuration.get('additional_description'));
13
16
  }
14
- };
17
+ };
@@ -27,6 +27,13 @@ pageflow.pageType.register('video', _.extend({
27
27
  //
28
28
 
29
29
  this.videoPlayer.ensureCreated();
30
+ pageElement.find('.controls')
31
+ .autoHidePlayerControls('reset');
32
+
33
+ pageElement.find('.videoPage')
34
+ .markWithPlayedStates('reset', {
35
+ autoplay: configuration.autoplay !== false
36
+ });
30
37
 
31
38
  if (pageflow.browser.has('mobile platform')) {
32
39
  this.videoPlayer.showPosterImage();
@@ -49,10 +56,11 @@ pageflow.pageType.register('video', _.extend({
49
56
  var videoPlayer = this.videoPlayer;
50
57
  var that = this;
51
58
 
52
- if (pageflow.browser.has('mobile platform')) {
53
- videoPlayer.src(videoPlayer.srcFromOptions()); // needed for iOS
59
+ if (pageflow.browser.has('ios platform')) {
60
+ videoPlayer.src(videoPlayer.srcFromOptions());
54
61
  }
55
- else {
62
+
63
+ if (!pageflow.browser.has('mobile platform')) {
56
64
  videoPlayer.prebuffer().done(function() {
57
65
  videoPlayer.hidePosterImage();
58
66
 
@@ -70,9 +78,6 @@ pageflow.pageType.register('video', _.extend({
70
78
  this.fadeSound(this.videoPlayer, 0, 400);
71
79
  this.stopListening();
72
80
  $('body').off('keyup');
73
-
74
- $('.entry .scroll_indicator').removeClass('faded');
75
- clearTimeout(this.scrollIndicatorTimeout);
76
81
  },
77
82
 
78
83
  deactivated: function(pageElement, configuration) {
@@ -111,7 +116,7 @@ pageflow.pageType.register('video', _.extend({
111
116
 
112
117
  _initVideoPlayer: function(pageElement, configuration) {
113
118
  var that = this;
114
-
119
+ var scrollIndicator = this.scrollIndicator;
115
120
  var videoPlayer = new pageflow.VideoPlayer.Lazy(pageElement.find('[data-template=video]'), {
116
121
  bufferUnderrunWaiting: true,
117
122
  controls: true,
@@ -135,20 +140,33 @@ pageflow.pageType.register('video', _.extend({
135
140
  videoPlayer.ready(function() {
136
141
  videoPlayer.showPosterImage();
137
142
 
138
- var addInfoBox = pageElement.find('.add_info_box'),
143
+ var pageContent = pageElement.find('.scroller, .controls, .shadow'),
144
+ wrapper = pageElement.find('.videoPage'),
139
145
  controls = pageElement.find('.controls'),
140
146
  controlBar = pageElement.find('.vjs-control-bar'),
141
147
  playButton = pageElement.find('.vjs-play-control'),
142
148
  loadingSpinner = pageElement.find('.vjs-loading-spinner'),
143
- poster = pageElement.find('.vjs-poster'),
144
- video = pageElement.find('video');
149
+ poster = pageElement.find('.vjs-poster');
145
150
 
146
151
  controlBar.appendTo(controls);
147
152
 
148
- var additionalControlsHtml = '<div class="player_skip" tabindex="4"></div><div class="player_fullscreen" tabindex="4"></div><div class="player_volume"><div class="volume-control"><div tabindex="0" class="player_volume_bar player_slider volume-slider"><div class="player_volume_level volume-level"></div><div class="player_volume_handle player_slider_handle volume-handle"></div></div></div><div class="player_mute volume-mute-button" tabindex="4"></div></div>';
153
+ var additionalControlsHtml =
154
+ '<div class="player_skip" tabindex="4"></div>' +
155
+ '<div class="player_fullscreen" tabindex="4"></div>' +
156
+ '<div class="player_volume">' +
157
+ ' <div class="volume-control">' +
158
+ ' <div tabindex="0" class="player_volume_bar player_slider volume-slider">' +
159
+ ' <div class="player_volume_level volume-level"></div>' +
160
+ ' <div class="player_volume_handle player_slider_handle volume-handle"></div>' +
161
+ ' </div>' +
162
+ ' </div>' +
163
+ ' <div class="player_mute volume-mute-button" tabindex="4"></div>' +
164
+ '</div>' +
165
+ '<div class="control_bar_text">' +
166
+ controls.data('controlBarText') +
167
+ '</div>';
149
168
 
150
169
  $(additionalControlsHtml).appendTo(controlBar);
151
- //pageElement.find('.scroller').after(controls);
152
170
 
153
171
  controlBar.addClass('vjs-default-skin vjs-player');
154
172
  playButton.before(loadingSpinner);
@@ -196,38 +214,11 @@ pageflow.pageType.register('video', _.extend({
196
214
  });
197
215
  }
198
216
 
199
- var timeout, scrollIndicatorTimeout,
200
- scrollIndicator = $('.entry .scroll_indicator'),
201
- pageContent = pageElement.find('.scroller, .controls, .shadow');
202
-
203
- pageContent.addClass('lock-showing');
204
-
205
- videoPlayer.on("pause", function() {
206
- pageContent.addClass('lock-showing');
207
-
208
- scrollIndicator.removeClass('faded');
209
- clearTimeout(scrollIndicatorTimeout);
210
- });
211
-
212
217
  videoPlayer.on('beforeplay', function() {
213
218
  loadingSpinner.addClass('showing-for-underrun');
214
219
  });
215
220
 
216
- videoPlayer.on("play", function() {
217
- pageContent.removeClass('lock-showing');
218
-
219
- if (pageElement.hasClass('active')) {
220
- clearTimeout(scrollIndicatorTimeout);
221
- scrollIndicatorTimeout = that.scrollIndicatorTimeout = setTimeout(function() {
222
- scrollIndicator.addClass('faded');
223
- }, 2000);
224
- }
225
- });
226
-
227
221
  videoPlayer.on("ended", function() {
228
- scrollIndicator.removeClass('faded');
229
- clearTimeout(scrollIndicatorTimeout);
230
-
231
222
  if (pageflow.browser.has('mobile platform')) {
232
223
  videoPlayer.showPosterImage();
233
224
  }
@@ -237,9 +228,32 @@ pageflow.pageType.register('video', _.extend({
237
228
  }
238
229
  });
239
230
 
240
- pageElement.on('mousemove', autoHideControls);
241
- $('body').on('keydown', autoHideControls);
242
- pageElement.find('.content').on('touchstart', autoHideControls);
231
+ pageElement
232
+ .hideContentDuringPlayback({
233
+ scrollIndicator: scrollIndicator
234
+ })
235
+ .hideContentDuringPlayback('attach', videoPlayer);
236
+
237
+ wrapper
238
+ .markWithPlayedStates({
239
+ target: wrapper,
240
+ })
241
+ .markWithPlayedStates('attach', videoPlayer);
242
+
243
+ controls
244
+ .autoHidePlayerControls({
245
+ pageElement: pageElement,
246
+ target: wrapper,
247
+
248
+ onShow: function() {
249
+ pageContent.addClass('fade-in').removeClass('fade-out');
250
+ },
251
+
252
+ onHide: function() {
253
+ pageContent.addClass('fade-out').removeClass('fade-in');
254
+ }
255
+ })
256
+ .autoHidePlayerControls('attach', videoPlayer);
243
257
 
244
258
  pageElement.find('.volume-control').volumeSlider({
245
259
  orientation: 'v'
@@ -249,23 +263,15 @@ pageflow.pageType.register('video', _.extend({
249
263
  pageElement.find('.player_skip').skipPageButton();
250
264
  pageElement.find('.player_fullscreen').fullscreenButton();
251
265
 
252
- function autoHideControls() {
253
- showControls();
254
- if (!pageflow.browser.has('phone platform')) {
255
- clearTimeout(timeout);
256
- timeout = setTimeout(hideControls, 2000);
257
- }
258
- }
259
-
260
- function hideControls() {
261
- if (!videoPlayer.paused()) {
262
- pageContent.addClass('fade-out').removeClass('fade-in');
263
- }
264
- }
265
-
266
- function showControls() {
267
- pageContent.addClass('fade-in').removeClass('fade-out');
268
- }
266
+ that._ensureAndroidPhoneControlsCanBeDisplayedViaTouch(pageElement);
269
267
  });
268
+ },
269
+
270
+ _ensureAndroidPhoneControlsCanBeDisplayedViaTouch: function(pageElement) {
271
+ if (pageflow.browser.has('phone platform')) {
272
+ pageElement.find('video').on('touchend', function(event) {
273
+ event.stopPropagation();
274
+ });
275
+ }
270
276
  }
271
277
  }, pageflow.volumeFade, pageflow.videoHelpers, pageflow.infoBox, pageflow.commonPageCssClasses));
@@ -2,8 +2,9 @@ pageflow.ready = new $.Deferred(function(readyDeferred) {
2
2
  window.onload = function() {
3
3
  pageflow.browser.detectFeatures().then(function() {
4
4
  var slideshow = $('[data-role=slideshow]');
5
+ var body = $('body');
5
6
 
6
- $('body').one('pagepreloaded', function() {
7
+ body.one('pagepreloaded', function() {
7
8
  readyDeferred.resolve();
8
9
  });
9
10
 
@@ -26,12 +27,13 @@ pageflow.ready = new $.Deferred(function(readyDeferred) {
26
27
  $('.overview').overview();
27
28
  $('.multimedia_alert').multimediaAlert();
28
29
 
29
- pageflow.widgetTypes.enhance($('body'));
30
+ pageflow.widgetTypes.enhance(body);
30
31
  }
31
32
  });
32
33
  });
33
34
 
34
35
  pageflow.links.setup();
36
+ pageflow.FocusOutline.setup(body);
35
37
  pageflow.nativeScrolling.preventScrollingOnEmbed(slideshow);
36
38
  });
37
39
  };
@@ -2,6 +2,7 @@
2
2
  //=require ./slideshow/lazy_page_widget
3
3
  //=require ./slideshow/page_widget
4
4
  //=require ./slideshow/scroller_widget
5
+ //=require ./slideshow/scroll_indicator
5
6
  //=require ./slideshow/scroll_indicator_widget
6
7
  //=require ./slideshow/hidden_text_indicator_widget
7
8
  //=require ./slideshow/progressive_preload
@@ -61,7 +61,7 @@
61
61
  update: function() {
62
62
  var configuration = this.slideshow.currentPageConfiguration();
63
63
 
64
- if (!this.disabled) {
64
+ if (!this.disabled && !pageflow.browser.has('mobile platform')) {
65
65
  this.multiPlayer.fadeTo(configuration[attributeName]);
66
66
  }
67
67
  },
@@ -10,7 +10,7 @@ pageflow.hideText = (function() {
10
10
  }
11
11
 
12
12
  $(function() {
13
- element().on('keydown', function(e) {
13
+ element().on('keydown', function(event) {
14
14
  if(event.keyCode == 27) {
15
15
  pageflow.hideText.deactivate();
16
16
  }
@@ -43,6 +43,10 @@ pageflow.hideText = (function() {
43
43
 
44
44
  on: function(event, callback) {
45
45
  element().on(prefix(event), callback);
46
+ },
47
+
48
+ off: function(event, callback) {
49
+ element().off(prefix(event), callback);
46
50
  }
47
51
  };
48
52
  }());
@@ -5,6 +5,8 @@
5
5
  this.configuration = this.element.data('configuration') || this.options.configuration;
6
6
  this.index = this.options.index;
7
7
 
8
+ this._setupNearBoundaryCssClasses();
9
+
8
10
  this.reinit();
9
11
  },
10
12
 
@@ -35,6 +37,7 @@
35
37
 
36
38
  this.content.scroller(this.pageType.scrollerOptions || {});
37
39
  this.pageType.scroller = this.content.scroller('instance');
40
+ this.pageType.scrollIndicator = new pageflow.ScrollIndicator(this.element);
38
41
 
39
42
  this._setupHideTextOnSwipe();
40
43
 
@@ -184,6 +187,20 @@
184
187
  !this.pageType.noHideTextOnSwipe) {
185
188
  this.content.hideTextOnSwipe();
186
189
  }
190
+ },
191
+
192
+ _setupNearBoundaryCssClasses: function() {
193
+ var element = this.element;
194
+
195
+ _(['top', 'bottom']).each(function(boundary) {
196
+ element.on('scrollernear' + boundary, function() {
197
+ element.addClass('is_near_' + boundary);
198
+ });
199
+
200
+ element.on('scrollernotnear' + boundary, function() {
201
+ element.removeClass('is_near_' + boundary);
202
+ });
203
+ });
187
204
  }
188
205
  });
189
206
  }(jQuery));
@@ -0,0 +1,27 @@
1
+ pageflow.ScrollIndicator = pageflow.Object.extend({
2
+ initialize: function(pageElement) {
3
+ this.pageElement = pageElement;
4
+ },
5
+
6
+ disable: function() {
7
+ if (this._isPageActive()) {
8
+ pageflow.events.trigger('scroll_indicator:disable');
9
+ }
10
+ },
11
+
12
+ scheduleDisable: function() {
13
+ if (this._isPageActive()) {
14
+ pageflow.events.trigger('scroll_indicator:schedule_disable');
15
+ }
16
+ },
17
+
18
+ enable: function(text) {
19
+ if (this._isPageActive()) {
20
+ pageflow.events.trigger('scroll_indicator:enable');
21
+ }
22
+ },
23
+
24
+ _isPageActive: function() {
25
+ return this.pageElement.hasClass('active');
26
+ }
27
+ });
@@ -9,15 +9,10 @@
9
9
  var parent = this.options.parent,
10
10
  direction = this.element.data('direction'),
11
11
  boundary = boundaries[direction],
12
- that = this;
12
+ that = this,
13
+ fadeTimeout;
13
14
 
14
15
  function update(page) {
15
- var invertIndicator = page.data('invertIndicator');
16
-
17
- if (typeof invertIndicator === 'undefined') {
18
- invertIndicator = page.hasClass('invert');
19
- }
20
-
21
16
  if (page.hasClass('scroll_indicator_mode_non') ||
22
17
  (page.hasClass('scroll_indicator_mode_only_next') && direction === 'up') ||
23
18
  (page.hasClass('scroll_indicator_mode_only_back') && direction === 'down')) {
@@ -28,21 +23,69 @@
28
23
  that.element.show();
29
24
  }
30
25
 
31
- that.element.toggleClass('invert', invertIndicator);
26
+ that.element.toggleClass('hidden_for_page', hideScrollIndicatorForPage(page));
27
+
28
+ that.element.toggleClass('invert', invertIndicator(page));
32
29
  that.element.toggleClass('horizontal', page.hasClass('scroll_indicator_orientation_horizontal'));
33
30
  that.element.toggleClass('available', targetPageExists());
34
31
  }
35
32
 
33
+ function invertIndicator(page) {
34
+ var result = page.data('invertIndicator');
35
+
36
+ if (typeof result === 'undefined') {
37
+ result = page.hasClass('invert') && !hasSlimPlayerControls(page);
38
+ }
39
+
40
+ return result;
41
+ }
42
+
43
+ function hideScrollIndicatorForPage(page) {
44
+ return hasSlimPlayerControls(page) ||
45
+ !pageflow.widgets.areLoaded();
46
+ }
47
+
48
+ function hasSlimPlayerControls(page) {
49
+ return hasPlayerControls(page) && pageflow.widgets.isPresent('slim_player_controls');
50
+ }
51
+
52
+ function hasPlayerControls(page) {
53
+ return !!page.find('[data-role="player_controls"]').length;
54
+ }
55
+
36
56
  function targetPageExists() {
37
57
  return direction === 'down' ? parent.nextPageExists() : parent.previousPageExists();
38
58
  }
39
59
 
40
60
  parent.on('pageactivate', function(event) {
41
61
  update($(event.target));
62
+
63
+ clearTimeout(fadeTimeout);
64
+ that.element.removeClass('faded');
42
65
  });
43
66
 
44
- pageflow.events.on('page:update', function() {
45
- update(parent.currentPage());
67
+ pageflow.events.on({
68
+ 'page:update': function() {
69
+ update(parent.currentPage());
70
+ },
71
+
72
+ 'scroll_indicator:disable': function() {
73
+ clearTimeout(fadeTimeout);
74
+ that.element.addClass('hidden_for_page');
75
+ },
76
+
77
+ 'scroll_indicator:schedule_disable': function() {
78
+ clearTimeout(fadeTimeout);
79
+
80
+ fadeTimeout = setTimeout(function() {
81
+ that.element.addClass('faded');
82
+ }, 2000);
83
+ },
84
+
85
+ 'scroll_indicator:enable': function() {
86
+ clearTimeout(fadeTimeout);
87
+ that.element.removeClass('faded hidden_for_page');
88
+ },
46
89
  });
47
90
 
48
91
  parent.on('scrollerhint' + direction, function() {