Joeri de Gooijer pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
811c0097 by Joeri de Gooijer at 2017-06-21T14:28:58+02:00
CHANNELMGR-1321 Disable instead of hide toggle when configuration locked
- - - - -
4 changed files:
- frontend-ng/src/angularjs/channel/channel.html
- frontend-ng/src/angularjs/channel/overlayToggle/overlayToggle.component.js
- frontend-ng/src/angularjs/channel/overlayToggle/overlayToggle.html
- frontend-ng/src/angularjs/channel/overlayToggle/overlayToggle.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
@@ -41,7 +41,8 @@
icon-src="images/toggle_components_overlay.svg"
tooltip="{{ channelCtrl.isComponentsOverlayDisplayed ?
'HIDE_COMPONENTS' : 'SHOW_COMPONENTS' | translate }}"
class="qa-toggle-components"
- ng-if="channelCtrl.isEditable() &&
channelCtrl.isPageLoaded() && !channelCtrl.isConfigurationLocked()">
+
is-configuration-locked="channelCtrl.isConfigurationLocked()"
+ ng-if="channelCtrl.isEditable() &&
channelCtrl.isPageLoaded()">
</overlay-toggle>
<overlay-toggle state="channelCtrl.isContentOverlayDisplayed"
=====================================
frontend-ng/src/angularjs/channel/overlayToggle/overlayToggle.component.js
=====================================
--- a/frontend-ng/src/angularjs/channel/overlayToggle/overlayToggle.component.js
+++ b/frontend-ng/src/angularjs/channel/overlayToggle/overlayToggle.component.js
@@ -26,6 +26,7 @@ const modeToggleComponent = {
iconName: '@?',
iconSrc: '@?',
tooltip: '@?',
+ isConfigurationLocked: '<',
},
};
=====================================
frontend-ng/src/angularjs/channel/overlayToggle/overlayToggle.html
=====================================
--- a/frontend-ng/src/angularjs/channel/overlayToggle/overlayToggle.html
+++ b/frontend-ng/src/angularjs/channel/overlayToggle/overlayToggle.html
@@ -14,12 +14,11 @@
~ limitations under the License.
-->
-<md-button class="btn-overlay-toggle"
+<md-button class="btn-overlay-toggle md-icon-button"
+ ng-disabled="$ctrl.isConfigurationLocked"
ng-click="$ctrl.toggleState()"
title="{{ $ctrl.tooltip }}">
- <md-icon ng-class="{
- 'active': $ctrl.state
- }"
+ <md-icon ng-class="{ 'active': $ctrl.state }"
md-svg-src="{{ $ctrl.iconSrc }}">
{{ $ctrl.iconName }}
</md-icon>
=====================================
frontend-ng/src/angularjs/channel/overlayToggle/overlayToggle.scss
=====================================
--- a/frontend-ng/src/angularjs/channel/overlayToggle/overlayToggle.scss
+++ b/frontend-ng/src/angularjs/channel/overlayToggle/overlayToggle.scss
@@ -14,26 +14,13 @@
@import 'variables';
-.btn-overlay-toggle {
- margin: 0;
- min-width: 1%;
+overlay-toggle {
+ margin-left: 6px !important;
+ margin-right: 6px !important;
md-icon {
- color: $grey-700 !important;
- user-select: none;
-
&.active {
- color: $blue-400 !important;
- }
-
- &:focus {
- border: 0 !important;
- box-shadow: 0 !important;
- outline: none !important;
- }
-
- &:hover {
- cursor: pointer;
+ color: $blue-400;
}
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/811c00975df2d9e07cfbce8bb396f2d18d84cdad
_______________________________________________
Hippocms-svn mailing list
[email protected]
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
