Commit 21d025efce38c245db7085ab45981cf04b4ad9c2

Authored by Leonardo Merlin
2 parents 5066bde3 10952c27

Merge branch 'merlin' into test

@@ -13,7 +13,8 @@ @@ -13,7 +13,8 @@
13 "angular": "~1.4.0", 13 "angular": "~1.4.0",
14 "modernizr": "~2.8.3", 14 "modernizr": "~2.8.3",
15 "angular-slugify": "~1.0.1", 15 "angular-slugify": "~1.0.1",
16 - "open-sans-fontface": "~1.4.2" 16 + "open-sans-fontface": "~1.4.2",
  17 + "angular-social-links": "~0.0.19"
17 }, 18 },
18 "devDependencies": { 19 "devDependencies": {
19 "angular-mocks": "~1.4.0" 20 "angular-mocks": "~1.4.0"
src/app/components/socialShare/socialShare.directive.js
@@ -11,7 +11,6 @@ @@ -11,7 +11,6 @@
11 restrict: 'E', 11 restrict: 'E',
12 templateUrl: 'app/components/socialShare/socialShare.html', 12 templateUrl: 'app/components/socialShare/socialShare.html',
13 scope: { 13 scope: {
14 - display: '='  
15 }, 14 },
16 controller: SocialShareController, 15 controller: SocialShareController,
17 controllerAs: 'vm', 16 controllerAs: 'vm',
@@ -25,8 +24,6 @@ @@ -25,8 +24,6 @@
25 $log.debug('SocialShareController'); 24 $log.debug('SocialShareController');
26 25
27 var vm = this; 26 var vm = this;
28 -  
29 - vm.displayFull = (vm.display && vm.display === 'full');  
30 } 27 }
31 } 28 }
32 29
src/app/components/socialShare/socialShare.html
1 <div class="social-share"> 1 <div class="social-share">
2 -  
3 - <p ng-if="vm.displayFull" class="social-share--description">  
4 - <span>COMPARTILHE</span>  
5 - <br>  
6 - <span>ESTE PROGRAMA</span>  
7 - </p>  
8 <ul> 2 <ul>
9 <li> 3 <li>
10 - <a ng-href="{{vm.social.facebook.href}}"  
11 - data-caption="{{vm.social.facebook.caption}}"  
12 - data-description="{{vm.social.facebook.description}}"> 4 + <a social-facebook custom-url="http://dialoga.gov.br">
13 <span class="icon icon-social-facebook"></span> 5 <span class="icon icon-social-facebook"></span>
14 <span class="sr-only">Compartilhar no Facebook</span> 6 <span class="sr-only">Compartilhar no Facebook</span>
15 </a> 7 </a>
16 </li> 8 </li>
17 <li> 9 <li>
18 - <a ng-href="{{vm.social.twitter.href}}" target="_blank"> 10 + <a social-twitter custom-url="http://dialoga.gov.br" status="This status is #{{ ctrl.coolWord }}">
19 <span class="icon icon-social-twitter"></span> 11 <span class="icon icon-social-twitter"></span>
20 <span class="sr-only">Compartilhar no Twitter</span> 12 <span class="sr-only">Compartilhar no Twitter</span>
21 </a> 13 </a>
22 </li> 14 </li>
23 <li> 15 <li>
24 - <a ng-href="{{vm.social.googlePlus.href}}" target="_blank"> 16 + <a social-gplus custom-url="http://dialoga.gov.br">
25 <span class="icon icon-social-google-plus"></span> 17 <span class="icon icon-social-google-plus"></span>
26 <span class="sr-only">Compartilhar no Google Plus</span> 18 <span class="sr-only">Compartilhar no Google Plus</span>
27 </a> 19 </a>
28 </li> 20 </li>
29 <li> 21 <li>
30 - <a ng-href="{{vm.social.whatsapp.href}}" target="_blank"> 22 + <a href="whatsapp://send?text=Apoio ao audiovisual brasileiro: ampliação da produção, da difusão e do acesso http%3A%2F%2Fdialoga.gov.br%2F%23%2Fprogramas%2F121492%2Fsobre-o-programa" target="_blank">
31 <span class="icon icon-social-whatsapp"></span> 23 <span class="icon icon-social-whatsapp"></span>
32 <span class="sr-only">Compartilhar no WhatsApp</span> 24 <span class="sr-only">Compartilhar no WhatsApp</span>
33 </a> 25 </a>
src/app/index.module.js
@@ -2,6 +2,6 @@ @@ -2,6 +2,6 @@
2 'use strict'; 2 'use strict';
3 3
4 angular 4 angular
5 - .module('dialoga', ['ngAnimate', 'ngCookies', 'ngTouch', 'ngSanitize', 'ui.router', 'slugifier']); 5 + .module('dialoga', ['ngAnimate', 'ngCookies', 'ngTouch', 'ngSanitize', 'ui.router', 'socialLinks', 'slugifier']);
6 6
7 })(); 7 })();
src/app/pages/programas/conheca-o-programa.html
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 </div> 24 </div>
25 </div> 25 </div>
26 <div class="col-sm-6"> 26 <div class="col-sm-6">
27 - <social-share display="'full'"></social-share> 27 + <social-share></social-share>
28 </div> 28 </div>
29 </aside> 29 </aside>
30 </div> 30 </div>