[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit] Pushed new branch feature/HSTTWO-3696
Woonsan Ko pushed new branch feature/HSTTWO-3696 at cms-community / hippo-site-toolkit ___ 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-725] 2 commits: CHANNELMGR-725 Simplified/clarified code
Mathijs den Burger pushed to branch bugfix/CHANNELMGR-725 at cms-community /
hippo-addon-channel-manager
Commits:
e89bd9e8 by Mathijs den Burger at 2016-06-06T16:49:41+02:00
CHANNELMGR-725 Simplified/clarified code
Renamed deleteComponentProperties to destroyComponentPropertiesWindow
which is more explicit.
The event after deleting a component succeeded or failed was
generated in two places (both the success and failure case). We
now generate it in one place: the finally handler.
- - - - -
4ce3cd67 by Mathijs den Burger at 2016-06-06T16:52:27+02:00
CHANNELMGR-725 Don't fetch a .json property of an undefined record
- - - - -
3 changed files:
- frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.js
- frontend-ng/src/angularjs/channel/page/pageStructure.service.js
-
frontend/src/main/resources/org/onehippo/cms7/channelmanager/channeleditor/ChannelEditor.js
Changes:
=
frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.js
=
--- a/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.js
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.js
@@ -109,11 +109,8 @@ export class HippoIframeCtrl {
_doDelete(componentId) {
return () => this.PageStructureService.removeComponentById(componentId)
- .then(
-({ oldContainer, newContainer }) =>
this.DragDropService.replaceContainer(oldContainer, newContainer),
-// inform extjs to delete the component properties dialog if deletion
fails
-() => this.CmsService.publish('delete-component-properties')
- );
+ .then(({ oldContainer, newContainer }) =>
this.DragDropService.replaceContainer(oldContainer, newContainer))
+ .finally(() =>
this.CmsService.publish('destroy-component-properties-window'));
}
_confirmDelete(selectedComponent) {
=
frontend-ng/src/angularjs/channel/page/pageStructure.service.js
=
--- a/frontend-ng/src/angularjs/channel/page/pageStructure.service.js
+++ b/frontend-ng/src/angularjs/channel/page/pageStructure.service.js
@@ -215,7 +215,6 @@ export class PageStructureService {
_onAfterRemoveComponent() {
this.ChannelService.recordOwnChange();
-this.CmsService.publish('delete-component-properties');
}
getContainerByIframeElement(containerIFrameElement) {
=
frontend/src/main/resources/org/onehippo/cms7/channelmanager/channeleditor/ChannelEditor.js
=
---
a/frontend/src/main/resources/org/onehippo/cms7/channelmanager/channeleditor/ChannelEditor.js
+++
b/frontend/src/main/resources/org/onehippo/cms7/channelmanager/channeleditor/ChannelEditor.js
@@ -47,7 +47,7 @@
this.iframeToHost.subscribe('channel-changed-in-angular',
this._reloadChannels, this);
this.iframeToHost.subscribe('switch-channel', this._setChannel, this);
this.iframeToHost.subscribe('show-component-properties',
this._showComponentProperties, this);
- this.iframeToHost.subscribe('delete-component-properties',
this._deleteComponentPropertiesWindow, this);
+ this.iframeToHost.subscribe('destroy-component-properties-window',
this._destroyComponentPropertiesWindow, this);
this.iframeToHost.subscribe('show-picker', this._showPicker, this);
this.iframeToHost.subscribe('open-content', this._openDocumentEditor,
this);
this.iframeToHost.subscribe('show-mask', this._maskSurroundings, this);
@@ -81,9 +81,11 @@
_syncChannel: function() {
this._reloadChannels().when(function (channelStore) {
-var id = this.selectedChannel.id;
-this.selectedChannel = channelStore.getById(id).json;
-if (!this.selectedChannel) {
+var id = this.selectedChannel.id,
+ channelRecord = channelStore.getById(id);
+if (channelRecord) {
+ this.selectedChannel = channelRecord.json;
+} else {
// we may just have created the preview config of this channel
this.selectedChannel = channelStore.getById(id + '-preview').json;
}
@@ -105,11 +107,11 @@
},
_onComponentLocked: function(data) {
- this._deleteComponentPropertiesWindow();
+ this._destroyComponentPropertiesWindow();
this.hostToIFrame.publish('reload-channel', data);
},
-_deleteComponentPropertiesWindow: function() {
+_destroyComponentPropertiesWindow: function() {
if (this.componentPropertiesWindow) {
this.componentPropertiesWindow.destroy();
}
@@ -146,7 +148,7 @@
_initialize: function(channel) {
this.selectedChannel = channel;
- this._deleteComponentPropertiesWindow();
+ this._destroyComponentPropertiesWindow();
// update breadcrumb
this.setTitle(channel.name);
@@ -179,7 +181,7 @@
hide: function() {
this.hostToIFrame
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch bugfix/CHANNELMGR-723
Arthur Bogaart pushed new branch bugfix/CHANNELMGR-723 at cms-community / hippo-addon-channel-manager ___ 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-723] CHANNELMGR-723 Remove debug html
Arthur Bogaart pushed to branch bugfix/CHANNELMGR-723 at cms-community /
hippo-addon-channel-manager
Commits:
32c98650 by Arthur Bogaart at 2016-06-06T17:43:07+02:00
CHANNELMGR-723 Remove debug html
- - - - -
1 changed file:
- frontend-ng/src/angularjs/channel/menu/editor.html
Changes:
=
frontend-ng/src/angularjs/channel/menu/editor.html
=
--- a/frontend-ng/src/angularjs/channel/menu/editor.html
+++ b/frontend-ng/src/angularjs/channel/menu/editor.html
@@ -49,7 +49,7 @@
remove
-{{ item.title }} - {{collapsed}} --
{{childNodes().length}} -- {{hasChild()}}
+{{ item.title }}
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/32c98650bda3a19824a69bb13176de2b5595c05c
___
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-700
Mathijs den Burger deleted branch bugfix/CHANNELMGR-700 at cms-community / hippo-addon-channel-manager ___ 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-700 Drag menu-editor item by card title
Mathijs den Burger pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
ca800659 by Arthur Bogaart at 2016-06-06T16:29:15+02:00
CHANNELMGR-700 Drag menu-editor item by card title
- Removed default ui-tree-handle directive from hippo-tree and place it on the
md-card-title element
- Aligned drag/drop cursor with other places where we support drag/drop (use
cursor: drag and cursor:dragging in normal browsers, use cursor:move in IE)
- - - - -
06f2bbe7 by Mathijs den Burger at 2016-06-06T17:22:02+02:00
CHANNELMGR-700 Reintegrate bugfix/CHANNELMGR-700
- - - - -
4 changed files:
- frontend-ng/src/angularjs/channel/menu/editor.controller.js
- frontend-ng/src/angularjs/channel/menu/editor.html
- frontend-ng/src/angularjs/channel/menu/tree/items.renderer.html
- frontend-ng/src/styles/_tree.scss
Changes:
=
frontend-ng/src/angularjs/channel/menu/editor.controller.js
=
--- a/frontend-ng/src/angularjs/channel/menu/editor.controller.js
+++ b/frontend-ng/src/angularjs/channel/menu/editor.controller.js
@@ -28,6 +28,7 @@ export class MenuEditorCtrl {
this.PickerService = PickerService;
this.isSaving = {};
+this.isDragging = false;
SiteMenuService.loadMenu(this.menuUuid)
.then((menu) => {
@@ -51,6 +52,12 @@ export class MenuEditorCtrl {
});
this.treeOptions = {
+ dragStart: () => {
+this.isDragging = true;
+ },
+ dragStop: () => {
+this.isDragging = false;
+ },
dropped: (event) => {
const source = event.source;
const sourceNodeScope = source.nodeScope;
=
frontend-ng/src/angularjs/channel/menu/editor.html
=
--- a/frontend-ng/src/angularjs/channel/menu/editor.html
+++ b/frontend-ng/src/angularjs/channel/menu/editor.html
@@ -27,13 +27,16 @@
data-options="menuEditor.treeOptions"
data-selected-item="menuEditor.selectedItem"
data-draggable="true"
+ ng-class="{
+ 'hippo-tree-is-dragging': menuEditor.isDragging,
+ }"
flex>
-
+
=
frontend-ng/src/angularjs/channel/menu/tree/items.renderer.html
=
--- a/frontend-ng/src/angularjs/channel/menu/tree/items.renderer.html
+++ b/frontend-ng/src/angularjs/channel/menu/tree/items.renderer.html
@@ -13,7 +13,7 @@
- See the License for the specific language governing permissions and
- limitations under the License.
-->
-
+
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/5bc12c8b336724a43d3dc4dfd685d2ae5b5f2467...06f2bbe745bc099d022be616aa007cf96ff8a42a
___
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-721 Use grey color for SVG icons of disabled icon buttons
Mathijs den Burger pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
970adcc0 by Mathijs den Burger at 2016-06-06T15:58:03+02:00
CHANNELMGR-721 Use grey color for SVG icons of disabled icon buttons
Otherwise these icon buttons don't look disabled.
- - - - -
3ad8fcf0 by Mathijs den Burger at 2016-06-06T17:09:20+02:00
CHANNELMGR-721 Replace md-colors with SASS rule
Removed the need for !important for the disabled style.
- - - - -
d8132714 by Mathijs den Burger at 2016-06-06T17:09:40+02:00
CHANNELMGR-721 Reintegrate bugfix/CHANNELMGR-721
- - - - -
2 changed files:
- frontend-ng/src/angularjs/channel/sidenav/toggle.html
- frontend-ng/src/styles/_buttons.scss
Changes:
=
frontend-ng/src/angularjs/channel/sidenav/toggle.html
=
--- a/frontend-ng/src/angularjs/channel/sidenav/toggle.html
+++ b/frontend-ng/src/angularjs/channel/sidenav/toggle.html
@@ -20,6 +20,5 @@
ng-click="toggle.toggleSidenav()"
ng-class="{ 'md-accent': toggle.isSidenavOpen() }">
=
frontend-ng/src/styles/_buttons.scss
=
--- a/frontend-ng/src/styles/_buttons.scss
+++ b/frontend-ng/src/styles/_buttons.scss
@@ -34,10 +34,21 @@
margin-right: 0;
}
}
+
.md-button.md-fab.md-fab-bottom-right {
position: fixed;
}
+
.fab-space-holder {
margin-bottom: 80px;
}
+.md-icon-button {
+ > md-icon {
+color: $text-dark;
+ }
+
+ &[disabled] > md-icon {
+color: $grey-500;
+ }
+}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/5e522abead31ac5aee67d602fd76fa2dfc94a2c4...d8132714bb7d9a4b534873ba8647d60968c59c09
___
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-722 Disable viewport switcher when needed
Mathijs den Burger pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
67437287 by Mathijs den Burger at 2016-06-06T10:58:00+02:00
CHANNELMGR-722 Disable viewport switcher when needed
- - - - -
5bc12c8b by Mathijs den Burger at 2016-06-06T17:14:12+02:00
CHANNELMGR-722 Reintegrate bugfix/CHANNELMGR-722
- - - - -
4 changed files:
- frontend-ng/src/angularjs/channel/channel.html
- frontend-ng/src/angularjs/channel/viewports/viewportToggle.directive.js
- frontend-ng/src/angularjs/channel/viewports/viewportToggle.html
- frontend-ng/src/styles/_toolbar.scss
Changes:
=
frontend-ng/src/angularjs/channel/channel.html
=
--- a/frontend-ng/src/angularjs/channel/channel.html
+++ b/frontend-ng/src/angularjs/channel/channel.html
@@ -29,7 +29,7 @@
-
+
=
frontend-ng/src/angularjs/channel/viewports/viewportToggle.directive.js
=
--- a/frontend-ng/src/angularjs/channel/viewports/viewportToggle.directive.js
+++ b/frontend-ng/src/angularjs/channel/viewports/viewportToggle.directive.js
@@ -18,6 +18,9 @@ export function viewportToggleDirective() {
return {
restrict: 'E',
templateUrl: 'channel/viewports/viewportToggle.html',
+bindToController: {
+ disabled: '=',
+},
controller: 'ViewportToggleCtrl',
controllerAs: 'toggleCtrl',
};
=
frontend-ng/src/angularjs/channel/viewports/viewportToggle.html
=
--- a/frontend-ng/src/angularjs/channel/viewports/viewportToggle.html
+++ b/frontend-ng/src/angularjs/channel/viewports/viewportToggle.html
@@ -16,6 +16,7 @@
=
frontend-ng/src/styles/_toolbar.scss
=
--- a/frontend-ng/src/styles/_toolbar.scss
+++ b/frontend-ng/src/styles/_toolbar.scss
@@ -64,9 +64,14 @@ md-toolbar.hippo-toolbar {
md-select {
margin: 0;
padding-bottom: 6px;
+
+&[disabled] md-select-value md-icon {
+ color: $grey-500;
+}
}
md-select-value {
+background: none !important;
border-bottom-width: 0 !important;
font-weight: bold;
margin-left: 4px;
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/d8132714bb7d9a4b534873ba8647d60968c59c09...5bc12c8b336724a43d3dc4dfd685d2ae5b5f2467
___
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-722
Mathijs den Burger deleted branch bugfix/CHANNELMGR-722 at cms-community / hippo-addon-channel-manager ___ 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-721
Mathijs den Burger deleted branch bugfix/CHANNELMGR-721 at cms-community / hippo-addon-channel-manager ___ 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-721] CHANNELMGR-721 Replace md-colors with SASS rule
Mathijs den Burger pushed to branch bugfix/CHANNELMGR-721 at cms-community /
hippo-addon-channel-manager
Commits:
3ad8fcf0 by Mathijs den Burger at 2016-06-06T17:09:20+02:00
CHANNELMGR-721 Replace md-colors with SASS rule
Removed the need for !important for the disabled style.
- - - - -
2 changed files:
- frontend-ng/src/angularjs/channel/sidenav/toggle.html
- frontend-ng/src/styles/_buttons.scss
Changes:
=
frontend-ng/src/angularjs/channel/sidenav/toggle.html
=
--- a/frontend-ng/src/angularjs/channel/sidenav/toggle.html
+++ b/frontend-ng/src/angularjs/channel/sidenav/toggle.html
@@ -20,6 +20,5 @@
ng-click="toggle.toggleSidenav()"
ng-class="{ 'md-accent': toggle.isSidenavOpen() }">
=
frontend-ng/src/styles/_buttons.scss
=
--- a/frontend-ng/src/styles/_buttons.scss
+++ b/frontend-ng/src/styles/_buttons.scss
@@ -43,6 +43,12 @@
margin-bottom: 80px;
}
-.md-icon-button[disabled] > md-icon {
- color: $grey-500 !important;
+.md-icon-button {
+ > md-icon {
+color: $text-dark;
+ }
+
+ &[disabled] > md-icon {
+color: $grey-500;
+ }
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/3ad8fcf0a1571d14eae48fe56375fcedee391022
___
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/cmng-psp1-CHANNELMGR-730
Joeri de Gooijer pushed new branch feature/cmng-psp1-CHANNELMGR-730 at cms-community / hippo-addon-channel-manager ___ 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-725
Mathijs den Burger deleted branch bugfix/CHANNELMGR-725 at cms-community / hippo-addon-channel-manager ___ 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/cmng-psp1-CMS-10159
Joeri de Gooijer pushed new branch feature/cmng-psp1-CMS-10159 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-frontend-theme] Pushed new branch feature/cmng-psp1-HIPPOTHEME-129
Joeri de Gooijer pushed new branch feature/cmng-psp1-HIPPOTHEME-129 at cms-community / hippo-frontend-theme ___ 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][feature/HSTTWO-3623] HSTTWO-3623: adding missing component
Woonsan Ko pushed to branch feature/HSTTWO-3623 at cms-community / hippo-site-toolkit Commits: 70cee765 by Woonsan Ko at 2016-06-06T10:38:18-04:00 HSTTWO-3623: adding missing component - - - - - 1 changed file: - components/core/src/main/resources/org/hippoecm/hst/site/container/SpringComponentManager-content-beans.xml Changes: = components/core/src/main/resources/org/hippoecm/hst/site/container/SpringComponentManager-content-beans.xml = --- a/components/core/src/main/resources/org/hippoecm/hst/site/container/SpringComponentManager-content-beans.xml +++ b/components/core/src/main/resources/org/hippoecm/hst/site/container/SpringComponentManager-content-beans.xml @@ -32,4 +32,8 @@ + + + View it on GitLab: https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/70cee7655b3ad2f0c2da8115bafb7cd21c9a9bdc ___ 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][master] ARCHE-492 Adding Chinese to default set of locales
Oscar Scholten pushed to branch master at cms-community / hippo-project-archetype Commits: cc5fe2c0 by Oscar Scholten at 2016-06-06T16:32:56+02:00 ARCHE-492 Adding Chinese to default set of locales - - - - - 1 changed file: - src/main/resources/archetype-resources/pom.xml Changes: = src/main/resources/archetype-resources/pom.xml = --- a/src/main/resources/archetype-resources/pom.xml +++ b/src/main/resources/archetype-resources/pom.xml @@ -75,7 +75,7 @@ 1.0.0 true -nl,de,fr +nl,de,fr,zh View it on GitLab: https://code.onehippo.org/cms-community/hippo-project-archetype/commit/cc5fe2c0ceb48ed259a4a36601e0c0041ea683ca ___ 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-700
Arthur Bogaart pushed new branch bugfix/CHANNELMGR-700 at cms-community / hippo-addon-channel-manager ___ 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-721
Mathijs den Burger pushed new branch bugfix/CHANNELMGR-721 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-translations][master] CMS-10145 Registering Chinese translation
Oscar Scholten pushed to branch master at cms-community / hippo-cms-translations
Commits:
34679137 by Oscar Scholten at 2016-06-06T15:53:47+02:00
CMS-10145 Registering Chinese translation
- - - - -
2 changed files:
-
channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore.registry.json
-
channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore_zh.properties
Changes:
=
channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore.registry.json
=
---
a/channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore.registry.json
+++
b/channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore.registry.json
@@ -115,9 +115,7 @@
},
"field.hstConfigEditor" : {
"status" : "UPDATED",
- "locales" : {
-"zh" : "UNRESOLVED"
- }
+ "locales" : null
}
}
-}
\ No newline at end of file
+}
=
channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore_zh.properties
=
---
a/channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore_zh.properties
+++
b/channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore_zh.properties
@@ -2,6 +2,7 @@
field.contextPath=\u4E0A\u4E0B\u6587\u8DEF\u5F84
field.lockedBy=\u9501\u5B9A\u4EBA\u5458
field.id=\u6807\u8BC6\u7B26
+field.hstConfigEditor=
field.region=\u533A\u57DF
channelexception.mount.not.found=\u4E0D\u80FD\u4F7F\u7528URL\u201C{0}\u201D\uFF0C\u56E0\u4E3A\u4E0A\u7EA7URL\u201C{1}\u201D\u672A\u88AB\u4EFB\u4F55\u901A\u9053\u4F7F\u7528\u3002
channelexception.cannot.create.content=\u5728\u201C{0}\u201D\u521B\u5EFA\u901A\u9053\u5185\u5BB9\u5931\u8D25\u3002
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms-translations/commit/34679137ee8849292f7ba09efd963a07452ee9a4
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-translations][master] CMS-10145 Importing Chinese translations
Oscar Scholten pushed to branch master at cms-community / hippo-cms-translations Commits: c58d3f9c by Oscar Scholten at 2016-06-06T15:40:39+02:00 CMS-10145 Importing Chinese translations - - - - - 100 changed files: - + channel-manager/resources/angular/channelmanager/menu/i18n/zh.json - + channel-manager/resources/angular/channelmanager/page/i18n/zh.json - + channel-manager/resources/angular/channelmanager/pages/i18n/zh.json - channel-manager/resources/angular/hippo-cm/i18n/registry.json - + channel-manager/resources/angular/hippo-cm/i18n/zh.json - + channel-manager/resources/extensions/zh/hippoecm-extension.xml - + channel-manager/resources/org/onehippo/cms7/channelmanager/ChannelManagerPerspective_zh.properties - channel-manager/resources/org/onehippo/cms7/channelmanager/RootPanel.registry.json - + channel-manager/resources/org/onehippo/cms7/channelmanager/RootPanel_zh.properties - channel-manager/resources/org/onehippo/cms7/channelmanager/channeleditor/ChannelEditor.registry.json - + channel-manager/resources/org/onehippo/cms7/channelmanager/channeleditor/ChannelEditor_zh.properties - channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelGridPanel.registry.json - + channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelGridPanel_zh.properties - + channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelIconPanel_zh.properties - + channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelOverview_zh.properties - + channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelPropertiesWindow_zh.properties - channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore.registry.json - + channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore_zh.properties - + channel-manager/resources/org/onehippo/cms7/channelmanager/hstconfig/HstConfigEditor_zh.properties - + channel-manager/resources/org/onehippo/cms7/channelmanager/plugins/channelactions/ChannelActionsPlugin_zh.properties - + channel-manager/resources/org/onehippo/cms7/channelmanager/templatecomposer/PageEditor_zh.properties - + channel-manager/resources/org/onehippo/cms7/channelmanager/widgets/ImageSetPathWidget_zh.properties - + channel-manager/resources/org/onehippo/cms7/channelmanager/widgets/JcrPathWidget_zh.properties - + channel-manager/resources/socialsharing-translations_zh.json - + content-blocks/resources/org/onehippo/forge/contentblocks/ContentBlocksFieldPlugin$DeleteItemDialog_zh.properties - + content-blocks/resources/org/onehippo/forge/contentblocks/ContentBlocksFieldPlugin_zh.properties - + content-tagging/resources/extensions/zh/hippoecm-extension.xml - + content-tagging/resources/org/onehippo/forge/ecmtagging/editor/TagSuggestPlugin_zh.properties - + content-tagging/resources/org/onehippo/forge/ecmtagging/editor/TagsPlugin_zh.properties - + content-tagging/resources/section-translations_zh.json - + dashboard-document-wizard/resources/org/onehippo/forge/dashboard/documentwizard/NewDocumentWizardPlugin$Dialog_zh.properties - + dashboard-document-wizard/resources/org/onehippo/forge/dashboard/documentwizard/NewDocumentWizardPlugin_zh.properties - + gallerypicker/resources/org/onehippo/addon/frontend/gallerypicker/GalleryPickerPlugin_zh.properties - + gallerypicker/resources/org/onehippo/addon/frontend/gallerypicker/dialog/GalleryPickerDialog_zh.properties - + hippo-cms/resources/builtin-workflow-translations_zh.json - + hippo-cms/resources/editor-templates-translations_zh.json - hippo-cms/resources/extensions/zh/hippoecm-extension.xml - + hippo-cms/resources/hippo-type-translations_zh.json - + hippo-cms/resources/hippogallery-template-translations_zh.json - + hippo-cms/resources/hippogallery-type-translations_zh.json - + hippo-cms/resources/hippostd-html-type-translations_zh.json - + hippo-cms/resources/hippostd-publishablesummary-type-translations_zh.json - + hippo-cms/resources/hippostd-templates-translations_zh.json - + hippo-cms/resources/hippostd-type-translations_zh.json - + hippo-cms/resources/hippostdpubwf-type-translations_zh.json - + hippo-cms/resources/hipposysedit-type-translations_zh.json - + hippo-cms/resources/org/hippoecm/addon/workflow/AbstractWorkflowDialog_zh.properties - + hippo-cms/resources/org/hippoecm/addon/workflow/CompatibilityWorkflowPlugin$WorkflowAction$DestinationDialog_zh.properties - + hippo-cms/resources/org/hippoecm/addon/workflow/CompatibilityWorkflowPlugin$WorkflowAction$TextDialog_zh.properties - + hippo-cms/resources/org/hippoecm/addon/workflow/DestinationDialog_zh.properties - + hippo-cms/resources/org/hippoecm/addon/workflow/FutureDateValidator_zh.properties - + hippo-cms/resources/org/hippoecm/addon/workflow/MenuDrop_zh.properties - + hippo-cms/resources/org/hippoecm/addon/workflow/TextDialog_zh.properties - + hippo-cms/resources/org/hippoecm/editor/NamespaceValidator_zh.properties - + hippo-cms/resources/org/hippoecm/editor/repos
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][feature/HSTTWO-3623] 161 commits: HSTTWO-3582: copy for branch hst-4.0.0-cmng
Woonsan Ko pushed to branch feature/HSTTWO-3623 at cms-community / hippo-site-toolkit Commits: be4a26c1 by Tobias Jeger at 2016-01-29T13:25:11+00:00 HSTTWO-3582: copy for branch hst-4.0.0-cmng - - - - - ad853f52 by Tobias Jeger at 2016-01-29T15:04:25+00:00 HSTTWO-3583: Initial draft to expose page meta-data at end of response payload (when requested inside the CM). - - - - - 4a09984b by Tobias Jeger at 2016-02-01T11:29:56+00:00 HSTTWO-3583: Add unit test for the new addEpilogue method in HstResponse. - - - - - 25c2da82 by Tobias Jeger at 2016-02-01T12:16:22+00:00 HSTTWO-3583: Update copyright year. - - - - - 0db8f560 by Tobias Jeger at 2016-02-02T08:59:30+00:00 CHANNELMGR-339: Detect channel changes and route them to the ChannelService. - - - - - c286d529 by Mathijs den Burger at 2016-02-08T11:23:32+01:00 HSTTWO-3582 Merge branch 'master' into feature/cmng-psp1 - - - - - 36f3423c by Tobias Jeger at 2016-02-08T12:04:07+01:00 HSTTWO-3588: Support GETting a single Channel (by id), add channel id to page meta data. - - - - - 32f59f4c by Arthur Bogaart at 2016-02-16T13:44:28+01:00 HSTTWO-1003 Remove redundant static final modifiers on String constants - - - - - 73354459 by Arthur Bogaart at 2016-02-16T17:49:00+01:00 HSTTWO-3595 Replace generic String "type" with "HST-Type" for container and container-item metadata attributes - - - - - e0f45cbb by Mathijs den Burger at 2016-02-17T09:19:54+01:00 HSTTWO-3588 code cleanup - bump copyright year - make local variable final - fix IntelliJ warnings - - - - - 30fe399c by Tobias Jeger at 2016-02-21T13:05:18+01:00 HSTTWO-3599: Fix ES-lint errors, improve consistency. - - - - - 1903ab86 by Tobias Jeger at 2016-02-23T09:13:40+01:00 HSTTWO-3599: Add fall-back if hst:label is not specified. Use CM constant for exposing a container's hst:xtype. - - - - - 57fa5a30 by Tobias Jeger at 2016-02-23T09:23:23+01:00 HSTTWO-3601: Add template and support for a transparent xtype. - - - - - aec9fa0c by Mathijs den Burger at 2016-02-23T15:31:11+01:00 HSTTWO-3599 bump copyright year - - - - - 731fc46d by Mathijs den Burger at 2016-02-23T15:37:38+01:00 HSTTWO-3601 bump copyright year - - - - - 583b6107 by Mathijs den Burger at 2016-02-24T12:32:20+01:00 HSTTWO-3603 add constant for 'inherited' channel manager property Also rename it to 'HST-Inherited'. - - - - - c5b84341 by Tobias Jeger at 2016-02-24T12:52:12+01:00 HSTTWO-3601: render a "end" comment for components and containers. - - - - - 543696a8 by Tobias Jeger at 2016-02-24T13:01:07+01:00 HSTTWO-3601: Make the end marker more different from the start marker. - - - - - 1d7def16 by Mathijs den Burger at 2016-02-24T17:05:47+01:00 HSTTWO-3601 fix typo in parameter name - - - - - b4cdbb4d by Mathijs den Burger at 2016-02-24T17:06:02+01:00 HSTTWO-3601 bump copyright year - - - - - 728c5281 by Mathijs den Burger at 2016-03-02T11:22:21+01:00 HSTTWO-3611 use CMS location instead of Referer for authentication URL The Referer header is not always the base of the CMS application anymore now that the CMS contains several AngularJs apps that first get their own index.html file (e.g. '/cms/angular/app/index.html)', which changes the Referer header in subsequent calls). - - - - - 75d240de by Joeri de Gooijer at 2016-03-07T16:23:36+01:00 HSTTWO-3582 merge master into feature/cmng-psp1 - - - - - 9785a477 by Tobias Jeger at 2016-03-09T12:06:22+01:00 HSTTWO-3614: Add support for setting the rendering mount id during the initial composermode call. This makes the timing of CM-related calls to the back-end independent of the calls issued by the preview iframe. - - - - - cd69c3fd by Mathijs den Burger at 2016-03-14T15:18:42+01:00 HSTTWO-3619 pass lastModified as part of container representation This simplifies the AngularJs frontend implementation. Also removed the itemUuid parameter since it was not used. - - - - - 9fbf44b1 by Mathijs den Burger at 2016-03-14T15:19:06+01:00 HSTTWO-3619 bump copyright year - - - - - 9018f046 by Tobias Jeger at 2016-03-14T21:11:04+01:00 HSTTWO-3620: Adjust the rendering of component metadata such that if the "root window" is a container item component or a container component, its metadata is rendered as well. - - - - - 94807314 by Tobias Jeger at 2016-03-15T11:49:11+01:00 HSTTWO-3620: remove page metadata when rendering a container or component. - - - - - 2642c91e by Tobias Jeger at 2016-03-18T09:01:18+01:00 HSTTWO-3582: merge master changes into feature branch. - - - - - 809c3ec1 by Canh Ngo at 2016-03-22T14:18:57+01:00 HSTTWO-3620: refactored the code to populate page metadata to a separated method - - - - - b9a64e38 by Ard Schrijvers at 2016-04-04T13:00:10+02:00 HSTTWO-3624 Make sure HippoBean also has an object converter instance Set the object converter on the bean during JcrContentBeanBinder#bind so the bean can also be used for calls like #getHtml returning another bean - - - - - 7139ea63 by Tobias Jeger at 2016-04-05T10:41:40+02:00 HSTTWO-3633: push private utility method as pro
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch bugfix/CHANNELMGR-713
Mathijs den Burger deleted branch bugfix/CHANNELMGR-713 at cms-community / hippo-addon-channel-manager ___ 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-713 Use explicit default css values for tooltip clipping/wrapping
Mathijs den Burger pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
19c0f531 by Arthur Bogaart at 2016-06-06T11:03:06+02:00
CHANNELMGR-713 Use explicit default css values for tooltip clipping/wrapping
The 'initial' keyword is not supported on IE, so instead of resetting the
text-overflow and white-space using 'initial' we pass the default values.
- - - - -
668c42e6 by Mathijs den Burger at 2016-06-06T15:43:03+02:00
CHANNELMGR-713 Reintegrate bugfix/CHANNELMGR-713
- - - - -
1 changed file:
- frontend-ng/src/styles/_channel.scss
Changes:
=
frontend-ng/src/styles/_channel.scss
=
--- a/frontend-ng/src/styles/_channel.scss
+++ b/frontend-ng/src/styles/_channel.scss
@@ -76,6 +76,6 @@ md-select.ng-invalid-required > md-select-value > span:after {
.tooltip-help-icon ._md-content {
height: auto;
max-width: 500px;
- text-overflow: initial;
- white-space: initial;
+ text-overflow: clip;
+ white-space: normal;
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/3a2137f7136aeb87e7abe18acb2471489b677057...668c42e6e9c546101bfba473eb0378018ebf4698
___
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-715
Mathijs den Burger deleted branch bugfix/CHANNELMGR-715 at cms-community / hippo-addon-channel-manager ___ 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-715 Add title attribute to back/close button
Mathijs den Burger pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
343d498b by Arthur Bogaart at 2016-06-03T13:55:16+02:00
CHANNELMGR-715 Add title attribute to back/close button
- - - - -
681509b5 by Arthur Bogaart at 2016-06-06T11:24:50+02:00
CHANNELMGR-715 Use data- prefix for title attribute
To prevent the 'title' attribute of the subpage directive serving a second
purpose (showing a native browser tooltip in the toolbar) we prefix it with
data-.
- - - - -
3a2137f7 by Mathijs den Burger at 2016-06-06T15:39:33+02:00
CHANNELMGR-715 Reintegrate bugfix/CHANNELMGR-715
- - - - -
9 changed files:
- frontend-ng/src/angularjs/channel/actions/settings/settings.html
- frontend-ng/src/angularjs/channel/changes/manageChanges.html
- frontend-ng/src/angularjs/channel/menu/editor.html
- frontend-ng/src/angularjs/channel/page/actions/copy/copy.html
- frontend-ng/src/angularjs/channel/page/actions/create/create.html
- frontend-ng/src/angularjs/channel/page/actions/edit/edit.html
- frontend-ng/src/angularjs/channel/page/actions/move/move.html
- frontend-ng/src/angularjs/channel/subpage/toolbar.html
- frontend-ng/src/angularjs/channel/subpage/toolbar.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/actions/settings/settings.html
=
--- a/frontend-ng/src/angularjs/channel/actions/settings/settings.html
+++ b/frontend-ng/src/angularjs/channel/actions/settings/settings.html
@@ -15,7 +15,7 @@
-->
=
frontend-ng/src/angularjs/channel/changes/manageChanges.html
=
--- a/frontend-ng/src/angularjs/channel/changes/manageChanges.html
+++ b/frontend-ng/src/angularjs/channel/changes/manageChanges.html
@@ -15,7 +15,7 @@
-->
=
frontend-ng/src/angularjs/channel/menu/editor.html
=
--- a/frontend-ng/src/angularjs/channel/menu/editor.html
+++ b/frontend-ng/src/angularjs/channel/menu/editor.html
@@ -15,7 +15,7 @@
-->
=
frontend-ng/src/angularjs/channel/page/actions/copy/copy.html
=
--- a/frontend-ng/src/angularjs/channel/page/actions/copy/copy.html
+++ b/frontend-ng/src/angularjs/channel/page/actions/copy/copy.html
@@ -15,7 +15,7 @@
-->
=
frontend-ng/src/angularjs/channel/page/actions/create/create.html
=
--- a/frontend-ng/src/angularjs/channel/page/actions/create/create.html
+++ b/frontend-ng/src/angularjs/channel/page/actions/create/create.html
@@ -15,7 +15,7 @@
-->
=
frontend-ng/src/angularjs/channel/page/actions/edit/edit.html
=
--- a/frontend-ng/src/angularjs/channel/page/actions/edit/edit.html
+++ b/frontend-ng/src/angularjs/channel/page/actions/edit/edit.html
@@ -15,7 +15,7 @@
-->
@@ -77,4 +77,4 @@
-
\ No newline at end of file
+
=
frontend-ng/src/angularjs/channel/page/actions/move/move.html
=
--- a/frontend-ng/src/angularjs/channel/page/actions/move/move.html
+++ b/frontend-ng/src/angularjs/channel/page/actions/move/move.html
@@ -15,7 +15,7 @@
-->
@@ -65,4 +65,4 @@
-
\ No newline at end of file
+
=
frontend-ng/src/angularjs/channel/subpage/toolbar.html
=
--- a/frontend-ng/src/angularjs/channel/subpage/toolbar.html
+++ b/frontend-ng/src/angularjs/channel/subpage/toolbar.html
@@ -18,6 +18,7 @@
=
frontend-ng/src/angularjs/channel/subpage/toolbar.spec.js
=
--- a/frontend-ng/src/angularjs/channel/subpage/toolbar.spec.js
+++ b/frontend-ng/src/angularjs/channel/subpage/toolbar.spec.js
@@ -41,7 +41,7 @@ describe('SubpageToolbar', () => {
$scope.onBack = jasmine.createSpy('onBack');
$scope.title = 'testTitle';
$scope.mode = mode;
-$element = angular.element(' ');
+$element = angular.element(' ');
$compile($element)($scope);
$scope.$digest();
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/eaadfde474bd04169a1b9ffc58e93afc7696a772...3a2137f7136aeb87e7abe18acb2471489b677057
___
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-725
Mathijs den Burger pushed new branch bugfix/CHANNELMGR-725 at cms-community / hippo-addon-channel-manager ___ 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-784 Exclude file from license check
Michiel Eggermont pushed to branch master at cms-community / hippo-essentials Commits: 810df3d5 by Michiel Eggermont at 2016-06-06T14:40:02+02:00 ESSENTIALS-784 Exclude file from license check - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -240,6 +240,7 @@ plugins/skeleton-package/src/main/resources/instructions/js/jquery*.js plugins/**/*.ftl plugins/**/*.jsp + plugins/rest-services/src/main/resources/BeanNameResource.txt View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/810df3d5e5a6a7f80d3764ddcc0d6ce64dbd6e60 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-search-service][bugfix/CMS-10098] CMS-10098: used SearchService.DEFAULT_WILDCARD_POSTFIX_LENGTH on two more occasi…
Jeroen Hoffman pushed to branch bugfix/CMS-10098 at cms-community /
hippo-addon-search-service
Commits:
dff6be5f by Jeroen Hoffman at 2016-06-06T14:50:23+02:00
CMS-10098: used SearchService.DEFAULT_WILDCARD_POSTFIX_LENGTH on two more
occasions and removed the now useless FullTextSearchParser#getMinimalLength
- - - - -
2 changed files:
- jcr/src/main/java/org/onehippo/cms7/services/search/jcr/query/Filter.java
-
jcr/src/main/java/org/onehippo/cms7/services/search/jcr/query/FullTextSearchParser.java
Changes:
=
jcr/src/main/java/org/onehippo/cms7/services/search/jcr/query/Filter.java
=
--- a/jcr/src/main/java/org/onehippo/cms7/services/search/jcr/query/Filter.java
+++ b/jcr/src/main/java/org/onehippo/cms7/services/search/jcr/query/Filter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2013 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2012-2016 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.
@@ -25,15 +25,17 @@ import javax.jcr.Session;
import org.hippoecm.repository.util.DateTools;
import org.onehippo.cms7.services.search.query.constraint.DateConstraint;
+import org.onehippo.cms7.services.search.service.SearchService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class Filter {
static final Logger log = LoggerFactory.getLogger(Filter.class);
+
private static final String[] DEFAULT_SKIPS = new String[]{"."};
-private int wildcardPostfixMinLength = 5;
+private int wildcardPostfixMinLength =
SearchService.DEFAULT_WILDCARD_POSTFIX_LENGTH;
private StringBuilder jcrExpressionBuilder;
@@ -93,7 +95,7 @@ public class Filter {
return;
}
} else {
-String parsedText =
FullTextSearchParser.fullTextParseCmsSimpleSearchMode(fullTextSearch, false,
wildcardPostfixMinLength);
+String parsedText =
FullTextSearchParser.fullTextParseCmsSimpleSearchMode(fullTextSearch, false);
if (fulltextWildcardPostfixed && fullTextSearch.length() >
wildcardPostfixMinLength) {
String parsedTextWildCardPostFixed =
FullTextSearchParser.fullTextParseCmsSimpleSearchMode(fullTextSearch, true,
wildcardPostfixMinLength);
=
jcr/src/main/java/org/onehippo/cms7/services/search/jcr/query/FullTextSearchParser.java
=
---
a/jcr/src/main/java/org/onehippo/cms7/services/search/jcr/query/FullTextSearchParser.java
+++
b/jcr/src/main/java/org/onehippo/cms7/services/search/jcr/query/FullTextSearchParser.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2013 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2012-2016 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.
@@ -18,6 +18,7 @@ package org.onehippo.cms7.services.search.jcr.query;
import java.util.StringTokenizer;
import org.apache.commons.lang.StringUtils;
+import org.onehippo.cms7.services.search.service.SearchService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,8 +36,6 @@ public final class FullTextSearchParser {
private final static String ignoredChars = DEFAULT_IGNORED_CHARS;
-private final static int minimalLength = 3;
-
private static final String WHITESPACE_PATTERN = "\\s+";
private FullTextSearchParser() {
@@ -64,8 +63,9 @@ public final class FullTextSearchParser {
public static String fullTextParseCmsSimpleSearchMode(String value, final
boolean wildcardPostfix) {
-return fullTextParseCmsSimpleSearchMode(value, wildcardPostfix,
getMinimalLength());
+return fullTextParseCmsSimpleSearchMode(value, wildcardPostfix,
SearchService.DEFAULT_WILDCARD_POSTFIX_LENGTH);
}
+
public static String fullTextParseCmsSimpleSearchMode(String value, final
boolean wildcardPostfix, final int minimalLength) {
value = foldToASCIIReplacer(value.trim());
@@ -115,7 +115,7 @@ public final class FullTextSearchParser {
if (wildcardPostfix && tb.length() < minimalLength &&
!isOperatorToken) {
-// for wildcard postfixing we demand the term to be at least
as long as #getMinimalLength()
+// for wildcard postfixing we demand the term to be at least
as long as minimal length
continue;
}
@@ -157,11 +157,6 @@ public final class FullTextSearchParser {
return whereClauseBuilder.toString();
}
-public static int getMinimalLength() {
-return minimalLength;
-}
-
-
/**
*
* Removes invalid chars, escapes some chars. If
allowSingleNonLeadingWildCard is true, there
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-search-se
[HippoCMS-scm] [Git][cms-community/hippo-cms-translations][master] 4 commits: CMS-10145 Setting up configuration to build Chinese localization packages
Oscar Scholten pushed to branch master at cms-community / hippo-cms-translations
Commits:
abc87bfb by Oscar Scholten at 2016-05-30T17:24:27+02:00
CMS-10145 Setting up configuration to build Chinese localization packages
- - - - -
d0e1b8f2 by Oscar Scholten at 2016-06-06T11:23:25+02:00
CMS-10139 Merge master changes into feature/chinese-translation
- - - - -
3f1f4846 by Oscar Scholten at 2016-06-06T11:52:50+02:00
CMS-10139 Merge master changes into feature/chinese-translation
- - - - -
f8965f23 by Oscar Scholten at 2016-06-06T14:14:05+02:00
CMS-10139 Reintegrating feature/chinese-translation into master
- - - - -
2 changed files:
- + hippo-cms/resources/extensions/zh/hippoecm-extension.xml
- pom.xml
Changes:
=
hippo-cms/resources/extensions/zh/hippoecm-extension.xml
=
--- /dev/null
+++ b/hippo-cms/resources/extensions/zh/hippoecm-extension.xml
@@ -0,0 +1,19 @@
+http://www.jcp.org/jcr/sv/1.0"; sv:name="hippo:initialize">
+
+hippo:initializefolder
+
+
+
+ hippo:initializeitem
+
+
+ 1004
+
+
+ /hippo:configuration/hippo:frontend/settings/locales
+
+
+ zh
+
+
+
\ No newline at end of file
=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
1.0.0-SNAPSHOT
-fr,nl,de
+fr,nl,de,zh
Default
false
@@ -112,6 +112,18 @@
${project.build.outputDirectory}/de
+
+
+ zh_jar
+ package
+
+jar
+
+
+zh
+
${project.build.outputDirectory}/zh
+
+
@@ -162,6 +174,14 @@
**/de.json
+
+resources
+zh
+
+ **/*_zh.*
+ **/zh.json
+
+
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms-translations/compare/3e7f9e07f9c03d38e87faf585682a14790795926...f8965f235be548afe1ada3dbcfc377d6a12ece1e
___
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][release/3.1] HSTTWO-3581 [Backport 3.1] make sure that requests that are a FORWARD and a JAA…
Ard Schrijvers pushed to branch release/3.1 at cms-community /
hippo-site-toolkit
Commits:
4464c990 by Ard Schrijvers at 2016-06-06T14:12:25+02:00
HSTTWO-3581 [Backport 3.1] make sure that requests that are a FORWARD and a
JAAS authentication request are not handled by the HST
(cherry picked from commit 799a46d2b3d690171fa75d97aca1344a55cb6d35)
- - - - -
1 changed file:
-
components/core/src/main/java/org/hippoecm/hst/container/HstDelegateeFilterBean.java
Changes:
=
components/core/src/main/java/org/hippoecm/hst/container/HstDelegateeFilterBean.java
=
---
a/components/core/src/main/java/org/hippoecm/hst/container/HstDelegateeFilterBean.java
+++
b/components/core/src/main/java/org/hippoecm/hst/container/HstDelegateeFilterBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2008-2016 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.
@@ -20,6 +20,7 @@ import java.util.List;
import javax.jcr.Repository;
import javax.servlet.FilterChain;
+import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
@@ -65,6 +66,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.web.context.ServletContextAware;
+import static
org.hippoecm.hst.core.container.ContainerConstants.HST_JAAS_LOGIN_ATTEMPT_RESOURCE_TOKEN;
+import static
org.hippoecm.hst.core.container.ContainerConstants.HST_JAAS_LOGIN_ATTEMPT_RESOURCE_URL_ATTR;
import static
org.hippoecm.hst.util.HstRequestUtils.createURLWithExplicitSchemeForRequest;
import static org.hippoecm.hst.util.HstRequestUtils.getFarthestRemoteAddr;
import static org.hippoecm.hst.util.HstRequestUtils.getFarthestRequestHost;
@@ -151,6 +154,16 @@ public class HstDelegateeFilterBean extends
AbstractFilterBean implements Servle
HttpServletRequest req = (HttpServletRequest)request;
HttpServletResponse res = (HttpServletResponse)response;
+HttpSession session = req.getSession(false);
+final boolean isJaasLoginAttempt = session != null
+&& session.getAttribute(HST_JAAS_LOGIN_ATTEMPT_RESOURCE_TOKEN)
!= null
+&&
session.getAttribute(HST_JAAS_LOGIN_ATTEMPT_RESOURCE_TOKEN).equals(req.getParameter("token"));
+// make sure to not handle FORWARD requests for jaas authentication by
the HST
+if (isJaasLoginAttempt &&
req.getAttribute(RequestDispatcher.FORWARD_SERVLET_PATH) != null) {
+chain.doFilter(req, res);
+return;
+}
+
request.setAttribute(FILTER_DONE_KEY, Boolean.TRUE);
boolean requestContextSetToProvider = false;
@@ -207,19 +220,16 @@ public class HstDelegateeFilterBean extends
AbstractFilterBean implements Servle
* always a http redirect is done by the container. Hence we check
below whether there is an attribute
* on the http session that is only present after a jaas login
attempt. If present, we do another redirect.
*/
-HttpSession session = req.getSession(false);
-if (session != null &&
session.getAttribute(ContainerConstants.HST_JAAS_LOGIN_ATTEMPT_RESOURCE_TOKEN)
!= null ) {
-if
(session.getAttribute(ContainerConstants.HST_JAAS_LOGIN_ATTEMPT_RESOURCE_TOKEN).equals(req.getParameter("token")))
{
-// we are dealing with client side redirect from the
container after JAAS login. This redirect typically
-// fails in case of proxy taking care of the context path
in front of the application.
-// hence we need another redirect.
-String resourceURL =
(String)session.getAttribute(ContainerConstants.HST_JAAS_LOGIN_ATTEMPT_RESOURCE_URL_ATTR);
-
session.removeAttribute(ContainerConstants.HST_JAAS_LOGIN_ATTEMPT_RESOURCE_URL_ATTR);
-
session.removeAttribute(ContainerConstants.HST_JAAS_LOGIN_ATTEMPT_RESOURCE_TOKEN);
-log.debug("Redirect {} to '{}'", containerRequest,
resourceURL);
-res.sendRedirect(resourceURL);
-return;
-}
+if (isJaasLoginAttempt) {
+// we are dealing with client side redirect from the container
after JAAS login. This redirect typically
+// fails in case of proxy taking care of the context path in
front of the application.
+// hence we need another redirect.
+String resourceURL =
(String)session.getAttribute(HST_JAAS_LOGIN_ATTEMPT_RESOURCE_URL_ATTR);
+
session.removeAttribute(HST_JAAS_LOGIN_ATTEMPT_RESOURCE_URL_ATTR);
+sessi
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][release/3.2] HSTTWO-3580 [Backport 3.2] make sure that requests that are a FORWARD and a JAAS…
Ard Schrijvers pushed to branch release/3.2 at cms-community /
hippo-site-toolkit
Commits:
3ee859f1 by Ard Schrijvers at 2016-06-06T14:08:40+02:00
HSTTWO-3580 [Backport 3.2] make sure that requests that are a FORWARD and a
JAAS authentication request are not handled by the HST
(cherry picked from commit 799a46d2b3d690171fa75d97aca1344a55cb6d35)
- - - - -
1 changed file:
-
components/core/src/main/java/org/hippoecm/hst/container/HstDelegateeFilterBean.java
Changes:
=
components/core/src/main/java/org/hippoecm/hst/container/HstDelegateeFilterBean.java
=
---
a/components/core/src/main/java/org/hippoecm/hst/container/HstDelegateeFilterBean.java
+++
b/components/core/src/main/java/org/hippoecm/hst/container/HstDelegateeFilterBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2008-2016 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.
@@ -20,6 +20,7 @@ import java.util.List;
import javax.jcr.Repository;
import javax.servlet.FilterChain;
+import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
@@ -65,6 +66,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.web.context.ServletContextAware;
+import static
org.hippoecm.hst.core.container.ContainerConstants.HST_JAAS_LOGIN_ATTEMPT_RESOURCE_TOKEN;
+import static
org.hippoecm.hst.core.container.ContainerConstants.HST_JAAS_LOGIN_ATTEMPT_RESOURCE_URL_ATTR;
import static
org.hippoecm.hst.util.HstRequestUtils.createURLWithExplicitSchemeForRequest;
import static org.hippoecm.hst.util.HstRequestUtils.getFarthestRemoteAddr;
import static org.hippoecm.hst.util.HstRequestUtils.getFarthestRequestHost;
@@ -151,6 +154,16 @@ public class HstDelegateeFilterBean extends
AbstractFilterBean implements Servle
HttpServletRequest req = (HttpServletRequest)request;
HttpServletResponse res = (HttpServletResponse)response;
+HttpSession session = req.getSession(false);
+final boolean isJaasLoginAttempt = session != null
+&& session.getAttribute(HST_JAAS_LOGIN_ATTEMPT_RESOURCE_TOKEN)
!= null
+&&
session.getAttribute(HST_JAAS_LOGIN_ATTEMPT_RESOURCE_TOKEN).equals(req.getParameter("token"));
+// make sure to not handle FORWARD requests for jaas authentication by
the HST
+if (isJaasLoginAttempt &&
req.getAttribute(RequestDispatcher.FORWARD_SERVLET_PATH) != null) {
+chain.doFilter(req, res);
+return;
+}
+
request.setAttribute(FILTER_DONE_KEY, Boolean.TRUE);
boolean requestContextSetToProvider = false;
@@ -207,19 +220,16 @@ public class HstDelegateeFilterBean extends
AbstractFilterBean implements Servle
* always a http redirect is done by the container. Hence we check
below whether there is an attribute
* on the http session that is only present after a jaas login
attempt. If present, we do another redirect.
*/
-HttpSession session = req.getSession(false);
-if (session != null &&
session.getAttribute(ContainerConstants.HST_JAAS_LOGIN_ATTEMPT_RESOURCE_TOKEN)
!= null ) {
-if
(session.getAttribute(ContainerConstants.HST_JAAS_LOGIN_ATTEMPT_RESOURCE_TOKEN).equals(req.getParameter("token")))
{
-// we are dealing with client side redirect from the
container after JAAS login. This redirect typically
-// fails in case of proxy taking care of the context path
in front of the application.
-// hence we need another redirect.
-String resourceURL =
(String)session.getAttribute(ContainerConstants.HST_JAAS_LOGIN_ATTEMPT_RESOURCE_URL_ATTR);
-
session.removeAttribute(ContainerConstants.HST_JAAS_LOGIN_ATTEMPT_RESOURCE_URL_ATTR);
-
session.removeAttribute(ContainerConstants.HST_JAAS_LOGIN_ATTEMPT_RESOURCE_TOKEN);
-log.debug("Redirect {} to '{}'", containerRequest,
resourceURL);
-res.sendRedirect(resourceURL);
-return;
-}
+if (isJaasLoginAttempt) {
+// we are dealing with client side redirect from the container
after JAAS login. This redirect typically
+// fails in case of proxy taking care of the context path in
front of the application.
+// hence we need another redirect.
+String resourceURL =
(String)session.getAttribute(HST_JAAS_LOGIN_ATTEMPT_RESOURCE_URL_ATTR);
+
session.removeAttribute(HST_JAAS_LOGIN_ATTEMPT_RESOURCE_URL_ATTR);
+sessio
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][master] HSTTWO-3656 don't pull in the 'hippo-cms-api'
Ard Schrijvers pushed to branch master at cms-community / hippo-site-toolkit
Commits:
eecd711c by Ard Schrijvers at 2016-06-06T14:01:40+02:00
HSTTWO-3656 don't pull in the 'hippo-cms-api'
- - - - -
1 changed file:
- client-modules/page-composer/pom.xml
Changes:
=
client-modules/page-composer/pom.xml
=
--- a/client-modules/page-composer/pom.xml
+++ b/client-modules/page-composer/pom.xml
@@ -36,12 +36,6 @@
- org.onehippo.cms7
- hippo-cms-api
- ${hippo.cms.version}
-
-
-
org.onehippo.cms7.hst
hst-api
${project.version}
@@ -69,9 +63,8 @@
org.onehippo.cms7.hst
hst-cms-restapi
${project.version}
- provided
-
+
org.onehippo.cms7.hst.components
hst-jaxrs
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/eecd711ce1455eec3093196d86aadeaefd430874
___
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][master] HSTTWO-3387 Make HST page diagnostics show the class delegated to by Spring Bridge
Ard Schrijvers pushed to branch master at cms-community / hippo-site-toolkit
Commits:
bce42fec by Ard Schrijvers at 2016-06-06T13:28:57+02:00
HSTTWO-3387 Make HST page diagnostics show the class delegated to by Spring
Bridge
Apply patch from William
- - - - -
1 changed file:
-
client/src/main/java/org/hippoecm/hst/component/support/spring/SpringBridgeHstComponent.java
Changes:
=
client/src/main/java/org/hippoecm/hst/component/support/spring/SpringBridgeHstComponent.java
=
---
a/client/src/main/java/org/hippoecm/hst/component/support/spring/SpringBridgeHstComponent.java
+++
b/client/src/main/java/org/hippoecm/hst/component/support/spring/SpringBridgeHstComponent.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2013 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2008-2016 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.
@@ -25,6 +25,8 @@ import org.hippoecm.hst.core.component.HstComponentException;
import org.hippoecm.hst.core.component.HstRequest;
import org.hippoecm.hst.core.component.HstResponse;
import org.hippoecm.hst.core.request.ComponentConfiguration;
+import org.hippoecm.hst.diagnosis.HDC;
+import org.hippoecm.hst.diagnosis.Task;
import org.hippoecm.hst.site.HstServices;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,11 +47,11 @@ import org.springframework.web.servlet.FrameworkServlet;
* parameter value with the parameter name, 'spring-delegated-bean-param-name'.
* This bridge component will retrieve the bean from the spring web
application context by the
* bean name.
- * If you want to change the default parameter name, then you can achieve that
+ * If you want to change the default parameter name, then you can achieve that
* by configuring the parameter name with an added "hst-" prefix in the
web.xml.
* For example, if you want to change the default parameter name to
'my-bean-param', then
* you can configure this like the following:
- *
+ *
*
*
*
*
*
- *
+ *
* With the above setting, you need to set the parameters with name,
'my-bean-param' in the
* component configurations in the repository.
*
@@ -89,7 +91,7 @@ import org.springframework.web.servlet.FrameworkServlet;
* Spring MVC Servlet derived from
org.springframework.web.servlet.FrameworkServlet
* such as
org.hippoecm.hst.component.support.spring.mvc.HstDispatcherServlet
or
* org.springframework.web.servlet.DispatcherServlet, instead of
the root web
- * application context, then the fully qualified bean name must be prefixed by
the servlet
+ * application context, then the fully qualified bean name must be prefixed by
the servlet
* context attribute name prefix (see {@link
FrameworkServlet#SERVLET_CONTEXT_PREFIX}).
*
*
@@ -111,7 +113,7 @@ public class SpringBridgeHstComponent extends
GenericHstComponent implements App
protected AbstractApplicationContext delegatedBeanApplicationContext;
protected HstComponent delegatedBean;
-private ServletContext servletContext;
+private ServletContext servletContext;
@Override
public void init(ServletContext servletContext, ComponentConfiguration
componentConfig) throws HstComponentException {
@@ -145,17 +147,38 @@ public class SpringBridgeHstComponent extends
GenericHstComponent implements App
@Override
public void doAction(HstRequest request, HstResponse response) throws
HstComponentException {
-getDelegatedBean(request).doAction(request, response);
+final HstComponent delegatee = getDelegatedBean(request);
+
+if (HDC.isStarted()) {
+final Task curTask = HDC.getCurrentTask();
+curTask.setAttribute("SpringBridgeHstComponent.delegatee",
delegatee.getClass().toString());
+}
+
+delegatee.doAction(request, response);
}
@Override
public void doBeforeRender(HstRequest request, HstResponse response)
throws HstComponentException {
-getDelegatedBean(request).doBeforeRender(request, response);
+final HstComponent delegatee = getDelegatedBean(request);
+
+if (HDC.isStarted()) {
+final Task curTask = HDC.getCurrentTask();
+curTask.setAttribute("SpringBridgeHstComponent.delegatee",
delegatee.getClass().toString());
+}
+
+delegatee.doBeforeRender(request, response);
}
@Override
public void doBeforeServeResource(HstRequest request, HstResponse
response) throws HstComponentException {
-getDelegatedBean(request).doBeforeServeResource(request, response);
+final HstComponent delegatee = getDelegatedBean(request);
+
+if (HDC.isStarted()) {
+final Task curTask = HDC.getCurrentTask();
+curTask.setAttribute("SpringBridgeHstComponent.delegatee",
delegatee.getClass().t
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][release/3.1] HSTTWO-3694 [Backport 3.1] only add param if key and value *NOT* null
Ard Schrijvers pushed to branch release/3.1 at cms-community /
hippo-site-toolkit
Commits:
10eedd91 by Ard Schrijvers at 2016-06-06T13:23:14+02:00
HSTTWO-3694 [Backport 3.1] only add param if key and value *NOT* null
(cherry picked from commit 8e0ef1f68cd6494eb412ff481c98c36f248cd303)
- - - - -
1 changed file:
-
components/core/src/main/java/org/hippoecm/hst/core/linking/LocationMapResolver.java
Changes:
=
components/core/src/main/java/org/hippoecm/hst/core/linking/LocationMapResolver.java
=
---
a/components/core/src/main/java/org/hippoecm/hst/core/linking/LocationMapResolver.java
+++
b/components/core/src/main/java/org/hippoecm/hst/core/linking/LocationMapResolver.java
@@ -193,14 +193,14 @@ public class LocationMapResolver {
if(keyToPropertyPlaceHolderMap.containsKey(entry.getKey())) {
// translate key1 -> n1, key2 -> n2 etc
final String key =
keyToPropertyPlaceHolderMap.get(entry.getKey());
-if (key == null || entry.getValue() == null) {
+if (key != null && entry.getValue() != null) {
params.put(key, entry.getValue());
}
} else {
if(!keyToPropertyPlaceHolderMap.containsValue(entry.getKey()))
{
// inherited params from current ctx: when the
keyToPropertyPlaceHolderMap contains the entry.getKey() as value,
// the param is already mapped.
-if (entry.getKey() == null || entry.getValue() == null) {
+if (entry.getKey() != null && entry.getValue() != null) {
params.put(entry.getKey(), entry.getValue());
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/10eedd9139ab4715b9347024afeb007eb3e40e76
___
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][release/3.2] HSTTWO-3693 [Backport 3.2] only add param if key and value *NOT* null
Ard Schrijvers pushed to branch release/3.2 at cms-community /
hippo-site-toolkit
Commits:
2f5044ea by Ard Schrijvers at 2016-06-06T13:22:45+02:00
HSTTWO-3693 [Backport 3.2] only add param if key and value *NOT* null
(cherry picked from commit 8e0ef1f68cd6494eb412ff481c98c36f248cd303)
- - - - -
1 changed file:
-
components/core/src/main/java/org/hippoecm/hst/core/linking/LocationMapResolver.java
Changes:
=
components/core/src/main/java/org/hippoecm/hst/core/linking/LocationMapResolver.java
=
---
a/components/core/src/main/java/org/hippoecm/hst/core/linking/LocationMapResolver.java
+++
b/components/core/src/main/java/org/hippoecm/hst/core/linking/LocationMapResolver.java
@@ -193,14 +193,14 @@ public class LocationMapResolver {
if(keyToPropertyPlaceHolderMap.containsKey(entry.getKey())) {
// translate key1 -> n1, key2 -> n2 etc
final String key =
keyToPropertyPlaceHolderMap.get(entry.getKey());
-if (key == null || entry.getValue() == null) {
+if (key != null && entry.getValue() != null) {
params.put(key, entry.getValue());
}
} else {
if(!keyToPropertyPlaceHolderMap.containsValue(entry.getKey()))
{
// inherited params from current ctx: when the
keyToPropertyPlaceHolderMap contains the entry.getKey() as value,
// the param is already mapped.
-if (entry.getKey() == null || entry.getValue() == null) {
+if (entry.getKey() != null && entry.getValue() != null) {
params.put(entry.getKey(), entry.getValue());
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/2f5044ea2ed504db28b3c702a5776d80ac91a7d4
___
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][master] HSTTWO-3692 only add param if key and value *NOT* null
Ard Schrijvers pushed to branch master at cms-community / hippo-site-toolkit
Commits:
8e0ef1f6 by Ard Schrijvers at 2016-06-06T13:21:01+02:00
HSTTWO-3692 only add param if key and value *NOT* null
- - - - -
1 changed file:
-
components/core/src/main/java/org/hippoecm/hst/core/linking/LocationMapResolver.java
Changes:
=
components/core/src/main/java/org/hippoecm/hst/core/linking/LocationMapResolver.java
=
---
a/components/core/src/main/java/org/hippoecm/hst/core/linking/LocationMapResolver.java
+++
b/components/core/src/main/java/org/hippoecm/hst/core/linking/LocationMapResolver.java
@@ -193,14 +193,14 @@ public class LocationMapResolver {
if(keyToPropertyPlaceHolderMap.containsKey(entry.getKey())) {
// translate key1 -> n1, key2 -> n2 etc
final String key =
keyToPropertyPlaceHolderMap.get(entry.getKey());
-if (key == null || entry.getValue() == null) {
+if (key != null && entry.getValue() != null) {
params.put(key, entry.getValue());
}
} else {
if(!keyToPropertyPlaceHolderMap.containsValue(entry.getKey()))
{
// inherited params from current ctx: when the
keyToPropertyPlaceHolderMap contains the entry.getKey() as value,
// the param is already mapped.
-if (entry.getKey() == null || entry.getValue() == null) {
+if (entry.getKey() != null && entry.getValue() != null) {
params.put(entry.getKey(), entry.getValue());
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/8e0ef1f68cd6494eb412ff481c98c36f248cd303
___
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/chinese-translation] CMS-10127 Removing debug console logging
Oscar Scholten pushed to branch feature/chinese-translation at cms-community /
hippo-cms
Commits:
5a3b8985 by Oscar Scholten at 2016-06-06T12:52:14+02:00
CMS-10127 Removing debug console logging
- - - - -
1 changed file:
-
api/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/281/datetime/datetime.js
Changes:
=
api/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/281/datetime/datetime.js
=
---
a/api/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/281/datetime/datetime.js
+++
b/api/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/281/datetime/datetime.js
@@ -280,7 +280,6 @@ if (!YAHOO.hippo.DateTime) {
},
_localizeCalendar : function(calendar, lang) {
-console.log(lang);
var locale = {
en: function(cfg) {
// defaults to English
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/5a3b89857f2803eb38967660ea84d616daa5a65a
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository][bugfix/REPO-1487] REPO-1487 add junit to test the change
Saimir Muco pushed to branch bugfix/REPO-1487 at cms-community /
hippo-repository
Commits:
67f92026 by Saimir Muco at 2016-06-06T12:47:44+02:00
REPO-1487 add junit to test the change
- - - - -
1 changed file:
- +
engine/src/test/java/org/hippoecm/repository/security/group/RepositoryGroupManagerTest.java
Changes:
=
engine/src/test/java/org/hippoecm/repository/security/group/RepositoryGroupManagerTest.java
=
--- /dev/null
+++
b/engine/src/test/java/org/hippoecm/repository/security/group/RepositoryGroupManagerTest.java
@@ -0,0 +1,53 @@
+package org.hippoecm.repository.security.group;
+
+import junit.framework.Assert;
+import org.hippoecm.repository.api.HippoNodeType;
+import org.hippoecm.repository.api.NodeNameCodec;
+import org.hippoecm.repository.security.ManagerContext;
+import org.junit.After;
+import org.junit.Test;
+import org.onehippo.repository.testutils.RepositoryTestCase;
+
+import javax.jcr.Node;
+
+/**
+ */
+public class RepositoryGroupManagerTest extends RepositoryTestCase {
+
+ManagerContext managerContext;
+private static final String GROUP_NAME = "external-editors";
+private static final String USER_NAME = "external-editor-1";
+
+@After
+@Override
+public void tearDown() throws Exception {
+
+final Node groups =
session.getNode("/hippo:configuration/hippo:groups");
+if (groups.hasNode(GROUP_NAME)) {
+groups.getNode(GROUP_NAME).remove();
+}
+session.save();
+super.tearDown();
+}
+
+/**
+ * test REPO-1487
+ * @throws Exception
+ */
+@Test
+public void testAddMember() throws Exception {
+//first create an empty group
+final Node groups =
session.getNode("/hippo:configuration/hippo:groups");
+final Node group = groups.addNode(NodeNameCodec.encode(GROUP_NAME,
true), HippoNodeType.NT_GROUP);
+Assert.assertNotNull(group);
+session.save();
+
+managerContext = new ManagerContext(session,
"hippo:configuration/hippo:security/internal",
"hippo:configuration/hippo:groups",true);
+RepositoryGroupManager repositoryGroupManager = new
RepositoryGroupManager();
+repositoryGroupManager.init(managerContext);
+
+repositoryGroupManager.addMember(group, USER_NAME);
+
+
Assert.assertTrue(repositoryGroupManager.getMembers(group).contains(USER_NAME));
+}
+}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/67f9202619f0e5ed769e227a7ca7a2c129e5a124
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [onehippo/ckeditor] 1f9ceb: CMS-10139 Setting chinese-translation development ...
Branch: refs/heads/hippo/4.5.x Home: https://github.com/onehippo/ckeditor Commit: 1f9ceb4863ca96c05ebc2c947dedeb4060519bcb https://github.com/onehippo/ckeditor/commit/1f9ceb4863ca96c05ebc2c947dedeb4060519bcb Author: Oscar Scholten Date: 2016-05-27 (Fri, 27 May 2016) Changed paths: M pom.xml Log Message: --- CMS-10139 Setting chinese-translation development version Commit: 87bb9dac8e419e4bd0a4bfb95f38e7f17206ba1e https://github.com/onehippo/ckeditor/commit/87bb9dac8e419e4bd0a4bfb95f38e7f17206ba1e Author: Oscar Scholten Date: 2016-05-27 (Fri, 27 May 2016) Changed paths: R lang/zh-cn.js A lang/zh-tw.js M lang/zh.js Log Message: --- CMS-10140 Reshuffling the language files so CKEditor display simplified Chinese when the CMS' locale is set to "zh" Commit: 6603a2d3710fe53a26c5a73e6f24b28ebcbb5408 https://github.com/onehippo/ckeditor/commit/6603a2d3710fe53a26c5a73e6f24b28ebcbb5408 Author: Oscar Scholten Date: 2016-05-27 (Fri, 27 May 2016) Changed paths: M dev/builder/build-config.js Log Message: --- CMS-10140 Adjusting build config to include simplified Chinese Commit: c63913519d1f6d26fe27d984c21000ea6f41b703 https://github.com/onehippo/ckeditor/commit/c63913519d1f6d26fe27d984c21000ea6f41b703 Author: Oscar Scholten Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M dev/builder/build-config.js R lang/zh-cn.js A lang/zh-tw.js M lang/zh.js Log Message: --- CMS-10139 Reintegrate feature/chinese-translation Compare: https://github.com/onehippo/ckeditor/compare/ecd1dd70cb00...c63913519d1f___ 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-784
Michiel Eggermont deleted branch bugfix/ESSENTIALS-784 at cms-community / hippo-essentials ___ 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] 2 commits: ESSENTIALS-784 removed copyright header from Resource template file
Michiel Eggermont pushed to branch master at cms-community / hippo-essentials
Commits:
ba0a28c9 by Bert Leunis at 2016-05-13T12:07:45+02:00
ESSENTIALS-784 removed copyright header from Resource template file
- - - - -
e71c887a by Michiel Eggermont at 2016-06-06T12:00:02+02:00
Reintegrate bugfix/ESSENTIALS-784
- - - - -
1 changed file:
- plugins/rest-services/src/main/resources/BeanNameResource.txt
Changes:
=
plugins/rest-services/src/main/resources/BeanNameResource.txt
=
--- a/plugins/rest-services/src/main/resources/BeanNameResource.txt
+++ b/plugins/rest-services/src/main/resources/BeanNameResource.txt
@@ -1,19 +1,3 @@
-/*
- * Copyright 2014 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.
- */
-
package {{restPackage}};
import javax.servlet.http.HttpServletRequest;
@@ -39,26 +23,22 @@ import {{fullQualifiedName}};
@Path("/{{beanName}}/")
public class {{beanName}}Resource extends BaseRestResource {
-
@GET
@Path("/")
public Pageable<{{beanName}}> index(@Context HttpServletRequest request) {
return findBeans(new DefaultRestContext(this, request),
{{beanName}}.class);
}
-
@GET
@Path("/page/{page}")
public Pageable<{{beanName}}> page(@Context HttpServletRequest request,
@PathParam("page") int page) {
return findBeans(new DefaultRestContext(this, request, page,
DefaultRestContext.PAGE_SIZE), {{beanName}}.class);
}
-
@GET
@Path("/page/{page}/{pageSize}")
public Pageable<{{beanName}}> pageForSize(@Context HttpServletRequest
request, @PathParam("page") int page, @PathParam("pageSize") int pageSize) {
return findBeans(new DefaultRestContext(this, request, page,
pageSize), {{beanName}}.class);
}
-
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/compare/2c9988381a64e175a910b5c384b5a525b3b969cf...e71c887af22b3cb64f70794b82a0e4aac70a9d20
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-translations][feature/chinese-translation] 2 commits: HIPPLUG-1309 Update registry for new label in selections plugin
Oscar Scholten pushed to branch feature/chinese-translation at cms-community /
hippo-cms-translations
Commits:
3e7f9e07 by Tobias Jeger at 2016-06-06T11:07:28+02:00
HIPPLUG-1309 Update registry for new label in selections plugin
- - - - -
3f1f4846 by Oscar Scholten at 2016-06-06T11:52:50+02:00
CMS-10139 Merge master changes into feature/chinese-translation
- - - - -
2 changed files:
-
selections/resources/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.properties
-
selections/resources/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.registry.json
Changes:
=
selections/resources/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.properties
=
---
a/selections/resources/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.properties
+++
b/selections/resources/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.properties
@@ -1,2 +1,3 @@
-#Wed Apr 20 11:10:49 CEST 2016
+#Mon Jun 06 11:02:50 CEST 2016
+select=Select all
unselect=Deselect all
=
selections/resources/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.registry.json
=
---
a/selections/resources/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.registry.json
+++
b/selections/resources/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.registry.json
@@ -4,6 +4,14 @@
"unselect" : {
"status" : "CLEAN",
"locales" : null
+},
+"select" : {
+ "status" : "ADDED",
+ "locales" : {
+"de" : "UNRESOLVED",
+"fr" : "UNRESOLVED",
+"nl" : "UNRESOLVED"
+ }
}
}
}
\ No newline at end of file
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms-translations/compare/d0e1b8f27faf322fb2bd93111676ba7b2b2ead26...3f1f48467d50a8f5b394872929b375ed6ca68ac6
___
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 feature/HSTTWO-3628
Ard Schrijvers deleted branch feature/HSTTWO-3628 at cms-community / hippo-site-toolkit ___ 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-715] CHANNELMGR-715 Use data- prefix for title attribute
Arthur Bogaart pushed to branch bugfix/CHANNELMGR-715 at cms-community /
hippo-addon-channel-manager
Commits:
681509b5 by Arthur Bogaart at 2016-06-06T11:24:50+02:00
CHANNELMGR-715 Use data- prefix for title attribute
To prevent the 'title' attribute of the subpage directive serving a second
purpose (showing a native browser tooltip in the toolbar) we prefix it with
data-.
- - - - -
8 changed files:
- frontend-ng/src/angularjs/channel/actions/settings/settings.html
- frontend-ng/src/angularjs/channel/changes/manageChanges.html
- frontend-ng/src/angularjs/channel/menu/editor.html
- frontend-ng/src/angularjs/channel/page/actions/copy/copy.html
- frontend-ng/src/angularjs/channel/page/actions/create/create.html
- frontend-ng/src/angularjs/channel/page/actions/edit/edit.html
- frontend-ng/src/angularjs/channel/page/actions/move/move.html
- frontend-ng/src/angularjs/channel/subpage/toolbar.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/actions/settings/settings.html
=
--- a/frontend-ng/src/angularjs/channel/actions/settings/settings.html
+++ b/frontend-ng/src/angularjs/channel/actions/settings/settings.html
@@ -15,7 +15,7 @@
-->
=
frontend-ng/src/angularjs/channel/changes/manageChanges.html
=
--- a/frontend-ng/src/angularjs/channel/changes/manageChanges.html
+++ b/frontend-ng/src/angularjs/channel/changes/manageChanges.html
@@ -15,7 +15,7 @@
-->
=
frontend-ng/src/angularjs/channel/menu/editor.html
=
--- a/frontend-ng/src/angularjs/channel/menu/editor.html
+++ b/frontend-ng/src/angularjs/channel/menu/editor.html
@@ -15,7 +15,7 @@
-->
=
frontend-ng/src/angularjs/channel/page/actions/copy/copy.html
=
--- a/frontend-ng/src/angularjs/channel/page/actions/copy/copy.html
+++ b/frontend-ng/src/angularjs/channel/page/actions/copy/copy.html
@@ -15,7 +15,7 @@
-->
=
frontend-ng/src/angularjs/channel/page/actions/create/create.html
=
--- a/frontend-ng/src/angularjs/channel/page/actions/create/create.html
+++ b/frontend-ng/src/angularjs/channel/page/actions/create/create.html
@@ -15,7 +15,7 @@
-->
=
frontend-ng/src/angularjs/channel/page/actions/edit/edit.html
=
--- a/frontend-ng/src/angularjs/channel/page/actions/edit/edit.html
+++ b/frontend-ng/src/angularjs/channel/page/actions/edit/edit.html
@@ -15,7 +15,7 @@
-->
@@ -77,4 +77,4 @@
-
\ No newline at end of file
+
=
frontend-ng/src/angularjs/channel/page/actions/move/move.html
=
--- a/frontend-ng/src/angularjs/channel/page/actions/move/move.html
+++ b/frontend-ng/src/angularjs/channel/page/actions/move/move.html
@@ -15,7 +15,7 @@
-->
@@ -65,4 +65,4 @@
-
\ No newline at end of file
+
=
frontend-ng/src/angularjs/channel/subpage/toolbar.spec.js
=
--- a/frontend-ng/src/angularjs/channel/subpage/toolbar.spec.js
+++ b/frontend-ng/src/angularjs/channel/subpage/toolbar.spec.js
@@ -41,7 +41,7 @@ describe('SubpageToolbar', () => {
$scope.onBack = jasmine.createSpy('onBack');
$scope.title = 'testTitle';
$scope.mode = mode;
-$element = angular.element(' ');
+$element = angular.element(' ');
$compile($element)($scope);
$scope.$digest();
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/681509b5adf53fe2b6b6e0404d645f0ef036f1f8
___
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][feature/HSTTWO-3628] HSTTWO-3628 bump copyright years
Ard Schrijvers pushed to branch feature/HSTTWO-3628 at cms-community / hippo-site-toolkit Commits: b29f8940 by Ard Schrijvers at 2016-06-06T11:22:32+02:00 HSTTWO-3628 bump copyright years - - - - - 2 changed files: - components/core/src/main/java/org/hippoecm/hst/core/container/HstComponentFactoryImpl.java - components/core/src/main/java/org/hippoecm/hst/site/container/SpringComponentManager.java Changes: = components/core/src/main/java/org/hippoecm/hst/core/container/HstComponentFactoryImpl.java = --- a/components/core/src/main/java/org/hippoecm/hst/core/container/HstComponentFactoryImpl.java +++ b/components/core/src/main/java/org/hippoecm/hst/core/container/HstComponentFactoryImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2008-2013 Hippo B.V. (http://www.onehippo.com) + * Copyright 2008-2016 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. = components/core/src/main/java/org/hippoecm/hst/site/container/SpringComponentManager.java = --- a/components/core/src/main/java/org/hippoecm/hst/site/container/SpringComponentManager.java +++ b/components/core/src/main/java/org/hippoecm/hst/site/container/SpringComponentManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2008-2013 Hippo B.V. (http://www.onehippo.com) + * Copyright 2008-2016 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. View it on GitLab: https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/b29f8940f960ed03b4a9d1ab21abbeb713325208 ___ 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 feature/HSTTWO-3686
Ard Schrijvers deleted branch feature/HSTTWO-3686 at cms-community / hippo-site-toolkit ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-translations][master] HIPPLUG-1309 Update registry for new label in selections plugin
Tobias Jeger pushed to branch master at cms-community / hippo-cms-translations
Commits:
3e7f9e07 by Tobias Jeger at 2016-06-06T11:07:28+02:00
HIPPLUG-1309 Update registry for new label in selections plugin
- - - - -
2 changed files:
-
selections/resources/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.properties
-
selections/resources/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.registry.json
Changes:
=
selections/resources/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.properties
=
---
a/selections/resources/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.properties
+++
b/selections/resources/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.properties
@@ -1,2 +1,3 @@
-#Wed Apr 20 11:10:49 CEST 2016
+#Mon Jun 06 11:02:50 CEST 2016
+select=Select all
unselect=Deselect all
=
selections/resources/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.registry.json
=
---
a/selections/resources/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.registry.json
+++
b/selections/resources/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.registry.json
@@ -4,6 +4,14 @@
"unselect" : {
"status" : "CLEAN",
"locales" : null
+},
+"select" : {
+ "status" : "ADDED",
+ "locales" : {
+"de" : "UNRESOLVED",
+"fr" : "UNRESOLVED",
+"nl" : "UNRESOLVED"
+ }
}
}
}
\ No newline at end of file
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms-translations/commit/3e7f9e07f9c03d38e87faf585682a14790795926
___
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-713
Arthur Bogaart pushed new branch bugfix/CHANNELMGR-713 at cms-community / hippo-addon-channel-manager ___ 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-722
Mathijs den Burger pushed new branch bugfix/CHANNELMGR-722 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-translations][master] CMS-9986 Additional change to trigger retranslation of label
Tobias Jeger pushed to branch master at cms-community / hippo-cms-translations
Commits:
bb75b437 by Tobias Jeger at 2016-06-06T09:59:47+02:00
CMS-9986 Additional change to trigger retranslation of label
- - - - -
1 changed file:
-
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.registry.json
Changes:
=
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.registry.json
=
---
a/hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.registry.json
+++
b/hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.registry.json
@@ -10,7 +10,7 @@
"locales" : null
},
"fit-view" : {
- "status" : "CLEAN",
+ "status" : "UPDATED",
"locales" : {
"de" : "UNRESOLVED",
"fr" : "UNRESOLVED",
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms-translations/commit/bb75b437f959986b8a72309d0d49e6b5e0b36690
___
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-719
Mathijs den Burger deleted branch bugfix/CHANNELMGR-719 at cms-community / hippo-addon-channel-manager ___ 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-715 Fixed test
Mathijs den Burger pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
d17cd353 by Arthur Bogaart at 2016-06-03T14:37:31+02:00
CHANNELMGR-715 Fixed test
On OSX (possibly on other platforms as well) it is possible to only show
scrollbars when scrolling, in which case getScrollBarWidth return zero. And in
this case zero is correct, as these scrollbars appear 'over' the site instead
of next to it. So I changed the test to expect a number greater than -1.
- - - - -
eaadfde4 by Mathijs den Burger at 2016-06-06T09:54:22+02:00
CHANNELMGR-719 Reintegrate bugfix/CHANNELMGR-719
- - - - -
1 changed file:
- frontend-ng/src/angularjs/utils/dom.service.spec.js
Changes:
=
frontend-ng/src/angularjs/utils/dom.service.spec.js
=
--- a/frontend-ng/src/angularjs/utils/dom.service.spec.js
+++ b/frontend-ng/src/angularjs/utils/dom.service.spec.js
@@ -166,7 +166,7 @@ describe('DomService', () => {
it('can calculate the scroll bar width', () => {
const width = DomService.getScrollBarWidth();
-expect(width).toBeGreaterThan(0);
+expect(width).toBeGreaterThan(-1);
});
});
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/172621f1b7f0d3977855ebc5f0626fc19a97a6fa...eaadfde474bd04169a1b9ffc58e93afc7696a772
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-translations][master] 2 commits: CMS-9986 Mark fit-view key as unresolved to force translation request
Tobias Jeger pushed to branch master at cms-community / hippo-cms-translations
Commits:
88f302e4 by Tobias Jeger at 2016-06-06T09:39:56+02:00
CMS-9986 Mark fit-view key as unresolved to force translation request
- - - - -
c269f012 by Tobias Jeger at 2016-06-06T09:46:30+02:00
CMS-9873 update Dutch label for image section as requested
- - - - -
2 changed files:
-
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.registry.json
- hippo-cms/resources/section-translations_nl.json
Changes:
=
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.registry.json
=
---
a/hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.registry.json
+++
b/hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.registry.json
@@ -11,7 +11,11 @@
},
"fit-view" : {
"status" : "CLEAN",
- "locales" : null
+ "locales" : {
+"de" : "UNRESOLVED",
+"fr" : "UNRESOLVED",
+"nl" : "UNRESOLVED"
+ }
},
"thumbnail-size" : {
"status" : "CLEAN",
=
hippo-cms/resources/section-translations_nl.json
=
--- a/hippo-cms/resources/section-translations_nl.json
+++ b/hippo-cms/resources/section-translations_nl.json
@@ -1,6 +1,6 @@
{"hippo:cms": {"sections": {"nl": {
"section-documents": "Documenten",
- "section-images": "Beeldbank",
+ "section-images": "Afbeeldingen",
"section-files": "Bestanden",
"section-configuration": "Document Types"
\ No newline at end of file
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms-translations/compare/49df75fab8582418351550ebd6bb45673fc8e1e7...c269f0126c63e97bd8b1d3c8cf5502afd64af403
___
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-720 Force toolbar height and remove (bottom) margins
Mathijs den Burger pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
af9de979 by Arthur Bogaart at 2016-06-03T12:39:56+02:00
CHANNELMGR-720 Force toolbar height and remove (bottom) margins
- - - - -
172621f1 by Mathijs den Burger at 2016-06-06T09:39:16+02:00
CHANNELMGR-720 Reintegrate bugfix/CHANNELMGR-720
- - - - -
2 changed files:
- frontend-ng/src/styles/_toolbar.scss
- frontend-ng/src/styles/_variables.scss
Changes:
=
frontend-ng/src/styles/_toolbar.scss
=
--- a/frontend-ng/src/styles/_toolbar.scss
+++ b/frontend-ng/src/styles/_toolbar.scss
@@ -15,8 +15,8 @@
md-toolbar.hippo-toolbar {
background: $grey-200;
color: $text-dark;
- height: 40px;
- min-height: 40px;
+ height: $toolbar-height;
+ min-height: $toolbar-height;
md-progress-linear {
height: 2px;
@@ -36,7 +36,7 @@ md-toolbar.hippo-toolbar {
.md-icon-button {
color: $text-dark;
-height: 40px;
+height: $toolbar-height;
padding-bottom: 0;
padding-top: 0;
width: 48px;
@@ -48,6 +48,7 @@ md-toolbar.hippo-toolbar {
.md-toolbar-tools {
font-size: 14px;
+height: $toolbar-height;
}
.button-group {
@@ -60,6 +61,11 @@ md-toolbar.hippo-toolbar {
}
}
+ md-select {
+margin: 0;
+padding-bottom: 6px;
+ }
+
md-select-value {
border-bottom-width: 0 !important;
font-weight: bold;
@@ -71,6 +77,10 @@ md-toolbar.hippo-toolbar {
color: $text-dark;
}
}
+
+ md-switch {
+margin: 0;
+ }
}
.viewport-name {
=
frontend-ng/src/styles/_variables.scss
=
--- a/frontend-ng/src/styles/_variables.scss
+++ b/frontend-ng/src/styles/_variables.scss
@@ -117,3 +117,6 @@ $tooltip-bg: $black;
// Style mdSelect
$select-invalid-color:#f70029;
+
+// Toolbar
+$toolbar-height: 40px;
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/f43d8f686b1453559e3f008766b8178ffa3dba5b...172621f1b7f0d3977855ebc5f0626fc19a97a6fa
___
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-720
Mathijs den Burger deleted branch bugfix/CHANNELMGR-720 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-translations][master] CHANNELMGR-331 Silence l10n for key with empty value
Tobias Jeger pushed to branch master at cms-community / hippo-cms-translations
Commits:
49df75fa by Tobias Jeger at 2016-06-06T09:31:25+02:00
CHANNELMGR-331 Silence l10n for key with empty value
- - - - -
4 changed files:
-
channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore.registry.json
-
channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore_de.properties
-
channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore_fr.properties
-
channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore_nl.properties
Changes:
=
channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore.registry.json
=
---
a/channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore.registry.json
+++
b/channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore.registry.json
@@ -114,12 +114,8 @@
"locales" : null
},
"field.hstConfigEditor" : {
- "status" : "ADDED",
- "locales" : {
-"de" : "UNRESOLVED",
-"fr" : "UNRESOLVED",
-"nl" : "UNRESOLVED"
- }
+ "status" : "CLEAN",
+ "locales" : null
}
}
}
\ No newline at end of file
=
channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore_de.properties
=
---
a/channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore_de.properties
+++
b/channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore_de.properties
@@ -2,6 +2,7 @@
field.contextPath=Context Verzeichnis
field.lockedBy=Gesperrt von
field.id=id
+field.hstConfigEditor=
field.region=Region
channelexception.mount.not.found=Die URL ''{0}'' kann nicht benutzt werden da
die parent URL ''{1}'' nicht von einem anderen Channel benutzt wird.
channelexception.cannot.create.content=Es ist ein Fehler aufgetreten beim
Erstellen des Channel Contents\: ''{0}''.
=
channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore_fr.properties
=
---
a/channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore_fr.properties
+++
b/channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore_fr.properties
@@ -2,6 +2,7 @@
field.contextPath=Chemin vers le contexte
field.lockedBy=V\u00E9rouill\u00E9 par
field.id=Identifiant
+field.hstConfigEditor=
field.region=R\u00E9gion
channelexception.mount.not.found=L'URL ''{0}'' ne peut pas \u00EAtre
utilis\u00E9e parce que l'URL parente ''{1}'' n'est utilis\u00E9e dans aucun
canal.
channelexception.cannot.create.content=\u00C9chec lors de la cr\u00E9ation du
contenu du canal \u00E0 ''{0}''.
=
channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore_nl.properties
=
---
a/channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore_nl.properties
+++
b/channel-manager/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore_nl.properties
@@ -2,6 +2,7 @@
field.contextPath=Contextpad
field.lockedBy=Vergrendeld door
field.id=Identificatie
+field.hstConfigEditor=
field.region=Regio
channelexception.mount.not.found=De URL ''{0}'' kan niet gebruikt worden omdat
nog geen enkel channel de URL ''{1}'' gebruikt.
channelexception.cannot.create.content=Kan geen content aanmaken voor het
nieuwe channel in de map ''{0}''.
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms-translations/commit/49df75fab8582418351550ebd6bb45673fc8e1e7
___
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-712 Provide better fix for JS console error
Mathijs den Burger pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
26c05fe3 by Tobias Jeger at 2016-06-03T13:37:17+02:00
CHANNELMGR-712 Provide better fix for JS console error
- - - - -
f43d8f68 by Mathijs den Burger at 2016-06-06T09:33:16+02:00
CHANNELMGR-712 Reintegrate bugfix/CHANNELMGR-712
- - - - -
1 changed file:
- frontend-ng/src/angularjs/utils/directive/scrollToIf.directive.js
Changes:
=
frontend-ng/src/angularjs/utils/directive/scrollToIf.directive.js
=
--- a/frontend-ng/src/angularjs/utils/directive/scrollToIf.directive.js
+++ b/frontend-ng/src/angularjs/utils/directive/scrollToIf.directive.js
@@ -15,7 +15,7 @@
*/
const findAncestor = (elem, className) => {
- while (!elem.classList.contains(className)) {
+ while (elem && !elem.classList.contains(className)) {
elem = elem.parentElement;
}
return elem;
@@ -51,8 +51,8 @@ export function scrollToIfDirective($timeout) {
scope.$watch(attrs.scrollToIf, (value) => {
if (value) {
$timeout(() => {
-if (elem[0]) { // by now, the element could have gone away...
- const parent = getParentOfScrollItem(elem[0]);
+const parent = getParentOfScrollItem(elem[0]);
+if (parent) {
const topPadding = parseInt(window.getComputedStyle(parent,
null).getPropertyValue('padding-top'), 10) || 0;
const leftPadding = parseInt(window.getComputedStyle(parent,
null).getPropertyValue('padding-left'), 10) || 0;
const elemOffsetTop = elem[0].offsetTop;
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/4a157ba0c677369cb275a8eb5b15f2140a61b356...f43d8f686b1453559e3f008766b8178ffa3dba5b
___
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-712
Mathijs den Burger deleted branch bugfix/CHANNELMGR-712 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
