Download as
Browse Code »

Commit 8690849bc505ac8e8581406b4993aebb453aecfb

Authored by Ábner Oliveira
Committed by Michel Felipe
1 parent a61cb0f5
Exists in master and in 7 other branches cosmetic_changes_people_and_communities_block, forgot_password, profile-blocks-sass, profile_description_block_component, staging, translations, users_profile_page

correções sugeridas no merge request !39

Showing 7 changed files with 62 additions and 28 deletions   Show diff stats
src/app/admin/layout-edit/designModeToggler.component.ts
  Diff comments   View file @8690849
@@ -6,18 +6,34 @@ import {AuthService, AuthEvents} from '../../login'; @@ -6,18 +6,34 @@ import {AuthService, AuthEvents} from '../../login';
6 selector: 'noosfero-design-toggler', 6 selector: 'noosfero-design-toggler',
7 templateUrl: 'app/admin/layout-edit/designModeToggler.html' 7 templateUrl: 'app/admin/layout-edit/designModeToggler.html'
8 }) 8 })
9 -@Inject(DesignModeService, AuthService) 9 +@Inject(DesignModeService)
10 export class DesignModeTogglerComponent { 10 export class DesignModeTogglerComponent {
11 11
12 - icon: string = "&nbsp;<i class='glyphicon glyphicon-wrench'></i>&nbsp;"; 12 + @Input() iconClass: string = '';
  13 + @Input() knobLabel: string = '';
  14 + @Input() offLabel: string = '';
  15 + @Input() onLabel: string = '';
13 16
14 - constructor(private designModeService: DesignModeService, private authService: AuthService) { 17 + private _inDesignMode: boolean = false;
  18 +
  19 + constructor(private designModeService: DesignModeService, private authService: AuthService, private $sce: ng.ISCEService) {
15 this.authService.subscribe(AuthEvents[AuthEvents.logoutSuccess], () => { 20 this.authService.subscribe(AuthEvents[AuthEvents.logoutSuccess], () => {
16 this.designModeService.destroy(); 21 this.designModeService.destroy();
17 }); 22 });
18 } 23 }
19 24
20 - private _inDesignMode: boolean = false; 25 + get icon(): string {
  26 + if (this.iconClass && this.iconClass.trim().length > 0 ) {
  27 + return '<i class=\'design-toggle-icon ' + this.iconClass + '\'></i>';
  28 + }
  29 + else {
  30 + return '';
  31 + }
  32 + }
  33 +
  34 + getKnobLabel(): string {
  35 + return this.$sce.trustAsHtml(this.icon + this.knobLabel);
  36 + }
21 37
22 get inDesignMode(): boolean { 38 get inDesignMode(): boolean {
23 return this.designModeService.isInDesignMode(); 39 return this.designModeService.isInDesignMode();
@@ -26,4 +42,4 @@ export class DesignModeTogglerComponent { @@ -26,4 +42,4 @@ export class DesignModeTogglerComponent {
26 set inDesignMode(value: boolean) { 42 set inDesignMode(value: boolean) {
27 this.designModeService.setInDesignMode(value); 43 this.designModeService.setInDesignMode(value);
28 }; 44 };
29 -} 45 -}
  46 +}
30 \ No newline at end of file 47 \ No newline at end of file
src/app/admin/layout-edit/designModeToggler.html
  Diff comments   View file @8690849
1 <toggle-switch 1 <toggle-switch
2 html="true" 2 html="true"
3 ng-model="ctrl.inDesignMode" 3 ng-model="ctrl.inDesignMode"
4 - on-label="{{'designMode.toggle.ON' | translate}}"  
5 - off-label="{{'designMode.toggle.OFF' | translate}}" 4 + on-label="{{ctrl.onLabel}}"
  5 + off-label="{{ctrl.offLabel}}"
6 class="switch-small" 6 class="switch-small"
7 - knob-label="{{ ctrl.icon + ('designMode.label' | translate) }}"> 7 + knob-label="{{ ctrl.getKnobLabel() }}">
8 </toggle-switch> 8 </toggle-switch>
9 \ No newline at end of file 9 \ No newline at end of file
src/app/admin/layout-edit/designModeToggler.scss 0 → 100644
  Diff comments   View file @8690849
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
  1 +ul.nav > li.toggler-container {
  2 + position: relative;
  3 + padding-top: 12px;
  4 +}
  5 +
  6 +body.noosfero-design-on {
  7 +
  8 + div.content-wrapper {
  9 + opacity: 0.5;
  10 + }
  11 +}
  12 +
  13 +
  14 +
  15 +noosfero-design-toggler .ats-switch .knob i {
  16 + color: #999999;
  17 +}
  18 +
  19 +
  20 +.design-toggle-icon {
  21 + margin-left: 3px;
  22 + margin-right: 3px;
  23 +}
0 \ No newline at end of file 24 \ No newline at end of file
src/app/layout/scss/_layout.scss
  Diff comments   View file @8690849
@@ -34,17 +34,4 @@ @@ -34,17 +34,4 @@
34 .main-box-body { 34 .main-box-body {
35 padding: 0 20px 20px 20px; 35 padding: 0 20px 20px 20px;
36 } 36 }
37 -}  
38 -  
39 -ul.nav > li.toggler-container {  
40 - position: relative;  
41 - padding-top: 12px;  
42 -}  
43 -  
44 -.noosfero-main-toolbar {  
45 - padding: 5px;  
46 - @include make-row();  
47 - margin-left: 0px;  
48 - margin-right: 0px;  
49 - background-color: #edecec;  
50 -} 37 +}
51 \ No newline at end of file 38 \ No newline at end of file
src/app/layout/scss/skins/_whbl.scss
  Diff comments   View file @8690849
@@ -291,11 +291,7 @@ $whbl-font-color: #16191c; @@ -291,11 +291,7 @@ $whbl-font-color: #16191c;
291 background-color: #fff; 291 background-color: #fff;
292 } 292 }
293 293
294 - noosfero-design-toggler .ats-switch .knob i {  
295 - color: #999999;  
296 - }  
297 -  
298 - .ats-switch .knob { 294 + .ats-switch .knob {
299 padding-right: 15px; 295 padding-right: 15px;
300 } 296 }
301 297
src/app/profile/toolbar.html
  Diff comments   View file @8690849
1 <div class="noosfero-main-toolbar" permission="vm.profile.permissions" permission-action="allow_edit"> 1 <div class="noosfero-main-toolbar" permission="vm.profile.permissions" permission-action="allow_edit">
2 - <noosfero-design-toggler class="pull-right"></noosfero-design-toggler> 2 + <noosfero-design-toggler
  3 + [icon-class]="'glyphicon glyphicon-wrench'"
  4 + [knob-label]="'designMode.label' | translate"
  5 + [on-label]="'designMode.toggle.ON' | translate"
  6 + [off-label]="'designMode.toggle.OFF' | translate"
  7 + class="pull-right"></noosfero-design-toggler>
3 8
4 </div> 9 </div>
5 \ No newline at end of file 10 \ No newline at end of file
src/app/profile/toolbar.scss 0 → 100644
  Diff comments   View file @8690849
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
  1 +.noosfero-main-toolbar {
  2 + padding: 5px;
  3 + @include make-row();
  4 + margin-left: 0px;
  5 + margin-right: 0px;
  6 + background-color: #edecec;
  7 +}
0 \ No newline at end of file 8 \ No newline at end of file