Compare View

switch
from
...
to
 
Commits (2)
Showing 10 changed files   Show diff stats
src/app/index.scss
  Diff comments   View file @a06484d
@@ -39,6 +39,12 @@ $break-sm-min: 992px; @@ -39,6 +39,12 @@ $break-sm-min: 992px;
39 $break-xxs-max: ($break-xxs-min - 1); 39 $break-xxs-max: ($break-xxs-min - 1);
40 $break-sm-max: ($break-sm-min - 1); 40 $break-sm-max: ($break-sm-min - 1);
41 $break-xs-max: ($break-xs-min - 1); 41 $break-xs-max: ($break-xs-min - 1);
  42 +// TODO: improve this method to collect all the paddings with a single var
  43 +$wrapper-padding: 15px 15px 35px 15px;
  44 +$wrapper-padding-top: 15px;
  45 +$wrapper-padding-right: 15px;
  46 +$wrapper-padding-bottom: 35px;
  47 +$wrapper-padding-left: 15px;
42 48
43 49
44 @import "../../bower_components/bootswatch/flatly/_variables.scss"; 50 @import "../../bower_components/bootswatch/flatly/_variables.scss";
src/app/layout/blocks/communities/communities-block.html
  Diff comments   View file @a06484d
1 - <div ng-repeat="profile in ctrl.profiles" class="col-xs-2 col-md-4 block-item">  
2 - <a ui-sref="main.profile.home({profile: profile.identifier})">  
3 - <noosfero-profile-image [profile]="profile"></noosfero-profile-image>  
4 - </a>  
5 - <p>{{profile.name}}</p>  
6 - </div> 1 +<div ng-repeat="profile in ctrl.profiles" class="col-xs-2 col-md-4 block-item">
  2 + <a ui-sref="main.profile.home({profile: profile.identifier})">
  3 + <noosfero-profile-image [profile]="profile"></noosfero-profile-image>
  4 + </a>
  5 + <p>{{profile.name}}</p>
  6 +</div>
src/app/layout/scss/skins/_whbl.scss
  Diff comments   View file @a06484d
@@ -122,7 +122,7 @@ $whbl-font-color: #16191c; @@ -122,7 +122,7 @@ $whbl-font-color: #16191c;
122 margin-bottom: 0; 122 margin-bottom: 0;
123 position: relative; 123 position: relative;
124 min-height: 1200px; 124 min-height: 1200px;
125 - padding: 15px 15px 35px 15px; 125 + padding: $wrapper-padding;
126 margin-left: 220px; 126 margin-left: 220px;
127 // border-left: 2px solid #e7ebee; 127 // border-left: 2px solid #e7ebee;
128 } 128 }
src/app/profile/image/image.html
  Diff comments   View file @a06484d
1 <span class="profile-image-wrap" title="{{ctrl.profile.name}}"> 1 <span class="profile-image-wrap" title="{{ctrl.profile.name}}">
2 - <img ng-if="ctrl.profile.image" ng-src="{{ctrl.profile.image.url}}" class="img-responsive profile-image img-avatar"> 2 + <img ng-if="ctrl.profile.image" ng-src="{{ctrl.profile.image.url}}" class="">
3 <i ng-if="!ctrl.profile.image" class="fa {{ctrl.defaultIcon}} fa-5x profile-image img-avatar"></i> 3 <i ng-if="!ctrl.profile.image" class="fa {{ctrl.defaultIcon}} fa-5x profile-image img-avatar"></i>
4 </span> 4 </span>
src/app/profile/info/profile-info.component.ts
  Diff comments   View file @a06484d
@@ -16,17 +16,23 @@ export class ProfileInfoComponent { @@ -16,17 +16,23 @@ 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() {
25 this.profileService.getCurrentProfile().then((profile: noosfero.Profile) => { 34 this.profileService.getCurrentProfile().then((profile: noosfero.Profile) => {
26 this.profile = profile; 35 this.profile = profile;
27 - return this.profileService.getActivities(<number>this.profile.id);  
28 - }).then((response: restangular.IResponse) => {  
29 - this.activities = response.data.activities;  
30 }); 36 });
31 } 37 }
32 } 38 }
src/app/profile/info/profile-info.html
  Diff comments   View file @a06484d
@@ -28,13 +28,14 @@ @@ -28,13 +28,14 @@
28 </div> 28 </div>
29 </div> 29 </div>
30 </div> --> 30 </div> -->
31 -<div class="bg-image"> 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"> 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">
39 <li>Facebook</li> 40 <li>Facebook</li>
40 <li>Twitter</li> 41 <li>Twitter</li>
@@ -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/info/profile-info.scss 0 → 100644
  Diff comments   View file @a06484d
src/app/profile/profile.component.ts
  Diff comments   View file @a06484d
@@ -14,8 +14,7 @@ import {ProfileActionsComponent} from &quot;./profile-actions.component&quot;; @@ -14,8 +14,7 @@ import {ProfileActionsComponent} from &quot;./profile-actions.component&quot;;
14 import {ProfileToolbarComponent} from "./profile-toolbar.component"; 14 import {ProfileToolbarComponent} from "./profile-toolbar.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
@@ -47,11 +46,6 @@ import {ProfileToolbarComponent} from &quot;./profile-toolbar.component&quot;; @@ -47,11 +46,6 @@ import {ProfileToolbarComponent} from &quot;./profile-toolbar.component&quot;;
47 "toolbar@main": { 46 "toolbar@main": {
48 templateUrl: "app/profile/toolbar.html", 47 templateUrl: "app/profile/toolbar.html",
49 controller: ProfileToolbarComponent, 48 controller: ProfileToolbarComponent,
50 - },  
51 - "mainBlockContent": {  
52 - templateUrl: "app/profile/activities/activities.html",  
53 - controller: ProfileInfoComponent,  
54 - controllerAs: "vm"  
55 } 49 }
56 } 50 }
57 }, 51 },
@@ -147,4 +141,6 @@ export class ProfileComponent { @@ -147,4 +141,6 @@ export class ProfileComponent {
147 notificationService.error({ message: "notification.profile.not_found" }); 141 notificationService.error({ message: "notification.profile.not_found" });
148 }); 142 });
149 } 143 }
  144 +
  145 +
150 } 146 }
src/app/profile/profile.html
  Diff comments   View file @a06484d
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 [attribute]="'custom_header'" 4 [attribute]="'custom_header'"
5 [profile]="vm.profile"> 5 [profile]="vm.profile">
6 </custom-content> 6 </custom-content>
  7 + <div class="row" ui-view="profile-info"></div>
7 <noosfero-boxes ng-if="vm.boxes" 8 <noosfero-boxes ng-if="vm.boxes"
8 [layout]="vm.profile.layout_template" 9 [layout]="vm.profile.layout_template"
9 [boxes]="vm.boxes" 10 [boxes]="vm.boxes"
src/app/profile/profile.scss
  Diff comments   View file @a06484d
1 .profile-container { 1 .profile-container {
2 @extend .container-fluid; 2 @extend .container-fluid;
3 - padding: 0 1%; 3 + margin-top: -$wrapper-padding-top;
  4 + margin-left: -$wrapper-padding-left;
  5 + margin-bottom: -$wrapper-padding-bottom;
  6 + margin-right: -$wrapper-padding-right;
4 @media (max-width: 978px) { 7 @media (max-width: 978px) {
5 padding: 0 2%; 8 padding: 0 2%;
6 } 9 }
@@ -14,8 +17,6 @@ @@ -14,8 +17,6 @@
14 @charset "UTF-8"; 17 @charset "UTF-8";
15 /* CSS Document */ 18 /* CSS Document */
16 19
17 -@import "font-awesome.min.css";  
18 -@import "font-awesome-ie7.min.css";  
19 /* Space out content a bit */ 20 /* Space out content a bit */
20 body { 21 body {
21 padding-top: 0; 22 padding-top: 0;
@@ -144,11 +145,46 @@ a{ @@ -144,11 +145,46 @@ a{
144 145
145 /* NOOSFERO PROFILE */ 146 /* NOOSFERO PROFILE */
146 .bg-image {} 147 .bg-image {}
147 -#noosfero-profile {background:#fff; margin: -200px auto auto; z-index:9999; left:0; right:0; border:1px solid #eee; padding:20px 0;}  
148 - #noosfero-profile img {margin:10px; border:1px solid #eee;} 148 +
  149 +#noosfero-profile {
  150 + background:#fff;
  151 + margin: -200px auto auto;
  152 + z-index:9999;
  153 + left:0;
  154 + right:0;
  155 + border:1px solid #eee;
  156 + padding:20px 0;
  157 + font-size: 14px;
  158 + img, i {
  159 + text-align: center;
  160 + margin:10px; border:1px solid #eee;
  161 + }
  162 + .col-sm-2 {
  163 + text-align: center;
  164 + }
  165 + h3 {
  166 + margin-top: 16px;
  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 + }
  179 +}
  180 +
149 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;}
150 #infocontato {max-width:200px;} 182 #infocontato {max-width:200px;}
151 -#infocontato .alert-info{margin:.5rem 0; padding:1rem; font-size:1rem; line-height:1.5rem;} 183 +#infocontato .alert-info{margin:.5rem 0;
  184 + padding:1rem;
  185 + font-size:1rem;
  186 + line-height:1.5rem;
  187 +}
152 #noosfero-groups {margin:auto;} 188 #noosfero-groups {margin:auto;}
153 189
154 .secondary {border:1px solid #eee; padding:1rem; margin-top:2rem;} 190 .secondary {border:1px solid #eee; padding:1rem; margin-top:2rem;}