Tobias Jeger pushed to branch feature/cmng-psp1-CHANNELMGR-673 at cms-community / hippo-addon-channel-manager
Commits: ab968377 by Tobias Jeger at 2016-05-20T12:45:50+02:00 CHANNELMGR-673 Add discard buttons to all stateful subpages - - - - - 7 changed files: - frontend-ng/src/angularjs/channel/actions/edit/edit.html - frontend-ng/src/angularjs/channel/page/actions/add/add.html - frontend-ng/src/angularjs/channel/page/actions/copy/copy.html - frontend-ng/src/angularjs/channel/page/actions/edit/edit.html - frontend-ng/src/angularjs/channel/page/actions/move/move.html - frontend-ng/src/i18n/en.json - frontend-ng/src/i18n/nl.json Changes: ===================================== frontend-ng/src/angularjs/channel/actions/edit/edit.html ===================================== --- a/frontend-ng/src/angularjs/channel/actions/edit/edit.html +++ b/frontend-ng/src/angularjs/channel/actions/edit/edit.html @@ -42,6 +42,11 @@ </div> <div layout="row" layout-align="end center"> + <md-button type="button" + class="qa-discard" + ng-click="channelEdit.onDone()"> + {{ 'SUBPAGE_BUTTON_DISCARD' | translate }} + </md-button> <md-button type="submit" class="qa-action md-raised md-primary"> {{ 'SUBPAGE_BUTTON_SAVE' | translate }} ===================================== frontend-ng/src/angularjs/channel/page/actions/add/add.html ===================================== --- a/frontend-ng/src/angularjs/channel/page/actions/add/add.html +++ b/frontend-ng/src/angularjs/channel/page/actions/add/add.html @@ -75,6 +75,11 @@ </div> </md-input-container> <div layout="row" layout-align="end center"> + <md-button type="button" + class="qa-discard" + ng-click="pageAdd.onDone()"> + {{ 'SUBPAGE_BUTTON_DISCARD' | translate }} + </md-button> <md-button type="submit" class="md-raised md-primary qa-action"> {{ 'SUBPAGE_PAGE_ADD_BUTTON_CREATE' | translate }} ===================================== 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 @@ -68,6 +68,11 @@ </div> <div layout="row" layout-align="end center"> + <md-button type="button" + class="qa-discard" + ng-click="pageCopy.onDone()"> + {{ 'SUBPAGE_BUTTON_DISCARD' | translate }} + </md-button> <md-button type="submit" class="md-raised md-primary qa-action"> {{ 'SUBPAGE_PAGE_COPY_BUTTON_COPY' | translate }} ===================================== 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 @@ -64,6 +64,11 @@ </md-select> </md-input-container> <div layout="row" layout-align="end center"> + <md-button type="button" + class="qa-discard" + ng-click="pageEdit.onDone()"> + {{ 'SUBPAGE_BUTTON_DISCARD' | translate }} + </md-button> <md-button type="submit" class="md-raised md-primary qa-action"> {{ 'SUBPAGE_BUTTON_SAVE' | translate }} ===================================== 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 @@ -52,6 +52,11 @@ </md-input-container> </div> <div layout="row" layout-align="end center"> + <md-button type="button" + class="qa-discard" + ng-click="pageMove.onDone()"> + {{ 'SUBPAGE_BUTTON_DISCARD' | translate }} + </md-button> <md-button type="submit" class="md-raised md-primary qa-action"> {{ 'SUBPAGE_PAGE_MOVE_BUTTON_MOVE' | translate }} ===================================== frontend-ng/src/i18n/en.json ===================================== --- a/frontend-ng/src/i18n/en.json +++ b/frontend-ng/src/i18n/en.json @@ -49,6 +49,7 @@ "EXPERIMENT_LABEL_RUNNING": "Experiment running", "SIDENAV_TAB_COMPONENTS": "Components", "SIDENAV_TAB_SITEMAP": "Sitemap", + "SUBPAGE_BUTTON_DISCARD": "Discard", "SUBPAGE_BUTTON_SAVE": "Save", "SUBPAGE_CHANGEMANAGEMENT_INTRO": "Select users to publish or discard changes.", "SUBPAGE_CHANGEMANAGEMENT_SELECT_ALL": "Select all", ===================================== frontend-ng/src/i18n/nl.json ===================================== --- a/frontend-ng/src/i18n/nl.json +++ b/frontend-ng/src/i18n/nl.json @@ -44,6 +44,7 @@ "EXPERIMENT_LABEL_RUNNING": "Experiment bezig", "SIDENAV_TAB_COMPONENTS": "Componenten", "SIDENAV_TAB_SITEMAP": "Sitemap", + "SUBPAGE_BUTTON_DISCARD": "Maak ongedaan", "SUBPAGE_BUTTON_SAVE": "Sla op", "SUBPAGE_CHANGEMANAGEMENT_INTRO": "???", "SUBPAGE_CHANGEMANAGEMENT_SELECT_ALL": "Selecteer alle", View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/ab96837744a93fc1d8cccf931f1966f804eec048
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn