[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][master] CHANNELMGR-1391 Add null-check for user's time zone
Mathijs den Burger pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
d83ee853 by Mathijs den Burger at 2018-03-27T20:55:35+02:00
CHANNELMGR-1391 Add null-check for users time zone
Its not set when the DefaultLoginPlugin does not show time zones.
- - - - -
1 changed file:
-
frontend/src/main/java/org/onehippo/cms7/channelmanager/channeleditor/ChannelEditor.java
Changes:
=
frontend/src/main/java/org/onehippo/cms7/channelmanager/channeleditor/ChannelEditor.java
=
---
a/frontend/src/main/java/org/onehippo/cms7/channelmanager/channeleditor/ChannelEditor.java
+++
b/frontend/src/main/java/org/onehippo/cms7/channelmanager/channeleditor/ChannelEditor.java
@@ -17,6 +17,7 @@ package org.onehippo.cms7.channelmanager.channeleditor;
import java.io.Serializable;
import java.util.Optional;
+import java.util.TimeZone;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
@@ -128,7 +129,12 @@ public class ChannelEditor extends ExtPanel {
this.locale = Session.get().getLocale().toString();
final UserSession userSession = UserSession.get();
-this.timeZone =
userSession.getClientInfo().getProperties().getTimeZone().getID();
+
+final TimeZone timeZone =
userSession.getClientInfo().getProperties().getTimeZone();
+if (timeZone != null) {
+this.timeZone = timeZone.getID();
+}
+
this.cmsUser = userSession.getJcrSession().getUserID();
this.debug =
Application.get().getDebugSettings().isAjaxDebugModeEnabled();
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/d83ee8533a9bb6bd45df52492dbdd5a531ac74ac
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/d83ee8533a9bb6bd45df52492dbdd5a531ac74ac
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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/CHANNELMGR-1769
Mathijs den Burger deleted branch feature/CHANNELMGR-1769 at cms-community / hippo-addon-channel-manager --- 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][master] 4 commits: CHANNELMGR-1769 Store open state for leftSidePanel
Mathijs den Burger pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
e4dc7001 by Arthur Bogaart at 2018-03-26T17:42:13+02:00
CHANNELMGR-1769 Store openclose state for leftSidePanel
- - - - -
2b8a4987 by Arthur Bogaart at 2018-03-26T17:44:19+02:00
CHANNELMGR-1769 Store tab state in leftSidepanel
If an OOB index is returned, the tabs component falls back to zero.
- - - - -
c838822f by Mathijs den Burger at 2018-03-27T12:58:53+02:00
CHANNELMGR-1769 Remove unused injected $scope
- - - - -
1c4a9403 by Mathijs den Burger at 2018-03-27T12:59:15+02:00
CHANNELMGR-1769 Reintegrate feature/CHANNELMGR-1769
- - - - -
3 changed files:
-
frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.controller.js
- frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.html
- frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.spec.js
Changes:
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.controller.js
=
---
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.controller.js
+++
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.controller.js
@@ -50,6 +50,28 @@ class LeftSidePanelCtrl {
this.localStorageService.set('leftSidePanelWidth', this.lastSavedWidth);
}
+ get selectedTab() {
+const selectedTabIndex =
parseInt(this.localStorageService.get('leftSidePanelSelectedTab'), 10);
+return !isNaN(selectedTabIndex) ? selectedTabIndex : 0;
+ }
+
+ set selectedTab(tabIndex) {
+tabIndex = parseInt(tabIndex, 10);
+if (!isNaN(tabIndex) && tabIndex >= 0) {
+ this.localStorageService.set('leftSidePanelSelectedTab', tabIndex);
+}
+ }
+
+ get isOpen() {
+return this.localStorageService.get('leftSidePanelOpen') === true;
+ }
+
+ set isOpen(isOpen) {
+if (typeof isOpen === 'boolean') {
+ this.localStorageService.set('leftSidePanelOpen', isOpen);
+}
+ }
+
isLockedOpen() {
return this.SidePanelService.isOpen('left');
}
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.html
=
--- a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.html
+++ b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.html
@@ -15,6 +15,7 @@
-->
{
expect(ctrl.isLockedOpen()).toBe(false);
});
+ describe('property isOpen', () => {
+it('defaults to false', () => {
+ const ctrl = instantiateController();
+ expect(ctrl.isOpen).toBe(false);
+});
+
+it('stores the open state as a boolean', () => {
+ const ctrl = instantiateController();
+ ctrl.isOpen = true;
+ expect(ctrl.localStorageService.get('leftSidePanelOpen')).toBe(true);
+ expect(ctrl.isOpen).toBe(true);
+
+ ctrl.isOpen = false;
+ expect(ctrl.localStorageService.get('leftSidePanelOpen')).toBe(false);
+ expect(ctrl.isOpen).toBe(false);
+});
+
+it('falls back to false if the stored value is not a boolean', () => {
+ const ctrl = instantiateController();
+ spyOn(ctrl.localStorageService, 'get').and.returnValue(null);
+
+ expect(ctrl.isOpen).toBe(false);
+});
+
+it('ignores input that is not a boolean', () => {
+ const ctrl = instantiateController();
+ spyOn(ctrl.localStorageService, 'set').and.callThrough();
+
+ ctrl.isOpen = null;
+ ctrl.isOpen = 1;
+ ctrl.isOpen = 'a string';
+ expect(ctrl.localStorageService.set).not.toHaveBeenCalled();
+});
+ });
+
+ describe('property selectedTab', () => {
+it('defaults to zero', () => {
+ const ctrl = instantiateController();
+ expect(ctrl.selectedTab).toBe(0);
+});
+
+it('stores the selected tab as a number', () => {
+ const ctrl = instantiateController();
+
+ ctrl.selectedTab = 0;
+
expect(ctrl.localStorageService.get('leftSidePanelSelectedTab')).toBe('0');
+ expect(ctrl.selectedTab).toBe(0);
+
+ ctrl.selectedTab = 1;
+
expect(ctrl.localStorageService.get('leftSidePanelSelectedTab')).toBe('1');
+ expect(ctrl.selectedTab).toBe(1);
+});
+
+it('falls back to zero if the stored value is NaN', () => {
+ const ctrl = instantiateController();
+ spyOn(ctrl.localStorageService, 'get').and.returnValue('a string');
+
+ expect(ctrl.selectedTab).toBe(0);
+});
+
+it('ignores input that is not a number', () => {
+ const ctrl = instantiateController();
+ ctrl.selectedTab = 1;
+ spyOn(ctrl.localStorageService, 'set').and.callThrough();
+
+ ctrl.selectedTab = null;
+ ctrl.selectedTab = false;
+ ctrl.selectedTab = 'a string';
+ expect(ctrl.localStorageService.set).not.toHaveBeenCalled();
+ expect(ctrl.selectedTab).toBe(1);
+});
+
+it('ignores numbers
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1769] CHANNELMGR-1769 Remove unused injected $scope
Mathijs den Burger pushed to branch feature/CHANNELMGR-1769 at cms-community /
hippo-addon-channel-manager
Commits:
c838822f by Mathijs den Burger at 2018-03-27T12:58:53+02:00
CHANNELMGR-1769 Remove unused injected $scope
- - - - -
1 changed file:
-
frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.controller.js
Changes:
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.controller.js
=
---
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.controller.js
+++
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.controller.js
@@ -17,7 +17,6 @@
class LeftSidePanelCtrl {
constructor(
$element,
-$scope,
localStorageService,
CatalogService,
ChannelService,
@@ -27,7 +26,6 @@ class LeftSidePanelCtrl {
'ngInject';
this.$element = $element;
-this.$scope = $scope;
this.localStorageService = localStorageService;
this.CatalogService = CatalogService;
this.ChannelService = ChannelService;
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/c838822ffe211e0e0c9236e6fefb2a7d72545806
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/c838822ffe211e0e0c9236e6fefb2a7d72545806
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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/CHANNELMGR-1767
Mathijs den Burger deleted branch feature/CHANNELMGR-1767 at cms-community / hippo-addon-channel-manager --- 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1767] 2 commits: CHANNELMGR-1767 Limit the height of catalog items with very long names
Mathijs den Burger pushed to branch feature/CHANNELMGR-1767 at cms-community /
hippo-addon-channel-manager
Commits:
542ed40e by Mathijs den Burger at 2018-03-27T12:05:38+02:00
CHANNELMGR-1767 Limit the height of catalog items with very long names
- - - - -
b2f9cb8e by Mathijs den Burger at 2018-03-27T12:49:36+02:00
CHANNELMGR-1767 Show border below tabs in left side-panel
The border needs to be extended inside the resize handle with an
additional pseudo element, otherwise it leaves an ugly 10px gap.
- - - - -
5 changed files:
-
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.scss
- frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.html
- frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.scss
- frontend-ng/src/app/channel/sidePanels/resizeHandle/resizeHandle.scss
- frontend-ng/src/styles/_variables.scss
Changes:
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.scss
=
---
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.scss
+++
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.scss
@@ -13,6 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+@import 'variables';
+
component-catalog {
height: 100%;
@@ -28,6 +30,12 @@ component-catalog {
border-radius: 0 !important;
}
+ .md-list-item-text {
+// very long component names should not increase the height of list items
+max-height: $catalog-item-height;
+overflow: hidden;
+ }
+
.catalog-list-item-active {
font-style: italic;
}
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.html
=
--- a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.html
+++ b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.html
@@ -21,6 +21,7 @@
md-component-id="left-side-panel"
md-disable-backdrop>
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.scss
=
--- a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.scss
+++ b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.scss
@@ -19,10 +19,6 @@ left-side-panel {
md-sidenav {
max-width: 100%;
width: 100%;
-
-md-tabs {
- padding-right: 12px;
-}
}
&.in-resize {
@@ -40,5 +36,16 @@ left-side-panel {
&.sidepanel-lifted {
z-index: $z-index-sidepanel-lifted;
}
+
+ // visually extend the bottom border of the tabs in the resize handle
+ resize-handle::before {
+border-bottom: 1px solid $tabs-bottom-border-color;
+content: "";
+height: $tabs-header-height;
+position: absolute;
+right: 0;
+top: 0;
+width: $resize-handle-width-right;
+ }
}
=
frontend-ng/src/app/channel/sidePanels/resizeHandle/resizeHandle.scss
=
--- a/frontend-ng/src/app/channel/sidePanels/resizeHandle/resizeHandle.scss
+++ b/frontend-ng/src/app/channel/sidePanels/resizeHandle/resizeHandle.scss
@@ -17,8 +17,6 @@
@import 'variables';
resize-handle {
- $handle-width-left: 20px;
- $handle-width-right: 10px;
$handle-height: 100%;
height: $handle-height;
@@ -31,20 +29,20 @@ resize-handle {
&.left {
left: -7px;
position: absolute;
-width: $handle-width-left;
+width: $resize-handle-width-left;
.handle-inner {
background-position: -4px;
- width: $handle-width-left;
+ width: $resize-handle-width-left;
}
}
&.right {
-width: $handle-width-right;
+width: $resize-handle-width-right;
.handle-inner {
background-position: -12px;
- width: $handle-width-right;
+ width: $resize-handle-width-right;
}
}
=
frontend-ng/src/styles/_variables.scss
=
--- a/frontend-ng/src/styles/_variables.scss
+++ b/frontend-ng/src/styles/_variables.scss
@@ -101,7 +101,18 @@ $canvas-bgcolor: #c1c3c5;
// the default background color in browsers is white, so make the sheet white
too
$sheet-bgcolor: #fff;
+
+// Left side panel
$list-item-active-bgcolor: rgba(158, 158, 158, .2);
+$catalog-item-height: 70px;
+
+// Resize handles for side-panels
+$resize-handle-width-left: 20px;
+$resize-handle-width-right: 10px;
+
+// Tabs
+$tabs-bottom-border-color: rgba(0, 0, 0, .12);
+$tabs-header-height: 48px;
// Picker
$picker-subheader-bgcolor: $grey-100;
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/3
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1767] 4 commits: CHANNELMGR-1767 Move search component dependency to child modules
Mathijs den Burger pushed to branch feature/CHANNELMGR-1767 at cms-community /
hippo-addon-channel-manager
Commits:
a983f377 by Mathijs den Burger at 2018-03-27T09:37:55+02:00
CHANNELMGR-1767 Move search component dependency to child modules
The left side panel itself does not use search, its two child components
do.
- - - - -
4804ab63 by Mathijs den Burger at 2018-03-27T10:03:05+02:00
CHANNELMGR-1767 Move h4 rule to sitemap listing SASS
The h4 is only used in the sitemap listing.
- - - - -
f8387666 by Mathijs den Burger at 2018-03-27T10:03:23+02:00
CHANNELMGR-1767 Bump copyright year
- - - - -
3d95120e by Mathijs den Burger at 2018-03-27T10:08:06+02:00
CHANNELMGR-1767 Initialize empty filtered array in constructor
To ensure code that depends on the filtered array does not break in the
future. It also reduces the magic of how the filtered array is created.
- - - - -
8 changed files:
-
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.component.js
-
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.controller.js
-
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.module.js
- frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.module.js
- frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.scss
-
frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/siteMapListing.controller.js
-
frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/siteMapListing.module.js
-
frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/siteMapListing.scss
Changes:
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.component.js
=
---
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.component.js
+++
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.component.js
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2016-2018 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.controller.js
=
---
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.controller.js
+++
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.controller.js
@@ -24,7 +24,7 @@ class ComponentCatalogController {
this.ComponentCatalogService = ComponentCatalogService;
this.filteredFields = ['label'];
-this.filteredComponents = this.components;
+this.filteredComponents = [];
}
_toggleState() {
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.module.js
=
---
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.module.js
+++
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.module.js
@@ -16,9 +16,12 @@
import ComponentCatalogService from './componentCatalog.service';
import componentCatalogComponent from './componentCatalog.component';
+import searchModule from '../search/search.module';
const componentCatalogModule = angular
- .module('hippo-cm.channel.componentCatalog', [])
+ .module('hippo-cm.channel.componentCatalog', [
+searchModule.name,
+ ])
.service('ComponentCatalogService', ComponentCatalogService)
.component('componentCatalog', componentCatalogComponent);
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.module.js
=
---
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.module.js
+++
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.module.js
@@ -17,13 +17,11 @@
import leftSidePanelComponent from './leftSidePanel.component';
import leftSidePanelToggleComponent from
'./leftSidePanelToggle/leftSidePanelToggle.component';
import componentCatalogModule from
'./componentCatalog/componentCatalog.module';
-import searchModule from './search/search.module';
import sitemapListingModule from './siteMapListing/siteMapListing.module';
const leftSidePanelModule = angular
.module('hippo-cm.channel.leftSidePanelModule', [
componentCatalogModule.name,
-searchModule.name,
sitemapListingModule.name,
])
.component('leftSidePanel', leftSidePanelComponent)
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSide
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1767] CHANNELMGR-1767 Use virtual repeat container in component catalog
Mathijs den Burger pushed to branch feature/CHANNELMGR-1767 at cms-community /
hippo-addon-channel-manager
Commits:
5439210d by Mathijs den Burger at 2018-03-26T21:09:46+02:00
CHANNELMGR-1767 Use virtual repeat container in component catalog
The md-1-line class per item gave a weird virtual scroller height while
md-2-line class works fine. Only the name of the components is smaller
now, but that actually looks quite good.
- - - - -
3 changed files:
-
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.html
-
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.scss
-
frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/siteMapListing.scss
Changes:
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.html
=
---
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.html
+++
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.html
@@ -22,26 +22,27 @@
-
-
-
+
+
+
+
-
-
- {{ $ctrl.getComponentLabel(component) }}
-
-
+
+
+{{ $ctrl.getComponentLabel(component)
}}
+
+
-
-close
-
-
-
-
-
+
+ close
+
+
+
+
+
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.scss
=
---
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.scss
+++
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.scss
@@ -16,6 +16,14 @@
component-catalog {
height: 100%;
+ > md-content {
+height: 100%;
+ }
+
+ .md-virtual-repeat-container {
+height: 100%;
+ }
+
.md-avatar {
border-radius: 0 !important;
}
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/siteMapListing.scss
=
---
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/siteMapListing.scss
+++
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/siteMapListing.scss
@@ -21,7 +21,7 @@ site-map-listing {
height: 100%;
}
- md-virtual-repeat-container {
+ .md-virtual-repeat-container {
height: 100%;
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/5439210d93f79a18db6b8c6d91f80d1d0008c5ed
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/5439210d93f79a18db6b8c6d91f80d1d0008c5ed
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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1767] CHANNELMGR-1767 Move component catalog specific rules to its own scss
Mathijs den Burger pushed to branch feature/CHANNELMGR-1767 at cms-community /
hippo-addon-channel-manager
Commits:
22dd5cea by Mathijs den Burger at 2018-03-26T20:53:22+02:00
CHANNELMGR-1767 Move component catalog specific rules to its own scss
- - - - -
2 changed files:
-
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.scss
- frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.scss
Changes:
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.scss
=
---
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.scss
+++
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.scss
@@ -15,4 +15,12 @@
*/
component-catalog {
height: 100%;
+
+ .md-avatar {
+border-radius: 0 !important;
+ }
+
+ .catalog-list-item-active {
+font-style: italic;
+ }
}
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.scss
=
--- a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.scss
+++ b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.scss
@@ -33,18 +33,10 @@ left-side-panel {
padding: 0;
}
- .md-avatar {
-border-radius: 0 !important;
- }
-
.list-item-active {
background-color: $list-item-active-bgcolor;
}
- .catalog-list-item-active {
-font-style: italic;
- }
-
// OpenSans fonts cut off at the 'g' with line-height 1.2 from Material
.md-list-item-text h4 {
line-height: 1.3em !important;
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/22dd5cea1e502db1036d4414208c57a09845caa2
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/22dd5cea1e502db1036d4414208c57a09845caa2
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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1767] CHANNELMGR-1767 Add search to component catalog
Mathijs den Burger pushed to branch feature/CHANNELMGR-1767 at cms-community /
hippo-addon-channel-manager
Commits:
e9a7b76d by Mathijs den Burger at 2018-03-26T17:32:05+02:00
CHANNELMGR-1767 Add search to component catalog
- - - - -
6 changed files:
-
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.component.js
-
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.controller.js
-
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.html
- +
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.scss
- frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.html
- frontend-ng/src/i18n/en.json
Changes:
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.component.js
=
---
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.component.js
+++
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.component.js
@@ -16,6 +16,7 @@
import ComponentCatalogController from './componentCatalog.controller';
import template from './componentCatalog.html';
+import './componentCatalog.scss';
const componentCatalogComponent = {
bindings: {
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.controller.js
=
---
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.controller.js
+++
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.controller.js
@@ -22,6 +22,9 @@ class ComponentCatalogController {
this.MaskService = MaskService;
this.OverlayService = OverlayService;
this.ComponentCatalogService = ComponentCatalogService;
+
+this.filteredFields = ['label'];
+this.filteredComponents = this.components;
}
_toggleState() {
@@ -31,6 +34,10 @@ class ComponentCatalogController {
}
}
+ onFilter(filteredComponents) {
+this.filteredComponents = filteredComponents;
+ }
+
onSelect(component) {
this._toggleState();
this.ComponentCatalogService.selectComponent(component);
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.html
=
---
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.html
+++
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.html
@@ -13,27 +13,35 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
-
-
-
-
-{{ $ctrl.getComponentLabel(component) }}
-
-
-
-
- close
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{ $ctrl.getComponentLabel(component) }}
+
+
+
+
+close
+
+
+
+
+
+
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.scss
=
--- /dev/null
+++
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.scss
@@ -0,0 +1,18 @@
+/*!
+ * Copyright 2018 Hippo B.V. (http://www.onehippo.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+component-catalog {
+ height: 100%;
+}
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.html
=
--- a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.html
+++ b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.html
@@ -24,10 +24,17 @@
md-no-pagination
class="qa-sidenav-tabs">
-
+
+
-
+
+
=
frontend-ng/src/i18n/en.json
=
--- a/frontend-ng/src/i18n/en.json
+++ b/frontend-ng/src/i18n/en.json
@@ -172,6 +172,8 @@
"SAVE_CHANGES_GENERIC": "'{{documentName}}' has unsaved changes. Do you want
to save or discard these changes?"
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/CHANNELMGR-1767
Mathijs den Burger pushed new branch feature/CHANNELMGR-1767 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CHANNELMGR-1767 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1391] CHANNELMGR-1391 Add tests for $mdDateLocale and moment.js initialization
Mathijs den Burger pushed to branch feature/CHANNELMGR-1391 at cms-community /
hippo-addon-channel-manager
Commits:
95bf4b83 by Mathijs den Burger at 2018-03-26T12:51:10+02:00
CHANNELMGR-1391 Add tests for $mdDateLocale and moment.js initialization
- - - - -
1 changed file:
- frontend-ng/src/app/hippo-cm.spec.js
Changes:
=
frontend-ng/src/app/hippo-cm.spec.js
=
--- a/frontend-ng/src/app/hippo-cm.spec.js
+++ b/frontend-ng/src/app/hippo-cm.spec.js
@@ -1,5 +1,5 @@
/*
- * Copyright 2015-2017 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2015-2018 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,11 +16,13 @@
import angular from 'angular';
import 'angular-mocks';
+import moment from 'moment-timezone';
describe('The hippo-cm module', () => {
let configService;
let $http;
let $httpBackend;
+ let $injector;
let $rootScope;
let $state;
let $translate;
@@ -42,10 +44,11 @@ describe('The hippo-cm module', () => {
$translateProvider.translations('nl', MOCK_TRANSLATIONS.nl);
});
-inject((ConfigService, _$http_, _$httpBackend_, _$rootScope_, _$state_,
_$translate_, _$window_) => {
+inject((ConfigService, _$http_, _$httpBackend_, _$injector_, _$rootScope_,
_$state_, _$translate_, _$window_) => {
configService = ConfigService;
$http = _$http_;
$httpBackend = _$httpBackend_;
+ $injector = _$injector_;
$rootScope = _$rootScope_;
$state = _$state_;
$translate = _$translate_;
@@ -88,4 +91,76 @@ describe('The hippo-cm module', () => {
$httpBackend.flush();
expect($window.APP_TO_CMS.publish).toHaveBeenCalledWith('user-activity');
});
+
+ it('uses the user locale for moment.js', () => {
+configService.locale = 'nl';
+$state.go('hippo-cm.dummy-child-state');
+$rootScope.$apply();
+
+expect(moment.locale()).toEqual('nl');
+ });
+
+ describe('Angular Material Date Locale Provider', () => {
+it('uses an empty string for invalid dates', () => {
+ const $mdDateLocale = $injector.get('$mdDateLocale');
+ const invalidDate = new Date('2015-13-25T35:78:89.000Z');
+ expect($mdDateLocale.formatDate(invalidDate)).toEqual('');
+});
+
+describe('with a Dutch user locale', () => {
+ let $mdDateLocale;
+
+ beforeEach(() => {
+configService.locale = 'nl';
+$state.go('hippo-cm.dummy-child-state');
+$rootScope.$apply();
+
+// fetch $mdDateLocale after setting the locale so it uses the tweaks
in the $mdDateLocaleProvider
+$mdDateLocale = $injector.get('$mdDateLocale');
+ });
+
+ it('uses locale-specific month names', () => {
+expect($mdDateLocale.months).toEqual(['januari', 'februari', 'maart',
'april', 'mei', 'juni', 'juli', 'augustus', 'september', 'oktober', 'november',
'december']);
+ });
+
+ it('uses locale-specific short month names', () => {
+expect($mdDateLocale.shortMonths).toEqual(['jan.', 'feb.', 'mrt.',
'apr.', 'mei', 'jun.', 'jul.', 'aug.', 'sep.', 'okt.', 'nov.', 'dec.']);
+ });
+
+ it('uses locale-specific day names', () => {
+expect($mdDateLocale.days).toEqual(['maandag', 'dinsdag', 'woensdag',
'donderdag', 'vrijdag', 'zaterdag', 'zondag']);
+ });
+
+ it('uses locale-specific short day names', () => {
+expect($mdDateLocale.shortDays).toEqual(['ma', 'di', 'wo', 'do', 'vr',
'za', 'zo']);
+ });
+
+ it('formats dates in the user locale', () => {
+const christmas = new Date('2015-12-25T06:53:00.000Z');
+expect($mdDateLocale.formatDate(christmas)).toEqual('25-12-2015');
+ });
+});
+
+describe('without a locale', () => {
+ let $mdDateLocale;
+
+ beforeEach(() => {
+configService.locale = null;
+$state.go('hippo-cm.dummy-child-state');
+$rootScope.$apply();
+
+// fetch $mdDateLocale after setting the locale so it uses the tweaks
in the $mdDateLocaleProvider
+$mdDateLocale = $injector.get('$mdDateLocale');
+ });
+
+ it('falls back to English', () => {
+expect(moment.locale()).toEqual('en');
+ });
+
+ it('formats dates in the English locale', () => {
+const christmas = new Date('2015-12-25T06:53:00.000Z');
+expect($mdDateLocale.formatDate(christmas)).toEqual('12/25/2015');
+ });
+});
+ });
});
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/95bf4b83484cfd2f1da0210da7e5b59ca580a4e9
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/95bf4b83484cfd2f1da0210da7e5b59ca580a4e9
You're receiving this email because of your account on code.onehipp
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1391] CHANNELMGR-1391 Read time zone from user session instead of a cookie
Mathijs den Burger pushed to branch feature/CHANNELMGR-1391 at cms-community /
hippo-addon-channel-manager
Commits:
a172ae57 by Mathijs den Burger at 2018-03-26T11:10:50+02:00
CHANNELMGR-1391 Read time zone from user session instead of a cookie
The DefaultLoginPlugin puts the selected time zone in the server-side
user session as well as in a cookie. The cookie is used to re-select
a previously selected time zone in the login page, but was now also used
to initialize the time zone in the Channel Manager. Thats an unexpected
side channel between modules that should be avoided.
- - - - -
5 changed files:
- frontend-ng/package-lock.json
- frontend-ng/package.json
- frontend-ng/src/app/hippo-cm.js
- frontend-ng/src/app/services/config.service.js
-
frontend/src/main/java/org/onehippo/cms7/channelmanager/channeleditor/ChannelEditor.java
Changes:
=
frontend-ng/package-lock.json
=
--- a/frontend-ng/package-lock.json
+++ b/frontend-ng/package-lock.json
@@ -371,11 +371,6 @@
"resolved":
"https://registry.npmjs.org/angular-aria/-/angular-aria-1.5.11.tgz;,
"integrity": "sha1-JpY6wzaJHO17GZ5Zr9fpsl5T1qY="
},
-"angular-cookies": {
- "version": "1.5.11",
- "resolved":
"https://registry.npmjs.org/angular-cookies/-/angular-cookies-1.5.11.tgz;,
- "integrity": "sha1-iFWN58UETcw6vreWFNfvgQe6ScA="
-},
"angular-local-storage": {
"version": "0.7.1",
"resolved":
"https://registry.npmjs.org/angular-local-storage/-/angular-local-storage-0.7.1.tgz;,
=
frontend-ng/package.json
=
--- a/frontend-ng/package.json
+++ b/frontend-ng/package.json
@@ -28,7 +28,6 @@
"angular": "1.5.11",
"angular-animate": "1.5.11",
"angular-aria": "1.5.11",
-"angular-cookies": "1.5.11",
"angular-local-storage": "0.7.1",
"angular-material": "1.1.5",
"angular-messages": "1.5.11",
=
frontend-ng/src/app/hippo-cm.js
=
--- a/frontend-ng/src/app/hippo-cm.js
+++ b/frontend-ng/src/app/hippo-cm.js
@@ -16,7 +16,6 @@
import angular from 'angular';
import ngAnimate from 'angular-animate';
-import ngCookies from 'angular-cookies';
import ngDeviceDetector from 'ng-device-detector';
import ngLocalStorage from 'angular-local-storage';
import ngMaterial from 'angular-material';
@@ -59,7 +58,6 @@ import run from './hippo-cm.run';
const hippoCmng = angular
.module('hippo-cm', [
ngAnimate,
-ngCookies,
ngDeviceDetector,
ngLocalStorage,
ngMaterial,
=
frontend-ng/src/app/services/config.service.js
=
--- a/frontend-ng/src/app/services/config.service.js
+++ b/frontend-ng/src/app/services/config.service.js
@@ -15,13 +15,12 @@
*/
class ConfigService {
- constructor($cookies, $window, CmsService) {
+ constructor($window, CmsService) {
'ngInject';
this.$window = $window;
this.locale = 'en';
-this.timeZone = $cookies.get('tzcookie');
this.rootUuid = 'cafebabe-cafe-babe-cafe-babecafebabe';
this.contextPaths = ['/site'];
=
frontend/src/main/java/org/onehippo/cms7/channelmanager/channeleditor/ChannelEditor.java
=
---
a/frontend/src/main/java/org/onehippo/cms7/channelmanager/channeleditor/ChannelEditor.java
+++
b/frontend/src/main/java/org/onehippo/cms7/channelmanager/channeleditor/ChannelEditor.java
@@ -70,6 +70,10 @@ public class ChannelEditor extends ExtPanel {
@ExtProperty
@SuppressWarnings("unused")
+private String timeZone;
+
+@ExtProperty
+@SuppressWarnings("unused")
private String apiUrlPrefix;
@ExtProperty
@@ -122,8 +126,13 @@ public class ChannelEditor extends ExtPanel {
this.apiUrlPrefix = apiUrlPrefix;
this.contextPaths = contextPaths;
this.locale = Session.get().getLocale().toString();
+
+final UserSession userSession = UserSession.get();
+this.timeZone =
userSession.getClientInfo().getProperties().getTimeZone().getID();
+this.cmsUser = userSession.getJcrSession().getUserID();
+
this.debug =
Application.get().getDebugSettings().isAjaxDebugModeEnabled();
-this.cmsUser = UserSession.get().getJcrSession().getUserID();
+
this.ckeditorUrl =
CKEditorConstants.getCKEditorJsReference().getUrl().toString();
this.ckeditorTimestamp = CKEditorConstants.CKEDITOR_TIMESTAMP;
View it on GitLab:
https://code.onehippo.or
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1391] 4 commits: CHANNELMGR-1391 Fix lint error
Mathijs den Burger pushed to branch feature/CHANNELMGR-1391 at cms-community /
hippo-addon-channel-manager
Commits:
2cb082de by Mathijs den Burger at 2018-03-26T10:00:14+02:00
CHANNELMGR-1391 Fix lint error
- - - - -
fe09d1d0 by Mathijs den Burger at 2018-03-26T10:12:57+02:00
CHANNELMGR-1391 Improve name of _checkInit method
- - - - -
fe0e8832 by Mathijs den Burger at 2018-03-26T10:24:40+02:00
CHANNELMGR-1391 Simplify check for hours higher than 23
If hours is null, the comparison is also false.
- - - - -
20c4fcf9 by Mathijs den Burger at 2018-03-26T10:25:25+02:00
CHANNELMGR-1391 Polish unit test
- reuse field value in expected old date
- capitalize names
- - - - -
2 changed files:
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.controller.js
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.spec.js
Changes:
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.controller.js
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.controller.js
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.controller.js
@@ -43,7 +43,7 @@ export class DateValue {
this._initJsDate();
}
- _initJsDate () {
+ _initJsDate() {
// use only the year, month and day of the moment and ignore the time and
time zone
this.jsDate = new Date(this.moment.format('L'));
}
@@ -53,7 +53,7 @@ export class DateValue {
this.jsDate = null;
}
- _checkInit() {
+ _initIfNeeded() {
if (this.moment === null) {
this._init(moment());
}
@@ -64,8 +64,8 @@ export class DateValue {
}
set hours(hours) {
-const checkedHours = (hours && hours > 23) ? 23 : hours;
-this._checkInit();
+const checkedHours = hours > 23 ? 23 : hours;
+this._initIfNeeded();
this.moment.hours(checkedHours);
}
@@ -84,7 +84,7 @@ export class DateValue {
}
set minutes(minutes) {
-this._checkInit();
+this._initIfNeeded();
this.moment.minutes(minutes);
}
@@ -94,7 +94,7 @@ export class DateValue {
set date(date) {
if (date) {
- this._checkInit();
+ this._initIfNeeded();
this.moment.year(date.getFullYear());
this.moment.month(date.getMonth());
this.moment.date(date.getDate()); // day of the month
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.spec.js
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.spec.js
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.spec.js
@@ -63,7 +63,7 @@ describe('DateField', () => {
it('sets the value of a date to the current date and time when set to now is
called', () => {
spyOn($ctrl, 'valueChanged');
-const oldValue = new DateValue('2015-08-24T06:53:00.000Z');
+const oldValue = new DateValue(fieldValue.value);
$ctrl.dateValue = new DateValue('2015-08-24T06:53:00.000Z');
$ctrl.setToNow();
@@ -117,8 +117,8 @@ describe('DateValue', () => {
// methods. The fields for the hours and minutes part of the date are
using their own getter/setters.
it('shows the day of the month correctly across the dateline', () => {
- // in Amsterdam this is january 1 in 2019 at 0:30 (am)
- // in Londen this is december 31 in 2018 at 23:30
+ // in Amsterdam this is January 1 in 2019 at 0:30 (am)
+ // in London this is December 31 in 2018 at 23:30
const dateString = '2019-01-01T00:30:00.000+01:00';
dateValue = new DateValue(dateString, 'Europe/London');
@@ -129,8 +129,8 @@ describe('DateValue', () => {
});
it('shows the month correctly across the dateline', () => {
- // in Amsterdam this is january 1 in 2019 at 0:30 (am)
- // in Londen this is december 31 in 2018 at 23:30
+ // in Amsterdam this is January 1 in 2019 at 0:30 (am)
+ // in London this is December 31 in 2018 at 23:30
const dateString = '2019-01-01T00:30:00.000+01:00';
dateValue = new DateValue(dateString, 'Europe/London');
@@ -141,8 +141,8 @@ describe('DateValue', () => {
});
it('shows the year correctly across the dateline', () => {
- // in Amsterdam this is january 1 in 2019 at 0:30 (am)
- // in Londen this is december 31 in 2018 at 23:30
+ // in Amsterdam this is January 1 in 2019 at 0:30 (am)
+ // in London this is December 31 in 2018 at 23:30
const dateString = '2019-01-01T00:30:00.000+01:00';
dateValue = new DateValue(dateString, 'Europe/London');
@@ -153,8 +153,8 @@ describe('DateValue', () => {
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1391] CHANNELMGR-1391 Use helper method to initialize jsDate
Mathijs den Burger pushed to branch feature/CHANNELMGR-1391 at cms-community /
hippo-addon-channel-manager
Commits:
6ef46192 by Mathijs den Burger at 2018-03-26T09:40:37+02:00
CHANNELMGR-1391 Use helper method to initialize jsDate
- - - - -
1 changed file:
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.controller.js
Changes:
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.controller.js
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.controller.js
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.controller.js
@@ -40,6 +40,11 @@ export class DateValue {
if (this.userTimeZone) {
this.moment.tz(this.userTimeZone);
}
+this._initJsDate();
+ }
+
+ _initJsDate () {
+// use only the year, month and day of the moment and ignore the time and
time zone
this.jsDate = new Date(this.moment.format('L'));
}
@@ -93,7 +98,7 @@ export class DateValue {
this.moment.year(date.getFullYear());
this.moment.month(date.getMonth());
this.moment.date(date.getDate()); // day of the month
- this.jsDate = new Date(this.moment.format('L'));
+ this._initJsDate();
} else {
this._initBlank();
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/6ef46192dd0d0373d38841dd883985f81f941b6c
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/6ef46192dd0d0373d38841dd883985f81f941b6c
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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][master] CHANNELMGR-1744 Added license headers to fix the build
Mathijs den Burger pushed to branch master at cms-community / hippo-addon-channel-manager Commits: 8126c19c by Mathijs den Burger at 2018-03-23T15:33:40+01:00 CHANNELMGR-1744 Added license headers to fix the build - - - - - 3 changed files: - documentation/src/main/markdown/channel-manager-guidebook.md - documentation/src/main/plantuml/container-diagram.txt - documentation/src/main/plantuml/context-diagram.txt Changes: = documentation/src/main/markdown/channel-manager-guidebook.md = --- a/documentation/src/main/markdown/channel-manager-guidebook.md +++ b/documentation/src/main/markdown/channel-manager-guidebook.md @@ -1,3 +1,19 @@ + + # Channel Manager Guidebook Guide for the Channel Manager codebase. = documentation/src/main/plantuml/container-diagram.txt = --- a/documentation/src/main/plantuml/container-diagram.txt +++ b/documentation/src/main/plantuml/container-diagram.txt @@ -1,3 +1,19 @@ +/' + Copyright 2018 Hippo B.V. (http://www.onehippo.com) + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +'/ + @startuml scale 1400 width = documentation/src/main/plantuml/context-diagram.txt = --- a/documentation/src/main/plantuml/context-diagram.txt +++ b/documentation/src/main/plantuml/context-diagram.txt @@ -1,3 +1,19 @@ +/' + Copyright 2018 Hippo B.V. (http://www.onehippo.com) + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +'/ + @startuml scale 600 width View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/8126c19c1e7353251369887fb4df368b8fbadc6e --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/8126c19c1e7353251369887fb4df368b8fbadc6e 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][master] CHANNELMGR-1431 Use gallery picker node type constant directly
Mathijs den Burger pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
c4284291 by Mathijs den Burger at 2018-03-23T15:09:46+01:00
CHANNELMGR-1431 Use gallery picker node type constant directly
- - - - -
2 changed files:
-
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
Changes:
=
content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtils.java
=
---
a/content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtils.java
+++
b/content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtils.java
@@ -29,6 +29,7 @@ import javax.jcr.RepositoryException;
import org.hippoecm.repository.HippoStdNodeType;
import org.hippoecm.repository.util.JcrUtils;
+import org.onehippo.addon.frontend.gallerypicker.GalleryPickerNodeType;
import org.onehippo.cms.channelmanager.content.document.model.FieldValue;
import org.onehippo.cms.channelmanager.content.document.util.FieldPath;
import org.onehippo.cms.channelmanager.content.documenttype.ContentTypeContext;
@@ -67,7 +68,6 @@ public class FieldTypeUtils {
private static final String FIELD_TYPE_COMPOUND = "Compound";
private static final String FIELD_TYPE_CHOICE = "Choice";
-public static final String FIELD_TYPE_IMAGELINK =
"hippogallerypicker:imagelink";
private static final String PROPERTY_FIELD_PLUGIN =
"org.hippoecm.frontend.editor.plugins.field.PropertyFieldPlugin";
private static final String NODE_FIELD_PLUGIN =
"org.hippoecm.frontend.editor.plugins.field.NodeFieldPlugin";
private static final String CONTENT_BLOCKS_PLUGIN =
"org.onehippo.forge.contentblocks.ContentBlocksFieldPlugin";
@@ -114,7 +114,7 @@ public class FieldTypeUtils {
FIELD_TYPE_MAP.put(HippoStdNodeType.NT_HTML, new
TypeDescriptor(RichTextFieldType.class, NODE_FIELD_PLUGIN));
FIELD_TYPE_MAP.put(FIELD_TYPE_COMPOUND, new
TypeDescriptor(CompoundFieldType.class, NODE_FIELD_PLUGIN));
FIELD_TYPE_MAP.put(FIELD_TYPE_CHOICE, new
TypeDescriptor(ChoiceFieldType.class, CONTENT_BLOCKS_PLUGIN));
-FIELD_TYPE_MAP.put(FIELD_TYPE_IMAGELINK, new
TypeDescriptor(ImageLinkFieldType.class, NODE_FIELD_PLUGIN));
+FIELD_TYPE_MAP.put(GalleryPickerNodeType.NT_IMAGE_LINK, new
TypeDescriptor(ImageLinkFieldType.class, NODE_FIELD_PLUGIN));
}
private static final Logger log =
LoggerFactory.getLogger(FieldTypeUtils.class);
=
content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/ChoiceFieldUtils.java
=
---
a/content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/ChoiceFieldUtils.java
+++
b/content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/ChoiceFieldUtils.java
@@ -24,9 +24,9 @@ import javax.jcr.RepositoryException;
import org.hippoecm.repository.HippoStdNodeType;
import org.hippoecm.repository.util.JcrUtils;
+import org.onehippo.addon.frontend.gallerypicker.GalleryPickerNodeType;
import org.onehippo.cms.channelmanager.content.documenttype.ContentTypeContext;
import
org.onehippo.cms.channelmanager.content.documenttype.field.FieldTypeContext;
-import
org.onehippo.cms.channelmanager.content.documenttype.field.FieldTypeUtils;
import
org.onehippo.cms.channelmanager.content.documenttype.util.LocalizationUtils;
import org.onehippo.cms7.services.contenttype.ContentType;
import org.onehippo.cms7.services.contenttype.ContentTypeItem;
@@ -135,7 +135,7 @@ public class ChoiceFieldUtils {
final RichTextFieldType richText = new RichTextFieldType();
richText.init(fieldContext);
return richText;
-} else if
(contentType.isContentType(FieldTypeUtils.FIELD_TYPE_IMAGELINK)) {
+} else if
(contentType.isContentType(GalleryPickerNodeType.NT_IMAGE_LINK)) {
final ImageLinkFieldType imageLink = new ImageLinkFieldType();
imageLink.init(fieldContext);
return imageLink;
@@ -212,7 +212,7 @@ public class ChoiceFieldUtils {
// FIXME: this init call will not load configuration
richText.initListBasedChoice(choiceId);
return richText;
-} else
if(contentType.isContentType(FieldTypeUtils.FIELD_TYPE_IMAGELINK)) {
+} else
if(contentType.isContentType(GalleryPickerNodeType.NT_IMAGE_LINK)) {
// FIXME: this init call will not load configuration
final ImageLinkFieldType imageLink = new ImageLinkFieldType();
imageLink
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1391] CHANNELMGR-1391 Fix lint errors
Mathijs den Burger pushed to branch feature/CHANNELMGR-1391 at cms-community /
hippo-addon-channel-manager
Commits:
575b7471 by Mathijs den Burger at 2018-03-23T15:01:31+01:00
CHANNELMGR-1391 Fix lint errors
- - - - -
1 changed file:
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.scss
Changes:
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.scss
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.scss
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.scss
@@ -22,7 +22,6 @@
}
date-field {
-
.md-datepicker-input-container {
z-index: 2;
border-bottom-width: 0;
@@ -53,7 +52,7 @@ date-field {
md-input-container.md-input-focused > input.timepart {
border-bottom: 2px solid $blue-500 !important;
padding-bottom: 0 !important;
- }
+}
}
.now-button {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/575b74718daa5fd3e8e1264c9bcd235c09d834fb
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/575b74718daa5fd3e8e1264c9bcd235c09d834fb
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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1756] CHANNELMGR-1756 Truncate names of site map items
Mathijs den Burger pushed to branch feature/CHANNELMGR-1756 at cms-community /
hippo-addon-channel-manager
Commits:
6969febc by Mathijs den Burger at 2018-03-23T13:30:33+01:00
CHANNELMGR-1756 Truncate names of site map items
All items should be equally high to work well in the
md-virtual-repeat-container, so the name should not span multiple lines
but a single line only.
- - - - -
1 changed file:
-
frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/siteMapListing.html
Changes:
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/siteMapListing.html
=
---
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/siteMapListing.html
+++
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/siteMapListing.html
@@ -34,7 +34,7 @@
ng-click="$ctrl.showPage(item)">
{{ item.pathInfo | startWithSlash }}
- {{ item.pageTitle || item.name }}
+ {{ item.pageTitle || item.name
}}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/6969febce23d84e62782097e42dc4a40dbaf1f0f
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/6969febce23d84e62782097e42dc4a40dbaf1f0f
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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][master] CHANNELMGR-1430 Don't show outline for focused image in Chrome
Mathijs den Burger pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
a3f18c00 by Mathijs den Burger at 2018-03-23T12:36:59+01:00
CHANNELMGR-1430 Dont show outline for focused image in Chrome
Chrome outlines focused images by default, which looks ugly.
- - - - -
1 changed file:
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/imageLink/imageLink.scss
Changes:
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/imageLink/imageLink.scss
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/imageLink/imageLink.scss
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/imageLink/imageLink.scss
@@ -39,6 +39,10 @@ image-link {
img {
cursor: pointer;
padding-top: 6px;
+
+&:focus {
+ outline: none; // prevent browser-specific outline when focused
+}
}
.md-icon-button > md-icon {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/a3f18c00b75141b75b3483002b017e499a25172c
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/a3f18c00b75141b75b3483002b017e499a25172c
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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1756] CHANNELMGR-1756 Add unit tests for multiple terms in search filter
Mathijs den Burger pushed to branch feature/CHANNELMGR-1756 at cms-community /
hippo-addon-channel-manager
Commits:
ac7573e2 by Mathijs den Burger at 2018-03-21T22:59:29+01:00
CHANNELMGR-1756 Add unit tests for multiple terms in search filter
- - - - -
1 changed file:
-
frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/search.filter.spec.js
Changes:
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/search.filter.spec.js
=
---
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/search.filter.spec.js
+++
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/search.filter.spec.js
@@ -54,13 +54,25 @@ describe('search filter', () => {
it('should return all matches for a single term', () => {
expect(searchFilter(people, 'a', ['firstName'])).toEqual([andrii, arthur,
mathijs, michael]);
expect(searchFilter(people, 'b', ['firstName'])).toEqual([bert]);
+expect(searchFilter(people, 'AnDr', ['firstName'])).toEqual([andrii]);
expect(searchFilter(people, 'q', ['firstName'])).toEqual([]);
});
- it('should return all matches in all fields', () => {
+ it('should return all matches for a single term in all fields', () => {
expect(searchFilter(people, 'er', ['firstName',
'lastName'])).toEqual([bert, mathijs, michael]);
});
+ it('should return all matches for multiple terms', () => {
+expect(searchFilter(people, 'a r', ['firstName'])).toEqual([andrii,
arthur]);
+expect(searchFilter(people, 'er en', ['lastName'])).toEqual([mathijs]);
+ });
+
+ it('should return all matches for multiple terms in all fields', () => {
+expect(searchFilter(people, 'er s', ['firstName',
'lastName'])).toEqual([bert, mathijs]);
+expect(searchFilter(people, 'den burger', ['firstName',
'lastName'])).toEqual([mathijs]);
+expect(searchFilter(people, 'arthur metternich', ['firstName',
'lastName'])).toEqual([]);
+ });
+
it('should return all matches when there are no terms', () => {
expect(searchFilter(people, '', ['firstName'])).toEqual(people);
expect(searchFilter(people, ' ', ['firstName'])).toEqual(people);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/ac7573e22c776534e09bd26914455ce54cefda4e
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/ac7573e22c776534e09bd26914455ce54cefda4e
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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1756] 6 commits: CHANNELMGR-1756 Improve variable names
Mathijs den Burger pushed to branch feature/CHANNELMGR-1756 at cms-community /
hippo-addon-channel-manager
Commits:
91e13d76 by Mathijs den Burger at 2018-03-21T18:17:03+01:00
CHANNELMGR-1756 Improve variable names
- list -- items (multiple things sounds more logical)
- query -- keywords (in line with the controller)
- internal query - terms (in line with Lucene)
- needle -- term (in line with terms)
- - - - -
0e5f82e5 by Mathijs den Burger at 2018-03-21T21:20:46+01:00
CHANNELMGR-1756 Relax assumptions on input
- assume fields is always an Array instead of stringifying a non-array
- assume non-string fields never match instead of stringifying them
- - - - -
66c03d6a by Mathijs den Burger at 2018-03-21T21:25:14+01:00
CHANNELMGR-1756 Rename siteMapListingFilter to searchFilter
Seems a more logical name since its so generic.
- - - - -
1bcf9af6 by Mathijs den Burger at 2018-03-21T21:33:16+01:00
CHANNELMGR-1756 Remove empty terms before searching
More than one space between terms results in empty terms when splitting
on spaces. Looping over these empty terms is unnecessary since they will
never match, so filter them out beforehand.
- - - - -
4c6a50bf by Mathijs den Burger at 2018-03-21T21:35:02+01:00
CHANNELMGR-1756 Also search in the pageTitle of site map items
The list renders either the pageTitle or (if missing) the name property,
so search both.
- - - - -
6b9774b3 by Mathijs den Burger at 2018-03-21T21:59:02+01:00
CHANNELMGR-1756 Add unit tests for search filter
- - - - -
4 changed files:
-
frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/siteMapListing.filter.js
→
frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/search.filter.js
- +
frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/search.filter.spec.js
-
frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/siteMapListing.controller.js
-
frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/siteMapListing.module.js
Changes:
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/siteMapListing.filter.js
→
frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/search.filter.js
=
---
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/siteMapListing.filter.js
+++
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/search.filter.js
@@ -14,28 +14,26 @@
* limitations under the License.
*/
-function siteMapListingFilter() {
+function searchFilter() {
'ngInject';
- return (list, query, fields) => {
-if (!query) {
- return list;
+ return (items, keywords, fields) => {
+if (!keywords) {
+ return items;
}
-query = query.toLowerCase().split(' ');
+const terms = keywords.toLowerCase().split(' ').filter(term => term.length
> 0);
+
+return items.filter(item => terms.every(term => fields.some((field) => {
+ const content = item[field];
-if (!angular.isArray(fields)) {
- fields = [fields.toString()];
-}
-return list.filter(item => query.every(needle => fields.some((field) => {
- let content = item[field] != null ? item[field] : '';
if (!angular.isString(content)) {
-content = `${content}`;
+return false;
}
- return content.toLowerCase().indexOf(needle) > -1;
+ return content.toLowerCase().indexOf(term) > -1;
})));
};
}
-export default siteMapListingFilter;
+export default searchFilter;
=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/search.filter.spec.js
=
--- /dev/null
+++
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/search.filter.spec.js
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2018 Hippo B.V. (http://www.onehippo.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import angular from 'angular';
+import 'angular-mocks';
+
+describe('search filter', () => {
+ let searchFilter;
+
+ const andrii = {
+firstName: 'Andrii',
+lastName: 'Solod',
+qa: true,
+ };
+ const arthur = {
+firstName: 'Arthur',
+lastName: 'Bogaart',
+ };
+ const bert = {
+firstName: 'Bert',
+lastName: 'Leunis',
+ };
+ const mathijs = {
+firstName: 'Mathijs',
+lastName: 'den Burger',
+ };
+
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][master] 4 commits: CHANNELMGR-1430 Move clear and select button a little closer together
Mathijs den Burger pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
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.
- - - - -
2 changed files:
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/imageLink/imageLink.html
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/imageLink/imageLink.scss
Changes:
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/imageLink/imageLink.html
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/imageLink/imageLink.html
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/imageLink/imageLink.html
@@ -15,6 +15,7 @@
-->
+ ng-if="$ctrl.url"
+ ng-class="{'input-bottom-border-limited-image': $ctrl.index > 0}">
{{::$ctrl.hiddenLabel}}
clear
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/imageLink/imageLink.scss
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/imageLink/imageLink.scss
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/imageLink/imageLink.scss
@@ -15,11 +15,14 @@
@import 'variables';
$thumbnail-width: 60px; // default thumbnail max width
+$first-button-left-padding: 8px;
+$button-width: 40px;
$hint-icon-width: 28px; // the hint icon width is 24px + 4px margin
image-link {
.input-bottom-border {
border-bottom: 1px solid;
+max-width: 148px;
}
.input-bottom-border,
@@ -29,6 +32,18 @@ image-link {
border-bottom-color: rgba(0, 0, 0, .12) !important;
}
+ .input-bottom-border-limited-empty {
+max-width: $thumbnail-width + $first-button-left-padding + $button-width;
+ }
+
+ .input-border-border-limited-image {
+max-width: $thumbnail-width + $first-button-left-padding + (2 *
$button-width);
+ }
+
+ img {
+padding-top: 6px;
+ }
+
.md-icon-button > md-icon {
color: $grey-600 !important;
margin: 0;
@@ -44,7 +59,11 @@ image-link {
}
.md-button.md-icon-button {
- margin: 0 0 0 8px;
+ margin: 0;
+
+ &:first-of-type {
+margin-left: $first-button-left-padding;
+ }
}
// the hippo-imagelink-buttons container will overlay the (optional) hint
icon,
@@ -63,7 +82,6 @@ image-link {
}
&.image-has-url {
- align-items: center;
height: 100%;
padding-left: $thumbnail-width;
@@ -72,9 +90,11 @@ image-link {
}
}
+align-items: flex-end;
display: flex;
+min-height: $button-width;
position: absolute;
-top: -2px;
+top: 0;
z-index: 1;
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/3572b3ef12c2ee5660c9669d160c9183e26c048d...c68ef9fa49091957c00925cb3ea3ab30ecaee6fc
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/3572b3ef12c2ee5660c9669d160c9183e26c048d...c68ef9fa49091957c00925cb3ea3ab30ecaee6fc
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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1756] 67 commits: CHANNELMGR-1431 Add ImageLinkFieldType
Mathijs den Burger pushed to branch feature/CHANNELMGR-1756 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 Theres 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/CHANNELMGR-1744-generate-diagrams
Mathijs den Burger pushed new branch feature/CHANNELMGR-1744-generate-diagrams at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CHANNELMGR-1744-generate-diagrams 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
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch feature/CMS-10913
Mathijs den Burger deleted branch feature/CMS-10913 at cms-community / hippo-cms --- 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
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch feature/CMS-10840
Mathijs den Burger deleted branch feature/CMS-10840 at cms-community / hippo-cms --- 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][master] 64 commits: CHANNELMGR-1431 Add ImageLinkFieldType
Mathijs den Burger pushed to branch master 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 Theres 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/CHANNELMGR-1431
Mathijs den Burger deleted branch feature/CHANNELMGR-1431 at cms-community / hippo-addon-channel-manager --- 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/CHANNELMGR-1430
Mathijs den Burger deleted branch feature/CHANNELMGR-1430 at cms-community / hippo-addon-channel-manager --- 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
[HippoCMS-scm] [Git][cms-community/hippo-plugin-gallerypicker] Deleted branch feature/HIPPLUG-1486
Mathijs den Burger deleted branch feature/HIPPLUG-1486 at cms-community / hippo-plugin-gallerypicker --- 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1744] CHANNELMGR-1744 Only generate PlantUML diagrams when Graphviz is present
Mathijs den Burger pushed to branch feature/CHANNELMGR-1744 at cms-community /
hippo-addon-channel-manager
Commits:
b49bb0e1 by Mathijs den Burger at 2018-03-20T17:27:03+01:00
CHANNELMGR-1744 Only generate PlantUML diagrams when Graphviz is present
- - - - -
2 changed files:
- documentation/README.md
- documentation/pom.xml
Changes:
=
documentation/README.md
=
--- a/documentation/README.md
+++ b/documentation/README.md
@@ -1,7 +1,10 @@
The Maven build generates documentation from sources in Markdown (text) and
PlantUML (diagrams):
$ mvn
-
-The result can be found in the file
+
+The resulting HTML file can be viewed in a browser:
target/html/channel-manager-guidebook.html
+
+The PlantUML diagrams are only generated when
[Graphviz](https://www.graphviz.org) is installed.
+The diagrams can also be previewed in IntelliJ using the PlantUML plugin.
=
documentation/pom.xml
=
--- a/documentation/pom.xml
+++ b/documentation/pom.xml
@@ -35,36 +35,6 @@
package
-com.github.jeluard
-plantuml-maven-plugin
-1.2
-
-
-${project.basedir}/src/main/plantuml
-
- *.txt
-
-
- svg
-
-
-
-net.sourceforge.plantuml
-plantuml
-8059
-
-
-
-
-generate-diagrams
-generate-resources
-
- generate
-
-
-
-
-
com.ruleoftech
markdown-page-generator-plugin
2.1.0
@@ -84,4 +54,49 @@
+
+
+ generate-plantuml-diagrams
+
+
+ /usr/bin/dot
+
+
+
+
+
+com.github.jeluard
+plantuml-maven-plugin
+1.2
+
+
+${project.basedir}/src/main/plantuml
+
+ *.txt
+
+
+ svg
+
+
+
+net.sourceforge.plantuml
+plantuml
+8059
+
+
+
+
+generate-diagrams
+generate-resources
+
+ generate
+
+
+
+
+
+
+
+
+
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/b49bb0e1aec2acc60fe28355738a2ce08431e962
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/b49bb0e1aec2acc60fe28355738a2ce08431e962
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
[HippoCMS-scm] [Git][cms-community/hippo-plugin-gallerypicker][feature/HIPPLUG-1486] HIPPLUG-1486 Remove preview.width property from default config
Mathijs den Burger pushed to branch feature/HIPPLUG-1486 at cms-community / hippo-plugin-gallerypicker Commits: 1199ba85 by Mathijs den Burger at 2018-03-20T12:57:03+01:00 HIPPLUG-1486 Remove preview.width property from default config This property is broken by design: rendering each preview image at the same width distorts images whose width is actually smaller. Its usage should not be promoted. - - - - - 1 changed file: - src/main/resources/hcm-config/imagelink-type.yaml Changes: = src/main/resources/hcm-config/imagelink-type.yaml = --- a/src/main/resources/hcm-config/imagelink-type.yaml +++ b/src/main/resources/hcm-config/imagelink-type.yaml @@ -26,13 +26,12 @@ definitions: enable.upload: 'true' image.validator.id: service.gallery.image.validation jcr:primaryType: frontend:plugincluster - frontend:properties: [base.uuid, cluster.name, enable.upload, image.validator.id, last.visited.enabled, last.visited.key, mode, nodetypes, preview.width] + frontend:properties: [base.uuid, cluster.name, enable.upload, image.validator.id, last.visited.enabled, last.visited.key, mode, nodetypes] frontend:references: [model.compareTo, wicket.model] frontend:services: [wicket.id] last.visited.enabled: 'true' last.visited.key: gallerypicker-imagelink nodetypes: [] - preview.width: '60' /root: jcr:primaryType: frontend:plugin plugin.class: org.onehippo.addon.frontend.gallerypicker.GalleryPickerPlugin View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-gallerypicker/commit/1199ba85fb5bc8fac5ceed6cab0b287f076921a2 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-gallerypicker/commit/1199ba85fb5bc8fac5ceed6cab0b287f076921a2 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch bugfix/CHANNELMGR-1724
Mathijs den Burger deleted branch bugfix/CHANNELMGR-1724 at cms-community / hippo-addon-channel-manager --- 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][bugfix/CHANNELMGR-1724] CHANNELMGR-1724 Fix file paths in appended-resources/META-INF/LICENSE
Mathijs den Burger pushed to branch bugfix/CHANNELMGR-1724 at cms-community / hippo-addon-channel-manager Commits: 4a32b914 by Mathijs den Burger at 2018-03-12T14:19:40+01:00 CHANNELMGR-1724 Fix file paths in appended-resources/META-INF/LICENSE - - - - - 1 changed file: - frontend-ng/src/main/appended-resources/META-INF/LICENSE Changes: = frontend-ng/src/main/appended-resources/META-INF/LICENSE = --- a/frontend-ng/src/main/appended-resources/META-INF/LICENSE +++ b/frontend-ng/src/main/appended-resources/META-INF/LICENSE @@ -4,8 +4,8 @@ Addon Channel Manager Frontend Next Generation includes and bundles the followin licensed under the Apache License, Version 2.0. Your use of the code for these sub-components is subject to the terms and conditions of the Apache License, Version 2.0, as specified in the license text above: -angular/hippo-cm/fonts/Regular/** -angular/hippo-cm/scripts/hippo-cm*.min.js (parts originating from https://code.google.com/p/mutation-summary) +angular/hippo-cm/OpenSans-Regular.* +angular/hippo-cm/app.*.js (parts originating from https://code.google.com/p/mutation-summary) For both the above listed sub-components or other bundled sub-components also additional or separate copyright notices and license terms may apply. Your use of the code for these sub-components is also subject to the terms and conditions @@ -37,8 +37,9 @@ angular/hippo-cm/styles/dragula.min.css CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -angular/hippo-cm/scripts/hippo-cm*.min.js -angular/hippo-cm/styles/hippo-cm-*.min.css +angular/hippo-cm/app.*.js +angular/hippo-cm/app.*.css +angular/hippo-cm/vendor.*.js These files include and merge a number of 3rd party resources with separate copyright notices and license terms. Your use of (parts of) these external resources is subject to the terms and conditions of their specific license. View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/4a32b9141561b8fdf725bf82480cd85f45f78bca --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/4a32b9141561b8fdf725bf82480cd85f45f78bca 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1744] 2 commits: CHANNELMGR-1744 Only use name of injectables in generation code
Mathijs den Burger pushed to branch feature/CHANNELMGR-1744 at cms-community /
hippo-addon-channel-manager
Commits:
692ac2be by Mathijs den Burger at 2018-03-12T12:42:50+01:00
CHANNELMGR-1744 Only use name of injectables in generation code
- - - - -
a36957fb by Mathijs den Burger at 2018-03-12T12:43:28+01:00
CHANNELMGR-1744 Add diagram of all shared injectables
- - - - -
2 changed files:
- + documentation/src/main/plantuml/channel-editor-module-shared.txt
- frontend-ng/src/app/generate-plantuml-diagrams.spec.js
Changes:
=
documentation/src/main/plantuml/channel-editor-module-shared.txt
=
--- /dev/null
+++ b/documentation/src/main/plantuml/channel-editor-module-shared.txt
@@ -0,0 +1,51 @@
+@startuml
+scale 1500 width
+rectangle "shared" as hippo_cm_module {
+rectangle HstConstants
+rectangle BrowserService
+rectangle CatalogService
+rectangle CmsService
+rectangle ConfigService
+rectangle ContentService
+rectangle DialogService
+rectangle HstComponentService
+rectangle HstService
+rectangle SessionService
+rectangle SiteMapService
+rectangle SiteMapItemService
+rectangle SiteMenuService
+rectangle DomService
+rectangle FeedbackService
+rectangle PathService
+rectangle ProjectService
+rectangle HippoGlobal
+rectangle illegalCharacters
+rectangle stopPropagation
+rectangle scrollToIf
+rectangle getByProperty
+rectangle incrementProperty
+rectangle startWithSlash
+rectangle ChannelService
+CatalogService --> HstService
+ConfigService --> CmsService
+ContentService --> ConfigService
+ContentService --> PathService
+DialogService --> CmsService
+HstComponentService --> CmsService
+HstComponentService --> HstService
+HstService --> CmsService
+HstService --> ConfigService
+HstService --> PathService
+SessionService --> HstService
+SiteMapService --> HstService
+SiteMapService --> FeedbackService
+SiteMapItemService --> ConfigService
+SiteMapItemService --> HstService
+SiteMapItemService --> FeedbackService
+SiteMenuService --> HstService
+DomService --> BrowserService
+ProjectService --> ConfigService
+ProjectService --> FeedbackService
+ProjectService --> HippoGlobal
+}
+@enduml
=
frontend-ng/src/app/generate-plantuml-diagrams.spec.js
=
--- a/frontend-ng/src/app/generate-plantuml-diagrams.spec.js
+++ b/frontend-ng/src/app/generate-plantuml-diagrams.spec.js
@@ -82,11 +82,10 @@ function isInternalInjectable(name) {
const renderedInjectables = new Set();
-function renderInjectable(injectable) {
- if (!renderedInjectables.has(injectable.name)) {
-dump(`rectangle ${sanitize(injectable.name)}`);
-// TODO: also render injectable.type?
-renderedInjectables.add(injectable.name);
+function renderInjectable(name) {
+ if (!renderedInjectables.has(name)) {
+dump(`rectangle ${sanitize(name)}`);
+renderedInjectables.add(name);
}
}
@@ -178,23 +177,18 @@ xit('generates a graph of all internal modules', () => {
function walkInjectableGraph(moduleName, nodeCallback, edgeCallback) {
const module = angular.module(moduleName);
- const moduleInjectables = module._invokeQueue.map((provider) => {
-return {
- name: provider[2][0],
- type: provider[1],
-}
- });
+ const moduleInjectables = module._invokeQueue.map((provider) =>
provider[2][0]);
moduleInjectables.forEach((injectable) => {
nodeCallback(injectable);
});
module._invokeQueue.forEach((provider) => {
-const injectableName = provider[2][0];
+const injectable = provider[2][0];
const dependencies = provider[2][1].$inject || [];
-dependencies.forEach((dependencyName) => {
- const internalInModule = moduleInjectables.some((injectable) =>
injectable.name === dependencyName);
- edgeCallback(injectableName, dependencyName, internalInModule);
+dependencies.forEach((dependency) => {
+ const internalInModule = moduleInjectables.some((injectable) =>
injectable === dependency);
+ edgeCallback(injectable, dependency, internalInModule);
});
});
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/09db933125a1b8affa59f78f9657ed026e9d9029...a36957fbeada3370675a4cbac1e5fb911fa8c4ba
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/09db933125a1b8affa59f78f9657ed026e9d9029...a36957fbeada3370675a4cbac1e5fb911fa8c4ba
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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1744] CHANNELMGR-1744 Fix ID of repository box in context diagram
Mathijs den Burger pushed to branch feature/CHANNELMGR-1744 at cms-community / hippo-addon-channel-manager Commits: 4e6547f9 by Mathijs den Burger at 2018-03-08T14:08:46+01:00 CHANNELMGR-1744 Fix ID of repository box in context diagram - - - - - 1 changed file: - documentation/src/main/plantuml/context-diagram.txt Changes: = documentation/src/main/plantuml/context-diagram.txt = --- a/documentation/src/main/plantuml/context-diagram.txt +++ b/documentation/src/main/plantuml/context-diagram.txt @@ -30,7 +30,7 @@ CMS -left-> CM : View content in channel CM --> HST : Modifies presentation model HST --> CM : Renders channels -REPO --> CM : Provides content and\n content types +Repository --> CM : Provides content and\n content types CM --> Repository : Creates and\n updates content HST --> Repository : Stores presentation model View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/4e6547f9165d92dd0cb01c11ada81ffa45c5724b --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/4e6547f9165d92dd0cb01c11ada81ffa45c5724b 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/CHANNELMGR-1744
Mathijs den Burger pushed new branch feature/CHANNELMGR-1744 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CHANNELMGR-1744 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/CHANNELMGR-1747
Mathijs den Burger deleted branch feature/CHANNELMGR-1747 at cms-community / hippo-addon-channel-manager --- 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1747] CHANNELMGR-1747 Don't use NPM for angularjs-api dependency
Mathijs den Burger pushed to branch feature/CHANNELMGR-1747 at cms-community /
hippo-addon-channel-manager
Commits:
f6cbd314 by Mathijs den Burger at 2018-03-05T13:31:16+01:00
CHANNELMGR-1747 Dont use NPM for angularjs-api dependency
The SNAPSHOT dependency breaks in Node 8 because the hash changes.
But: Maven can unpack the SNAPSHOT dependency, and Grunt and Karma can
include those unpacked files directly. No need to use NPM there.
- - - - -
6 changed files:
- frontend/Gruntfile.js
- frontend/build.config.js
- frontend/karma.config.js
- frontend/package-lock.json
- frontend/package.json
- frontend/pom.xml
Changes:
=
frontend/Gruntfile.js
=
--- a/frontend/Gruntfile.js
+++ b/frontend/Gruntfile.js
@@ -135,13 +135,20 @@ module.exports = function (grunt) {
'@bloomreach/hippo-theme/dist/js/main.min.js',
'@bloomreach/hippo-theme/dist/images/*',
'@bloomreach/hippo-theme/dist/fonts/*',
+ 'jquery/dist/jquery.min.js',
+ 'jquery/dist/jquery.min.map',
+ 'underscore/underscore-min.js'
+]
+ },
+ {
+expand: true,
+cwd: '<%= build.ngdeps %>',
+dest: '<%= build.ngtarget %>/components',
+src: [
'hippo-addon-channel-manager-angularjs-api/dist/css/main.min.css',
'hippo-addon-channel-manager-angularjs-api/dist/js/main.min.js',
'hippo-addon-channel-manager-angularjs-api/dist/images/*',
- 'hippo-addon-channel-manager-angularjs-api/dist/fonts/*',
- 'jquery/dist/jquery.min.js',
- 'jquery/dist/jquery.min.map',
- 'underscore/underscore-min.js',
+ 'hippo-addon-channel-manager-angularjs-api/dist/fonts/*'
]
}
]
=
frontend/build.config.js
=
--- a/frontend/build.config.js
+++ b/frontend/build.config.js
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2016 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2014-2018 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
module.exports = {
npmDir: 'node_modules',
ngsource: 'js',
+ ngdeps: 'target/dependency',
ngtarget: 'target/classes/angular',
extjssource: 'src/main/resources/org/onehippo/cms7/channelmanager',
extjstarget: 'target/classes/org/onehippo/cms7/channelmanager',
=
frontend/karma.config.js
=
--- a/frontend/karma.config.js
+++ b/frontend/karma.config.js
@@ -37,7 +37,7 @@ module.exports = function karmaConfig(config) {
build.npmDir + '/angular-ui-tree/dist/angular-ui-tree.js',
build.npmDir + '/angular-chosen-localytics/dist/angular-chosen.js',
build.npmDir + '/angular-aria/angular-aria.js',
- build.npmDir +
'/hippo-addon-channel-manager-angularjs-api/dist/js/main.js',
+ build.ngdeps +
'/hippo-addon-channel-manager-angularjs-api/dist/js/main.js',
// testing dependencies
build.npmDir + '/jasmine-jquery/lib/jasmine-jquery.js',
=
frontend/package-lock.json
=
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -4327,14 +4327,6 @@
}
}
},
-"hippo-addon-channel-manager-angularjs-api": {
- "version":
"file:target/dependency/hippo-addon-channel-manager-angularjs-api.tar.gz",
- "integrity":
"sha512-J+s7bAzoWz+fmvSWMD6xORInDRg2Pgo7BzPsVtdcZaw+lfntSDB05AB+V6gqD+Vec699SV1nNGo7JFdjhqntyA==",
- "requires": {
-"angular": "1.4.8",
-"jquery": "2.1.4"
- }
-},
"hmac-drbg": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz;,
=
frontend/package.json
=
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -16,8 +16,7 @@
"angular-translate": "2.8.1",
"angular-translate-loader-static-files": "2.8.1",
"angular-ui-bootstrap": "0.14.3",
-"angular-ui-router": "0.2.15",
-"hippo-addon-channel-manager-angularjs-api":
"./target/dependency/hippo-addon-channel-manager-angularjs-api.tar.gz"
+"angular-ui-router": "0.2.15"
},
"devDependencies": {
"angular-mocks": "1.4.8",
=
frontend/pom.xml
=
--- a/frontend/pom.xml
+++ b/frontend/pom.xml
@@ -1,6 +1,6 @@
[HippoCMS-scm] [Git][cms-community/hippo-cms-release][release/11.2] CMS-16 Bump channel manager version to 4.2.6-SNAPSHOT
Mathijs den Burger pushed to branch release/11.2 at cms-community / hippo-cms-release Commits: de2832e5 by Mathijs den Burger at 2018-03-05T12:14:54+01:00 CMS-16 Bump channel manager version to 4.2.6-SNAPSHOT - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ 11.2.7-SNAPSHOT 3.2.0 - 4.2.5 + 4.2.6-SNAPSHOT 3.2.1 3.2.0 4.2.11 View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/de2832e52a33bff817bbb4ae4f79dc16f04a2f1c --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/de2832e52a33bff817bbb4ae4f79dc16f04a2f1c 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/CHANNELMGR-1748
Mathijs den Burger deleted branch feature/CHANNELMGR-1748 at cms-community / hippo-addon-channel-manager --- 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][release/4.2] 5 commits: CHANNELMGR-1748 Bump frontend-build to 4.4.0
Mathijs den Burger pushed to branch release/4.2 at cms-community /
hippo-addon-channel-manager
Commits:
27db38c2 by Arthur Bogaart at 2018-03-01T15:55:48+01:00
CHANNELMGR-1748 Bump frontend-build to 4.4.0
- - - - -
e95b1861 by Arthur Bogaart at 2018-03-01T16:14:02+01:00
CHANNELMGR-1748 Force usage of karma@2.0.0
- - - - -
ed3e9f90 by Arthur Bogaart at 2018-03-01T16:29:07+01:00
CHANNELMGR-1748 Rename npm-shrinkwrap to package-lock
- - - - -
773da0d9 by Mathijs den Burger at 2018-03-05T12:09:49+01:00
CHANNELMGR-1748 Regenerate license-summary.json
- - - - -
778774b7 by Mathijs den Burger at 2018-03-05T12:10:13+01:00
CHANNELMGR-1748 Reintegrate feature/CHANNELMGR-1748
- - - - -
4 changed files:
- frontend-ng/license-summary.json
- − frontend-ng/npm-shrinkwrap.json
- + frontend-ng/package-lock.json
- frontend-ng/package.json
Changes:
=
frontend-ng/license-summary.json
=
--- a/frontend-ng/license-summary.json
+++ b/frontend-ng/license-summary.json
@@ -28,7 +28,8 @@
"angular-translate-loader-static-files@2.11.1": {
"licenses": "MIT",
"repository":
"https://github.com/angular-translate/bower-angular-translate-loader-static-files;,
-"publisher": "Pascal Precht"
+"publisher": "Pascal Precht",
+"licenseFile":
"node_modules/angular-translate-loader-static-files/README.md"
},
"angular-translate@2.11.1": {
"licenses": "MIT",
@@ -82,7 +83,8 @@
"repository": "https://github.com/webmodules/custom-event;,
"publisher": "Nathan Rajlich",
"email": "nat...@tootallnate.net",
-"url": "http://n8.io/;
+"url": "http://n8.io/;,
+"licenseFile": "node_modules/custom-event/README.md"
},
"dragula@3.7.1": {
"licenses": "MIT",
@@ -99,10 +101,6 @@
"url": "http://paulmillr.com;,
"licenseFile": "node_modules/es6-shim/LICENSE"
},
- "hippo-cm@": {
-"licenses": "Apache-2.0",
-"licenseFile": "license-summary.json"
- },
"jquery@3.1.0": {
"licenses": "MIT",
"repository": "https://github.com/jquery/jquery;,
@@ -111,7 +109,7 @@
"licenseFile": "node_modules/jquery/LICENSE.txt"
},
"mutation-summary@0.0.0": {
-"licenses": "Apache 2.0",
+"licenses": "Apache*",
"repository": "https://code.google.com/p/mutation-summary/;,
"licenseFile": "node_modules/mutation-summary/COPYING"
},
@@ -128,8 +126,9 @@
"licenseFile": "node_modules/ng-focus-if/LICENSE"
},
"open-sans-fontface@1.4.2": {
-"licenses": "Apache License version 2.0",
-"repository": "https://github.com/FontFaceKit/open-sans;
+"licenses": "Apache*",
+"repository": "https://github.com/FontFaceKit/open-sans;,
+"licenseFile": "node_modules/open-sans-fontface/README.md"
},
"re-tree@0.0.2": {
"licenses": "MIT",
@@ -145,4 +144,4 @@
"url": "http://bevacqua.io/;,
"licenseFile": "node_modules/ticky/license"
}
-}
\ No newline at end of file
+}
=
frontend-ng/npm-shrinkwrap.json deleted
=
The diff for this file was not included because it is too large.
=
frontend-ng/package-lock.json
=
The diff for this file was not included because it is too large.
=
frontend-ng/package.json
=
--- a/frontend-ng/package.json
+++ b/frontend-ng/package.json
@@ -34,6 +34,6 @@
},
"devDependencies": {
"angular-mocks": "1.5.8",
-"frontend-build": "4.2.2"
+"frontend-build": "4.4.0"
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/d08899e0826b66eb1e482ca095b866b69332f5c6...778774b7dc57a8abbaf2659f3b2f16560d90e480
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/d08899e0826b66eb1e482ca095b866b69332f5c6...778774b7dc57a8abbaf2659f3b2f16560d90e480
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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1748] CHANNELMGR-1748 Regenerate license-summary.json
Mathijs den Burger pushed to branch feature/CHANNELMGR-1748 at cms-community /
hippo-addon-channel-manager
Commits:
773da0d9 by Mathijs den Burger at 2018-03-05T12:09:49+01:00
CHANNELMGR-1748 Regenerate license-summary.json
- - - - -
1 changed file:
- frontend-ng/license-summary.json
Changes:
=
frontend-ng/license-summary.json
=
--- a/frontend-ng/license-summary.json
+++ b/frontend-ng/license-summary.json
@@ -28,7 +28,8 @@
"angular-translate-loader-static-files@2.11.1": {
"licenses": "MIT",
"repository":
"https://github.com/angular-translate/bower-angular-translate-loader-static-files;,
-"publisher": "Pascal Precht"
+"publisher": "Pascal Precht",
+"licenseFile":
"node_modules/angular-translate-loader-static-files/README.md"
},
"angular-translate@2.11.1": {
"licenses": "MIT",
@@ -82,7 +83,8 @@
"repository": "https://github.com/webmodules/custom-event;,
"publisher": "Nathan Rajlich",
"email": "nat...@tootallnate.net",
-"url": "http://n8.io/;
+"url": "http://n8.io/;,
+"licenseFile": "node_modules/custom-event/README.md"
},
"dragula@3.7.1": {
"licenses": "MIT",
@@ -99,10 +101,6 @@
"url": "http://paulmillr.com;,
"licenseFile": "node_modules/es6-shim/LICENSE"
},
- "hippo-cm@": {
-"licenses": "Apache-2.0",
-"licenseFile": "license-summary.json"
- },
"jquery@3.1.0": {
"licenses": "MIT",
"repository": "https://github.com/jquery/jquery;,
@@ -111,7 +109,7 @@
"licenseFile": "node_modules/jquery/LICENSE.txt"
},
"mutation-summary@0.0.0": {
-"licenses": "Apache 2.0",
+"licenses": "Apache*",
"repository": "https://code.google.com/p/mutation-summary/;,
"licenseFile": "node_modules/mutation-summary/COPYING"
},
@@ -128,8 +126,9 @@
"licenseFile": "node_modules/ng-focus-if/LICENSE"
},
"open-sans-fontface@1.4.2": {
-"licenses": "Apache License version 2.0",
-"repository": "https://github.com/FontFaceKit/open-sans;
+"licenses": "Apache*",
+"repository": "https://github.com/FontFaceKit/open-sans;,
+"licenseFile": "node_modules/open-sans-fontface/README.md"
},
"re-tree@0.0.2": {
"licenses": "MIT",
@@ -145,4 +144,4 @@
"url": "http://bevacqua.io/;,
"licenseFile": "node_modules/ticky/license"
}
-}
\ No newline at end of file
+}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/773da0d9a69dd25c63b6fbda33914568073b3293
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/773da0d9a69dd25c63b6fbda33914568073b3293
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
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch feature/CMS-11090
Mathijs den Burger deleted branch feature/CMS-11090 at cms-community / hippo-cms --- 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
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch feature/CMS-11091
Mathijs den Burger deleted branch feature/CMS-11091 at cms-community / hippo-cms --- 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
[HippoCMS-scm] [Git][cms-community/hippo-essentials][release/3.2] ESSENTIALS-1171 Regenerate license-summary.json
Mathijs den Burger pushed to branch release/3.2 at cms-community /
hippo-essentials
Commits:
ee1505c4 by Mathijs den Burger at 2018-03-02T16:27:24+01:00
ESSENTIALS-1171 Regenerate license-summary.json
- - - - -
1 changed file:
- dashboard/license-summary.json
Changes:
=
dashboard/license-summary.json
=
--- a/dashboard/license-summary.json
+++ b/dashboard/license-summary.json
@@ -1,20 +1,36 @@
{
+ "@bloomreach/hippo-theme@3.2.2": {
+"licenses": "Apache-2.0",
+"repository":
"https://code.onehippo.org/cms-community/hippo-frontend-theme;,
+"licenseFile": "node_modules/@bloomreach/hippo-theme/LICENSE",
+"noticeFile": "node_modules/@bloomreach/hippo-theme/NOTICE"
+ },
"angular-animate@1.4.8": {
"licenses": "MIT",
-"repository": "https://github.com/angular/angular.js;
+"repository": "https://github.com/angular/angular.js;,
+"publisher": "Angular Core Team",
+"email": "angular-core+...@google.com",
+"licenseFile": "node_modules/angular-animate/README.md"
},
"angular-aria@1.4.8": {
"licenses": "MIT",
-"repository": "https://github.com/angular/angular.js;
+"repository": "https://github.com/angular/angular.js;,
+"publisher": "Angular Core Team",
+"email": "angular-core+...@google.com",
+"licenseFile": "node_modules/angular-aria/README.md"
},
"angular-chosen-localytics@1.4.0": {
"licenses": "MIT",
"repository": "https://github.com/leocaseiro/angular-chosen;,
+"publisher": "jr314159",
"licenseFile": "node_modules/angular-chosen-localytics/LICENSE"
},
"angular-sanitize@1.4.8": {
"licenses": "MIT",
-"repository": "https://github.com/angular/angular.js;
+"repository": "https://github.com/angular/angular.js;,
+"publisher": "Angular Core Team",
+"email": "angular-core+...@google.com",
+"licenseFile": "node_modules/angular-sanitize/README.md"
},
"angular-tablesort@1.1.1": {
"licenses": "MIT",
@@ -23,7 +39,9 @@
},
"angular-ui-bootstrap@0.14.3": {
"licenses": "MIT",
-"repository": "https://github.com/angular-ui/bootstrap;
+"repository": "https://github.com/angular-ui/bootstrap;,
+"publisher": "https://github.com/angular-ui/bootstrap/graphs/contributors;,
+"licenseFile": "node_modules/angular-ui-bootstrap/README.md"
},
"angular-ui-router@0.2.15": {
"licenses": "MIT",
@@ -37,31 +55,33 @@
},
"angular@1.4.8": {
"licenses": "MIT",
-"repository": "https://github.com/angular/angular.js;
+"repository": "https://github.com/angular/angular.js;,
+"publisher": "Angular Core Team",
+"email": "angular-core+...@google.com",
+"licenseFile": "node_modules/angular/README.md"
},
- "angular@1.5.7": {
+ "angular@1.6.1": {
"licenses": "MIT",
"repository": "https://github.com/angular/angular.js;,
+"publisher": "Angular Core Team",
+"email": "angular-core+...@google.com",
"licenseFile":
"node_modules/angular-chosen-localytics/node_modules/angular/LICENSE.md"
},
"chosen-npm@1.4.2": {
"licenses": "MIT",
"repository": "https://github.com/harvesthq/chosen;,
+"publisher": "harvest",
"licenseFile": "node_modules/chosen-npm/LICENSE.md"
},
"google-code-prettify@1.0.1": {
-"licenses": "UNKNOWN"
- },
- "hippo-essentials@": {
-"licenses": "Apache-2.0"
- },
- "hippo-theme@3.2.0": {
-"licenses": "MIT*",
-"licenseFile": "node_modules/hippo-theme/LICENSE"
+"licenses": "Apache*",
+"licenseFile": "node_modules/google-code-prettify/COPYING"
},
"jquery@2.1.4": {
"licenses": "MIT",
"repository": "https://github.com/jquery/jquery;,
-"licenseFile": "node_modules/jquery/MIT-LICENSE.txt"
+"publisher": "jQuery Foundation and other contributors",
+"url": "https://github.com/jquery/jquery/blob/2.1.4/AUTHORS.txt;,
+"licenseFile": "node_modules/jquery/README.md"
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/ee1505c452adc2ffd61c8da04740c5679a3a5d32
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/ee1505c452adc2ffd61c8da04740c5679a3a5d32
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
[HippoCMS-scm] [Git][cms-community/hippo-essentials][release/4.2] ESSENTIALS-604 Regenerate license-summary.json
Mathijs den Burger pushed to branch release/4.2 at cms-community /
hippo-essentials
Commits:
2e5bb674 by Mathijs den Burger at 2018-03-02T16:24:37+01:00
ESSENTIALS-604 Regenerate license-summary.json
- - - - -
1 changed file:
- dashboard/license-summary.json
Changes:
=
dashboard/license-summary.json
=
--- a/dashboard/license-summary.json
+++ b/dashboard/license-summary.json
@@ -1,4 +1,10 @@
{
+ "@bloomreach/hippo-theme@4.2.1": {
+"licenses": "Apache-2.0",
+"repository":
"https://code.onehippo.org/cms-community/hippo-frontend-theme;,
+"licenseFile": "node_modules/@bloomreach/hippo-theme/LICENSE",
+"noticeFile": "node_modules/@bloomreach/hippo-theme/NOTICE"
+ },
"angular-animate@1.5.11": {
"licenses": "MIT",
"repository": "https://github.com/angular/angular.js;,
@@ -51,12 +57,8 @@
},
"chosen-js@1.7.0": {
"licenses": "MIT",
-"repository": "https://github.com/harvesthq/chosen;
- },
- "hippo-theme@3.2.0-SNAPSHOT": {
-"licenses": "Apache-2.0",
-"licenseFile": "node_modules/hippo-theme/LICENSE",
-"noticeFile": "node_modules/hippo-theme/NOTICE"
+"repository": "https://github.com/harvesthq/chosen;,
+"licenseFile": "node_modules/chosen-js/README.md"
},
"jquery@3.2.1": {
"licenses": "MIT",
@@ -65,4 +67,4 @@
"url": "https://github.com/jquery/jquery/blob/3.2.1/AUTHORS.txt;,
"licenseFile": "node_modules/jquery/LICENSE.txt"
}
-}
\ No newline at end of file
+}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/2e5bb67433ba4e592c4a49e72f18aeeef5137c0b
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/2e5bb67433ba4e592c4a49e72f18aeeef5137c0b
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
[HippoCMS-scm] [Git][cms-community/hippo-essentials][feature/ESSENTIALS-1172] ESSENTIALS-1172 Generate license-summary.json
Mathijs den Burger pushed to branch feature/ESSENTIALS-1172 at cms-community /
hippo-essentials
Commits:
17e8ef1a by Mathijs den Burger at 2018-03-02T16:22:33+01:00
ESSENTIALS-1172 Generate license-summary.json
- - - - -
1 changed file:
- dashboard/license-summary.json
Changes:
=
dashboard/license-summary.json
=
--- a/dashboard/license-summary.json
+++ b/dashboard/license-summary.json
@@ -1,4 +1,10 @@
{
+ "@bloomreach/hippo-theme@4.1.2": {
+"licenses": "Apache-2.0",
+"repository":
"https://code.onehippo.org/cms-community/hippo-frontend-theme;,
+"licenseFile": "node_modules/@bloomreach/hippo-theme/LICENSE",
+"noticeFile": "node_modules/@bloomreach/hippo-theme/NOTICE"
+ },
"angular-animate@1.5.11": {
"licenses": "MIT",
"repository": "https://github.com/angular/angular.js;,
@@ -51,12 +57,8 @@
},
"chosen-js@1.7.0": {
"licenses": "MIT",
-"repository": "https://github.com/harvesthq/chosen;
- },
- "hippo-theme@3.2.0-SNAPSHOT": {
-"licenses": "Apache-2.0",
-"licenseFile": "node_modules/hippo-theme/LICENSE",
-"noticeFile": "node_modules/hippo-theme/NOTICE"
+"repository": "https://github.com/harvesthq/chosen;,
+"licenseFile": "node_modules/chosen-js/README.md"
},
"jquery@3.2.1": {
"licenses": "MIT",
@@ -65,4 +67,4 @@
"url": "https://github.com/jquery/jquery/blob/3.2.1/AUTHORS.txt;,
"licenseFile": "node_modules/jquery/LICENSE.txt"
}
-}
\ No newline at end of file
+}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/17e8ef1acc8e2797ebbba1f467993f2d24860e9e
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/17e8ef1acc8e2797ebbba1f467993f2d24860e9e
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
[HippoCMS-scm] [Git][cms-community/hippo-essentials][master] ESSENTIALS-1174 Regenerate license-summary.json
Mathijs den Burger pushed to branch master at cms-community / hippo-essentials
Commits:
2f074bf0 by Mathijs den Burger at 2018-03-02T16:11:30+01:00
ESSENTIALS-1174 Regenerate license-summary.json
- - - - -
1 changed file:
- dashboard/license-summary.json
Changes:
=
dashboard/license-summary.json
=
--- a/dashboard/license-summary.json
+++ b/dashboard/license-summary.json
@@ -1,4 +1,10 @@
{
+ "@bloomreach/hippo-theme@4.3.2": {
+"licenses": "Apache-2.0",
+"repository":
"https://code.onehippo.org/cms-community/hippo-frontend-theme;,
+"licenseFile": "node_modules/@bloomreach/hippo-theme/LICENSE",
+"noticeFile": "node_modules/@bloomreach/hippo-theme/NOTICE"
+ },
"angular-animate@1.5.11": {
"licenses": "MIT",
"repository": "https://github.com/angular/angular.js;,
@@ -51,12 +57,8 @@
},
"chosen-js@1.7.0": {
"licenses": "MIT",
-"repository": "https://github.com/harvesthq/chosen;
- },
- "hippo-theme@3.2.0-SNAPSHOT": {
-"licenses": "Apache-2.0",
-"licenseFile": "node_modules/hippo-theme/LICENSE",
-"noticeFile": "node_modules/hippo-theme/NOTICE"
+"repository": "https://github.com/harvesthq/chosen;,
+"licenseFile": "node_modules/chosen-js/README.md"
},
"jquery@3.2.1": {
"licenses": "MIT",
@@ -65,4 +67,4 @@
"url": "https://github.com/jquery/jquery/blob/3.2.1/AUTHORS.txt;,
"licenseFile": "node_modules/jquery/LICENSE.txt"
}
-}
\ No newline at end of file
+}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/2f074bf08a6fdb78ec2b6fdf381edba07fa339fe
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/2f074bf08a6fdb78ec2b6fdf381edba07fa339fe
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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/CHANNELMGR-1749
Mathijs den Burger deleted branch feature/CHANNELMGR-1749 at cms-community / hippo-addon-channel-manager --- 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][release/5.1] 4 commits: CHANNELMGR-1749 Replace sasslint config with stylelint config
Mathijs den Burger pushed to branch release/5.1 at cms-community /
hippo-addon-channel-manager
Commits:
7f994d00 by Arthur Bogaart at 2018-02-26T16:33:08+01:00
CHANNELMGR-1749 Replace sasslint config with stylelint config
(cherry picked from commit 538f5a7)
- - - - -
af420574 by Bert Leunis at 2018-02-26T16:45:32+01:00
CHANNELMGR-1749 Fix stylelint errors
- - - - -
1077e5f7 by Bert Leunis at 2018-02-27T13:50:12+01:00
CHANNELMGR-1749 update to node 8 npm 5
The way the Open Sans font is defined in the app.css is slightly different, but
the font is used correctly in a 12.1 project with this code, in Firefox, Edge,
Chrome and Safari.
The new uglify package version treats constants a bit differently, but no
functional differences though. End to end tests will show if there may be a
lurking problem deep in the minified script file.
- - - - -
41bd6e7d by Mathijs den Burger at 2018-03-02T15:48:25+01:00
CHANNELMGR-1749 Reintegrate feature/CHANNELMGR-1749
- - - - -
16 changed files:
- − frontend-ng/.sass-lint.yml
- + frontend-ng/.stylelintrc
- − frontend-ng/npm-shrinkwrap.json
- + frontend-ng/package-lock.json
- frontend-ng/package.json
- frontend-ng/src/app/channel/actions/settings/helpIcon/helpIcon.scss
- frontend-ng/src/app/channel/menu/menu.scss
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.scss
- frontend-ng/src/app/shared/material/material.scss
- frontend-ng/src/styles/_iframe.scss
- frontend-ng/src/styles/_mask.scss
- frontend-ng/src/styles/_picker.scss
- frontend-ng/src/styles/_side-panel.scss
- frontend-ng/src/styles/_tree.scss
- frontend-ng/src/styles/string/hippo-iframe.scss
- frontend-ng/src/vendor.scss
Changes:
=
frontend-ng/.sass-lint.yml deleted
=
--- a/frontend-ng/.sass-lint.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-options:
- config-file: node_modules/@bloomreach/frontend-build/.sass-lint.yml
=
frontend-ng/.stylelintrc
=
--- /dev/null
+++ b/frontend-ng/.stylelintrc
@@ -0,0 +1,3 @@
+{
+ "extends": "./node_modules/@bloomreach/frontend-build/.stylelintrc"
+}
=
frontend-ng/npm-shrinkwrap.json deleted
=
The diff for this file was not included because it is too large.
=
frontend-ng/package-lock.json
=
The diff for this file was not included because it is too large.
=
frontend-ng/package.json
=
--- a/frontend-ng/package.json
+++ b/frontend-ng/package.json
@@ -56,13 +56,14 @@
"zone.js": "0.8.17"
},
"devDependencies": {
-"@bloomreach/frontend-build": "6.0.2",
+"@bloomreach/frontend-build": "7.1.2",
"@types/jasmine": "2.5.54",
"@types/node": "8.0.28",
"@types/webpack-env": "1.13.1",
"angular-mocks": "1.5.11",
"codelyzer": "3.2.0",
-"gulp": "github:gulpjs/gulp#38246c3f8b6dbb8d4ef657183e92d90c8299e22f",
-"gulp-hub":
"github:frankwallis/gulp-hub#292f8ab005165c3267accb01a51f31719970d443"
+"gulp": "4.0.0",
+"gulp-hub": "4.2.0",
+"uglifyjs-webpack-plugin": "1.2.0"
}
}
=
frontend-ng/src/app/channel/actions/settings/helpIcon/helpIcon.scss
=
--- a/frontend-ng/src/app/channel/actions/settings/helpIcon/helpIcon.scss
+++ b/frontend-ng/src/app/channel/actions/settings/helpIcon/helpIcon.scss
@@ -18,5 +18,3 @@
right: -24px;
top: 10px;
}
-
-
=
frontend-ng/src/app/channel/menu/menu.scss
=
--- a/frontend-ng/src/app/channel/menu/menu.scss
+++ b/frontend-ng/src/app/channel/menu/menu.scss
@@ -13,7 +13,6 @@
// limitations under the License.
.dropdown-menu-content.md-menu-bar-menu.md-dense .md-indent {
-
> md-icon {
left: 16px;
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.scss
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.scss
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.scss
@@ -21,6 +21,7 @@
width: 0 !important;
}
}
+
ckeditor {
&.is-invalid {
.cke {
=
frontend-ng/src/app/shared/material/material.scss
=
--- a/frontend-ng/src/app/shared/material/material.scss
+++ b/frontend-ng/src/app/shared/material/material
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch feature/ESSENTIALS-1170
Mathijs den Burger pushed new branch feature/ESSENTIALS-1170 at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/feature/ESSENTIALS-1170 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
[HippoCMS-scm] [Git][cms-community/hippo-project-archetype] Pushed new branch feature/ARCHE-573
Mathijs den Burger pushed new branch feature/ARCHE-573 at cms-community / hippo-project-archetype --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-project-archetype/tree/feature/ARCHE-573 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
[HippoCMS-scm] [Git][cms-community/hippo-project-archetype] Pushed new branch feature/ARCHE-572
Mathijs den Burger pushed new branch feature/ARCHE-572 at cms-community / hippo-project-archetype --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-project-archetype/tree/feature/ARCHE-572 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
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch feature/ESSENTIALS-1171
Mathijs den Burger pushed new branch feature/ESSENTIALS-1171 at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/feature/ESSENTIALS-1171 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
[HippoCMS-scm] [Git][cms-community/hippo-cms-release][master] CMS-11104 Remove hippo-frontend-plugins and hippo-frontend-theme
Mathijs den Burger pushed to branch master at cms-community / hippo-cms-release
Commits:
085910f3 by Mathijs den Burger at 2018-02-28T15:52:57+01:00
CMS-11104 Remove hippo-frontend-plugins and hippo-frontend-theme
- plugins were not used anymore in the stack for a long time
- theme has been un-mavenized and is published on NPM instead
- - - - -
1 changed file:
- pom.xml
Changes:
=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -49,8 +49,6 @@
4.7.1-h12.3.0-SNAPSHOT
4.3.0-SNAPSHOT
5.3.0-SNAPSHOT
-
4.3.0-SNAPSHOT
-4.3.0-SNAPSHOT
5.3.0-SNAPSHOT
5.3.0-SNAPSHOT
5.3.0-SNAPSHOT
@@ -868,20 +866,6 @@
-org.onehippo.cms7.frontend
-hippo-plugins
-${hippo.frontend.plugins.version}
-distribution
-zip
-
-
-org.onehippo.cms7.frontend
-hippo-theme
-${hippo.frontend.theme.version}
-distribution
-zip
-
-
org.onehippo.cms7
hippo-ckeditor
optimized
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms-release/commit/085910f3b2e3debe977aa8276b2a9137212a8bfc
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms-release/commit/085910f3b2e3debe977aa8276b2a9137212a8bfc
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
[HippoCMS-scm] [Git][cms-community/hippo-essentials][feature/ESSENTIALS-1172] 2 commits: ESSENTIALS-1172 Rename npm-shrinkwrap.json to package-lock.json
Mathijs den Burger pushed to branch feature/ESSENTIALS-1172 at cms-community /
hippo-essentials
Commits:
a38ed73d by Mathijs den Burger at 2018-02-28T15:06:54+01:00
ESSENTIALS-1172 Rename npm-shrinkwrap.json to package-lock.json
- - - - -
aca50616 by Mathijs den Burger at 2018-02-28T15:11:41+01:00
ESSENTIALS-1172 Use hippo-theme 4.1.2 on NPM
Prevents an ever-changing hash in package-lock.json for a SNAPSHOT
dependency.
- - - - -
5 changed files:
- dashboard/.npmrc
- dashboard/Gruntfile.js
- dashboard/npm-shrinkwrap.json → dashboard/package-lock.json
- dashboard/package.json
- dashboard/pom.xml
Changes:
=
dashboard/.npmrc
=
--- a/dashboard/.npmrc
+++ b/dashboard/.npmrc
@@ -1,2 +1,2 @@
engine-strict=true
-registry=https://maven.onehippo.com/npm-all/
+registry=https://registry.npmjs.org
=
dashboard/Gruntfile.js
=
--- a/dashboard/Gruntfile.js
+++ b/dashboard/Gruntfile.js
@@ -1,5 +1,5 @@
/*
- * Copyright 2015-2016 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2015-2018 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -65,9 +65,16 @@ module.exports = function gruntFunctions(grunt) {
'angular-ui-tree/dist/angular-ui-tree.css',
'angular-ui-tree/dist/angular-ui-tree.js',
'angular-sanitize/angular-sanitize.js',
- 'hippo-theme/dist/**',
],
},
+ {
+expand: true,
+cwd: '<%= build.npmDir %>/@bloomreach',
+dest: '<%= build.dashboardtarget %>',
+src: [
+ 'hippo-theme/dist/**',
+],
+ }
],
},
},
=
dashboard/npm-shrinkwrap.json → dashboard/package-lock.json
=
--- a/dashboard/npm-shrinkwrap.json
+++ b/dashboard/package-lock.json
@@ -3,6 +3,11 @@
"requires": true,
"lockfileVersion": 1,
"dependencies": {
+"@bloomreach/hippo-theme": {
+ "version": "4.1.2",
+ "resolved":
"https://registry.npmjs.org/@bloomreach/hippo-theme/-/hippo-theme-4.1.2.tgz;,
+ "integrity":
"sha512-FY9nCYxlbmpH4Pne9KWBIi65Z/89hd+YrkEWJP8W0KY+iq9oMv19HmemWESHxq/nQ0vAQ9WTOe/NKEmH6hC9tA=="
+},
"abbrev": {
"version": "1.1.1",
"resolved":
"https://maven.onehippo.com/content/groups/npm-all/abbrev/-/abbrev-1.1.1.tgz;,
@@ -731,10 +736,6 @@
"ansi-regex": "2.1.1"
}
},
-"hippo-theme": {
- "version": "file:file:target/dependency/hippo-theme.tar.gz",
- "integrity": "sha1-H1O8gjSRQP0H+E2HkVCwInk8ynE="
-},
"hooker": {
"version": "0.2.3",
"resolved":
"https://maven.onehippo.com/content/groups/npm-all/hooker/-/hooker-0.2.3.tgz;,
=
dashboard/package.json
=
--- a/dashboard/package.json
+++ b/dashboard/package.json
@@ -21,7 +21,7 @@
"angular-ui-router": "0.4.2",
"angular-ui-tree": "2.22.5",
"chosen-js": "1.7.0",
-"hippo-theme": "./target/dependency/hippo-theme.tar.gz",
+"@bloomreach/hippo-theme": "4.1.2",
"jquery": "3.2.1"
},
"devDependencies": {
=
dashboard/pom.xml
=
--- a/dashboard/pom.xml
+++ b/dashboard/pom.xml
@@ -1,6 +1,6 @@
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch feature/ESSENTIALS-1174
Mathijs den Burger pushed new branch feature/ESSENTIALS-1174 at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/feature/ESSENTIALS-1174 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
[HippoCMS-scm] [Git][cms-community/hippo-essentials][release/4.2] ESSENTIALS-1169 Use hippo-theme 4.2.1 on NPM
Mathijs den Burger pushed to branch release/4.2 at cms-community /
hippo-essentials
Commits:
22a58031 by Mathijs den Burger at 2018-02-28T10:50:14+01:00
ESSENTIALS-1169 Use hippo-theme 4.2.1 on NPM
Prevents an ever-changing hash in package-lock.json for a SNAPSHOT
dependency.
- - - - -
5 changed files:
- dashboard/.npmrc
- dashboard/Gruntfile.js
- dashboard/package-lock.json
- dashboard/package.json
- dashboard/pom.xml
Changes:
=
dashboard/.npmrc
=
--- a/dashboard/.npmrc
+++ b/dashboard/.npmrc
@@ -1,2 +1,2 @@
engine-strict=true
-registry=https://maven.onehippo.com/npm-all/
+registry=https://registry.npmjs.org
=
dashboard/Gruntfile.js
=
--- a/dashboard/Gruntfile.js
+++ b/dashboard/Gruntfile.js
@@ -1,5 +1,5 @@
/*
- * Copyright 2015-2016 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2015-2018 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -65,9 +65,16 @@ module.exports = function gruntFunctions(grunt) {
'angular-ui-tree/dist/angular-ui-tree.css',
'angular-ui-tree/dist/angular-ui-tree.js',
'angular-sanitize/angular-sanitize.js',
- 'hippo-theme/dist/**',
],
},
+ {
+expand: true,
+cwd: '<%= build.npmDir %>/@bloomreach',
+dest: '<%= build.dashboardtarget %>',
+src: [
+ 'hippo-theme/dist/**',
+],
+ }
],
},
},
=
dashboard/package-lock.json
=
--- a/dashboard/package-lock.json
+++ b/dashboard/package-lock.json
@@ -3,10 +3,15 @@
"requires": true,
"lockfileVersion": 1,
"dependencies": {
+"@bloomreach/hippo-theme": {
+ "version": "4.2.1",
+ "resolved":
"https://registry.npmjs.org/@bloomreach/hippo-theme/-/hippo-theme-4.2.1.tgz;,
+ "integrity":
"sha512-4TR7so/wuLR7ep+0DPnw7D8PLL9V7YatC6XVCMB/os8mfmIEHjZpYHV3+EDbUnLXV9LiSM3zRDNgKqrF+mqF0Q=="
+},
"abbrev": {
"version": "1.1.1",
"resolved":
"https://maven.onehippo.com/content/groups/npm-all/abbrev/-/abbrev-1.1.1.tgz;,
- "integrity":
"sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+ "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg=",
"dev": true
},
"angular": {
@@ -78,7 +83,7 @@
"argparse": {
"version": "1.0.10",
"resolved":
"https://maven.onehippo.com/content/groups/npm-all/argparse/-/argparse-1.0.10.tgz;,
- "integrity":
"sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+ "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=",
"dev": true,
"requires": {
"sprintf-js": "1.0.3"
@@ -731,10 +736,6 @@
"ansi-regex": "2.1.1"
}
},
-"hippo-theme": {
- "version": "file:target/dependency/hippo-theme.tar.gz",
- "integrity":
"sha512-Bl/ACPS3UoSPf1RxXct1MddgPDBq2CbZUaG81ytl3yQOtcJbUMTAoiK3PSdRcbi/mJaZ565vDh1zRpYYHCrQ5Q=="
-},
"hooker": {
"version": "0.2.3",
"resolved":
"https://maven.onehippo.com/content/groups/npm-all/hooker/-/hooker-0.2.3.tgz;,
=
dashboard/package.json
=
--- a/dashboard/package.json
+++ b/dashboard/package.json
@@ -21,7 +21,7 @@
"angular-ui-router": "0.4.2",
"angular-ui-tree": "2.22.5",
"chosen-js": "1.7.0",
-"hippo-theme": "./target/dependency/hippo-theme.tar.gz",
+"@bloomreach/hippo-theme": "4.2.1",
"jquery": "3.2.1"
},
"devDependencies": {
=
dashboard/pom.xml
=
--- a/dashboard/pom.xml
+++ b/dashboard/pom.xml
@@ -41,15 +41,6 @@
- org.onehippo.cms7.frontend
- hippo-theme
- ${hippo.frontend.theme.version}
- distribution
- tar.gz
- provided
-
-
-
junit
junit
test
@@ -75,24 +66,6 @@
-org.apache.maven.plugins
-maven-dependency-plugin
-
-
-
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][master] CHANNELMGR-254 Use Hippo CKEditor 4.7.1-h12.3.0-SNAPSHOT
Mathijs den Burger pushed to branch master at cms-community / hippo-addon-channel-manager Commits: 4ff74700 by Mathijs den Burger at 2018-02-27T16:53:59+01:00 CHANNELMGR-254 Use Hippo CKEditor 4.7.1-h12.3.0-SNAPSHOT - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 5.3.0-SNAPSHOT 5.3.0-SNAPSHOT 5.3.0-SNAPSHOT -4.7.1-h12.1.0 +4.7.1-h12.3.0-SNAPSHOT 4.3.0-SNAPSHOT 4.3.0-SNAPSHOT 1.3.0-SNAPSHOT View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/4ff74700a8274ce634f3a4e406e9bc2ee7aaa130 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/4ff74700a8274ce634f3a4e406e9bc2ee7aaa130 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
[HippoCMS-scm] [Git][cms-community/hippo-cms-release][master] CMS-11098 Use Hippo CKEditor 4.7.1-h12.3.0-SNAPSHOT
Mathijs den Burger pushed to branch master at cms-community / hippo-cms-release Commits: 6aa5e136 by Mathijs den Burger at 2018-02-27T16:55:04+01:00 CMS-11098 Use Hippo CKEditor 4.7.1-h12.3.0-SNAPSHOT - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ 1.3.0-SNAPSHOT 5.3.0-SNAPSHOT 4.3.0-SNAPSHOT -4.7.1-h12.1.0 +4.7.1-h12.3.0-SNAPSHOT 4.3.0-SNAPSHOT 5.3.0-SNAPSHOT 4.3.0-SNAPSHOT View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/6aa5e13656371d9c1092dc9379b2b396e7a04a92 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/6aa5e13656371d9c1092dc9379b2b396e7a04a92 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
[HippoCMS-scm] [Git][cms-community/hippo-cms][master] CMS-11098 Use Hippo CKEditor 4.7.1-h12.3.0-SNAPSHOT
Mathijs den Burger pushed to branch master at cms-community / hippo-cms Commits: 2e56861c by Mathijs den Burger at 2018-02-27T16:52:29+01:00 CMS-11098 Use Hippo CKEditor 4.7.1-h12.3.0-SNAPSHOT - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ 1.01.12 1.01.04 1.01.06 -4.7.1-h12.1.0 +4.7.1-h12.3.0-SNAPSHOT 1.0.1 View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/commit/2e56861ce54180a64203702811cfc8bc04f03000 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/commit/2e56861ce54180a64203702811cfc8bc04f03000 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
[HippoCMS-scm] [Git][cms-community/hippo-cms-release][release/12.2] CMS-11098 Use Hippo CKEditor 4.7.1-h12.2.0
Mathijs den Burger pushed to branch release/12.2 at cms-community / hippo-cms-release Commits: cc1e06fa by Mathijs den Burger at 2018-02-27T16:38:28+01:00 CMS-11098 Use Hippo CKEditor 4.7.1-h12.2.0 - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][release/5.2] CHANNELMGR-1755 Use Hippo CKEditor 4.7.1-h12.2.0
Mathijs den Burger pushed to branch release/5.2 at cms-community / hippo-addon-channel-manager Commits: 659c55fd by Mathijs den Burger at 2018-02-27T16:35:12+01:00 CHANNELMGR-1755 Use Hippo CKEditor 4.7.1-h12.2.0 - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 5.2.0-SNAPSHOT 5.2.0-SNAPSHOT 5.2.0-SNAPSHOT -4.7.1-h12.1.0 +4.7.1-h12.2.0 4.2.0-SNAPSHOT 4.2.0-SNAPSHOT 1.2.0-SNAPSHOT View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/659c55fd64433072b1bae2630bf6bc436614b120 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/659c55fd64433072b1bae2630bf6bc436614b120 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
[HippoCMS-scm] [Git][cms-community/hippo-cms][release/5.2] CMS-11098 Use Hippo CKEditor 4.7.1-h12.2.0
Mathijs den Burger pushed to branch release/5.2 at cms-community / hippo-cms Commits: d7f93d64 by Mathijs den Burger at 2018-02-27T16:33:07+01:00 CMS-11098 Use Hippo CKEditor 4.7.1-h12.2.0 - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ 1.01.12 1.01.04 1.01.06 -4.7.1-h12.1.0 +4.7.1-h12.2.0 1.0.1 View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/commit/d7f93d64b5538d9c8d7718a9b7a92370e6eeaf39 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/commit/d7f93d64b5538d9c8d7718a9b7a92370e6eeaf39 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
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch feature/CMS-11092
Mathijs den Burger pushed new branch feature/CMS-11092 at cms-community / hippo-cms --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/tree/feature/CMS-11092 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/CHANNELMGR-1700
Mathijs den Burger deleted branch feature/CHANNELMGR-1700 at cms-community / hippo-addon-channel-manager --- 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1700] CHANNELMGR-1700 Format code
Mathijs den Burger pushed to branch feature/CHANNELMGR-1700 at cms-community /
hippo-addon-channel-manager
Commits:
5237b9f8 by Mathijs den Burger at 2018-02-23T16:06:24+01:00
CHANNELMGR-1700 Format code
- - - - -
1 changed file:
-
content-service/src/test/java/org/onehippo/cms/channelmanager/content/document/util/FolderUtilsTest.java
Changes:
=
content-service/src/test/java/org/onehippo/cms/channelmanager/content/document/util/FolderUtilsTest.java
=
---
a/content-service/src/test/java/org/onehippo/cms/channelmanager/content/document/util/FolderUtilsTest.java
+++
b/content-service/src/test/java/org/onehippo/cms/channelmanager/content/document/util/FolderUtilsTest.java
@@ -87,7 +87,7 @@ public class FolderUtilsTest {
root.addNode("a", "nt:unstructured");
root.addNode("b", "nt:unstructured").setProperty("hippo:name", "Not a
folder");
root.addNode("c", "hippostd:folder");
-root.addNode("d", "hippostd:folder").setProperty("hippo:name",
"Folder");;
+root.addNode("d", "hippostd:folder").setProperty("hippo:name",
"Folder");
root.addNode("e", "hippo:handle").setProperty("hippo:name",
"Document");
// wrong type
@@ -204,7 +204,7 @@ public class FolderUtilsTest {
expect(mockNode.getPath()).andThrow(new RepositoryException());
replayAll();
-FolderUtils.getOrCreateFolder(mockNode,"test", session);
+FolderUtils.getOrCreateFolder(mockNode, "test", session);
}
@Test(expected = InternalServerErrorException.class)
@@ -217,7 +217,7 @@ public class FolderUtilsTest {
replayAll();
-FolderUtils.getOrCreateFolder(root,"test", session);
+FolderUtils.getOrCreateFolder(root, "test", session);
}
@Test(expected = InternalServerErrorException.class)
@@ -233,13 +233,13 @@ public class FolderUtilsTest {
replayAll();
-FolderUtils.getOrCreateFolder(root,"test", session);
+FolderUtils.getOrCreateFolder(root, "test", session);
}
@Test
public void createNewFolder() throws Exception {
root.setPrimaryType("hippostd:folder");
-root.setProperty("hippostd:foldertype", new String[] { "new-folder" });
+root.setProperty("hippostd:foldertype", new String[]{"new-folder"});
final WorkflowManager workflowManager =
createMock(WorkflowManager.class);
session.getWorkspace().setWorkflowManager(workflowManager);
@@ -252,7 +252,7 @@ public class FolderUtilsTest {
replayAll();
-final Node test = FolderUtils.getOrCreateFolder(root,"test", session);
+final Node test = FolderUtils.getOrCreateFolder(root, "test", session);
verifyAll();
assertSingleChild(root);
@@ -263,7 +263,7 @@ public class FolderUtilsTest {
@Test
public void createNewDirectory() throws Exception {
root.setPrimaryType("hippostd:directory");
-root.setProperty("hippostd:foldertype", new String[] { "new-folder" });
+root.setProperty("hippostd:foldertype", new String[]{"new-folder"});
final WorkflowManager workflowManager =
createMock(WorkflowManager.class);
session.getWorkspace().setWorkflowManager(workflowManager);
@@ -287,7 +287,7 @@ public class FolderUtilsTest {
@Test
public void createNewFolderWithMultipleFolderTypes() throws Exception {
root.setPrimaryType("hippostd:folder");
-root.setProperty("hippostd:foldertype", new String[] { "new-folder",
"new-other-folder" });
+root.setProperty("hippostd:foldertype", new String[]{"new-folder",
"new-other-folder"});
final WorkflowManager workflowManager =
createMock(WorkflowManager.class);
root.getSession().getWorkspace().setWorkflowManager(workflowManager);
@@ -300,7 +300,7 @@ public class FolderUtilsTest {
replayAll();
-final Node returnedNode = FolderUtils.getOrCreateFolder(root,"test",
session);
+final Node returnedNode = FolderUtils.getOrCreateFolder(root, "test",
session);
verifyAll();
assertSingleChild(root);
@@ -316,7 +316,7 @@ public class FolderUtilsTest {
public void createNewTranslatedFolder() throws Exception {
final MockNode translatedNode = root.addNode("translated",
"hippostd:folder");
translatedNode.addMixin("hippotranslation:translated");
-translatedNode.setProperty("h
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/CHANNELMGR-1700
Mathijs den Burger pushed new branch feature/CHANNELMGR-1700 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CHANNELMGR-1700 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][master] CHANNELMGR-1738 Center manage content button icons
Mathijs den Burger pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
646b714b by Mathijs den Burger at 2018-02-23T14:37:01+01:00
CHANNELMGR-1738 Center manage content button icons
Use flexbox to center icons exactly. Tweak the padding of the containing
button to center icons visually since not all icons have their
visual center-of-mass in the center of the canvas.
- - - - -
5 changed files:
- frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.js
- frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.spec.js
- frontend-ng/src/images/html/plus-white.svg
- frontend-ng/src/images/html/search-white.svg
- frontend-ng/src/styles/string/hippo-iframe.scss
Changes:
=
frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.js
=
--- a/frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.js
+++ b/frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.js
@@ -420,6 +420,7 @@ class OverlayService {
if (config.documentUuid) {
const editContentButton = {
+id: 'edit-content',
mainIcon: contentLinkSvg,
optionIcon: '', // edit button should never be a option button
callback: () => this._editContent(config.documentUuid),
@@ -430,6 +431,7 @@ class OverlayService {
if (config.parameterName) {
const selectDocumentButton = {
+id: 'select-document',
mainIcon: searchWhiteSvg,
optionIcon: searchSvg,
callback: () => this._pickPath(config),
@@ -441,6 +443,7 @@ class OverlayService {
if (config.templateQuery) {
const createContentButton = {
+id: 'create-content',
mainIcon: plusWhiteSvg,
optionIcon: plusSvg,
callback: () => this._createContent(config),
@@ -456,7 +459,7 @@ class OverlayService {
_createMainButton(button, manageContentConfig) {
const mainButton = $(`${button.mainIcon}`);
-mainButton.addClass('hippo-fab-main qa-manage-content-link');
+mainButton.addClass(`hippo-fab-main hippo-fab-main-${button.id}
qa-manage-content-link`);
if (button.isDisabled) {
mainButton.addClass('hippo-fab-main-disabled');
@@ -484,7 +487,7 @@ class OverlayService {
_createOptionButton(button, index) {
const optionButton = $(`${button.optionIcon}`);
-optionButton.addClass(`hippo-fab-option hippo-fab-option-${index}`);
+optionButton.addClass(`hippo-fab-option hippo-fab-option-${button.id}
hippo-fab-option-${index}`);
if (button.isDisabled) {
optionButton.addClass('hippo-fab-option-disabled');
=
frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.spec.js
=
--- a/frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.spec.js
+++ b/frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.spec.js
@@ -705,7 +705,7 @@ describe('OverlayService', () => {
const buttons = OverlayService._getButtons(config);
expect(buttons.length).toEqual(3);
- expect(Object.keys(buttons[0])).toEqual(['mainIcon', 'optionIcon',
'callback', 'tooltip']);
+ expect(Object.keys(buttons[0])).toEqual(['id', 'mainIcon', 'optionIcon',
'callback', 'tooltip']);
});
describe('_initManageContentConfig', () => {
=
frontend-ng/src/images/html/plus-white.svg
=
--- a/frontend-ng/src/images/html/plus-white.svg
+++ b/frontend-ng/src/images/html/plus-white.svg
@@ -13,6 +13,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-http://www.w3.org/2000/svg;>
+http://www.w3.org/2000/svg;>
=
frontend-ng/src/images/html/search-white.svg
=
--- a/frontend-ng/src/images/html/search-white.svg
+++ b/frontend-ng/src/images/html/search-white.svg
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-http://www.w3.org/2000/svg;
+http://www.w3.org/2000/svg;
enable-background="new 0 0 24 24" xml:space="preserve">
\ No newline at end of file
=
frontend-ng/src/styles/string/hippo-iframe.scss
=
--- a/frontend-ng/src/styles/string/hippo-iframe.scss
+++ b/frontend-ng/src/styles/string/hippo-iframe.scss
@@ -276,8 +276,9 @@
@extend %hippo-material-btn;
border: 0;
+display: flex;
height: 100%;
-padding: 8px 0 0 5px;
+padding: 0; // reset user-agent specific padding around buttons
width: 100%;
&:hover:not(.hippo-fab-main-disabled) {
@@ -290,6 +291,18 @@
box-shadow: $overlay-link-shadow-active !important;
}
+&-edit-content
[HippoCMS-scm] [Git][cms-community/hippo-frontend-theme][master] HIPPOTHEME-81 Ignore npm-debug.log file
Mathijs den Burger pushed to branch master at cms-community / hippo-frontend-theme Commits: f05a5a3a by Mathijs den Burger at 2018-02-23T13:26:51+01:00 HIPPOTHEME-81 Ignore npm-debug.log file Generated by NPM when an error occurred, should never be committed. - - - - - 1 changed file: - .gitignore Changes: = .gitignore = --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /docs /target /tmp +npm-debug.log \ No newline at end of file View it on GitLab: https://code.onehippo.org/cms-community/hippo-frontend-theme/commit/f05a5a3a660185d9ab2ce2fac15b2d598381d6e5 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-frontend-theme/commit/f05a5a3a660185d9ab2ce2fac15b2d598381d6e5 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
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch feature/CMS-11089
Mathijs den Burger deleted branch feature/CMS-11089 at cms-community / hippo-cms --- 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch bugfix/CHANNELMGR-1740
Mathijs den Burger pushed new branch bugfix/CHANNELMGR-1740 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/bugfix/CHANNELMGR-1740 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
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit] Deleted branch bugfix/HSTTWO-4247
Mathijs den Burger deleted branch bugfix/HSTTWO-4247 at cms-community / hippo-site-toolkit --- 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][master] 3 commits: CHANNELMGR-1741 Use class properties for '$log' and 'HstConstants'
Mathijs den Burger pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
71e0394a by Mathijs den Burger at 2018-02-20T11:23:47+01:00
CHANNELMGR-1741 Use class properties for $log and
HstConstants
Just like all other services do.
- - - - -
da9b31de by Mathijs den Burger at 2018-02-20T12:05:50+01:00
CHANNELMGR-1741 Remove fallback to DOM walking to find all HTML comments
Since IE is no longer supported we can assume that document.evaluate is
always available. Locating all HTML comments via XPath is faster than
DOM walking. DOM walking is still needed to find all HTML comments in a
jQuery node collection (e.g. when re-rendering HST components partially).
- - - - -
e88f8ff6 by Mathijs den Burger at 2018-02-20T13:47:12+01:00
CHANNELMGR-1741 Reintegrate feature/CHANNELMGR-1741
- - - - -
2 changed files:
-
frontend-ng/src/app/channel/hippoIframe/processing/hstCommentsProcessor.service.js
-
frontend-ng/src/app/channel/hippoIframe/processing/hstCommentsProcessor.service.spec.js
Changes:
=
frontend-ng/src/app/channel/hippoIframe/processing/hstCommentsProcessor.service.js
=
---
a/frontend-ng/src/app/channel/hippoIframe/processing/hstCommentsProcessor.service.js
+++
b/frontend-ng/src/app/channel/hippoIframe/processing/hstCommentsProcessor.service.js
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-2017 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2016-2018 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,29 +14,19 @@
* limitations under the License.
*/
-// TODO: Make this normal class properties
-let log;
-let HST;
-
class HstCommentsProcessorService {
constructor($log, HstConstants) {
'ngInject';
-log = $log;
-HST = HstConstants;
+this.$log = $log;
+this.HstConstants = HstConstants;
}
run(document, callback) {
if (!document) {
throw new Error('DOM document is empty');
}
-// IE doesn't support 'evaluate', see
-//
https://developer.mozilla.org/en/docs/Web/API/Document/evaluate#Browser_compatibility
-if (document.evaluate) {
- this.processCommentsWithXPath(document, callback);
-} else {
- this.processCommentsWithDomWalking(document, callback);
-}
+this.processCommentsWithXPath(document, callback);
}
processFragment(jQueryNodeCollection, callback) {
@@ -75,7 +65,7 @@ class HstCommentsProcessorService {
try {
callback(element, json);
} catch (e) {
- log.warn('Error invoking callback on HST comment', e, json);
+ this.$log.warn('Error invoking callback on HST comment', e, json);
}
}
}
@@ -102,18 +92,18 @@ class HstCommentsProcessorService {
return false;
}
const trimmedData = data.trim();
-return trimmedData.startsWith('{') && trimmedData.endsWith('}') &&
trimmedData.includes(HST.TYPE);
+return trimmedData.startsWith('{') && trimmedData.endsWith('}') &&
trimmedData.includes(this.HstConstants.TYPE);
}
_isHstEndMarker(data) {
-return data !== null && data.startsWith(' {') && data.endsWith('} ') &&
data.includes(HST.END_MARKER);
+return data !== null && data.startsWith(' {') && data.endsWith('} ') &&
data.includes(this.HstConstants.END_MARKER);
}
_parseJson(data) {
try {
return JSON.parse(data);
} catch (e) {
- log.warn('Error parsing HST comment as JSON', e, data);
+ this.$log.warn('Error parsing HST comment as JSON', e, data);
}
return null;
}
@@ -132,8 +122,7 @@ class HstCommentsProcessorService {
nextSibling = nextSibling.nextSibling;
}
-const exception = `No component end marker found for '${id}'.`;
-throw exception;
+throw new Error(`No component end marker found for '${id}'.`);
}
_isEndMarker(domElement, id) {
=
frontend-ng/src/app/channel/hippoIframe/processing/hstCommentsProcessor.service.spec.js
=
---
a/frontend-ng/src/app/channel/hippoIframe/processing/hstCommentsProcessor.service.spec.js
+++
b/frontend-ng/src/app/channel/hippoIframe/processing/hstCommentsProcessor.service.spec.js
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2016-2018 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ import 'angular-mocks';
describe('HstCommentsProcessorService', () => {
let hstCommentsProcessorService;
- function NOOP() { }
beforeEach(() => {
angular.mock.module('hippo-cm.channel.hippoIframe');
@@ -31,13 +30,
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/CHANNELMGR-1741
Mathijs den Burger deleted branch feature/CHANNELMGR-1741 at cms-community / hippo-addon-channel-manager --- 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
[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/CMS-10840] 2 commits: CMS-10840 Don't use autoboxed booleans when not needed
Mathijs den Burger pushed to branch feature/CMS-10840 at cms-community /
hippo-cms
Commits:
855e0676 by Mathijs den Burger at 2018-02-20T13:38:40+01:00
CMS-10840 Dont use autoboxed booleans when not needed
Autoboxing is less efficient, and can lead to nasty
NullPointerExceptions when the returned object is null.
- - - - -
86c6a76c by Mathijs den Burger at 2018-02-20T13:39:26+01:00
CMS-10840 Code formatting
Use the hippo code style.
- - - - -
2 changed files:
-
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldPluginHelper.java
-
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.java
Changes:
=
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldPluginHelper.java
=
---
a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldPluginHelper.java
+++
b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldPluginHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2016 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2009-2018 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -86,12 +86,9 @@ public class FieldPluginHelper implements IDetachable {
if (documentType == null) {
log.warn("No documentType found for type name {} or node model
{}", typeName, getNodeModel());
-}
-else if (fieldName == null) {
+} else if (fieldName == null) {
log.debug("No field was specified for type {} in the
configuration {}", documentType.getName(), config);
-}
-else {
-
+} else {
field = documentType.getField(fieldName);
if (field == null) {
log.warn("Could not find field with name {} in type {};
has the field been added " +
@@ -181,8 +178,7 @@ public class FieldPluginHelper implements IDetachable {
if (caption == null && !captionKey.isEmpty()) {
caption = StringUtils.capitalize(captionKey);
}
-}
-else {
+} else {
final String key = getPluginConfig().getString("captionKey");
if ((key != null) && !key.isEmpty()) {
captionKey = key;
@@ -194,8 +190,7 @@ public class FieldPluginHelper implements IDetachable {
if (caption == null) {
caption = StringUtils.capitalize(captionKey);
}
-}
-else {
+} else {
captionKey = StringUtils.lowerCase(caption);
}
}
=
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.java
=
---
a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.java
+++
b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2017 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2008-2018 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -159,7 +159,7 @@ public class MixinPlugin extends RenderPlugin {
return control;
}
-private static Boolean hasMixin(Node node, String type) throws
RepositoryException {
+private static boolean hasMixin(Node node, String type) throws
RepositoryException {
if (!node.hasProperty("jcr:mixinTypes")) {
return false;
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/258c44f1c2aa2d30461453646e00dc2bb490a272...86c6a76c85e05c9579cfacbdcceee6963b0b16c6
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/258c44f1c2aa2d30461453646e00dc2bb490a272...86c6a76c85e05c9579cfacbdcceee6963b0b16c6
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
[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/CMS-10840] 79 commits: CMS-10930 Set projectdocs development version
Mathijs den Burger pushed to branch feature/CMS-10840 at cms-community /
hippo-cms
Commits:
7ec51d92 by Michiel Eggermont at 2017-10-02T10:47:58+02:00
CMS-10930 Set projectdocs development version
- - - - -
3fa4df18 by Arent-Jan Banck at 2017-10-08T14:12:20+02:00
CMS-10930 Merge master changes in feature/projectdocs
- - - - -
6f06ee60 by Michiel Rop at 2017-10-12T16:39:19+02:00
CMS-10929 Call the workflow hints with an initializationPayload
Based on the initializationPayload the workflow can use session
related parameters.
- - - - -
02d96d81 by Michiel Rop at 2017-10-12T16:58:07+02:00
CMS-10929 Change package name
Add title instead of id.
- - - - -
46bc1875 by Ard Schrijvers at 2017-10-12T17:15:48+02:00
CMS-10930 bump repository version
- - - - -
259534a4 by Michiel Rop at 2017-10-12T21:52:31+02:00
CMS-10929 Change access modifier
- - - - -
e83efbae by Michiel Rop at 2017-10-13T08:54:19+02:00
CMS-10929 Add test-jar dependency
- - - - -
3544532b by Michiel Rop at 2017-10-13T10:49:41+02:00
CMS-10929 Add getHints(initializationPayload) to Workflow interface
Instead of:
if (workflow instanceof DocumentWorkflow){
workflow.hints(initializationPayload);
}
else workflow.hints();
use:
workflow.hints(initializationPayload);
The Folderworkflow will need an intializationPayload as well as
user context information that influences the creation of a draft
variant ( Edit ) will influence the Add action of the
Folderworkflow as well.
See REPO-1859 as well.
- - - - -
bbe7dc12 by Michiel Rop at 2017-10-13T13:40:08+02:00
CMS-10929 Add payload to hints method where applicable.
- - - - -
1e8399c3 by Michiel Rop at 2017-10-16T11:09:28+02:00
CMS-10929 Make sure InitializationPayload cannot be instantiated
Add logging.
- - - - -
0139c2d8 by Michiel Rop at 2017-10-16T14:52:24+02:00
CMS-10929 Add payload to obtainEditable instance calls to api
- - - - -
3375d1fa by Michiel Rop at 2017-10-16T20:55:55+02:00
CMS-10929 Add payload to commitEditableInstance calls
Refactored executeWorkflowForNode because:
- the method had a side effect ( it returned a boolean and called
the workflow ).
- The hints() method is expensive and was called twice.
- - - - -
be1bccda by Michiel Rop at 2017-10-16T21:02:15+02:00
CMS-10929 Add payload to api calls related to versioning
- - - - -
573c3dab by Michiel Rop at 2017-10-16T22:48:49+02:00
CMS-10929 Revert HippostdPublishableEditor
Add extra null check to InitializationPayload.
For now revert, solve it later.
- - - - -
32fa58c5 by Michiel Rop at 2017-10-17T11:23:13+02:00
CMS-10929 Add payload to api calls
- Call expensive hints action only once
- Remove side effect ( call workflow and return boolean )
- - - - -
4b2246f4 by Michiel Rop at 2017-10-17T15:21:01+02:00
CMS-10929 Add payload to api calls
Add payload to api calls for obtain, commit, isModified
- - - - -
860fb1be by Michiel Rop at 2017-10-17T15:21:13+02:00
CMS-10929 Add payload (scheduled)(de)publish calls
- - - - -
88595ee8 by Michiel Rop at 2017-10-17T15:22:00+02:00
CMS-10929 Add payload to unlock and request calls
Improve readability.
- - - - -
9496e899 by Michiel Rop at 2017-10-17T15:45:45+02:00
CMS-10929 Add payload to rename and move api calls
Split assignment and usage to improve readability.
( whereUsedAction showed up as non used during inspection )
- - - - -
101c1435 by Michiel Eggermont at 2017-10-18T10:22:31+02:00
CMS-10930 Merge master changes in feature/projectdocs
- - - - -
1e02cd6d by Ard Schrijvers at 2017-10-18T13:51:19+02:00
CMS-10929 log error instead of debug
When the payload is empty or there is no requestCycle there is an
implementation issue and we need to log an error
- - - - -
0ca00060 by Ard Schrijvers at 2017-10-18T13:53:53+02:00
CMS-10929 check for session null or cms session context
- - - - -
8b998637 by Ard Schrijvers at 2017-10-18T14:17:01+02:00
CMS-10929 Account for changed attribute in WorkflowTransition
- - - - -
bfe823f1 by Ard Schrijvers at 2017-10-18T14:17:29+02:00
CMS-10929 Account for changed attribute in WorkflowTransition
- - - - -
b07feb3e by Ard Schrijvers at 2017-10-18T17:23:19+02:00
CMS-10929 rename InitializationPayload to ContextPayloadProvider
Since we do not use it in scxml any more, the context payload covers
the intent better
- - - - -
aff5e639 by Ard Schrijvers at 2017-10-19T14:23:43+02:00
CMS-10929 rename initialPayload to contextPayload
- - - - -
621128a1 by Michiel Eggermont at 2017-10-19T15:43:58+02:00
CMS-10929 Remove implementation because it has a default in interface
- - - - -
b590d221 by Michiel Eggermont at 2017-10-19T15:44:21+02:00
CMS-10929 Rename method
- - - - -
ecf9974b by Michiel Eggermont at 2017-10-19T15:45:49+02:00
CMS-10929 Use Workflow interface instead of EditingWorkflow
This is possible because we can use Workflow#transition()
- - - - -
43bfefe7 by Michiel Eggermont at 2017-10-19T15:46:06+02:00
CMS-10929 Fix action
- - - - -
e1ed2f53 by Michiel Rop at 2017-10-23T10:25:37+02:00
CMS-10959 Let infoEditAction determine its
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Deleted branch bugfix/ESSENTIALS-1166
Mathijs den Burger deleted branch bugfix/ESSENTIALS-1166 at cms-community / hippo-essentials --- 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
[HippoCMS-scm] [Git][cms-community/hippo-essentials][master] ESSENTIALS-1166 add missing hippostd:holder property
Mathijs den Burger pushed to branch master at cms-community / hippo-essentials Commits: fe349abf by Bert Leunis at 2018-02-19T11:34:42+01:00 ESSENTIALS-1166 add missing hippostd:holder property Without it creating content with this definition in the channel manager fails. In the content perspective this is not a problem. - - - - - 1 changed file: - plugins/blog/src/main/resources/xml/namespaces/blogpost.xml Changes: = plugins/blog/src/main/resources/xml/namespaces/blogpost.xml = --- a/plugins/blog/src/main/resources/xml/namespaces/blogpost.xml +++ b/plugins/blog/src/main/resources/xml/namespaces/blogpost.xml @@ -245,6 +245,9 @@ draft + +holder + new View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/fe349abf2d32c5076db520f07776ccebe7ed7c93 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/fe349abf2d32c5076db520f07776ccebe7ed7c93 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/CHANNELMGR-1741
Mathijs den Burger pushed new branch feature/CHANNELMGR-1741 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CHANNELMGR-1741 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
[HippoCMS-scm] [Git][cms-community/hippo-cms-release][master] CMS-11021 Bump CKEditor version to 4.7.1-h12.2.0-SNAPSHOT
Mathijs den Burger pushed to branch master at cms-community / hippo-cms-release Commits: 61bf95f8 by Mathijs den Burger at 2018-02-19T15:09:32+01:00 CMS-11021 Bump CKEditor version to 4.7.1-h12.2.0-SNAPSHOT - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ 1.2.0-SNAPSHOT 5.2.0-SNAPSHOT 4.2.0-SNAPSHOT -4.7.1-h12.1.0 +4.7.1-h12.2.0-SNAPSHOT 4.2.0-SNAPSHOT 5.2.0-SNAPSHOT 4.2.0-SNAPSHOT View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/61bf95f8d584dcec8060a766d473dbd8290e4000 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/61bf95f8d584dcec8060a766d473dbd8290e4000 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch bugfix/CHANNELMGR-1584
Mathijs den Burger deleted branch bugfix/CHANNELMGR-1584 at cms-community / hippo-addon-channel-manager --- 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][master] 2 commits: CHANNELMGR-1584 Track components by ID instead of by label
Mathijs den Burger pushed to branch master at cms-community / hippo-addon-channel-manager Commits: efb7adb0 by Mathijs den Burger at 2018-02-19T11:16:03+01:00 CHANNELMGR-1584 Track components by ID instead of by label Component labels can clash. Component IDs are always unique. - - - - - 6d5f6f6a by Mathijs den Burger at 2018-02-19T11:21:24+01:00 CHANNELMGR-1584 Reintegrate bugfix/CHANNELMGR-1584 - - - - - 1 changed file: - frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.html Changes: = frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.html = --- a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.html +++ b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.html @@ -1,5 +1,5 @@
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch bugfix/CHANNELMGR-1584
Mathijs den Burger pushed new branch bugfix/CHANNELMGR-1584 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/bugfix/CHANNELMGR-1584 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch bugfix/CHANNELMGR-1721
Mathijs den Burger pushed new branch bugfix/CHANNELMGR-1721 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/bugfix/CHANNELMGR-1721 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
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-11080
Mathijs den Burger pushed new branch bugfix/CMS-11080 at cms-community / hippo-cms --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/tree/bugfix/CMS-11080 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
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Deleted branch bugfix/ESSENTIALS-1168
Mathijs den Burger deleted branch bugfix/ESSENTIALS-1168 at cms-community / hippo-essentials --- 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
[HippoCMS-scm] [Git][cms-community/hippo-essentials][master] ESSENTIALS-1168 Updated Carousel jsp template to match ftl
Mathijs den Burger pushed to branch master at cms-community / hippo-essentials Commits: 87b8adc0 by Michael Metternich at 2018-02-16T10:00:08+01:00 ESSENTIALS-1168 Updated Carousel jsp template to match ftl - - - - - 1 changed file: - plugins/banner-and-carousel/src/main/resources/jsp/essentials-carousel.jsp Changes: = plugins/banner-and-carousel/src/main/resources/jsp/essentials-carousel.jsp = --- a/plugins/banner-and-carousel/src/main/resources/jsp/essentials-carousel.jsp +++ b/plugins/banner-and-carousel/src/main/resources/jsp/essentials-carousel.jsp @@ -103,6 +103,6 @@ Click to edit Carousel - + View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/87b8adc0b5bc1d15f42d9b38e316caaa1e3392d8 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/87b8adc0b5bc1d15f42d9b38e316caaa1e3392d8 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch bugfix/CHANNELMGR-1661
Mathijs den Burger pushed new branch bugfix/CHANNELMGR-1661 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/bugfix/CHANNELMGR-1661 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
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit] Pushed new branch feature/HSTTWO-4242
Mathijs den Burger pushed new branch feature/HSTTWO-4242 at cms-community / hippo-site-toolkit --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-site-toolkit/tree/feature/HSTTWO-4242 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][master] CHANNELMGR-1726 Fix picking a relative path for manage content parameter
Mathijs den Burger pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
66008ff6 by Mathijs den Burger at 2018-02-13T10:34:24+01:00
CHANNELMGR-1726 Fix picking a relative path for manage content parameter
The picker should always pick an absolute path. The HstComponentService
makes the path relative (to the given basePath) when the parameter is
relative.
ManageContentLink#isParameterValueRelativePath assumed that the property
was a boolean while it was in fact a string (like all other boolean
values in HTML comments). So we should compare it to the string true.
- - - - -
3 changed files:
- frontend-ng/src/app/channel/page/element/manageContentLink.js
- frontend-ng/src/app/channel/page/pageStructure.service.fixture.html
- frontend-ng/src/app/channel/page/pageStructure.service.spec.js
Changes:
=
frontend-ng/src/app/channel/page/element/manageContentLink.js
=
--- a/frontend-ng/src/app/channel/page/element/manageContentLink.js
+++ b/frontend-ng/src/app/channel/page/element/manageContentLink.js
@@ -34,7 +34,7 @@ class ManageContentLink extends EmbeddedLink {
}
isParameterValueRelativePath() {
-return this.metaData.parameterValueIsRelativePath;
+return this.metaData.parameterValueIsRelativePath === 'true';
}
getPickerConfig() {
@@ -44,7 +44,7 @@ class ManageContentLink extends EmbeddedLink {
return {
configuration: this.metaData.pickerConfiguration,
initialPath: this.metaData.pickerInitialPath,
- isRelativePath: this.metaData.parameterValueIsRelativePath === 'true',
+ isRelativePath: false, // the path is made relative in
HstComponentService#saveParameter, and not by the picker
remembersLastVisited: this.metaData.pickerRemembersLastVisited ===
'true',
rootPath: this.metaData.pickerRootPath,
selectableNodeTypes: this.metaData.pickerSelectableNodeTypes ?
=
frontend-ng/src/app/channel/page/pageStructure.service.fixture.html
=
--- a/frontend-ng/src/app/channel/page/pageStructure.service.fixture.html
+++ b/frontend-ng/src/app/channel/page/pageStructure.service.fixture.html
@@ -110,6 +110,22 @@
"templateQuery": "new-test-document"
} -->
+
+
+
=
frontend-ng/src/app/channel/page/pageStructure.service.spec.js
=
--- a/frontend-ng/src/app/channel/page/pageStructure.service.spec.js
+++ b/frontend-ng/src/app/channel/page/pageStructure.service.spec.js
@@ -239,7 +239,6 @@ describe('PageStructureService', () => {
it('registers manage content links', () => {
registerEmbeddedLink('#manage-content-in-page');
const manageContentLinks = PageStructureService.getEmbeddedLinks();
-expect(manageContentLinks.length).toBe(1);
const manageContentLink = manageContentLinks[0];
expect(manageContentLink.getTemplateQuery()).toBe('new-test-document');
expect(manageContentLink.getDefaultPath()).toBe('test-default-path');
@@ -249,11 +248,32 @@ describe('PageStructureService', () => {
expect(manageContentLink.getPickerConfig()).toEqual({
configuration: 'test-component-picker configuration',
initialPath: 'test-component-picker-initial-path',
- isRelativePath: true,
+ isRelativePath: false,
remembersLastVisited: false,
rootPath: 'test-component-picker-root-path',
selectableNodeTypes: ['test-node-type-1', 'test-node-type-2'],
});
+expect(manageContentLink.isParameterValueRelativePath()).toBe(true);
+ });
+
+ it('recognizes a manage content link for a parameter that stores an absolute
path', () => {
+registerEmbeddedLink('#manage-content-with-absolute-path');
+const manageContentLinks = PageStructureService.getEmbeddedLinks();
+const manageContentLink = manageContentLinks[0];
+expect(manageContentLink.getTemplateQuery()).toBe('new-test-document');
+expect(manageContentLink.getDefaultPath()).toBe('test-default-path');
+expect(manageContentLink.getRootPath()).toBe('test-root-path');
+
expect(manageContentLink.getParameterName()).toBe('test-component-parameter');
+expect(manageContentLink.getParameterValue()).toBe('test-component-value');
+expect(manageContentLink.getPickerConfig()).toEqual({
+ configuration: 'test-component-picker configuration',
+ initialPath: 'test-component-picker-initial-path',
+ isRelativePath: false,
+ remembersLastVisited: false,
+ rootPath: 'test-component-picker-root-path',
+ selectableNodeTypes: ['test-node-type-1', 'test-node-type-2'],
+});
+expect(manageContentLink.isParameterValueRelativePath()).toBe(false);
});
it('registers processed and unprocessed head contributions', () => {
View it on GitLab:
https://code.onehippo.org/cms-commun
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit] Deleted branch bugfix/HSTTWO-4238
Mathijs den Burger deleted branch bugfix/HSTTWO-4238 at cms-community / hippo-site-toolkit --- 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/CHANNELMGR-1536
Mathijs den Burger deleted branch feature/CHANNELMGR-1536 at cms-community / hippo-addon-channel-manager --- 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][master] CHANNELMGR-1520 Fix 'switch editor' in error message of content editor
Mathijs den Burger pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
1af4c029 by Mathijs den Burger at 2018-02-12T15:30:43+01:00
CHANNELMGR-1520 Fix switch editor in error message of content editor
We do need to pass an on-switch-editor function to the content editor
since it can render error message with a button to switch to the content
editor. Both the edit-content and create-content-step-2 pass their own
switch-editor implementation.
- - - - -
4 changed files:
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/contentEditor.component.js
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/contentEditor.html
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/step2/step2.html
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/editContentMain.html
Changes:
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/contentEditor.component.js
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/contentEditor.component.js
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/contentEditor.component.js
@@ -28,6 +28,7 @@ const contentEditorComponent = {
closeLabel: '@',
onClose: '&',
onSave: '&',
+onSwitchEditor: '&',
showMessage: '<',
},
};
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/contentEditor.html
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/contentEditor.html
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/contentEditor.html
@@ -37,7 +37,7 @@
+ ng-click="$ctrl.onSwitchEditor()">
{{ ::'FEEDBACK_SWITCH_TO_CONTENT_EDITOR' | translate }}
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/step2/step2.html
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/step2/step2.html
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/step2/step2.html
@@ -34,6 +34,7 @@
cancel-label="{{ ::'DISCARD' | translate }}"
close-label="{{ ::'DISCARD' | translate }}"
allow-save="$ctrl.allMandatoryFieldsShown()"
+ on-switch-editor="$ctrl.switchEditor()"
on-save="$ctrl.save()"
on-close="$ctrl.close()">
{{ ::'NOT_ALL_MANDATORY_FIELDS_SHOWN' | translate }}
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/editContentMain.html
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/editContentMain.html
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/editContentMain.html
@@ -18,6 +18,7 @@
layout="column"
show-message="$ctrl.notAllFieldsShown()"
allow-save="true"
+on-switch-editor="$ctrl.switchEditor()"
on-save="$ctrl.save()"
on-close="$ctrl.close()">
{{ ::'NOT_ALL_FIELDS_SHOWN' | translate }}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/1af4c0296484056c66c0a0aab23ffe17b106a6eb
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/1af4c0296484056c66c0a0aab23ffe17b106a6eb
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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/CHANNELMGR-1536
Mathijs den Burger pushed new branch feature/CHANNELMGR-1536 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CHANNELMGR-1536 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CC-CHANNELMGR-1520] CHANNELMGR-1520 Include field info of empty (invalid) compounds
Mathijs den Burger pushed to branch feature/CC-CHANNELMGR-1520 at cms-community
/ hippo-addon-channel-manager
Commits:
71de9731 by Mathijs den Burger at 2018-02-09T16:38:48+01:00
CHANNELMGR-1520 Include field info of empty (invalid) compounds
A compound may be empty, which makes it invalid, so it is not included
in the document type. However, the compound may be empty because it
only contains unsupported fields. This fields information of such
a compound should therefore be added, otherwise those unsupported fields
are not reported nor included in the overall fields information. This
means that the fields information when initializing a field should
always be added, regardless whether the field is valid, since it may
contain information about other unsupported fields.
- - - - -
2 changed files:
-
content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtils.java
-
content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtilsTest.java
Changes:
=
content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtils.java
=
---
a/content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtils.java
+++
b/content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtils.java
@@ -182,8 +182,10 @@ public class FieldTypeUtils {
if (result.isPresent()) {
final FieldType fieldType = result.get();
final FieldsInformation fieldInfo = fieldType.init(context);
+
+allFieldsInfo.add(fieldInfo);
+
if (fieldType.isValid()) {
-allFieldsInfo.add(fieldInfo);
return result;
}
=
content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtilsTest.java
=
---
a/content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtilsTest.java
+++
b/content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtilsTest.java
@@ -577,6 +577,42 @@ public class FieldTypeUtilsTest {
}
@Test
+public void populateFieldsInvalidCompoundField() {
+final List fields = new ArrayList<>();
+final FieldSorter sorter = createMock(FieldSorter.class);
+final ContentTypeContext context =
createMock(ContentTypeContext.class);
+final ContentType contentType = createMock(ContentType.class);
+final FieldTypeContext fieldContext =
createMock(FieldTypeContext.class);
+final ContentTypeItem item = createMock(ContentTypeItem.class);
+final Node node = createMock(Node.class);
+final CompoundFieldType fieldType =
createMock(CompoundFieldType.class);
+
+expect(context.getContentTypeRoot()).andReturn(null);
+
expect(NamespaceUtils.retrieveFieldSorter(null)).andReturn(Optional.of(sorter));
+
expect(sorter.sortFields(context)).andReturn(Collections.singletonList(fieldContext));
+expect(fieldContext.getContentTypeItem()).andReturn(item).anyTimes();
+
expect(item.getItemType()).andReturn("project:compoundtype").anyTimes();
+expect(item.isProperty()).andReturn(false);
+expect(ChoiceFieldUtils.isChoiceField(fieldContext)).andReturn(false);
+
expect(ContentTypeContext.getContentType("project:compoundtype")).andReturn(Optional.of(contentType));
+expect(contentType.isCompoundType()).andReturn(true);
+
expect(fieldContext.getEditorConfigNode()).andReturn(Optional.of(node));
+
expect(NamespaceUtils.getPluginClassForField(node)).andReturn(Optional.of(COMPOUND_FIELD_PLUGIN));
+
expect(FieldTypeFactory.createFieldType(CompoundFieldType.class)).andReturn(Optional.of(fieldType));
+
expect(fieldType.init(fieldContext)).andReturn(FieldsInformation.noneSupported());
+expect(fieldType.isValid()).andReturn(false);
+expect(fieldType.hasUnsupportedValidator()).andReturn(false);
+replayAll();
+
+final FieldsInformation fieldsInfo =
FieldTypeUtils.populateFields(fields, context);
+assertFalse(fieldsInfo.isAllFieldsIncluded());
+assertFalse(fieldsInfo.getCanCreateAllRequiredFields());
+assertTrue(fieldsInfo.getUnsupportedFieldTypes().isEmpty());
+assertTrue(fields.isEmpty());
+verifyAll();
+}
+
+@Test
public void populateFieldsChoiceField() {
final List fields = new ArrayList<>();
final FieldSorter sorter = createMock(FieldSorter.class);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/71de97317a2b4ff12c48b2ae5e8e4e86ae107f58
---
View it on GitLab:
https:/
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/CHANNELMGR-1706
Mathijs den Burger deleted branch feature/CHANNELMGR-1706 at cms-community / hippo-addon-channel-manager --- 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
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CC-CHANNELMGR-1520] CHANNELMGR-1520 Don't include empty compound fields in document types
Mathijs den Burger pushed to branch feature/CC-CHANNELMGR-1520 at cms-community
/ hippo-addon-channel-manager
Commits:
bbe07f37 by Mathijs den Burger at 2018-02-09T14:41:10+01:00
CHANNELMGR-1520 Dont include empty compound fields in document types
An empty compound field is not valid but does not contain any
unsupported validator either. In that case the field should be not
reported as an unknown one, but it should not be included in the
document type either.
- - - - -
2 changed files:
-
content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtils.java
-
content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtilsTest.java
Changes:
=
content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtils.java
=
---
a/content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtils.java
+++
b/content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtils.java
@@ -184,16 +184,19 @@ public class FieldTypeUtils {
final FieldsInformation fieldInfo = fieldType.init(context);
if (fieldType.isValid()) {
allFieldsInfo.add(fieldInfo);
-} else if (fieldType.hasUnsupportedValidator()) {
+return result;
+}
+
+if (fieldType.hasUnsupportedValidator()) {
allFieldsInfo.addUnknownField(context.getContentTypeItem());
-result = Optional.empty();
}
+// Else the field is a known one, but still invalid (example: an
empty compound). Don't include
+// the field is the list of "unknown" fields, but don't include it
in the document type either.
} else {
allFieldsInfo.addUnknownField(context.getContentTypeItem());
-result = Optional.empty();
}
-return result;
+return Optional.empty();
}
private static Optional determineDescriptor(final
FieldTypeContext context) {
=
content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtilsTest.java
=
---
a/content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtilsTest.java
+++
b/content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtilsTest.java
@@ -541,7 +541,7 @@ public class FieldTypeUtilsTest {
}
@Test
-public void populateFieldsInvalidCompoundField() {
+public void populateFieldsEmptyCompoundField() {
final List fields = new ArrayList<>();
final FieldSorter sorter = createMock(FieldSorter.class);
final ContentTypeContext context =
createMock(ContentTypeContext.class);
@@ -572,9 +572,7 @@ public class FieldTypeUtilsTest {
assertTrue(fieldsInfo.isAllFieldsIncluded());
assertTrue(fieldsInfo.getCanCreateAllRequiredFields());
assertTrue(fieldsInfo.getUnsupportedFieldTypes().isEmpty());
-
-assertThat(fields.size(), equalTo(1));
-assertThat(fields.get(0), equalTo(fieldType));
+assertTrue(fields.isEmpty());
verifyAll();
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/bbe07f379538bbf799e7a087f89ebcc8f17e1846
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/bbe07f379538bbf799e7a087f89ebcc8f17e1846
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
