Commit 6bf7264e5767634e6ca629dee02ab1a640367c4f
1 parent
f4dc6b35
Exists in
users_profile_page
Improvements on profile-info
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Showing
4 changed files
with
33 additions
and
10 deletions
Show diff stats
src/app/profile/info/profile-info.component.ts
@@ -16,9 +16,18 @@ export class ProfileInfoComponent { | @@ -16,9 +16,18 @@ export class ProfileInfoComponent { | ||
16 | 16 | ||
17 | activities: any; | 17 | activities: any; |
18 | profile: noosfero.Profile; | 18 | profile: noosfero.Profile; |
19 | + showInformation: boolean = false; | ||
19 | 20 | ||
20 | constructor(private profileService: ProfileService, private amDateFormatFilter: any) { | 21 | constructor(private profileService: ProfileService, private amDateFormatFilter: any) { |
21 | this.init(); | 22 | this.init(); |
23 | + this.showInformation = false; | ||
24 | + } | ||
25 | + | ||
26 | + toggleInformation() { | ||
27 | + console.log(this.showInformation); | ||
28 | + console.log("argila"); | ||
29 | + this.showInformation = !this.showInformation; | ||
30 | + console.log(this.showInformation); | ||
22 | } | 31 | } |
23 | 32 | ||
24 | init() { | 33 | init() { |
src/app/profile/info/profile-info.html
@@ -28,11 +28,12 @@ | @@ -28,11 +28,12 @@ | ||
28 | </div> | 28 | </div> |
29 | </div> | 29 | </div> |
30 | </div> --> | 30 | </div> --> |
31 | -<div class="bg-image" style="background-color: black";> | 31 | + |
32 | +<div class="bg-image" style="background-color: grey";> | ||
32 | 33 | ||
33 | </div> | 34 | </div> |
34 | 35 | ||
35 | -<div class="container" id="noosfero-profile" style="background-color: aqua";> | 36 | +<div class="container" id="noosfero-profile"> |
36 | <div class="col-sm-2"> | 37 | <div class="col-sm-2"> |
37 | <noosfero-profile-image [profile]="vm.profile" class="img-avatar-main" data-pin-nopin="true"></noosfero-profile-image> | 38 | <noosfero-profile-image [profile]="vm.profile" class="img-avatar-main" data-pin-nopin="true"></noosfero-profile-image> |
38 | <ul class="social"> | 39 | <ul class="social"> |
@@ -48,12 +49,11 @@ | @@ -48,12 +49,11 @@ | ||
48 | <br /> | 49 | <br /> |
49 | <p class="pull-left">www.noosfero.gov.br/<strong>patriciaoliveira</strong></p> | 50 | <p class="pull-left">www.noosfero.gov.br/<strong>patriciaoliveira</strong></p> |
50 | <div class="pull-right info-contato"> | 51 | <div class="pull-right info-contato"> |
51 | - <button type="button" class="btn btn-sm" data-toggle="collapse" data-target="#infocontato">Informações de Contato</button> | ||
52 | - <div id="infocontato" class="collapse"> | ||
53 | - <br /><p>patricia@oliveira.com<br /> | ||
54 | - 61 9999-9999</p> | ||
55 | - </div> | 52 | + <button ng-click="vm.toggleInformation()" class="btn btn-sm">Informações de Contato</button> |
53 | + <div clas="profile-contact" ng-show="vm.showInformation"> | ||
54 | + <p class="email">patricia@oliveira.com</p> | ||
55 | + <p class="phone">61 9999-9999</p> | ||
56 | + </div> | ||
56 | </div> | 57 | </div> |
57 | </div> | 58 | </div> |
58 | </div> | 59 | </div> |
59 | - |
src/app/profile/profile.component.ts
@@ -14,8 +14,7 @@ import {ProfileActionsComponent} from "./profile-actions.component"; | @@ -14,8 +14,7 @@ import {ProfileActionsComponent} from "./profile-actions.component"; | ||
14 | import {ConfigBarComponent} from "./config-bar.component"; | 14 | import {ConfigBarComponent} from "./config-bar.component"; |
15 | /** | 15 | /** |
16 | * @ngdoc controller | 16 | * @ngdoc controller |
17 | - * @name profile.Profile | ||
18 | - * @description | 17 | + * @name profile.Profile * @description |
19 | * This is the profile controller. It provide routes to supported Noosfero Profiles. | 18 | * This is the profile controller. It provide routes to supported Noosfero Profiles. |
20 | */ | 19 | */ |
21 | 20 | ||
@@ -148,4 +147,6 @@ export class ProfileComponent { | @@ -148,4 +147,6 @@ export class ProfileComponent { | ||
148 | notificationService.error({ message: "notification.profile.not_found" }); | 147 | notificationService.error({ message: "notification.profile.not_found" }); |
149 | }); | 148 | }); |
150 | } | 149 | } |
150 | + | ||
151 | + | ||
151 | } | 152 | } |
src/app/profile/profile.scss
@@ -145,6 +145,7 @@ a{ | @@ -145,6 +145,7 @@ a{ | ||
145 | 145 | ||
146 | /* NOOSFERO PROFILE */ | 146 | /* NOOSFERO PROFILE */ |
147 | .bg-image {} | 147 | .bg-image {} |
148 | + | ||
148 | #noosfero-profile { | 149 | #noosfero-profile { |
149 | background:#fff; | 150 | background:#fff; |
150 | margin: -200px auto auto; | 151 | margin: -200px auto auto; |
@@ -164,7 +165,19 @@ a{ | @@ -164,7 +165,19 @@ a{ | ||
164 | h3 { | 165 | h3 { |
165 | margin-top: 16px; | 166 | margin-top: 16px; |
166 | } | 167 | } |
168 | + .btn { | ||
169 | + font-size: 12px; | ||
170 | + padding: 5px 10px; | ||
171 | + } | ||
172 | + .profile-contact { | ||
173 | + padding-top: 10px; | ||
174 | + | ||
175 | + p { | ||
176 | + margin: 0px; | ||
177 | + } | ||
178 | + } | ||
167 | } | 179 | } |
180 | + | ||
168 | ul.social {list-style:none; text-align:center;padding:0; margin:0;} | 181 | ul.social {list-style:none; text-align:center;padding:0; margin:0;} |
169 | #infocontato {max-width:200px;} | 182 | #infocontato {max-width:200px;} |
170 | #infocontato .alert-info{margin:.5rem 0; | 183 | #infocontato .alert-info{margin:.5rem 0; |