Mark Lenser pushed to branch feature/cmng-psp1-CHANNELMGR-685 at cms-community
/ hippo-addon-channel-manager
Commits:
77f2f2b4 by Mark at 2016-05-25T09:52:44+02:00
CHANNELMGR-685: Align the title or content - favoring content and only using
title when it adds value. Also align the normal dialog.
- - - - -
b8c1f699 by Mark at 2016-05-25T09:52:54+02:00
Merge remote-tracking branch 'origin/feature/cmng-psp1-CHANNELMGR-685' into
feature/cmng-psp1-CHANNELMGR-685
- - - - -
4 changed files:
- frontend-ng/src/angularjs/channel/page/actions/edit/edit.controller.js
- frontend-ng/src/angularjs/channel/page/actions/pageActions.controller.js
- frontend-ng/src/i18n/en.json
- frontend-ng/src/i18n/nl.json
Changes:
=====================================
frontend-ng/src/angularjs/channel/page/actions/edit/edit.controller.js
=====================================
--- a/frontend-ng/src/angularjs/channel/page/actions/edit/edit.controller.js
+++ b/frontend-ng/src/angularjs/channel/page/actions/edit/edit.controller.js
@@ -110,7 +110,6 @@ export class PageEditCtrl {
this.$mdDialog.show(
this.$mdDialog.alert()
.clickOutsideToClose(true)
- .title(this.$translate.instant('SUBPAGE_PAGE_EDIT_ALERT_TITLE'))
.textContent(textContent)
.ok(this.$translate.instant('ALERT_OK'))
);
=====================================
frontend-ng/src/angularjs/channel/page/actions/pageActions.controller.js
=====================================
--- a/frontend-ng/src/angularjs/channel/page/actions/pageActions.controller.js
+++ b/frontend-ng/src/angularjs/channel/page/actions/pageActions.controller.js
@@ -127,7 +127,7 @@ export class PageActionsCtrl {
_confirmDelete(page) {
const confirm = this.DialogService.confirm()
- .title(this.$translate.instant('CONFIRM_DELETE_PAGE_MESSAGE', { page }))
+ .textContent(this.$translate.instant('CONFIRM_DELETE_PAGE_MESSAGE', {
page }))
.ok(this.$translate.instant('DELETE'))
.cancel(this.$translate.instant('CANCEL'));
=====================================
frontend-ng/src/i18n/en.json
=====================================
--- a/frontend-ng/src/i18n/en.json
+++ b/frontend-ng/src/i18n/en.json
@@ -71,9 +71,8 @@
"SUBPAGE_PAGE_COPY_LABEL_URL_STEM": "Destination URL",
"SUBPAGE_PAGE_COPY_TITLE": "Copy page '{{pageName}}'",
"SUBPAGE_PAGE_CREATE_TITLE": "Create page",
- "SUBPAGE_PAGE_EDIT_ALERT_CONTENT_REMOVAL": "The selected template does not
have any containers. All container items on this page are deleted when this
template is assigned.",
- "SUBPAGE_PAGE_EDIT_ALERT_CONTENT_REPOSITIONING": "The container items on
this page will be repositioned when this template is assigned.",
- "SUBPAGE_PAGE_EDIT_ALERT_TITLE": "Assign a new template",
+ "SUBPAGE_PAGE_EDIT_ALERT_CONTENT_REMOVAL": "The selected template does not
have any containers. Container items on this page will be removed when this
page is saved with this template",
+ "SUBPAGE_PAGE_EDIT_ALERT_CONTENT_REPOSITIONING": "Container items on this
page will be repositioned when this page is saved with this template",
"SUBPAGE_PAGE_EDIT_LABEL_ASSIGN_NEW_TEMPLATE": "Assign a new template",
"SUBPAGE_PAGE_EDIT_LABEL_PRIMARY_DOCUMENT": "Primary Document",
"SUBPAGE_PAGE_EDIT_PRIMARY_DOCUMENT_VALUE_NONE": "None",
=====================================
frontend-ng/src/i18n/nl.json
=====================================
--- a/frontend-ng/src/i18n/nl.json
+++ b/frontend-ng/src/i18n/nl.json
@@ -50,7 +50,7 @@
"MOVE": "Verplaats",
"PUBLISH": "Publiceer",
"PUBLISH_ALL": "Publiceer alles",
- "REMOVE": "Remove",
+ "REMOVE": "???",
"SAVE": "Sla op",
"SIDENAV_TAB_COMPONENTS": "Componenten",
"SIDENAV_TAB_SITEMAP": "Sitemap",
@@ -66,7 +66,6 @@
"SUBPAGE_PAGE_CREATE_TITLE": "Maak pagina aan",
"SUBPAGE_PAGE_EDIT_ALERT_CONTENT_REMOVAL": "???",
"SUBPAGE_PAGE_EDIT_ALERT_CONTENT_REPOSITIONING": "???",
- "SUBPAGE_PAGE_EDIT_ALERT_TITLE": "Gebruik een nieuwe template",
"SUBPAGE_PAGE_EDIT_LABEL_ASSIGN_NEW_TEMPLATE": "Gebruik een nieuwe template",
"SUBPAGE_PAGE_EDIT_LABEL_PRIMARY_DOCUMENT": "Primair document",
"SUBPAGE_PAGE_EDIT_PRIMARY_DOCUMENT_VALUE_NONE": "Geen",
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/7b150510f2b19980d064cc288d561b2531cc8fed...b8c1f699f3e204d42b759e2666057c1e42b4870a
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
