Bert Leunis pushed to branch feature/CHANNELMGR-1765 at cms-community / hippo-addon-channel-manager
Commits: a44c76ac by Arthur Bogaart at 2017-08-17T15:55:03+02:00 CHANNELMGR-1431 Add ImageLinkFieldType - reads docbase value and returns it as a path - read config TODO: add writing and validation - - - - - dca44f5a by Mathijs den Burger at 2017-09-08T10:39:19+02:00 CHANNELMGR-1431 Merge master changes into feature/CHANNELMGR-1431 - - - - - 69b47b5b by Mathijs den Burger at 2017-09-11T10:44:24+02:00 CHANNELMGR-1431 Merge master changes into feature/CHANNELMGR-1431 - - - - - de5764e2 by Mathijs den Burger at 2017-09-11T12:35:25+02:00 CHANNELMGR-1431 Read and return all imagepicker properties - - - - - 2b6f8ebf by Mathijs den Burger at 2017-09-11T14:30:51+02:00 CHANNELMGR-1431 Remove unused open-link-picker event and listener - - - - - 82003cc6 by Mathijs den Burger at 2017-09-11T15:56:18+02:00 CHANNELMGR-1431 Merge master changes into feature/CHANNELMGR-1431 - - - - - a9c302ba by Mathijs den Burger at 2017-09-13T12:48:54+02:00 CHANNELMGR-1431 Return image url in field value - - - - - 7c25b806 by Mathijs den Burger at 2017-09-13T14:53:53+02:00 CHANNELMGR-1431 Rename imagePicker to imageVariantPicker You actually pick an image variant, not an image. This way the name "image picker" (and all related names, e.g. the 'show-image-picker' event) can be used to for the picker of the imagelink field. - - - - - ff5c6684 by Mathijs den Burger at 2017-09-13T14:54:49+02:00 CHANNELMGR-1431 Fix formatting of comment - - - - - be5cb730 by Mathijs den Burger at 2017-09-15T14:06:36+02:00 CHANNELMGR-1431 Use new FieldTypeConfig class to read config properties - - - - - 21adf7e5 by Mathijs den Burger at 2017-09-15T14:07:34+02:00 CHANNELMGR-1431 Read nodetypes property of imagelink as multiple string - - - - - ffdeebf6 by Mathijs den Burger at 2017-09-15T14:15:04+02:00 CHANNELMGR-1431 Move FieldTypeConfig to 'field' package Next to FieldTypeContext seems logical. - - - - - 00a4f566 by Mathijs den Burger at 2017-09-15T15:31:34+02:00 CHANNELMGR-1431 Reuse callback fields and -methods for all dialogs There's only one dialog active at the time, so reusing the callback fields and callback methods avoids code duplication. - - - - - dca7f71f by Mathijs den Burger at 2017-09-15T15:35:37+02:00 CHANNELMGR-1431 Initial ugly dummy implementation of imagelink field UI Visual TODOs: - the UUID should probably become a hidden input field - image and button should be styled - uuid (model value) and preview image should changed when the selection has changed Functional TODOs: - there should be a way to clear the selected image - the field should be saved - the field should be auto-drafted - - - - - 3bdafe92 by Mathijs den Burger at 2017-09-15T15:38:28+02:00 CHANNELMGR-1431 Initial partial implementation of the ImagePickerManager The field ID, uuid of the image and JSON configuration of the dialog are passed to the backend. TODO: - open the GalleryPickerDialog, possible with the selected image pre-selected - propagate the selected image to the frontend, including a URL for the selected image - propagate a cancelled dialog to the frontend - - - - - aa1d0a65 by Arthur Bogaart at 2017-09-15T15:59:27+02:00 CHANNELMGR-1431 Merge master changes into feature/CHANNELMGR-1431 - - - - - 5a2dc8b1 by Arthur Bogaart at 2017-09-19T22:14:09+02:00 CHANNELMGR-1431 Add dependency on hippo gallerypicker plugin - - - - - c1271fc6 by Arthur Bogaart at 2017-09-19T22:29:57+02:00 CHANNELMGR-1431 Refactored PickerManagers Implemented new DialogBehavior and DialogManager from CMS api. Moved PickedAction code into LinkPickerManager and added new DocumentPickerManager for handling RichTextEditorDocumentLinks. - - - - - 78be6f9a by Arthur Bogaart at 2017-09-19T22:30:42+02:00 CHANNELMGR-1431 Implement ImagePickerManager with new Dialog api - - - - - 1aa6f0a8 by Arthur Bogaart at 2017-09-19T22:43:25+02:00 CHANNELMGR-1431 Add write and choice-field support to ImageLinkTypeField TODO: the handling of listedBased choice fields is partly broken in terms of init/configuration. Applies to richtext and imagelink. - - - - - 5993b73b by Arthur Bogaart at 2017-09-19T22:44:15+02:00 CHANNELMGR-1431 Add simple frontend support for image picker - - - - - b3ec8c90 by Ariel Weinberger at 2017-09-22T14:42:40+02:00 CHANNELMGR-1431 Add front-end functionality of ImageLink - Picking an image is possible and the field looks in-line with the other fields. - Required validation is working properly. - - - - - 7d77967d by Ariel Weinberger at 2017-09-22T16:01:13+02:00 CHANNELMGR-1431 Remove unnecessary bindings and requires from component, link to parent form - - - - - 7cd35d0f by Ariel Weinberger at 2017-09-28T12:43:05+02:00 CHANNELMGR-1431 Merge branch 'master' into feature/CHANNELMGR-1431 # Conflicts: # content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/StringFieldType.java # frontend-ng/src/app/channel/sidePanels/rightSidePanel/fields/fields.ng1.module.js - - - - - 8b5cfcc7 by Ariel Weinberger at 2017-09-28T13:15:14+02:00 CHANNELMGR-1431 Remove unused angularjs folder - - - - - e7686294 by Ariel Weinberger at 2017-09-28T14:32:08+02:00 CHANNELMGR-1430 Create imageLink component and bootstrap it with ngUpgrade - - - - - 36ae934e by Ariel Weinberger at 2017-09-28T16:01:45+02:00 CHANNELMGR-1430 Create imageLink component with Angular 4 and Angular Material - Bump Angular Material version to 2.0.0-beta.11 - Add several exported material input modules to Material.module.ts - - - - - d6f712c8 by Ariel Weinberger at 2017-09-28T16:04:47+02:00 CHANNELMGR-1430 Remove rule from tslint.json (added in previous commit) - - - - - 6d4d3b63 by Mathijs den Burger at 2017-10-02T15:15:50+02:00 CHANNELMGR-1431 Improve picker manager class names The base class for pickers in rich text fields is now called "RichTextPickerManager", with subclasses "LinkPickerManager" and "ImageVariantPickerManager". - - - - - 62264531 by Mathijs den Burger at 2017-10-02T16:05:46+02:00 CHANNELMGR-1431 Create JSON with utility Ensures proper escaping etc. - - - - - 5ec62f94 by Mathijs den Burger at 2017-10-02T16:06:27+02:00 CHANNELMGR-1431 Merge master changes into feature/CHANNELMGR-1431 - - - - - fa5e6b52 by Mathijs den Burger at 2017-10-02T16:08:18+02:00 CHANNELMGR-1431 Json utility moved to CMS, update package - - - - - 85792055 by Mathijs den Burger at 2017-10-02T16:27:17+02:00 CHANNELMGR-1431 Use moved Json util, account for master changes - - - - - 419f33f4 by Arthur Bogaart at 2018-03-06T11:18:12+01:00 CHANNELMGR-1431 Merge master changes - - - - - 9668ba0e by Arthur Bogaart at 2018-03-08T22:54:38+01:00 CHANNELMGR-1431 Add dependency on CMS-JSON artifact - - - - - 3ecfb77e by Arthur Bogaart at 2018-03-08T22:55:13+01:00 CHANNELMGR-1431 Bump gallerypicker dependency - - - - - d2bd9a48 by Arthur Bogaart at 2018-03-08T23:13:43+01:00 CHANNELMGR-1431 Refactor link & image picker in ChannelManager Simplify the construction of both pickers by reusing the link&image picker managers from the CMS and moving all channel-manager specific logic out of the DialogManager hierarchy. - - - - - e608fb41 by Arthur Bogaart at 2018-03-08T23:42:00+01:00 CHANNELMGR-1431 Refactor ImagePicker using gallery dialog - - - - - 4cc3dfe6 by Arthur Bogaart at 2018-03-08T23:43:03+01:00 CHANNELMGR-1431 Return FieldsInformation from #init - - - - - 80796aaf by Arthur Bogaart at 2018-03-08T23:55:21+01:00 CHANNELMGR-1431 Merge master changes - - - - - 572b2830 by Arthur Bogaart at 2018-03-08T23:57:19+01:00 CHANNELMGR-1430 Merge feature/CHANNELMGR-1431 changes - - - - - 05073b39 by Arthur Bogaart at 2018-03-11T19:20:27+01:00 CHANNELMGR-1430 Replace .ts impl with .js Adjusted styling according to Feedback of Carolien. - - - - - 03430234 by Arthur Bogaart at 2018-03-15T15:43:06+01:00 CHANNELMGR-1763 Use documentType + locale as cacheKey for documentTypes - - - - - 705daff1 by Bert Leunis at 2018-03-15T16:05:05+01:00 CHANNELMGR-1758 Add translation keys for document fields in CC step 1 They are all placeholder texts. All words with capitals (in English) since they work like titles for the fields. - - - - - 6104ea84 by Arthur Bogaart at 2018-03-19T15:32:40+01:00 CHANNELMGR-1431 Rename ChannelEditorPicker.isValid to saveChanges Removed savePendingChanges in favor of saveChanges and copied back lost comment explaining the reason we have to do a session.save call. Changed the argument of setNodeId to a String which is more logical. - - - - - cd0f0eb5 by Arthur Bogaart at 2018-03-19T15:33:19+01:00 CHANNELMGR-1430 Merge feature/CHANNELMGR-1431 changes - - - - - 925a1772 by Arthur Bogaart at 2018-03-19T16:47:06+01:00 CHANNELMGR-1431 Add default impl of writeFieldValue All primitive fields will have the same impl for writing a choice field value. - - - - - 21bee4f1 by Arthur Bogaart at 2018-03-19T16:47:55+01:00 CHANNELMGR-1431 Fix unit tests for hippogallerypicker:imagelink - - - - - e0ec79cc by Michael Metternich at 2018-03-20T10:06:32+01:00 CHANNELMGR-1763 Merge master in development - - - - - 840a727b by Arthur Bogaart at 2018-03-20T11:01:11+01:00 CHANNELMGR-1431 Ignore UUID of root node The default value of an empty image link is the UUID of the JCR root node. In that case return an empty string to the front-end end, so the front-end only knows about an empty string. The reverse is done when writing a value. - - - - - afc83c2a by Mathijs den Burger at 2018-03-20T13:10:23+01:00 CHANNELMGR-1431 Don't expose config property "preview.width" It's only used by the Wicket plugin to set the width of the rendered preview image. Which is broken by design, since it distorts images with another actual width. - - - - - ad332b1f by Arthur Bogaart at 2018-03-20T15:11:35+01:00 CHANNELMGR-1430 Review changes - - - - - 6ecb207c by Arthur Bogaart at 2018-03-20T15:11:35+01:00 CHANNELMGR-1430 Merge feature/CHANNELMGR-1431 changes - - - - - 0741a3f5 by Arthur Bogaart at 2018-03-20T15:11:36+01:00 CHANNELMGR-1430 Merge feature/CHANNELMGR-1431 changes - - - - - 62ddb73a by Arthur Bogaart at 2018-03-20T15:11:36+01:00 CHANNELMGR-1430 Simplify _show*Picker code - - - - - 87a0c822 by Arthur Bogaart at 2018-03-20T15:11:37+01:00 CHANNELMGR-1430 Order bindings properties - - - - - 9dc5b5cf by Arthur Bogaart at 2018-03-20T15:11:37+01:00 CHANNELMGR-1430 Remove spaces - - - - - 72bfd3ed by Arthur Bogaart at 2018-03-20T15:11:37+01:00 CHANNELMGR-1430 Adjust hidden label for required field Add space&asterisk characters to the hidden label to ensure it uses the correct width. - - - - - 921f88db by Arthur Bogaart at 2018-03-20T15:11:38+01:00 CHANNELMGR-1430 Use correct hint-icon width The hint icon is 24px wide plus 4px margin. Align the md-icons in the center of the button. - - - - - 078e2413 by Arthur Bogaart at 2018-03-20T15:11:38+01:00 CHANNELMGR-1430 Set focus after closing picker The open-dialog button receives focus after the dialog is closed. - - - - - da950ccd by Arthur Bogaart at 2018-03-20T15:11:38+01:00 CHANNELMGR-1430 Add unit tests for image-link - - - - - dc3538af by Mathijs den Burger at 2018-03-20T15:52:28+01:00 CHANNELMGR-1431 Add unit tests for ImageLinkFieldType Added a package-private constructor that accepts an ImageItemFactory so the URL creation for image items can be mocked in unit tests. - - - - - c2684d70 by Arthur Bogaart at 2018-03-20T17:39:33+01:00 CHANNELMGR-1430 Ensure only the hint icon becomes red for invalid fields - - - - - 46ea4ef2 by Arthur Bogaart at 2018-03-20T17:50:29+01:00 CHANNELMGR-1430 Show grow animation after selecting image To make the UI interaction more smooth, we apply a grow animation after selecting an image. When clearing an image, it is immediately hidden to prevent it from first getting pushed down before it is removed from the DOM. - - - - - e4329f53 by Arthur Bogaart at 2018-03-20T22:45:35+01:00 CHANNELMGR-1430 Render hiddenLabel text for the first image only - - - - - 148cbdaf by Mathijs den Burger at 2018-03-21T10:20:58+01:00 CHANNELMGR-1430 Merge feature/CHANNELMGR-1431 changes - - - - - a1db2c9f by Mathijs den Burger at 2018-03-21T11:03:44+01:00 CHANNELMGR-1430 Reintegrate feature/CHANNELMGR-1430 - - - - - 02aa6584 by Michiel Eggermont at 2018-03-21T11:40:08+01:00 CHANNELMGR-1779 Enable components overlay for rejected channel If a channel is rejected during review it should become editable again so the components overlay button must be enabled in that case. Use the enabled flag of the resetChannel action to determine if the overlay must be enabled if the selected project is in review. - - - - - 3572b3ef by Michiel Eggermont at 2018-03-21T13:56:18+01:00 CHANNELMGR-1779 Only allow document editing for unapproved projects - - - - - 3f26ff86 by Mathijs den Burger at 2018-03-21T16:53:15+01:00 CHANNELMGR-1430 Move clear and select button a little closer together - - - - - c2f89c76 by Mathijs den Burger at 2018-03-21T16:53:57+01:00 CHANNELMGR-1430 Hide clear button when no image is selected - - - - - e583ee39 by Mathijs den Burger at 2018-03-21T17:27:51+01:00 CHANNELMGR-1430 Limit width of bottom border Bottom border is as wide as the width of the image (60px) plus the width of the buttons shown, except when the first (or only) image is empty: these still become full width to accommodate the floating label. - - - - - c68ef9fa by Mathijs den Burger at 2018-03-21T17:39:38+01:00 CHANNELMGR-1430 Always place buttons close to the bottom border Also add 6px padding between the floating label and the image to make them look more like the other inputs. - - - - - db32646c by Arent-Jan Banck at 2018-03-21T18:00:56+01:00 CHANNELMGR-1423 Update document icon svg to scale better to 24x24. - - - - - d55e7bc4 by Arthur Bogaart at 2018-03-22T11:33:42+01:00 CHANNELMGR-1430 Fix limit bottom border width Removed the additional class for setting a max-width on the .input-bottom-border element since it already got this width from the .input-bottom-border style. - - - - - 7f730de7 by Arthur Bogaart at 2018-03-22T11:37:18+01:00 CHANNELMGR-1430 Make the image clickable Show a pointer cursor when hovering the image and make sure pointer-events are always passed through the .hippo-imagelink-buttons element. - - - - - 35565541 by Arthur Bogaart at 2018-03-22T11:39:32+01:00 CHANNELMGR-1430 Fix button position on first image when hint is present Also moved buttons up 1px for when no image was selected yet. - - - - - 18736cbe by Arthur Bogaart at 2018-03-22T12:36:02+01:00 CHANNELMGR-1430 Set focus on image element If no image has been picked yet, we have to set focus on the img element during rendering; for this we use the focus-if directive. Otherwise we can set focus on the existing img element directly. When cancelling a picker we check if there is an image and give it focus, otherwise we focus the select button. - - - - - d81d82f6 by Bert Leunis at 2018-03-22T14:08:48+01:00 CHANNELMGR-1765 Merge master changes in feature/CHANNELMGR-1765 - - - - - 30 changed files: - content-service/pom.xml - content-service/src/main/java/org/onehippo/cms/channelmanager/content/document/model/FieldValue.java - content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/DocumentTypesServiceImpl.java - + content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeConfig.java - content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtils.java - content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/ChoiceFieldUtils.java - content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/FieldType.java - + content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/ImageLinkFieldType.java - content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/NodeFieldType.java - content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/RichTextFieldType.java - content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/StringFieldType.java - + content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeConfigTest.java - content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/ChoiceFieldUtilsTest.java - + content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/ImageLinkFieldTypeTest.java - content-service/src/test/resources/log4j-filters.txt - frontend-ng/src/app/channel/channel.controller.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/contentEditor.scss - frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/choiceField/choiceField.html - frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/ckeditor/ckeditor.component.spec.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/ckeditor/ckeditor.controller.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/compoundField/compoundField.html - frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/documentFields/documentFields.html - frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/fields.module.js - + frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/imageLink/imageLink.component.js - + frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/imageLink/imageLink.controller.js - + frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/imageLink/imageLink.controller.spec.js - + frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/imageLink/imageLink.html - + frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/imageLink/imageLink.scss - frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/primitiveField/primitiveField.html - frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/documentLocation/documentLocationField.html The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/40a950d409afe126ee75b7e8e6388f61265a92fc...d81d82f6e0ef1afb999274dd52213d26811a8a8f --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/40a950d409afe126ee75b7e8e6388f61265a92fc...d81d82f6e0ef1afb999274dd52213d26811a8a8f You're receiving this email because of your account on code.onehippo.org.
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
