From bbeb58489299d3314b9733554f4cd0bf745368f3 Mon Sep 17 00:00:00 2001 From: Abner Oliveira Date: Mon, 6 Jun 2016 18:10:20 -0300 Subject: [PATCH] changing designModeToggler to use toggle-switch angular directive --- bower.json | 7 ++++--- src/app/admin/designMode.service.ts | 10 +++++++--- src/app/admin/designModeToggler.component.ts | 25 ++++++++----------------- src/app/admin/designModeToggler.html | 13 +++++++------ src/app/layout/navbar/navbar.ts | 4 ++-- src/app/layout/scss/_layout.scss | 1 - src/app/main/main.component.ts | 2 +- src/languages/en.json | 2 +- 8 files changed, 30 insertions(+), 34 deletions(-) diff --git a/bower.json b/bower.json index d620d14..d247f10 100644 --- a/bower.json +++ b/bower.json @@ -35,9 +35,10 @@ "angular-i18n": "^1.5.0", "angular-load": "^0.4.1", "angular-translate-interpolation-messageformat": "^2.10.0", - "angular-bind-html-compile": "^1.2.1", - "angular-click-outside": "^2.7.1", - "ng-ckeditor": "^0.2.1" + "angular-bind-html-compile": "^1.2.1", + "angular-click-outside": "^2.7.1", + "ng-ckeditor": "^0.2.1", + "angular-bootstrap-toggle-switch": "^0.5.6" }, "devDependencies": { "angular-mocks": "~1.5.0" diff --git a/src/app/admin/designMode.service.ts b/src/app/admin/designMode.service.ts index 3d23d95..0028e01 100644 --- a/src/app/admin/designMode.service.ts +++ b/src/app/admin/designMode.service.ts @@ -7,11 +7,15 @@ export class DesignModeService { private designModeOn: boolean = false; - constructor() { + isInDesignMode(): boolean { + return this.designModeOn; } - toggle() { - this.designModeOn = !this.designModeOn; + setInDesignMode(value: boolean) { + this.designModeOn = value; this.onToggle.next(this.designModeOn); } + + constructor() { + } } \ No newline at end of file diff --git a/src/app/admin/designModeToggler.component.ts b/src/app/admin/designModeToggler.component.ts index 2e66f9b..bb9eee4 100644 --- a/src/app/admin/designModeToggler.component.ts +++ b/src/app/admin/designModeToggler.component.ts @@ -7,27 +7,18 @@ import {DesignModeService} from './designMode.service'; @Inject(DesignModeService, '$scope') export class DesignModeTogglerComponent { - inDesignMode: boolean = false; constructor(private designModeService: DesignModeService, private $scope: ng.IScope) { } - ngOnInit() { - this.designModeService.onToggle.subscribe((editOnOrFalse: boolean) => { - this.inDesignMode = editOnOrFalse; - this.$scope.$apply(); - }); - } + private _inDesignMode: boolean = false; - toggleDesignModeOn() { - if (!this.inDesignMode) { - this.designModeService.toggle(); - } - } + get inDesignMode(): boolean { + return this.designModeService.isInDesignMode(); + }; + + set inDesignMode(value: boolean) { + this.designModeService.setInDesignMode(value); + }; - toggleDesignModeOff() { - if (this.inDesignMode) { - this.designModeService.toggle(); - } - } } \ No newline at end of file diff --git a/src/app/admin/designModeToggler.html b/src/app/admin/designModeToggler.html index 24167e4..b021c80 100644 --- a/src/app/admin/designModeToggler.html +++ b/src/app/admin/designModeToggler.html @@ -1,6 +1,7 @@ - - -
- - -
+ + \ No newline at end of file diff --git a/src/app/layout/navbar/navbar.ts b/src/app/layout/navbar/navbar.ts index bc3d716..fa9f57c 100644 --- a/src/app/layout/navbar/navbar.ts +++ b/src/app/layout/navbar/navbar.ts @@ -5,11 +5,12 @@ import {EnvironmentService} from "./../../../lib/ng-noosfero-api/http/environmen import {SidebarNotificationService} from "../sidebar/sidebar.notification.service"; import {BodyStateClassesService} from '../services/body-state-classes.service'; import {DesignModeTogglerComponent} from './../../admin/designModeToggler.component'; +import {BootstrapSwitcherComponent, BootstrapSwitcherItem} from './../../shared/components/bootstrap-switcher/bootstrap-switcher.component'; @Component({ selector: "acme-navbar", templateUrl: "app/layout/navbar/navbar.html", - directives: [LanguageSelectorComponent, DesignModeTogglerComponent], + directives: [LanguageSelectorComponent, DesignModeTogglerComponent, BootstrapSwitcherComponent], providers: [AuthService, SessionService, SidebarNotificationService, EnvironmentService] }) @Inject("$uibModal", AuthService, "SessionService", "$state", SidebarNotificationService, BodyStateClassesService, EnvironmentService) @@ -19,7 +20,6 @@ export class Navbar { private modalInstance: any = null; public showHamburger: boolean = false; public currentEnvironment: noosfero.Environment = { name: '' }; - /** * */ diff --git a/src/app/layout/scss/_layout.scss b/src/app/layout/scss/_layout.scss index ce6a150..6f199b8 100644 --- a/src/app/layout/scss/_layout.scss +++ b/src/app/layout/scss/_layout.scss @@ -47,5 +47,4 @@ body.noosfero-design-on { ul.nav > li.toggler-container { position: relative; padding-top: 12px; - color: white; } \ No newline at end of file diff --git a/src/app/main/main.component.ts b/src/app/main/main.component.ts index 16b5a19..2637b47 100644 --- a/src/app/main/main.component.ts +++ b/src/app/main/main.component.ts @@ -109,7 +109,7 @@ export class EnvironmentContent { "angular-bind-html-compile", "angularMoment", "angular.filter", "akoenig.deckgrid", "angular-timeline", "duScroll", "oitozero.ngSweetAlert", "pascalprecht.translate", "tmh.dynamicLocale", "angularLoad", - "angular-click-outside", "noosfero.init"] + "angular-click-outside", "toggle-switch", "noosfero.init"] }) @StateConfig([ { diff --git a/src/languages/en.json b/src/languages/en.json index 651974f..f4611fb 100644 --- a/src/languages/en.json +++ b/src/languages/en.json @@ -75,7 +75,7 @@ "custom_content.title": "Edit content", "profile.custom_header.label": "Header", "profile.custom_footer.label": "Footer", - "designMode.label": "Design Mode", + "designMode.label": "In Design", "designMode.toggle.ON": "ON", "designMode.toggle.OFF": "OFF" } -- libgit2 0.21.2