pageflow 15.1.2 → 15.2.0

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

Potentially problematic release.


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

Files changed (61) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +77 -185
  3. data/README.md +1 -2
  4. data/admins/pageflow/accounts.rb +94 -19
  5. data/app/assets/javascripts/pageflow/admin/accounts.js +2 -2
  6. data/app/assets/javascripts/pageflow/dist/frontend.js +2 -0
  7. data/app/assets/javascripts/pageflow/dist/ui.js +9 -0
  8. data/app/assets/stylesheets/pageflow/themes/default/logo/variant/background_image.scss +4 -0
  9. data/app/assets/stylesheets/pageflow/themes/default/logo/variant/watermark.scss +5 -0
  10. data/app/controllers/pageflow/editor/widgets_controller.rb +1 -1
  11. data/app/helpers/pageflow/pages_helper.rb +1 -0
  12. data/app/models/pageflow/account.rb +6 -0
  13. data/app/models/pageflow/entry.rb +8 -1
  14. data/app/models/pageflow/entry_template.rb +55 -0
  15. data/app/models/pageflow/revision.rb +1 -1
  16. data/app/models/pageflow/theming.rb +8 -47
  17. data/app/policies/pageflow/entry_template_policy.rb +18 -0
  18. data/app/policies/pageflow/theming_policy.rb +0 -4
  19. data/app/views/admin/accounts/_configuration_label.html.erb +5 -0
  20. data/app/views/admin/accounts/_entry_template_details.html.arb +17 -0
  21. data/app/views/admin/accounts/_form.html.erb +43 -23
  22. data/app/views/admin/accounts/_share_providers_label.html.erb +5 -0
  23. data/app/views/admin/accounts/_theming_details.html.arb +0 -12
  24. data/app/views/pageflow/themes/_theme.json.jbuilder +1 -0
  25. data/config/locales/de.yml +12 -7
  26. data/config/locales/en.yml +12 -7
  27. data/db/migrate/20200122115400_create_pageflow_entry_templates.rb +75 -0
  28. data/db/migrate/20200206134400_convert_legacy_scrolled_content_element_types.rb +48 -0
  29. data/entry_types/paged/app/assets/javascripts/pageflow_paged/dist/editor.js +32 -3
  30. data/entry_types/scrolled/app/controllers/pageflow_scrolled/editor/content_elements_controller.rb +1 -0
  31. data/entry_types/scrolled/app/helpers/pageflow_scrolled/editor/seed_html_helper.rb +4 -1
  32. data/entry_types/scrolled/app/helpers/pageflow_scrolled/entry_json_seed_helper.rb +2 -1
  33. data/entry_types/scrolled/app/helpers/pageflow_scrolled/i18n_helper.rb +35 -0
  34. data/entry_types/scrolled/app/views/pageflow_scrolled/editor/entries/_seed.json.jbuilder +1 -1
  35. data/entry_types/scrolled/app/views/pageflow_scrolled/entries/show.html.erb +14 -2
  36. data/entry_types/scrolled/app/views/pageflow_scrolled/entry_json_seed/_entry.json.jbuilder +10 -1
  37. data/entry_types/scrolled/config/locales/new/de.yml +231 -8
  38. data/entry_types/scrolled/config/locales/new/en.yml +228 -10
  39. data/entry_types/scrolled/lib/generators/pageflow_scrolled/install/install_generator.rb +3 -0
  40. data/entry_types/scrolled/lib/pageflow_scrolled/seeds.rb +9 -4
  41. data/entry_types/scrolled/lib/tasks/pageflow_scrolled_tasks.rake +96 -0
  42. data/entry_types/scrolled/package/editor.js +498 -2561
  43. data/entry_types/scrolled/package/frontend.js +713 -1238
  44. data/entry_types/scrolled/package/package.json +12 -2
  45. data/lib/pageflow/ability_mixin.rb +3 -2
  46. data/lib/pageflow/seeds.rb +0 -2
  47. data/lib/pageflow/theme.rb +4 -0
  48. data/lib/pageflow/themes.rb +5 -1
  49. data/lib/pageflow/version.rb +1 -1
  50. data/packages/pageflow/config/jest/index.js +0 -1
  51. data/packages/pageflow/config/jest/transformers/jst.js +1 -1
  52. data/packages/pageflow/config/webpack.js +0 -1
  53. data/packages/pageflow/editor.js +23 -3
  54. data/packages/pageflow/package.json +2 -1
  55. data/packages/pageflow/testHelpers.js +367 -4
  56. data/packages/pageflow/ui.js +9 -0
  57. data/spec/factories/accounts.rb +6 -0
  58. data/spec/factories/entry_templates.rb +8 -0
  59. data/spec/factories/published_entries.rb +3 -1
  60. data/spec/factories/themings.rb +0 -1
  61. metadata +11 -1
@@ -1138,6 +1138,7 @@ var TooltipView = Marionette.ItemView.extend({
1138
1138
 
1139
1139
  var inputView = {
1140
1140
  ui: {
1141
+ label: 'label',
1141
1142
  labelText: 'label .name',
1142
1143
  inlineHelp: 'label .inline_help'
1143
1144
  },
@@ -1183,6 +1184,7 @@ var inputView = {
1183
1184
  this.ui.inlineHelp.hide();
1184
1185
  }
1185
1186
 
1187
+ this.setLabelFor();
1186
1188
  this.updateDisabled();
1187
1189
  this.setupVisibleBinding();
1188
1190
  },
@@ -1218,6 +1220,13 @@ var inputView = {
1218
1220
  html: true
1219
1221
  }), this.options.additionalInlineHelpText]).join(' ');
1220
1222
  },
1223
+ setLabelFor: function setLabelFor() {
1224
+ if (this.ui.input && this.ui.label.length === 1 && !this.ui.input.attr('id')) {
1225
+ var id = 'input_' + this.model.modelName + '_' + this.options.propertyName;
1226
+ this.ui.input.attr('id', id);
1227
+ this.ui.label.attr('for', id);
1228
+ }
1229
+ },
1221
1230
  updateDisabled: function updateDisabled() {
1222
1231
  if (this.ui.input) {
1223
1232
  this.updateDisabledAttribute(this.ui.input);
@@ -6,6 +6,12 @@ FactoryBot.define do
6
6
  account.default_theming ||= build(:theming, account: account)
7
7
  end
8
8
 
9
+ trait(:with_first_paged_entry_template) do
10
+ after(:create) do |account, _|
11
+ create(:entry_template, account: account, entry_type: 'paged')
12
+ end
13
+ end
14
+
9
15
  transient do
10
16
  with_member { nil }
11
17
  with_previewer { nil }
@@ -0,0 +1,8 @@
1
+ module Pageflow
2
+ FactoryBot.define do
3
+ factory :entry_template, class: Pageflow::EntryTemplate do
4
+ account
5
+ theme_name { 'default' }
6
+ end
7
+ end
8
+ end
@@ -3,12 +3,14 @@ module Pageflow
3
3
  factory :published_entry, class: PublishedEntry do
4
4
  transient do
5
5
  type_name { 'paged' }
6
+ revision_attributes { {} }
6
7
  end
7
8
 
8
9
  initialize_with do
9
10
  PublishedEntry.new(create(:entry,
10
11
  :published,
11
- type_name: type_name))
12
+ type_name: type_name,
13
+ published_revision_attributes: revision_attributes))
12
14
  end
13
15
 
14
16
  to_create { |published_entry| published_entry.entry.save! }
@@ -2,7 +2,6 @@ module Pageflow
2
2
  FactoryBot.define do
3
3
  factory :theming, :class => Pageflow::Theming do
4
4
  account
5
- theme_name { 'default' }
6
5
  end
7
6
  end
8
7
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pageflow
3
3
  version: !ruby/object:Gem::Version
4
- version: 15.1.2
4
+ version: 15.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Codevise Solutions Ltd
@@ -1418,6 +1418,7 @@ files:
1418
1418
  - app/models/pageflow/entry_duplicate.rb
1419
1419
  - app/models/pageflow/entry_publication.rb
1420
1420
  - app/models/pageflow/entry_role_query.rb
1421
+ - app/models/pageflow/entry_template.rb
1421
1422
  - app/models/pageflow/entry_title_or_account_name_query.rb
1422
1423
  - app/models/pageflow/file_import.rb
1423
1424
  - app/models/pageflow/file_reuse.rb
@@ -1459,6 +1460,7 @@ files:
1459
1460
  - app/policies/pageflow/admin/entry_tab_policy.rb
1460
1461
  - app/policies/pageflow/application_policy.rb
1461
1462
  - app/policies/pageflow/entry_policy.rb
1463
+ - app/policies/pageflow/entry_template_policy.rb
1462
1464
  - app/policies/pageflow/file_policy.rb
1463
1465
  - app/policies/pageflow/folder_policy.rb
1464
1466
  - app/policies/pageflow/membership_policy.rb
@@ -1467,7 +1469,10 @@ files:
1467
1469
  - app/state_machines/pageflow/image_and_text_track_processing_state_machine.rb
1468
1470
  - app/state_machines/pageflow/media_encoding_state_machine.rb
1469
1471
  - app/views/admin/accounts/_account_details.html.arb
1472
+ - app/views/admin/accounts/_configuration_label.html.erb
1473
+ - app/views/admin/accounts/_entry_template_details.html.arb
1470
1474
  - app/views/admin/accounts/_form.html.erb
1475
+ - app/views/admin/accounts/_share_providers_label.html.erb
1471
1476
  - app/views/admin/accounts/_theming_defaults_inline_help.html.erb
1472
1477
  - app/views/admin/accounts/_theming_details.html.arb
1473
1478
  - app/views/admin/entries/_attributes_table.html.arb
@@ -1630,6 +1635,8 @@ files:
1630
1635
  - db/migrate/20191220100946_create_pageflow_scrolled_storylines.rb
1631
1636
  - db/migrate/20200114154200_add_configuration_to_revisions.rb
1632
1637
  - db/migrate/20200117133200_change_revision_appearance_option_default_and_null.rb
1638
+ - db/migrate/20200122115400_create_pageflow_entry_templates.rb
1639
+ - db/migrate/20200206134400_convert_legacy_scrolled_content_element_types.rb
1633
1640
  - entry_types/paged/app/assets/javascripts/pageflow_paged/dist/editor.js
1634
1641
  - entry_types/paged/app/assets/javascripts/pageflow_paged/editor.js
1635
1642
  - entry_types/paged/app/assets/stylesheets/pageflow_paged/editor.scss
@@ -1674,6 +1681,7 @@ files:
1674
1681
  - entry_types/scrolled/app/controllers/pageflow_scrolled/entries_controller.rb
1675
1682
  - entry_types/scrolled/app/helpers/pageflow_scrolled/editor/seed_html_helper.rb
1676
1683
  - entry_types/scrolled/app/helpers/pageflow_scrolled/entry_json_seed_helper.rb
1684
+ - entry_types/scrolled/app/helpers/pageflow_scrolled/i18n_helper.rb
1677
1685
  - entry_types/scrolled/app/models/pageflow_scrolled/chapter.rb
1678
1686
  - entry_types/scrolled/app/models/pageflow_scrolled/content_element.rb
1679
1687
  - entry_types/scrolled/app/models/pageflow_scrolled/section.rb
@@ -1695,6 +1703,7 @@ files:
1695
1703
  - entry_types/scrolled/lib/pageflow_scrolled/engine.rb
1696
1704
  - entry_types/scrolled/lib/pageflow_scrolled/plugin.rb
1697
1705
  - entry_types/scrolled/lib/pageflow_scrolled/seeds.rb
1706
+ - entry_types/scrolled/lib/tasks/pageflow_scrolled_tasks.rake
1698
1707
  - entry_types/scrolled/package/editor.js
1699
1708
  - entry_types/scrolled/package/frontend.js
1700
1709
  - entry_types/scrolled/package/package.json
@@ -1832,6 +1841,7 @@ files:
1832
1841
  - spec/factories/draft_entries.rb
1833
1842
  - spec/factories/edit_locks.rb
1834
1843
  - spec/factories/entries.rb
1844
+ - spec/factories/entry_templates.rb
1835
1845
  - spec/factories/feature_targets.rb
1836
1846
  - spec/factories/file_usages.rb
1837
1847
  - spec/factories/folders.rb