pageflow 13.6.0 → 14.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e9dac37ddc4c26d594df5452f6bcf4a972fbccdc46538e764938984d93f6792
-  data.tar.gz: faf7217c3dd9128b6ab5ddf303a62f3a9df0364063ef0ba2e7156390660385be
+  metadata.gz: e85a3d4874ac0e48fd24a7e83259c1f5cb91f650d6963312389db99ed88877f7
+  data.tar.gz: d58afca9204dfecaf2809ecb3e0c55fcbe54c957b0a247f2f4dee55e3d178095
 SHA512:
-  metadata.gz: b8fbafc373c8c663037d5b67b27df6ad5df0586da48e286cd456c218a76f4a63a249a3097948aa27ef31aa36204b626c8a2d32633054d4692c5fd239d3458a94
-  data.tar.gz: c8190274933517b76c164c13fb78423341af6b37989a760a8ba466dfd183df293b11bdda3c2df117a49694637cd5843dd41a2519e2d8c42c5adbaf0bed38625f
+  metadata.gz: ca49aac5a2f04c18902044cdf5d604de35e86b3fc532ee28d0a12a9183cb654a81cb4f619a16ccc7f275a3e27b205844abcbeab1e6a16a699613d5bb860850fc
+  data.tar.gz: ac24b62c77bdec1b04daf2cc505f37b04835a9c27d132aa9076bd9eeb6b57f15ef337265cf7a5dac9fc77ed99138ad455c2b6b9f869864e25ba6e5b9d44493ee

data/CHANGELOG.md

@@ -1,14 +1,81 @@
 # CHANGELOG
 
-### Version 13.6.0
+### Version 14.0.0.beta1
 
-2019-03-07
+2019-03-08
 
-[Compare changes](https://github.com/codevise/pageflow/compare/13-5-stable...v13.6.0)
+[Compare changes](https://github.com/codevise/pageflow/compare/13-x-stable...v14.0.0.beta1)
+
+#### Manual Update Steps
+
+- Direct upload to S3
+  ([#1076](https://github.com/codevise/pageflow/pull/1076))
+
+  Files are now uploaded directly to S3 from the browser. The
+  following steps need to be performed:
+
+  * Update CORS-config for S3 bucket as described in
+    [`doc/setting_up_external_services.md`](https://github.com/codevise/pageflow/blob/14-0-stable/doc/setting_up_external_services.md).
+
+  * `nginx-upload-module` is no longer supported since the requests to
+    create files no longer contain uploads. Corresponding Nginx
+    configuration for Pageflow endpoints needs to be removed. Check
+    whether the `paperclip-nginx-upload` io adapter is still needed.
+
+#### Breaking Changes for Pageflow Plugins
+
+- Page DOM layout change
+  ([#1135](https://github.com/codevise/pageflow/pull/1135))
+
+  Page headers are now have level 3 instead of level 2. There is a new
+  helper which is recommended to render the default page header and
+  content text.
+
+  ERB template based page types need to make the following changes to
+  CSS class names in their page templates:
+
+  * `blackLayer` -> `black_layer`
+  * `backgroundArea` -> `page_background`
+  * `contentWrapper` -> `content_wrapper`
+  * `videoWrapper` -> `uncropped_media_wrapper`
+
+  The default header and content snippet
+
+        <div class="page_header">
+          <h2>
+            <span class="tagline"><%= configuration['tagline'] %></span>
+            <span class="title"><%= configuration['title'] %></span>
+            <span class="subtitle"><%= configuration['subtitle'] %></span>
+          </h2>
+          <%= background_image_tag(configuration['background_image_id'], {class: "print_image"}) %>
+        </div>
+        <div class="contentText">
+          <p><%= raw configuration['text'] %></p>
+        </div>
+
+  should be replaced with the following helper call:
+
+        <%= page_default_content(page) %>
+
+- Direct upload to S3
+  ([#1132](https://github.com/codevise/pageflow/pull/1132))
+
+  Files are now uploaded directly to S3 from the browser. The state
+  machine defined by `HostedFile` therefore no longer includes states
+  like `uploading_to_s3`. Files which are be in state
+  `uploading_to_s3_failed` have to be migrated to the
+  `uploading_failed` state. See the migrations inside the PR for
+  examples.
+
+#### Minor Changes
 
 - Add shared specs to pageflow-support to lint page types
-  ([#1134](https://github.com/codevise/pageflow/pull/1134))
+  ([#1133](https://github.com/codevise/pageflow/pull/1133))
+- Increase max length for page tagline, title and subtitles
+  ([#1131](https://github.com/codevise/pageflow/pull/1131))
+- Include text in navigation bar links
+  ([#1129](https://github.com/codevise/pageflow/pull/1129))
 
 See
-[13-5-stable branch](https://github.com/codevise/pageflow/blob/13-5-stable/CHANGELOG.md)
+[13-x-stable branch](https://github.com/codevise/pageflow/blob/13-x-stable/CHANGELOG.md)
 for previous changes.

data/app/assets/javascripts/pageflow/dist/react-client.js

@@ -9562,7 +9562,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	function className(_ref) {
 	  var pageHasPlayerControls = _ref.pageHasPlayerControls;
 
-	  return (0, _classnames2.default)('backgroundArea page_background', {
+	  return (0, _classnames2.default)('page_background', {
 	    'page_background-for_page_with_player_controls': pageHasPlayerControls
 	  });
 	}
@@ -17551,7 +17551,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	        { ref: 'scroller', className: className(this.props), style: style(this.props) },
 	        _react2.default.createElement(
 	          'div',
-	          { className: 'contentWrapper' },
+	          { className: 'content_wrapper' },
 	          this.props.children
 	        )
 	      );
@@ -17738,26 +17738,22 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	    key: "render",
 	    value: function render() {
 	      return _react2.default.createElement(
-	        "div",
+	        "h3",
 	        { className: "page_header" },
 	        _react2.default.createElement(
-	          "h2",
-	          null,
-	          _react2.default.createElement(
-	            "span",
-	            { className: "tagline" },
-	            this.props.page.tagline
-	          ),
-	          _react2.default.createElement(
-	            "span",
-	            { className: "title" },
-	            this.props.page.title
-	          ),
-	          _react2.default.createElement(
-	            "span",
-	            { className: "subtitle" },
-	            this.props.page.subtitle
-	          )
+	          "span",
+	          { className: "page_header-tagline" },
+	          this.props.page.tagline
+	        ),
+	        _react2.default.createElement(
+	          "span",
+	          { className: "page_header-title" },
+	          this.props.page.title
+	        ),
+	        _react2.default.createElement(
+	          "span",
+	          { className: "page_header-subtitle" },
+	          this.props.page.subtitle
 	        )
 	      );
 	    }
@@ -17767,7 +17763,6 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	}(_react2.default.Component);
 
 	exports.default = _class;
-	;
 
 /***/ }),
 /* 445 */
@@ -17822,7 +17817,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	};
 
 	function className(props) {
-	  return (0, _classnames2.default)('contentText', _defineProperty({}, 'contentText-margin_' + props.marginBottom, props.marginBottom != PageText.defaultProps.marginBottom));
+	  return (0, _classnames2.default)('page_text', _defineProperty({}, 'page_text-margin_' + props.marginBottom, props.marginBottom != PageText.defaultProps.marginBottom));
 	}
 
 	function text(props) {
@@ -26006,7 +26001,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	  var dimensions = (0, _getDimensions2.default)(props.videoFile, props.fit, props.position, wrapperDimensions);
 	  return _react2.default.createElement(
 	    'div',
-	    { className: 'videoWrapper' },
+	    { className: 'uncropped_media_wrapper' },
 	    _react2.default.createElement(
 	      'div',
 	      { className: (0, _getCueOffsetClassName2.default)(dimensions, wrapperDimensions),
@@ -26408,7 +26403,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	function PrintImageTag(_ref3) {
 	  var file = _ref3.file;
 
-	  if (file && _selectors2.pageIsPrepared) {
+	  if (file && file.isReady && _selectors2.pageIsPrepared) {
 	    return React.createElement('img', { src: file.urls.print,
 	      alt: file.alt,
 	      className: 'print_image' });
@@ -28130,7 +28125,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	          { pageHasPlayerControls: true },
 	          _react2.default.createElement(
 	            'div',
-	            { className: 'videoWrapper' },
+	            { className: 'uncropped_media_wrapper' },
 	            this.props.children
 	          ),
 	          _react2.default.createElement(_components.PageShadow, { page: page })
@@ -30788,7 +30783,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 
 	  return React.createElement(
 	    _media.Page,
-	    { className: 'audioPage',
+	    { className: 'audio_page',
 	      page: props.page,
 	      file: props.audioFile,
 	      playerState: props.playerState,
@@ -30933,7 +30928,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	function VideoPage(props) {
 	  return React.createElement(
 	    _media.Page,
-	    { className: 'videoPage',
+	    { className: 'video_page',
 	      page: props.page,
 	      file: props.videoFile,
 	      qualities: qualities,

data/app/assets/javascripts/pageflow/dist/react-server.js

@@ -9562,7 +9562,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	function className(_ref) {
 	  var pageHasPlayerControls = _ref.pageHasPlayerControls;
 
-	  return (0, _classnames2.default)('backgroundArea page_background', {
+	  return (0, _classnames2.default)('page_background', {
 	    'page_background-for_page_with_player_controls': pageHasPlayerControls
 	  });
 	}
@@ -17545,7 +17545,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	        { ref: 'scroller', className: className(this.props), style: style(this.props) },
 	        _react2.default.createElement(
 	          'div',
-	          { className: 'contentWrapper' },
+	          { className: 'content_wrapper' },
 	          this.props.children
 	        )
 	      );
@@ -17732,26 +17732,22 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	    key: "render",
 	    value: function render() {
 	      return _react2.default.createElement(
-	        "div",
+	        "h3",
 	        { className: "page_header" },
 	        _react2.default.createElement(
-	          "h2",
-	          null,
-	          _react2.default.createElement(
-	            "span",
-	            { className: "tagline" },
-	            this.props.page.tagline
-	          ),
-	          _react2.default.createElement(
-	            "span",
-	            { className: "title" },
-	            this.props.page.title
-	          ),
-	          _react2.default.createElement(
-	            "span",
-	            { className: "subtitle" },
-	            this.props.page.subtitle
-	          )
+	          "span",
+	          { className: "page_header-tagline" },
+	          this.props.page.tagline
+	        ),
+	        _react2.default.createElement(
+	          "span",
+	          { className: "page_header-title" },
+	          this.props.page.title
+	        ),
+	        _react2.default.createElement(
+	          "span",
+	          { className: "page_header-subtitle" },
+	          this.props.page.subtitle
 	        )
 	      );
 	    }
@@ -17761,7 +17757,6 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	}(_react2.default.Component);
 
 	exports.default = _class;
-	;
 
 /***/ }),
 /* 444 */
@@ -17816,7 +17811,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	};
 
 	function className(props) {
-	  return (0, _classnames2.default)('contentText', _defineProperty({}, 'contentText-margin_' + props.marginBottom, props.marginBottom != PageText.defaultProps.marginBottom));
+	  return (0, _classnames2.default)('page_text', _defineProperty({}, 'page_text-margin_' + props.marginBottom, props.marginBottom != PageText.defaultProps.marginBottom));
 	}
 
 	function text(props) {
@@ -26000,7 +25995,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	  var dimensions = (0, _getDimensions2.default)(props.videoFile, props.fit, props.position, wrapperDimensions);
 	  return _react2.default.createElement(
 	    'div',
-	    { className: 'videoWrapper' },
+	    { className: 'uncropped_media_wrapper' },
 	    _react2.default.createElement(
 	      'div',
 	      { className: (0, _getCueOffsetClassName2.default)(dimensions, wrapperDimensions),
@@ -26402,7 +26397,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	function PrintImageTag(_ref3) {
 	  var file = _ref3.file;
 
-	  if (file && _selectors2.pageIsPrepared) {
+	  if (file && file.isReady && _selectors2.pageIsPrepared) {
 	    return React.createElement('img', { src: file.urls.print,
 	      alt: file.alt,
 	      className: 'print_image' });
@@ -28108,7 +28103,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	          { pageHasPlayerControls: true },
 	          _react2.default.createElement(
 	            'div',
-	            { className: 'videoWrapper' },
+	            { className: 'uncropped_media_wrapper' },
 	            this.props.children
 	          ),
 	          _react2.default.createElement(_components.PageShadow, { page: page })
@@ -30766,7 +30761,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 
 	  return React.createElement(
 	    _media.Page,
-	    { className: 'audioPage',
+	    { className: 'audio_page',
 	      page: props.page,
 	      file: props.audioFile,
 	      playerState: props.playerState,
@@ -30911,7 +30906,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	function VideoPage(props) {
 	  return React.createElement(
 	    _media.Page,
-	    { className: 'videoPage',
+	    { className: 'video_page',
 	      page: props.page,
 	      file: props.videoFile,
 	      qualities: qualities,

data/app/assets/javascripts/pageflow/editor/collections/files_collection.js

@@ -27,7 +27,6 @@ pageflow.FilesCollection = Backbone.Collection.extend({
   findOrCreateBy: function(attributes) {
     return this.findWhere(attributes) ||
       this.create(attributes, {
-        noUpload: true,
         fileType: this.fileType
       });
   },

data/app/assets/javascripts/pageflow/editor/models/file_uploader.js

@@ -12,7 +12,9 @@ pageflow.FileUploader = pageflow.Object.extend({
     var fileType = this.fileTypes.findByUpload(upload);
     var file = new fileType.model({
       state: 'uploadable',
-      file_name: upload.name
+      file_name: upload.name,
+      content_type: upload.type,
+      file_size: upload.size
     }, {
       fileType: fileType
     });

data/app/assets/javascripts/pageflow/editor/models/hosted_file.js

@@ -4,17 +4,12 @@ pageflow.HostedFile = pageflow.UploadedFile.extend({
       {
         name: 'uploading',
         activeStates: ['uploading'],
-        failedStates: ['upload_failed']
-      },
-      {
-        name: 'uploading_to_s3',
-        activeStates: ['uploading_to_s3'],
-        failedStates: ['uploading_to_s3_failed']
+        failedStates: ['uploading_failed']
       }
     ].concat(_.result(this, 'processingStages'));
   },
 
   processingStages: [],
 
-  readyState: 'uploaded_to_s3'
+  readyState: 'uploaded'
 });

data/app/assets/javascripts/pageflow/editor/models/image_file.js

@@ -3,7 +3,7 @@ pageflow.ImageFile = pageflow.UploadedFile.extend({
     {
       name: 'uploading',
       activeStates: ['uploading'],
-      failedStates: ['upload_failed']
+      failedStates: ['uploading_failed']
     },
     {
       name: 'processing',

data/app/assets/javascripts/pageflow/editor/models/uploaded_file.js

@@ -38,12 +38,7 @@ pageflow.UploadedFile = Backbone.Model.extend({
   },
 
   urlRoot: function() {
-    if (this.isNew() && this.options.noUpload) {
-      return this.collection.url() + '/empty';
-    }
-    else {
-      return this.collection.url();
-    }
+    return this.collection.url();
   },
 
   fileType: function() {
@@ -80,7 +75,7 @@ pageflow.UploadedFile = Backbone.Model.extend({
   },
 
   isUploaded: function() {
-    return this.get('state') !== 'uploading' && this.get('state') !== 'upload_failed';
+    return this.get('state') !== 'uploading' && this.get('state') !== 'uploading_failed';
   },
 
   isPending: function() {
@@ -108,7 +103,9 @@ pageflow.UploadedFile = Backbone.Model.extend({
   },
 
   toJSON: function() {
-    return _.extend(_.pick(this.attributes, 'rights', 'parent_file_id', 'parent_file_model_type'), {
+    return _.extend(_.pick(this.attributes,
+      'file_name', 'rights', 'parent_file_id', 'parent_file_model_type', 'content_type', 'file_size'
+    ), {
       configuration: this.configuration.toJSON()
     });
   },
@@ -121,9 +118,14 @@ pageflow.UploadedFile = Backbone.Model.extend({
   },
 
   uploadFailed: function() {
-    this.set('state', 'upload_failed');
+    this.set('state', 'uploading_failed');
     this.unset('uploading_progress');
-
     this.trigger('uploadFailed');
+  },
+
+  publish: function() {
+    this.save({}, {
+      url: this.url() + '/publish'
+    });
   }
 });

data/app/assets/javascripts/pageflow/editor/views/configuration_editors/groups/general.js

@@ -1,10 +1,10 @@
 pageflow.ConfigurationEditorTabView.groups.define('general', function() {
-  this.input('title', pageflow.TextInputView, {required: true});
+  this.input('title', pageflow.TextInputView, {required: true, maxLength: 5000});
   this.input('hide_title', pageflow.CheckBoxInputView);
-  this.input('tagline', pageflow.TextInputView);
-  this.input('subtitle', pageflow.TextInputView);
+  this.input('tagline', pageflow.TextInputView, {maxLength: 5000});
+  this.input('subtitle', pageflow.TextInputView, {maxLength: 5000});
   this.input('text', pageflow.TextAreaInputView);
   this.input('text_position', pageflow.SelectInputView, {values: pageflow.Page.textPositions});
   this.input('gradient_opacity', pageflow.SliderInputView);
   this.input('invert', pageflow.CheckBoxInputView);
-});
+});