Mathijs den Burger pushed to branch feature/cmng-psp1 at cms-community / hippo-addon-channel-manager
Commits: 567c7d2c by Mark at 2016-05-27T11:54:33+02:00 CHANNELMGR-694: modify FAB items on iframe as discussed yesterday - - - - - 0b095906 by Mathijs den Burger at 2016-05-30T12:15:08+02:00 CHANNELMGR-694 Merge changes into mainline - - - - - 2 changed files: - frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.html - frontend-ng/src/i18n/en.json Changes: ===================================== frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.html ===================================== --- a/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.html +++ b/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.html @@ -45,17 +45,25 @@ </div> <div ng-repeat="contentLink in iframe.getContentLinks()"> <overlay-element structure-element="contentLink"> - <md-button class="overlay-element-fab md-fab qa-content-link" + <md-button class="overlay-element-fab md-fab md-mini md-hue-2 qa-content-link" ng-click="iframe.openContent(contentLink)"> - <md-icon class="material-icons">description</md-icon> + <md-icon class="material-icons" + aria-label="{{'IFRAME_OPEN_DOCUMENT' | translate }}">description</md-icon> + <md-tooltip md-direction="top"> + {{'IFRAME_OPEN_DOCUMENT' | translate}} + </md-tooltip> </md-button> </overlay-element> </div> <div ng-repeat="editMenuLink in iframe.getEditMenuLinks()"> <overlay-element structure-element="editMenuLink"> - <md-button class="overlay-element-fab md-fab qa-edit-menu-link" + <md-button class="overlay-element-fab md-fab md-mini md-hue-2 qa-edit-menu-link" ng-click="iframe.openMenuEditor(editMenuLink)"> - <md-icon class="material-icons">menu</md-icon> + <md-icon class="material-icons" + aria-label="{{'IFRAME_EDIT_MENU' | translate }}">edit</md-icon> + <md-tooltip md-direction="top"> + {{'IFRAME_EDIT_MENU' | translate}} + </md-tooltip> </md-button> </overlay-element> </div> ===================================== frontend-ng/src/i18n/en.json ===================================== --- a/frontend-ng/src/i18n/en.json +++ b/frontend-ng/src/i18n/en.json @@ -61,6 +61,8 @@ "EXPERIMENT_LABEL_COMPLETED": "Experiment completed", "EXPERIMENT_LABEL_CREATED": "Experiment created", "EXPERIMENT_LABEL_RUNNING": "Experiment running", + "IFRAME_EDIT_MENU": "Edit menu", + "IFRAME_OPEN_DOCUMENT": "Open document", "LINK_REQUIRED": "Link is required", "MOVE": "Move", "PUBLISH": "Publish", View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/eac6ae4cd5eadb3e95c8e3bae8cf8cda6d3f8e59...0b095906275daf4a90cdd7d136eac1af5bc16492
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn