pageflow 15.6.1 → 15.7.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 (267) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +236 -11
  3. data/README.md +1 -2
  4. data/admins/pageflow/entry.rb +28 -57
  5. data/admins/pageflow/user.rb +1 -3
  6. data/app/assets/images/pageflow/admin/icons/buttons/editor.svg +2 -0
  7. data/app/assets/images/pageflow/admin/icons/buttons/preview.svg +2 -0
  8. data/app/assets/images/pageflow/admin/icons/buttons/show_public.svg +2 -0
  9. data/app/assets/images/pageflow/admin/icons/delete.svg +9 -0
  10. data/app/assets/images/pageflow/admin/icons/done.svg +6 -0
  11. data/app/assets/images/pageflow/admin/icons/edit.svg +7 -0
  12. data/app/assets/images/pageflow/admin/icons/editor.svg +2 -0
  13. data/app/assets/images/pageflow/admin/icons/folder.svg +8 -0
  14. data/app/assets/images/pageflow/admin/icons/folder_active.svg +8 -0
  15. data/app/assets/images/pageflow/admin/icons/info.svg +3 -0
  16. data/app/assets/images/pageflow/admin/icons/new.svg +5 -0
  17. data/app/assets/images/pageflow/admin/icons/preview.svg +2 -0
  18. data/app/assets/images/pageflow/admin/icons/published.svg +2 -0
  19. data/app/assets/images/pageflow/admin/icons/published_with_password.svg +2 -0
  20. data/app/assets/images/pageflow/admin/icons/show_public.svg +2 -0
  21. data/app/assets/images/pageflow/editor/blank_entry/logo.png +0 -0
  22. data/app/assets/images/pageflow/themes/default/embed_opt_in.svg +3 -0
  23. data/app/assets/images/pageflow/themes/default/embed_opt_out_info.svg +16 -0
  24. data/app/assets/javascripts/pageflow/admin/entries.js +9 -57
  25. data/app/assets/javascripts/pageflow/dist/ui.js +127 -10
  26. data/app/assets/stylesheets/pageflow/admin/active_admin_patches.scss +18 -16
  27. data/app/assets/stylesheets/pageflow/admin/badge_list.scss +25 -35
  28. data/app/assets/stylesheets/pageflow/admin/columns.scss +13 -11
  29. data/app/assets/stylesheets/pageflow/admin/embed_code.scss +1 -4
  30. data/app/assets/stylesheets/pageflow/admin/entries/folders.scss +44 -19
  31. data/app/assets/stylesheets/pageflow/admin/entries.scss +15 -31
  32. data/app/assets/stylesheets/pageflow/admin/features.scss +3 -1
  33. data/app/assets/stylesheets/pageflow/admin/forms.scss +14 -12
  34. data/app/assets/stylesheets/pageflow/admin/hint.scss +8 -14
  35. data/app/assets/stylesheets/pageflow/admin/icon_button.scss +25 -14
  36. data/app/assets/stylesheets/pageflow/admin/icon_link.scss +31 -15
  37. data/app/assets/stylesheets/pageflow/admin/publication_state_indicator.scss +14 -7
  38. data/app/assets/stylesheets/pageflow/admin/status_tags.scss +5 -4
  39. data/app/assets/stylesheets/pageflow/admin/tabs_view.scss +36 -34
  40. data/app/assets/stylesheets/pageflow/admin/tooltip_bubble.scss +15 -11
  41. data/app/assets/stylesheets/pageflow/admin.scss +12 -0
  42. data/app/assets/stylesheets/pageflow/editor/background_positioning.scss +15 -61
  43. data/app/assets/stylesheets/pageflow/editor/base.scss +28 -13
  44. data/app/assets/stylesheets/pageflow/editor/blank_entry.scss +6 -6
  45. data/app/assets/stylesheets/pageflow/editor/change_theme.scss +28 -71
  46. data/app/assets/stylesheets/pageflow/editor/composables.scss +2 -2
  47. data/app/assets/stylesheets/pageflow/editor/confirm_encoding.scss +18 -36
  48. data/app/assets/stylesheets/pageflow/editor/confirm_upload.scss +12 -39
  49. data/app/assets/stylesheets/pageflow/editor/dialogs.scss +39 -12
  50. data/app/assets/stylesheets/pageflow/editor/disabled_atmo_indicator.scss +3 -3
  51. data/app/assets/stylesheets/pageflow/editor/drop_down_button.scss +7 -10
  52. data/app/assets/stylesheets/pageflow/editor/emulation_mode_button.scss +3 -8
  53. data/app/assets/stylesheets/pageflow/editor/failures.scss +3 -3
  54. data/app/assets/stylesheets/pageflow/editor/file_import.scss +22 -38
  55. data/app/assets/stylesheets/pageflow/editor/file_meta_data.scss +3 -7
  56. data/app/assets/stylesheets/pageflow/editor/file_settings_dialog.scss +4 -24
  57. data/app/assets/stylesheets/pageflow/editor/file_stages.scss +10 -11
  58. data/app/assets/stylesheets/pageflow/editor/file_thumbnails.scss +4 -8
  59. data/app/assets/stylesheets/pageflow/editor/files.scss +7 -6
  60. data/app/assets/stylesheets/pageflow/editor/files_explorer.scss +13 -30
  61. data/app/assets/stylesheets/pageflow/editor/files_gallery.scss +15 -11
  62. data/app/assets/stylesheets/pageflow/editor/filtered_files.scss +6 -7
  63. data/app/assets/stylesheets/pageflow/editor/help.scss +19 -14
  64. data/app/assets/stylesheets/pageflow/editor/help_image.scss +1 -1
  65. data/app/assets/stylesheets/pageflow/editor/info_box.scss +19 -0
  66. data/app/assets/stylesheets/pageflow/editor/inputs/file_input.scss +7 -11
  67. data/app/assets/stylesheets/pageflow/editor/inputs/file_processing_state_display.scss +0 -2
  68. data/app/assets/stylesheets/pageflow/editor/inputs/reference.scss +7 -11
  69. data/app/assets/stylesheets/pageflow/editor/list.scss +13 -10
  70. data/app/assets/stylesheets/pageflow/editor/loading.scss +1 -1
  71. data/app/assets/stylesheets/pageflow/editor/locked.scss +9 -5
  72. data/app/assets/stylesheets/pageflow/editor/menu.scss +5 -5
  73. data/app/assets/stylesheets/pageflow/editor/notifications.scss +15 -14
  74. data/app/assets/stylesheets/pageflow/editor/other_entry_item.scss +7 -3
  75. data/app/assets/stylesheets/pageflow/editor/outline.scss +57 -19
  76. data/app/assets/stylesheets/pageflow/editor/page_links.scss +10 -8
  77. data/app/assets/stylesheets/pageflow/editor/page_selection.scss +2 -29
  78. data/app/assets/stylesheets/pageflow/editor/publish_entry.scss +5 -6
  79. data/app/assets/stylesheets/pageflow/editor/quotas.scss +2 -3
  80. data/app/assets/stylesheets/pageflow/editor/select_button.scss +12 -6
  81. data/app/assets/stylesheets/pageflow/editor/sidebar_footer.scss +1 -5
  82. data/app/assets/stylesheets/pageflow/editor/storyline_picker.scss +6 -2
  83. data/app/assets/stylesheets/pageflow/editor/text_tracks.scss +6 -22
  84. data/app/assets/stylesheets/pageflow/editor/widgets.scss +2 -2
  85. data/app/assets/stylesheets/pageflow/editor/wysihtml5.scss +35 -29
  86. data/app/assets/stylesheets/pageflow/mixins/background_icons.scss +3 -3
  87. data/app/assets/stylesheets/pageflow/mixins/buttons.scss +50 -68
  88. data/app/assets/stylesheets/pageflow/themes/default/base.scss +2 -0
  89. data/app/assets/stylesheets/pageflow/themes/default/consent/bar.scss +156 -0
  90. data/app/assets/stylesheets/pageflow/themes/default/consent/vendor_list.scss +62 -0
  91. data/app/assets/stylesheets/pageflow/themes/default/consent.scss +2 -0
  92. data/app/assets/stylesheets/pageflow/themes/default/logo/alignment.scss +7 -0
  93. data/app/assets/stylesheets/pageflow/themes/default/page/shadow.scss +44 -0
  94. data/app/assets/stylesheets/pageflow/themes/default/third_party_embed_consent.scss +103 -0
  95. data/app/assets/stylesheets/pageflow/ui/forms.scss +79 -84
  96. data/app/assets/stylesheets/pageflow/ui/functions.scss +56 -0
  97. data/app/assets/stylesheets/pageflow/ui/input/check_box_group_input.scss +2 -3
  98. data/app/assets/stylesheets/pageflow/ui/input/color_input.scss +6 -6
  99. data/app/assets/stylesheets/pageflow/ui/input/extended_select_input.scss +63 -50
  100. data/app/assets/stylesheets/pageflow/ui/normalize/forms.scss +153 -0
  101. data/app/assets/stylesheets/pageflow/ui/normalize.scss +278 -0
  102. data/app/assets/stylesheets/pageflow/ui/properties.scss +44 -0
  103. data/app/assets/stylesheets/pageflow/ui/table_cells/delete_row_table_cell.scss +1 -1
  104. data/app/assets/stylesheets/pageflow/ui/table_view.scss +14 -18
  105. data/app/assets/stylesheets/pageflow/ui/tabs_view.scss +8 -11
  106. data/app/assets/stylesheets/pageflow/ui/tooltip.scss +6 -8
  107. data/app/assets/stylesheets/pageflow/ui/validation_error_messages.scss +6 -0
  108. data/app/assets/stylesheets/pageflow/ui.scss +4 -0
  109. data/app/controllers/pageflow/edit_locks_controller.rb +3 -1
  110. data/app/helpers/pageflow/admin/entries_helper.rb +2 -12
  111. data/app/helpers/pageflow/embed_code_helper.rb +1 -1
  112. data/app/helpers/pageflow/entries_helper.rb +41 -2
  113. data/app/helpers/pageflow/file_background_images_helper.rb +1 -1
  114. data/app/helpers/pageflow/page_types_helper.rb +1 -1
  115. data/app/helpers/pageflow/themes_helper.rb +1 -1
  116. data/app/jobs/pageflow/poll_meta_data_from_zencoder_job.rb +1 -1
  117. data/app/jobs/pageflow/poll_zencoder_job.rb +1 -9
  118. data/app/models/pageflow/audio_file.rb +17 -0
  119. data/app/models/pageflow/audio_file_url_templates.rb +4 -1
  120. data/app/models/pageflow/customized_theme.rb +37 -0
  121. data/app/models/pageflow/draft_entry.rb +6 -59
  122. data/app/models/pageflow/entry_at_revision.rb +68 -0
  123. data/app/models/pageflow/entry_role_query.rb +44 -24
  124. data/app/models/pageflow/image_file_css_background_image_urls.rb +8 -2
  125. data/app/models/pageflow/published_entry.rb +9 -56
  126. data/app/models/pageflow/theme_customization.rb +46 -0
  127. data/app/models/pageflow/theme_customization_file.rb +58 -0
  128. data/app/models/pageflow/video_file.rb +11 -1
  129. data/app/models/pageflow/video_file_url_templates.rb +1 -0
  130. data/app/policies/pageflow/entry_policy.rb +4 -0
  131. data/app/state_machines/pageflow/media_encoding_state_machine.rb +23 -4
  132. data/app/views/admin/entries/_form.html.erb +50 -0
  133. data/app/views/admin/entries/entry_type_name_input.html.erb +5 -0
  134. data/app/views/admin/features/_form.html.erb +1 -1
  135. data/app/views/admin/memberships/_form.html.erb +2 -3
  136. data/app/views/admin/users/_form.html.erb +1 -1
  137. data/app/views/admin/users/invitation.html.erb +2 -2
  138. data/app/views/components/pageflow/admin/entry_user_badge_list.rb +10 -9
  139. data/app/views/components/pageflow/admin/members_tab.rb +5 -1
  140. data/app/views/components/pageflow/admin/revisions_tab.rb +13 -3
  141. data/app/views/components/pageflow/admin/timestamp.rb +20 -0
  142. data/app/views/components/pageflow/admin/user_account_badge_list.rb +5 -6
  143. data/app/views/pageflow/admin/entries/_cannot_add_user.html.erb +9 -5
  144. data/app/views/pageflow/admin/entries/_entry_type_name_input.html.erb +7 -0
  145. data/app/views/pageflow/audio_files/_audio_file.json.jbuilder +13 -0
  146. data/app/views/pageflow/editor/encoding_confirmations/_intro.html.erb +0 -0
  147. data/app/views/pageflow/editor/encoding_confirmations/check.json.jbuilder +14 -2
  148. data/config/initializers/paperclip.rb +16 -1
  149. data/config/locales/de.yml +24 -28
  150. data/config/locales/en.yml +19 -10
  151. data/db/migrate/20210528073122_create_pageflow_theme_customizations.rb +11 -0
  152. data/db/migrate/20210531090654_create_pageflow_theme_customization_files.rb +15 -0
  153. data/db/migrate/20210531102228_add_selected_file_ids_to_theme_customizations.rb +5 -0
  154. data/db/migrate/20211020085902_add_canonical_entry_url_prefix_to_themings.rb +5 -0
  155. data/db/migrate/20220503150010_add_peak_data_to_audio_files.rb +5 -0
  156. data/db/migrate/20220705084830_add_trailing_slash_in_canonical_urls_to_themings.rb +5 -0
  157. data/entry_types/paged/app/assets/javascripts/pageflow_paged/dist/editor.js +256 -124
  158. data/entry_types/paged/app/assets/javascripts/pageflow_paged/dist/frontend.js +566 -167
  159. data/entry_types/paged/app/assets/javascripts/pageflow_paged/dist/react-client.js +5 -5
  160. data/entry_types/paged/app/assets/javascripts/pageflow_paged/dist/react-server.js +4 -4
  161. data/entry_types/paged/app/helpers/pageflow_paged/third_party_embed_consent_helper.rb +38 -0
  162. data/entry_types/paged/app/views/pageflow_paged/third_party_embed_consent/_opt_in.html.erb +12 -0
  163. data/entry_types/paged/app/views/pageflow_paged/third_party_embed_consent/_opt_out_info.html.erb +10 -0
  164. data/entry_types/paged/config/initializers/features.rb +2 -0
  165. data/entry_types/paged/config/locales/new/video_contain.de.yml +7 -0
  166. data/entry_types/paged/config/locales/new/video_contain.en.yml +7 -0
  167. data/entry_types/scrolled/app/helpers/pageflow_scrolled/editor/seed_html_helper.rb +3 -0
  168. data/entry_types/scrolled/app/helpers/pageflow_scrolled/entry_json_seed_helper.rb +1 -0
  169. data/entry_types/scrolled/app/helpers/pageflow_scrolled/packs_helper.rb +58 -0
  170. data/entry_types/scrolled/app/helpers/pageflow_scrolled/react_server_side_rendering_helper.rb +37 -3
  171. data/entry_types/scrolled/app/helpers/pageflow_scrolled/themes_helper.rb +92 -6
  172. data/entry_types/scrolled/app/helpers/pageflow_scrolled/webpack_public_path_helper.rb +20 -0
  173. data/entry_types/scrolled/app/models/pageflow_scrolled/content_element.rb +7 -0
  174. data/entry_types/scrolled/app/views/pageflow_scrolled/editor/entries/_head.html.erb +5 -2
  175. data/entry_types/scrolled/app/views/pageflow_scrolled/editor/entries/_seed.json.jbuilder +5 -1
  176. data/entry_types/scrolled/app/views/pageflow_scrolled/entries/show.html.erb +5 -4
  177. data/entry_types/scrolled/app/views/pageflow_scrolled/entry_json_seed/_entry.json.jbuilder +16 -0
  178. data/entry_types/scrolled/app/views/pageflow_scrolled/entry_json_seed/_theme.json.jbuilder +13 -2
  179. data/entry_types/scrolled/app/views/pageflow_scrolled/entry_json_seed/_widget.json.jbuilder +2 -0
  180. data/entry_types/scrolled/config/locales/de.yml +1 -8
  181. data/entry_types/scrolled/config/locales/en.yml +1 -9
  182. data/entry_types/scrolled/config/locales/new/before_after_slider.de.yml +8 -0
  183. data/entry_types/scrolled/config/locales/new/before_after_slider.en.yml +8 -0
  184. data/entry_types/scrolled/config/locales/new/center_ragged.de.yml +8 -0
  185. data/entry_types/scrolled/config/locales/new/center_ragged.en.yml +9 -0
  186. data/entry_types/scrolled/config/locales/new/consent.de.yml +25 -0
  187. data/entry_types/scrolled/config/locales/new/consent.en.yml +24 -0
  188. data/entry_types/scrolled/config/locales/new/content_element_categories.de.yml +39 -0
  189. data/entry_types/scrolled/config/locales/new/content_element_categories.en.yml +39 -0
  190. data/entry_types/scrolled/config/locales/new/default_transition.de.yml +14 -0
  191. data/entry_types/scrolled/config/locales/new/default_transition.en.yml +14 -0
  192. data/entry_types/scrolled/config/locales/new/header_line_breaks.de.yml +28 -0
  193. data/entry_types/scrolled/config/locales/new/header_line_breaks.en.yml +27 -0
  194. data/entry_types/scrolled/config/locales/new/header_size.de.yml +17 -0
  195. data/entry_types/scrolled/config/locales/new/header_size.en.yml +17 -0
  196. data/entry_types/scrolled/config/locales/new/iframe_embed.de.yml +39 -0
  197. data/entry_types/scrolled/config/locales/new/iframe_embed.en.yml +39 -0
  198. data/entry_types/scrolled/config/locales/new/inline_loops.de.yml +26 -0
  199. data/entry_types/scrolled/config/locales/new/inline_loops.en.yml +26 -0
  200. data/entry_types/scrolled/config/locales/new/portrait_inline_image.de.yml +9 -0
  201. data/entry_types/scrolled/config/locales/new/portrait_inline_image.en.yml +9 -0
  202. data/entry_types/scrolled/config/locales/new/section_width.de.yml +10 -0
  203. data/entry_types/scrolled/config/locales/new/section_width.en.yml +10 -0
  204. data/entry_types/scrolled/config/locales/new/typography_variants.de.yml +7 -0
  205. data/entry_types/scrolled/config/locales/new/typography_variants.en.yml +7 -0
  206. data/entry_types/scrolled/config/locales/new/video_embed_poster.de.yml +8 -0
  207. data/entry_types/scrolled/config/locales/new/video_embed_poster.en.yml +8 -0
  208. data/entry_types/scrolled/config/locales/new/waveform_styles.de.yml +11 -0
  209. data/entry_types/scrolled/config/locales/new/waveform_styles.en.yml +12 -0
  210. data/entry_types/scrolled/config/locales/new/widgets.de.yml +6 -0
  211. data/entry_types/scrolled/config/locales/new/widgets.en.yml +6 -0
  212. data/entry_types/scrolled/lib/generators/pageflow_scrolled/install/install_generator.rb +29 -5
  213. data/entry_types/scrolled/lib/generators/pageflow_scrolled/install/templates/themes_plugin.rb.tt +8 -6
  214. data/entry_types/scrolled/lib/pageflow_scrolled/additional_packs.rb +37 -0
  215. data/entry_types/scrolled/lib/pageflow_scrolled/additional_seed_data.rb +57 -0
  216. data/entry_types/scrolled/lib/pageflow_scrolled/configuration.rb +49 -0
  217. data/entry_types/scrolled/lib/pageflow_scrolled/plugin.rb +8 -0
  218. data/entry_types/scrolled/lib/pageflow_scrolled/react_widget_type.rb +42 -0
  219. data/entry_types/scrolled/lib/pageflow_scrolled.rb +17 -1
  220. data/entry_types/scrolled/package/contentElements-editor.js +323 -89
  221. data/entry_types/scrolled/package/contentElements-frontend.css +1 -1
  222. data/entry_types/scrolled/package/contentElements-frontend.js +719 -529
  223. data/entry_types/scrolled/package/editor.js +459 -261
  224. data/entry_types/scrolled/package/frontend/{EditableText-7093fd0e.js → EditableInlineText.module-b9923660.js} +284 -362
  225. data/entry_types/scrolled/package/frontend/{i18n-4dc6c377.js → PhonePlatformContext-9fb97827.js} +199 -106
  226. data/entry_types/scrolled/package/frontend/{Viewer-e49e7807.js → Viewer-e2290ea0.js} +196 -79
  227. data/entry_types/scrolled/package/frontend/{Wavesurfer-0adf5667.js → Wavesurfer-7d9cf1b7.js} +16 -58
  228. data/entry_types/scrolled/package/frontend/{components-6a6793ca.js → components-6ab26015.js} +664 -671
  229. data/entry_types/scrolled/package/frontend/{getPrototypeOf-63c7c8e8.js → createSuper-d0f30da3.js} +34 -5
  230. data/entry_types/scrolled/package/frontend/index.css +1 -9
  231. data/entry_types/scrolled/package/frontend/index.js +1919 -2386
  232. data/entry_types/scrolled/package/frontend/{useBrowserFeature-91a4c29d.js → usePhonePlatform-2857c22b.js} +9 -8
  233. data/entry_types/scrolled/package/frontend-server.js +3 -6
  234. data/entry_types/scrolled/package/package.json +16 -8
  235. data/entry_types/scrolled/package/testHelpers.js +456 -0
  236. data/entry_types/scrolled/package/values/breakpoints.module.css +9 -0
  237. data/entry_types/scrolled/package/values/colors.module.css +5 -0
  238. data/entry_types/scrolled/package/widgets/defaultNavigation.css +9 -0
  239. data/entry_types/scrolled/package/widgets/defaultNavigation.js +612 -0
  240. data/entry_types/scrolled/spec/fixtures/image.svg +1 -0
  241. data/lib/pageflow/ability_mixin.rb +4 -0
  242. data/lib/pageflow/built_in_widget_type.rb +4 -0
  243. data/lib/pageflow/built_in_widget_types_plugin.rb +7 -0
  244. data/lib/pageflow/configuration.rb +34 -1
  245. data/lib/pageflow/entry_type.rb +11 -2
  246. data/lib/pageflow/entry_type_configuration.rb +2 -0
  247. data/lib/pageflow/file_type.rb +24 -0
  248. data/lib/pageflow/paperclip_processors/audio_waveform.rb +42 -0
  249. data/lib/pageflow/paperclip_processors/noop.rb +10 -0
  250. data/lib/pageflow/theme_customizations.rb +61 -0
  251. data/lib/pageflow/version.rb +1 -1
  252. data/lib/pageflow.rb +9 -0
  253. data/package/config/jest/index.js +2 -1
  254. data/package/config/postcss/scaleFunctions.js +71 -0
  255. data/package/editor.js +95 -85
  256. data/package/frontend.js +521 -161
  257. data/package/package.json +5 -3
  258. data/package/testHelpers.js +26 -5
  259. data/package/ui.js +124 -11
  260. data/spec/factories/draft_entries.rb +19 -1
  261. data/spec/factories/entries.rb +4 -0
  262. data/spec/factories/published_entries.rb +6 -0
  263. data/spec/fixtures/audio.ogg +0 -0
  264. metadata +118 -14
  265. data/app/views/admin/entries/_not_allowed_to_see_entry_types.json.jbuilder +0 -2
  266. data/app/views/admin/entries/entry_types.json.jbuilder +0 -4
  267. data/package/config/jest/transformers/upwardBabel.js +0 -5
data/package/editor.js CHANGED
@@ -332,10 +332,14 @@ var EditFileView = Marionette.ItemView.extend({
332
332
  model: this.model.configuration,
333
333
  attributeTranslationKeyPrefixes: ['pageflow.editor.files.attributes.' + fileType.collectionName, 'pageflow.editor.files.common_attributes', 'pageflow.editor.nested_files.' + fileType.collectionName, 'pageflow.editor.nested_files.common_attributes']
334
334
  });
335
- tab.input('file_name', TextInputView, {
336
- model: this.model,
337
- disabled: true
338
- });
335
+
336
+ if (this.options.displayFileName) {
337
+ tab.input('file_name', TextInputView, {
338
+ model: this.model,
339
+ disabled: true
340
+ });
341
+ }
342
+
339
343
  tab.input('rights', TextInputView, {
340
344
  model: this.model,
341
345
  placeholder: entry.get('default_file_rights')
@@ -380,7 +384,7 @@ var dialogView = {
380
384
 
381
385
  function template$1(data) {
382
386
  var __t, __p = '';
383
- __p += '<div class="box">\n <div class="content">\n </div>\n\n <div class="footer">\n <a href="" class="close">\n ' +
387
+ __p += '<div class="box">\n <div class="content">\n <h1 class="dialog-header"></h1>\n </div>\n\n <div class="footer">\n <a href="" class="close">\n ' +
384
388
  ((__t = ( I18n.t('pageflow.editor.templates.file_settings_dialog.close') )) == null ? '' : __t) +
385
389
  '\n </a>\n </div>\n</div>\n';
386
390
  return __p
@@ -391,9 +395,11 @@ var FileSettingsDialogView = Marionette.ItemView.extend({
391
395
  className: 'file_settings_dialog editor dialog',
392
396
  mixins: [dialogView],
393
397
  ui: {
394
- content: '.content'
398
+ content: '.content',
399
+ header: '.dialog-header'
395
400
  },
396
401
  onRender: function onRender() {
402
+ this.ui.header.text(this.model.title());
397
403
  this.tabsView = new TabsView({
398
404
  model: this.model,
399
405
  i18n: 'pageflow.editor.files.settings_dialog_tabs',
@@ -2354,8 +2360,8 @@ var EntryMetadata = Configuration.extend({
2354
2360
  initialize: function initialize(attributes, options) {
2355
2361
  Configuration.prototype.initialize.apply(this, attributes, options);
2356
2362
  this.configuration = new EntryMetadataConfiguration(_.clone(attributes.configuration) || {});
2357
- this.listenTo(this.configuration, 'change', function () {
2358
- this.trigger('change');
2363
+ this.listenTo(this.configuration, 'change', function (model, options) {
2364
+ this.trigger('change', model, options);
2359
2365
  this.parent.save();
2360
2366
  });
2361
2367
  },
@@ -3909,7 +3915,7 @@ __p += '<div class="blank_slate">\n <p>\n ' +
3909
3915
  ((__t = ( I18n.t('pageflow.editor.templates.confirm_encoding.link_to_progress', {
3910
3916
  link: '<a href="#/files/video_files">'+I18n.t('pageflow.editor.templates.confirm_encoding.manage_files')+'</a>'})
3911
3917
  )) == null ? '' : __t) +
3912
- '\n </p>\n</div>\n\n<div class="video_files_panel">\n <h2>' +
3918
+ '\n </p>\n</div>\n\n<div class="intro">\n</div>\n\n<div class="video_files_panel">\n <h2>' +
3913
3919
  ((__t = ( I18n.t('pageflow.editor.templates.confirm_encoding.videos_tab') )) == null ? '' : __t) +
3914
3920
  '</h2>\n</div>\n\n<div class="audio_files_panel">\n <h2>' +
3915
3921
  ((__t = ( I18n.t('pageflow.editor.templates.confirm_encoding.audios_tab') )) == null ? '' : __t) +
@@ -3927,6 +3933,7 @@ var ConfirmEncodingView = Marionette.ItemView.extend({
3927
3933
  videoFilesPanel: '.video_files_panel',
3928
3934
  audioFilesPanel: '.audio_files_panel',
3929
3935
  summary: '.summary',
3936
+ intro: '.intro',
3930
3937
  confirmButton: 'button'
3931
3938
  },
3932
3939
  events: {
@@ -3968,10 +3975,12 @@ var ConfirmEncodingView = Marionette.ItemView.extend({
3968
3975
  },
3969
3976
  updateBlankSlate: function updateBlankSlate() {
3970
3977
  this.ui.blankSlate.toggle(!this.confirmableVideoFiles.length && !this.confirmableAudioFiles.length);
3978
+ this.ui.intro.toggle(!!this.confirmableVideoFiles.length || !!this.confirmableAudioFiles.length);
3971
3979
  this.ui.videoFilesPanel.toggle(!!this.confirmableVideoFiles.length);
3972
3980
  this.ui.audioFilesPanel.toggle(!!this.confirmableAudioFiles.length);
3973
3981
  },
3974
3982
  updateSummary: function updateSummary(enabled) {
3983
+ this.ui.intro.html(this.model.get('intro_html'));
3975
3984
  this.ui.summary.html(this.model.get('summary_html'));
3976
3985
  this.ui.confirmButton.toggleClass('checking', !!this.model.get('checking'));
3977
3986
 
@@ -4366,13 +4375,13 @@ var BackgroundPositioningSlidersView = Marionette.ItemView.extend({
4366
4375
 
4367
4376
  function template$b(data) {
4368
4377
  var __t, __p = '';
4369
- __p += '<div class="box">\n <h2>' +
4378
+ __p += '<div class="box">\n <div class="content">\n <h2 class="dialog-header">' +
4370
4379
  ((__t = ( I18n.t('pageflow.editor.templates.background_positioning.title') )) == null ? '' : __t) +
4371
- '</h2>\n <p>' +
4380
+ '</h2>\n <p class="dialog-hint">' +
4372
4381
  ((__t = ( I18n.t('pageflow.editor.templates.background_positioning.help') )) == null ? '' : __t) +
4373
- '</p>\n\n <div class="wrapper">\n </div>\n\n <h3>' +
4382
+ '</p>\n\n <div class="wrapper">\n </div>\n\n <h3>' +
4374
4383
  ((__t = ( I18n.t('pageflow.editor.templates.background_positioning.preview_title') )) == null ? '' : __t) +
4375
- '</h3>\n <div class="previews">\n <div>\n </div>\n </div>\n\n <div class="footer">\n <a href="" class="save">' +
4384
+ '</h3>\n <div class="previews">\n <div>\n </div>\n </div>\n </div>\n\n <div class="footer">\n <a href="" class="save">' +
4376
4385
  ((__t = ( I18n.t('pageflow.editor.templates.background_positioning.save') )) == null ? '' : __t) +
4377
4386
  '</a>\n <a href="" class="close">' +
4378
4387
  ((__t = ( I18n.t('pageflow.editor.templates.background_positioning.cancel') )) == null ? '' : __t) +
@@ -4382,7 +4391,7 @@ return __p
4382
4391
 
4383
4392
  var BackgroundPositioningView = Marionette.ItemView.extend({
4384
4393
  template: template$b,
4385
- className: 'background_positioning dialog',
4394
+ className: 'background_positioning editor dialog',
4386
4395
  mixins: [dialogView],
4387
4396
  ui: {
4388
4397
  previews: '.previews > div',
@@ -4934,13 +4943,13 @@ var ThemeItemView = Marionette.ItemView.extend({
4934
4943
 
4935
4944
  function template$i(data) {
4936
4945
  var __t, __p = '';
4937
- __p += '<div class="box">\n <div class="content">\n <div>\n <h2 class="themes_header">' +
4946
+ __p += '<div class="box">\n <h1 class="dialog-header">\n ' +
4938
4947
  ((__t = ( I18n.t('pageflow.editor.templates.change_theme_dialog.header') )) == null ? '' : __t) +
4939
- '</h2>\n <div class="themes_panel">\n </div>\n <div class="preview_panel">\n <h2 class="preview_header">' +
4948
+ '\n </h1>\n <div class="panels">\n <div class="themes_panel">\n </div>\n <div class="preview_panel">\n <h2 class="dialog-sub_header">\n ' +
4940
4949
  ((__t = ( I18n.t('pageflow.editor.templates.change_theme_dialog.preview_header_prefix') )) == null ? '' : __t) +
4941
- '\n <span class="preview_header_theme_name"></span>' +
4950
+ '\n <span class="preview_header_theme_name"></span>\n ' +
4942
4951
  ((__t = ( I18n.t('pageflow.editor.templates.change_theme_dialog.preview_header_suffix') )) == null ? '' : __t) +
4943
- '\n </h2>\n <div class="preview_image_region">\n <img class="preview_image" src="default_template.png">\n </div>\n </div>\n </div>\n </div>\n\n <div class="footer">\n <a href="" class="close">\n ' +
4952
+ '\n </h2>\n <div class="preview_image_region">\n <img class="preview_image" src="default_template.png">\n </div>\n </div>\n </div>\n <div class="footer">\n <a href="" class="close">\n ' +
4944
4953
  ((__t = ( I18n.t('pageflow.editor.templates.change_theme_dialog.close') )) == null ? '' : __t) +
4945
4954
  '\n </a>\n </div>\n</div>\n';
4946
4955
  return __p
@@ -4951,7 +4960,6 @@ var ChangeThemeDialogView = Marionette.ItemView.extend({
4951
4960
  className: 'change_theme dialog editor',
4952
4961
  mixins: [dialogView],
4953
4962
  ui: {
4954
- content: '.content',
4955
4963
  themesPanel: '.themes_panel',
4956
4964
  previewPanel: '.preview_panel',
4957
4965
  previewImageRegion: '.preview_image_region',
@@ -5462,9 +5470,9 @@ var OtherEntriesCollectionView = Marionette.View.extend({
5462
5470
 
5463
5471
  function template$q(data) {
5464
5472
  var __t, __p = '';
5465
- __p += '<div class="box">\n <h2>' +
5473
+ __p += '<div class="box">\n <h1 class="dialog-header">\n ' +
5466
5474
  ((__t = ( I18n.t('pageflow.editor.templates.files_explorer.reuse_files') )) == null ? '' : __t) +
5467
- '</h2>\n\n <div class="panels">\n <ul class="entries_panel">\n </ul>\n\n <div class="files_panel">\n </div>\n </div>\n\n <div class="footer">\n <button class="ok">' +
5475
+ '\n </h1>\n\n <div class="panels">\n <ul class="entries_panel">\n </ul>\n\n <div class="files_panel">\n </div>\n </div>\n\n <div class="footer">\n <button class="ok">' +
5468
5476
  ((__t = ( I18n.t('pageflow.editor.templates.files_explorer.ok') )) == null ? '' : __t) +
5469
5477
  '</button>\n <button class="close">' +
5470
5478
  ((__t = ( I18n.t('pageflow.editor.templates.files_explorer.cancel') )) == null ? '' : __t) +
@@ -5959,9 +5967,9 @@ function template$x(data) {
5959
5967
  var __t, __p = '';
5960
5968
  __p += '<div class="box file_importer_box">\n <h1 class="dialog-header">' +
5961
5969
  ((__t = ( I18n.t('pageflow.editor.file_importers.'+data.importerKey+'.dialog_label') )) == null ? '' : __t) +
5962
- '</h1>\n\n <div class="content_panel">\n \n </div>\n\n <div class="footer">\n <div class="disclaimer">\n <p>' +
5970
+ '</h1>\n\n <div class="content_panel">\n \n </div>\n\n <div class="footer">\n <div class="disclaimer">\n ' +
5963
5971
  ((__t = ( I18n.t('pageflow.editor.file_importers.'+data.importerKey+'.disclaimer') )) == null ? '' : __t) +
5964
- '</p>\n </div>\n <button class="import">' +
5972
+ '\n </div>\n <button class="import" disabled>' +
5965
5973
  ((__t = ( I18n.t('pageflow.editor.views.files_view.import') )) == null ? '' : __t) +
5966
5974
  '</button>\n <button class="close">' +
5967
5975
  ((__t = ( I18n.t('pageflow.editor.templates.files_explorer.cancel') )) == null ? '' : __t) +
@@ -5975,9 +5983,9 @@ __p += '<div class="box">\n <h1 class="dialog-header">' +
5975
5983
  ((__t = ( I18n.t('pageflow.editor.templates.confirm_upload.header') )) == null ? '' : __t) +
5976
5984
  '</h1>\n <p class="dialog-hint">' +
5977
5985
  ((__t = ( I18n.t('pageflow.editor.templates.confirm_upload.hint') )) == null ? '' : __t) +
5978
- '</p>\n\n <div class="files_panel">\n </div>\n\n <div class="selected_file_panel">\n <h2>' +
5986
+ '</p>\n\n <div class="panels">\n <div class="files_panel">\n </div>\n\n <div class="selected_file_panel">\n <h2 class="dialog-sub_header">' +
5979
5987
  ((__t = ( I18n.t('pageflow.editor.templates.confirm_upload.edit_file_header') )) == null ? '' : __t) +
5980
- '</h2>\n <div class="selected_file_region">\n </div>\n </div>\n\n <div class="footer">\n <button class="upload">' +
5988
+ '</h2>\n <div class="selected_file_region">\n </div>\n </div>\n </div>\n\n <div class="footer">\n <button class="upload">' +
5981
5989
  ((__t = ( I18n.t('pageflow.editor.templates.confirm_upload.upload') )) == null ? '' : __t) +
5982
5990
  '</button>\n <button class="close">' +
5983
5991
  ((__t = ( I18n.t('pageflow.editor.templates.confirm_upload.close') )) == null ? '' : __t) +
@@ -5985,14 +5993,7 @@ __p += '<div class="box">\n <h1 class="dialog-header">' +
5985
5993
  return __p
5986
5994
  }
5987
5995
 
5988
- function template$z(data) {
5989
- var __p = '';
5990
- __p += '<h2></h2>\n';
5991
- return __p
5992
- }
5993
-
5994
- var UploadableFilesView = Marionette.ItemView.extend({
5995
- template: template$z,
5996
+ var UploadableFilesView = Marionette.View.extend({
5996
5997
  className: 'uploadable_files',
5997
5998
  ui: {
5998
5999
  header: 'h2'
@@ -6004,24 +6005,27 @@ var UploadableFilesView = Marionette.ItemView.extend({
6004
6005
  this.options.selection.set('file', this.uploadableFiles.first());
6005
6006
  }
6006
6007
  },
6007
- onRender: function onRender() {
6008
- this.ui.header.text(I18n$1.t('pageflow.editor.files.tabs.' + this.options.fileType.collectionName));
6008
+ render: function render() {
6009
6009
  this.appendSubview(new TableView({
6010
6010
  collection: this.uploadableFiles,
6011
6011
  attributeTranslationKeyPrefixes: ['pageflow.editor.files.attributes.' + this.options.fileType.collectionName, 'pageflow.editor.files.common_attributes'],
6012
- columns: this.commonColumns().concat(this.fileTypeColumns()),
6012
+ columns: this.commonColumns({
6013
+ fileTypeDisplayName: I18n$1.t('pageflow.editor.files.tabs.' + this.options.fileType.collectionName)
6014
+ }).concat(this.fileTypeColumns()),
6013
6015
  selection: this.options.selection,
6014
6016
  selectionAttribute: 'file'
6015
6017
  }));
6016
6018
  this.listenTo(this.uploadableFiles, 'add remove', this.update);
6017
6019
  this.update();
6020
+ return this;
6018
6021
  },
6019
6022
  update: function update() {
6020
6023
  this.$el.toggleClass('is_empty', this.uploadableFiles.length === 0);
6021
6024
  },
6022
- commonColumns: function commonColumns() {
6025
+ commonColumns: function commonColumns(options) {
6023
6026
  return [{
6024
6027
  name: 'file_name',
6028
+ headerText: options.fileTypeDisplayName,
6025
6029
  cellView: TextTableCellView
6026
6030
  }, {
6027
6031
  name: 'rights',
@@ -6195,7 +6199,7 @@ FilesImporterView.open = function (options) {
6195
6199
  app.dialogRegion.show(new FilesImporterView(options).render());
6196
6200
  };
6197
6201
 
6198
- function template$A(data) {
6202
+ function template$z(data) {
6199
6203
  var __t, __p = '';
6200
6204
  __p += '<button class="">\n <span class="label">' +
6201
6205
  ((__t = ( I18n.t('pageflow.editor.templates.select_button.select') )) == null ? '' : __t) +
@@ -6204,7 +6208,7 @@ return __p
6204
6208
  }
6205
6209
 
6206
6210
  var SelectButtonView = Marionette.ItemView.extend({
6207
- template: template$A,
6211
+ template: template$z,
6208
6212
  className: 'select_button',
6209
6213
  ui: {
6210
6214
  button: 'button',
@@ -6239,7 +6243,7 @@ var SelectButtonView = Marionette.ItemView.extend({
6239
6243
  }
6240
6244
  });
6241
6245
 
6242
- function template$B(data) {
6246
+ function template$A(data) {
6243
6247
  var __t, __p = '';
6244
6248
  __p += '<a class="back">' +
6245
6249
  ((__t = ( I18n.t('pageflow.editor.templates.files.back') )) == null ? '' : __t) +
@@ -6248,7 +6252,7 @@ return __p
6248
6252
  }
6249
6253
 
6250
6254
  var FilesView = Marionette.ItemView.extend({
6251
- template: template$B,
6255
+ template: template$A,
6252
6256
  className: 'manage_files',
6253
6257
  events: {
6254
6258
  'click a.back': 'goBack',
@@ -6333,14 +6337,14 @@ var FilesView = Marionette.ItemView.extend({
6333
6337
  }
6334
6338
  });
6335
6339
 
6336
- function template$C(data) {
6340
+ function template$B(data) {
6337
6341
  var __p = '';
6338
6342
  __p += '<div class="quota_state">\n</div>\n<div class="outlet">\n</div>\n<div class="exhausted_message">\n</div>\n';
6339
6343
  return __p
6340
6344
  }
6341
6345
 
6342
6346
  var EntryPublicationQuotaDecoratorView = Marionette.Layout.extend({
6343
- template: template$C,
6347
+ template: template$B,
6344
6348
  className: 'quota_decorator',
6345
6349
  regions: {
6346
6350
  outlet: '.outlet'
@@ -6381,7 +6385,7 @@ var EntryPublicationQuotaDecoratorView = Marionette.Layout.extend({
6381
6385
  }
6382
6386
  });
6383
6387
 
6384
- function template$D(data) {
6388
+ function template$C(data) {
6385
6389
  var __t, __p = '';
6386
6390
  __p += '<div class="files_pending notice">\n <p>' +
6387
6391
  ((__t = ( I18n.t('pageflow.editor.templates.publish_entry.files_pending_notice') )) == null ? '' : __t) +
@@ -6428,7 +6432,7 @@ return __p
6428
6432
  }
6429
6433
 
6430
6434
  var PublishEntryView = Marionette.ItemView.extend({
6431
- template: template$D,
6435
+ template: template$C,
6432
6436
  className: 'publish_entry',
6433
6437
  ui: {
6434
6438
  publishUntilFields: '.publish_until_fields',
@@ -6701,11 +6705,13 @@ var SidebarController = Marionette.Controller.extend({
6701
6705
  editor.setDefaultHelpEntry('pageflow.help_entries.files');
6702
6706
  },
6703
6707
  confirmableFiles: function confirmableFiles(preselectedFileType, preselectedFileId) {
6708
+ var model = EncodingConfirmation.createWithPreselection({
6709
+ fileType: preselectedFileType,
6710
+ fileId: preselectedFileId
6711
+ });
6712
+ model.check();
6704
6713
  this.region.show(ConfirmEncodingView.create({
6705
- model: EncodingConfirmation.createWithPreselection({
6706
- fileType: preselectedFileType,
6707
- fileId: preselectedFileId
6708
- })
6714
+ model: model
6709
6715
  }));
6710
6716
  },
6711
6717
  metaData: function metaData(tab) {
@@ -6811,7 +6817,7 @@ var ScrollingView = Marionette.View.extend({
6811
6817
  }
6812
6818
  });
6813
6819
 
6814
- function template$E(data) {
6820
+ function template$D(data) {
6815
6821
  var __t, __p = '';
6816
6822
  __p += '<div class="box">\n <h2>' +
6817
6823
  ((__t = ( I18n.t('pageflow.editor.templates.help.title') )) == null ? '' : __t) +
@@ -6822,7 +6828,7 @@ return __p
6822
6828
  }
6823
6829
 
6824
6830
  var HelpView = Marionette.ItemView.extend({
6825
- template: template$E,
6831
+ template: template$D,
6826
6832
  className: 'help',
6827
6833
  ui: {
6828
6834
  placeholder: '.placeholder',
@@ -6899,7 +6905,7 @@ var PageThumbnailView = ModelThumbnailView.extend({
6899
6905
  className: 'model_thumbnail page_thumbnail'
6900
6906
  });
6901
6907
 
6902
- function template$F(data) {
6908
+ function template$E(data) {
6903
6909
  var __t, __p = '';
6904
6910
  __p += '<div>\n <span class="missing_page_thumbnail"></span>\n <span class="page_thumbnail"></span>\n <div class="title"></div>\n <div class="label"></div>\n <a class="remove" title="' +
6905
6911
  ((__t = ( I18n.t('pageflow.editor.templates.page_link_item.remove') )) == null ? '' : __t) +
@@ -6910,7 +6916,7 @@ return __p
6910
6916
  }
6911
6917
 
6912
6918
  var PageLinkItemView = Marionette.ItemView.extend({
6913
- template: template$F,
6919
+ template: template$E,
6914
6920
  tagName: 'li',
6915
6921
  className: 'page_link',
6916
6922
  ui: {
@@ -6960,7 +6966,7 @@ var PageLinkItemView = Marionette.ItemView.extend({
6960
6966
  }
6961
6967
  });
6962
6968
 
6963
- function template$G(data) {
6969
+ function template$F(data) {
6964
6970
  var __t, __p = '';
6965
6971
  __p += '<label>\n <span class="name">' +
6966
6972
  ((__t = ( I18n.t('pageflow.editor.templates.page_links.label') )) == null ? '' : __t) +
@@ -6971,7 +6977,7 @@ return __p
6971
6977
  }
6972
6978
 
6973
6979
  var PageLinksView = Marionette.ItemView.extend({
6974
- template: template$G,
6980
+ template: template$F,
6975
6981
  className: 'page_links',
6976
6982
  ui: {
6977
6983
  links: 'ul.links',
@@ -7007,14 +7013,14 @@ var PageLinksView = Marionette.ItemView.extend({
7007
7013
  }
7008
7014
  });
7009
7015
 
7010
- function template$H(data) {
7016
+ function template$G(data) {
7011
7017
  var __p = '';
7012
7018
  __p += '<div class="emulation_mode_button-wrapper"\n data-tooltip-align="top center">\n <div class="emulation_mode_button-desktop_icon"/>\n <div class="emulation_mode_button-phone_icon"/>\n <div class="emulation_mode_button-track" />\n <div class="emulation_mode_button-thumb" />\n</div>\n';
7013
7019
  return __p
7014
7020
  }
7015
7021
 
7016
7022
  var EmulationModeButtonView = Marionette.ItemView.extend({
7017
- template: template$H,
7023
+ template: template$G,
7018
7024
  className: 'emulation_mode_button',
7019
7025
  mixins: [tooltipContainer],
7020
7026
  ui: {
@@ -7048,7 +7054,7 @@ var EmulationModeButtonView = Marionette.ItemView.extend({
7048
7054
  }
7049
7055
  });
7050
7056
 
7051
- function template$I(data) {
7057
+ function template$H(data) {
7052
7058
  var __t, __p = '';
7053
7059
  __p +=
7054
7060
  ((__t = ( I18n.t('pageflow.editor.templates.help_button.open_help') )) == null ? '' : __t);
@@ -7056,7 +7062,7 @@ return __p
7056
7062
  }
7057
7063
 
7058
7064
  var HelpButtonView = Marionette.ItemView.extend({
7059
- template: template$I,
7065
+ template: template$H,
7060
7066
  className: 'help_button',
7061
7067
  events: {
7062
7068
  'click': function click() {
@@ -7096,7 +7102,7 @@ var InfoBoxView = Marionette.View.extend({
7096
7102
  }
7097
7103
  });
7098
7104
 
7099
- function template$J(data) {
7105
+ function template$I(data) {
7100
7106
  var __t, __p = '';
7101
7107
  __p += '<span class="list_item_thumbnail"></span>\n<span class="list_item_missing_thumbnail"></span>\n<span class="list_item_type_pictogram type_pictogram"></span>\n\n<div class="list_item_title"></div>\n<div class="list_item_description"></div>\n\n<div class="list_item_buttons">\n <a class="list_item_edit_button" title="' +
7102
7108
  ((__t = ( I18n.t('pageflow.editor.templates.list_item.edit') )) == null ? '' : __t) +
@@ -7107,7 +7113,7 @@ return __p
7107
7113
  }
7108
7114
 
7109
7115
  var ListItemView = Marionette.ItemView.extend({
7110
- template: template$J,
7116
+ template: template$I,
7111
7117
  tagName: 'li',
7112
7118
  className: 'list_item',
7113
7119
  ui: {
@@ -7181,13 +7187,13 @@ var ListItemView = Marionette.ItemView.extend({
7181
7187
  }
7182
7188
  });
7183
7189
 
7184
- function template$K(data) {
7190
+ function template$J(data) {
7185
7191
  var __t, __p = '';
7186
- __p += '<div class="checking notice">\n <p>' +
7192
+ __p += '<div class="checking notice editor">\n <p>' +
7187
7193
  ((__t = ( I18n.t('pageflow.editor.templates.locked.loading') )) == null ? '' : __t) +
7188
7194
  '</p>\n\n <a class="close" href="#">' +
7189
7195
  ((__t = ( I18n.t('pageflow.editor.templates.locked.close') )) == null ? '' : __t) +
7190
- '</a>\n</div>\n\n<div class="error notice">\n <div class="message"></div>\n\n <a class="close" href="#">' +
7196
+ '</a>\n</div>\n\n<div class="error notice editor">\n <p class="message"></p>\n\n <a class="close" href="#">' +
7191
7197
  ((__t = ( I18n.t('pageflow.editor.templates.locked.close') )) == null ? '' : __t) +
7192
7198
  '</a>\n <a class="break" href="#">' +
7193
7199
  ((__t = ( I18n.t('pageflow.editor.templates.locked.open_here') )) == null ? '' : __t) +
@@ -7196,7 +7202,7 @@ return __p
7196
7202
  }
7197
7203
 
7198
7204
  var LockedView = Marionette.ItemView.extend({
7199
- template: template$K,
7205
+ template: template$J,
7200
7206
  className: 'locked checking',
7201
7207
  ui: {
7202
7208
  breakButton: '.break',
@@ -7389,7 +7395,7 @@ var LazyVideoEmbeddedView = Marionette.View.extend({
7389
7395
  }
7390
7396
  });
7391
7397
 
7392
- function template$L(data) {
7398
+ function template$K(data) {
7393
7399
  var __t, __p = '';
7394
7400
  __p += '<li class="uploading"><span class="count">0</span>' +
7395
7401
  ((__t = ( I18n.t('pageflow.editor.templates.notification.upload_pending') )) == null ? '' : __t) +
@@ -7412,7 +7418,7 @@ return __p
7412
7418
  var NotificationsView = Marionette.ItemView.extend({
7413
7419
  className: 'notifications',
7414
7420
  tagName: 'ul',
7415
- template: template$L,
7421
+ template: template$K,
7416
7422
  ui: {
7417
7423
  failedCount: '.failed .count',
7418
7424
  uploadingCount: '.uploading .count',
@@ -7499,14 +7505,7 @@ var FileProcessingStateDisplayView = Marionette.View.extend({
7499
7505
  }
7500
7506
  });
7501
7507
 
7502
- function template$M(data) {
7503
- var __p = '';
7504
- __p += '<h2></h2>\n';
7505
- return __p
7506
- }
7507
-
7508
- var NestedFilesView = Marionette.ItemView.extend({
7509
- template: template$M,
7508
+ var NestedFilesView = Marionette.View.extend({
7510
7509
  className: 'nested_files',
7511
7510
  ui: {
7512
7511
  header: 'h2'
@@ -7525,8 +7524,7 @@ var NestedFilesView = Marionette.ItemView.extend({
7525
7524
  this.listenTo(this.collection, 'request', this.update);
7526
7525
  this.listenTo(this.collection, 'sync', this.update);
7527
7526
  },
7528
- onRender: function onRender() {
7529
- this.ui.header.text(this.collection.parentModel.get('file_name'));
7527
+ render: function render() {
7530
7528
  this.appendSubview(new TableView({
7531
7529
  collection: this.collection,
7532
7530
  attributeTranslationKeyPrefixes: ['pageflow.editor.nested_files.' + this.options.fileType.collectionName],
@@ -7536,6 +7534,7 @@ var NestedFilesView = Marionette.ItemView.extend({
7536
7534
  blankSlateText: this.options.tableBlankSlateText
7537
7535
  }));
7538
7536
  this.update();
7537
+ return this;
7539
7538
  },
7540
7539
  update: function update() {
7541
7540
  this.$el.toggleClass('is_empty', this.collection.length === 0);
@@ -7582,18 +7581,18 @@ var NestedFilesView = Marionette.ItemView.extend({
7582
7581
  }, 200)
7583
7582
  });
7584
7583
 
7585
- function template$N(data) {
7584
+ function template$L(data) {
7586
7585
  var __t, __p = '';
7587
7586
  __p += '<div class="text_tracks_container">\n <div class="files_upload_panel">\n <div class="files_panel">\n </div>\n <a class="upload" href="">' +
7588
7587
  ((__t = ( I18n.t('pageflow.editor.templates.text_tracks.upload') )) == null ? '' : __t) +
7589
- '</a>\n </div>\n\n <div class="selected_file_panel">\n <h2 class="selected_file_header">' +
7588
+ '</a>\n </div>\n\n <div class="selected_file_panel">\n <h2 class="selected_file_header dialog-sub_header">' +
7590
7589
  ((__t = ( I18n.t('pageflow.editor.templates.text_tracks.edit_file_header') )) == null ? '' : __t) +
7591
7590
  '</h2>\n <div class="selected_file_region">\n </div>\n </div>\n</div>\n';
7592
7591
  return __p
7593
7592
  }
7594
7593
 
7595
7594
  var TextTracksView = Marionette.Layout.extend({
7596
- template: template$N,
7595
+ template: template$L,
7597
7596
  className: 'text_tracks',
7598
7597
  regions: {
7599
7598
  selectedFileRegion: '.selected_file_region'
@@ -7631,6 +7630,7 @@ var TextTracksView = Marionette.Layout.extend({
7631
7630
  if (selectedFile) {
7632
7631
  this.selectedFileRegion.show(new EditFileView({
7633
7632
  model: selectedFile,
7633
+ displayFileName: true,
7634
7634
  attributeTranslationKeyPrefixes: ['pageflow.editor.nested_files.text_track_files']
7635
7635
  }));
7636
7636
  this.ui.selectedFileHeader.toggle(true);
@@ -7656,7 +7656,7 @@ var TextTracksFileMetaDataItemValueView = FileMetaDataItemValueView.extend({
7656
7656
  }
7657
7657
  });
7658
7658
 
7659
- function template$O(data) {
7659
+ function template$M(data) {
7660
7660
  var __p = '';
7661
7661
  __p += '<label>\n <span class="list_label"></span>\n</label>\n\n<ul class="list_items"></ul>\n';
7662
7662
  return __p
@@ -7703,7 +7703,7 @@ return __p
7703
7703
  */
7704
7704
 
7705
7705
  var ListView = Marionette.ItemView.extend({
7706
- template: template$O,
7706
+ template: template$M,
7707
7707
  className: 'list',
7708
7708
  ui: {
7709
7709
  label: '.list_label',
@@ -7906,6 +7906,18 @@ editor.widgetTypes.register('classic_loading_spinner', {
7906
7906
  })
7907
7907
  });
7908
7908
 
7909
+ editor.widgetTypes.register('consent_bar', {
7910
+ configurationEditorView: ConfigurationEditorView.extend({
7911
+ configure: function configure() {
7912
+ this.tab('consent_bar', function () {
7913
+ this.view(InfoBoxView, {
7914
+ text: I18n$1.t('pageflow.editor.consent_bar.widget_type_info_box_text')
7915
+ });
7916
+ });
7917
+ }
7918
+ })
7919
+ });
7920
+
7909
7921
  editor.widgetTypes.registerRole('cookie_notice', {
7910
7922
  isOptional: true
7911
7923
  });
@@ -8234,9 +8246,7 @@ app.addInitializer(function () {
8234
8246
  });
8235
8247
  });
8236
8248
 
8237
- app.addInitializer(function ()
8238
- /* args */
8239
- {
8249
+ app.addInitializer(function () {
8240
8250
  var context = this;
8241
8251
  var args = arguments;
8242
8252