Download as
Browse Code »

Commit c1995119cca699cd995efdd8e8d22c1dfd5700d9

Authored by Leonardo Merlin
1 parent b5cfe510
Exists in master and in 8 other branches css-list, feature-captcha, feature-proposal-vote, feature-respostas, production, rafael, staging, the_glorious_return_of_piwik

Sync

Showing 13 changed files with 138 additions and 99 deletions   Show diff stats
src/app/components/navbar/navbar.html
  Diff comments   View file @c199511
... ... @@ -23,21 +23,35 @@
23 23 <li role="separator" class="divider hidden-xs hidden-sm"><span>|</span></li>
24 24 <li class="dropdown">
25 25 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Compartilhar <span class="icon icon-social-share-small"></span></a>
26   - <ul class="dropdown-menu dropdown-menu-right dropdown-menu-social">
  26 + <social-share class="dropdown-menu dropdown-menu-right"></social-share>
  27 + <!-- <ul class="dropdown-menu dropdown-menu-right dropdown-menu-social">
27 28 <li>
28   - <a social-facebook custom-url="http://dialoga.gov.br" title="Compartilhar no Facebook">
  29 + <a socialshare
  30 + socialshare-provider="facebook"
  31 + socialshare-url="http://dialoga.gov.br"
  32 + socialshare-text="Conheça o Dialoga Brasil. Dialoga Brasil | O País fica melhor quando VOCÊ PARTICIPA."
  33 + title="Compartilhar no Facebook">
29 34 <span class="icon-circle icon-small icon-circle-social-facebook"><span class="icon icon-social-facebook"></span></span>
30 35 <span class="sr-only">Compartilhar no Facebook</span>
31 36 </a>
32 37 </li>
33 38 <li>
34   - <a social-twitter custom-url="http://dialoga.gov.br" status="This status is #{{ vm.status }}" title="Compartilhar no Twitter">
  39 + <a socialshare
  40 + socialshare-provider="twitter"
  41 + socialshare-url="http://dialoga.gov.br"
  42 + socialshare-text="Conheça o Dialoga Brasil. Dialoga Brasil | O País fica melhor quando VOCÊ PARTICIPA."
  43 + socialshare-hastags="dialogabrasil"
  44 + title="Compartilhar no Twitter">
35 45 <span class="icon-circle icon-small icon-circle-social-twitter"><span class="icon icon-social-twitter"></span></span>
36 46 <span class="sr-only">Compartilhar no Twitter</span>
37 47 </a>
38 48 </li>
39 49 <li>
40   - <a social-gplus custom-url="http://dialoga.gov.br" title="Compartilhar no Google Plus">
  50 + <a socialshare
  51 + socialshare-provider="gplus"
  52 + socialshare-url="http://dialoga.gov.br"
  53 + socialshare-text="Conheça o Dialoga Brasil. Dialoga Brasil | O País fica melhor quando VOCÊ PARTICIPA."
  54 + title="Compartilhar no Google Plus">
41 55 <span class="icon-circle icon-small icon-circle-social-googleplus"><span class="icon icon-social-googleplus"></span></span>
42 56 <span class="sr-only">Compartilhar no Google Plus</span>
43 57 </a>
... ... @@ -48,7 +62,7 @@
48 62 <span class="sr-only">Enviar por email</span>
49 63 </a>
50 64 </li>
51   - </ul>
  65 + </ul> -->
52 66 </li>
53 67 </ul>
54 68 </div>
... ...
src/app/components/navbar/navbar.scss
  Diff comments   View file @c199511
... ... @@ -44,6 +44,10 @@
44 44 }
45 45 }
46 46  
  47 + .dropdown-menu {
  48 + padding: 0;
  49 + }
  50 +
47 51 .navbar-nav > li {
48 52  
49 53 & > a {
... ...
src/app/components/social-share/social-share.directive.js 0 → 100644
  Diff comments   View file @c199511
... ... @@ -0,0 +1,30 @@
  1 +(function() {
  2 + 'use strict';
  3 +
  4 + angular
  5 + .module('dialoga')
  6 + .directive('socialShare', socialShare);
  7 +
  8 + /** @ngInject */
  9 + function socialShare() {
  10 + var directive = {
  11 + restrict: 'E',
  12 + templateUrl: 'app/components/social-share/social-share.html',
  13 + scope: {
  14 + },
  15 + controller: SocialShareController,
  16 + controllerAs: 'vm',
  17 + bindToController: true
  18 + };
  19 +
  20 + return directive;
  21 +
  22 + /** @ngInject */
  23 + function SocialShareController($log) {
  24 + $log.debug('SocialShareController');
  25 +
  26 + // var vm = this;
  27 + }
  28 + }
  29 +
  30 +})();
... ...
src/app/components/social-share/social-share.html 0 → 100644
  Diff comments   View file @c199511
... ... @@ -0,0 +1,74 @@
  1 +<ul class="social-share list-inline">
  2 + <li>
  3 + <a socialshare
  4 + socialshare-provider="facebook"
  5 + socialshare-url="http://dialoga.gov.br"
  6 + socialshare-text="Conheça o Dialoga Brasil. Dialoga Brasil | O País fica melhor quando VOCÊ PARTICIPA."
  7 + title="Compartilhar no Facebook">
  8 + <span class="icon-circle icon-small icon-circle-social-facebook"><span class="icon icon-social-facebook"></span></span>
  9 + <span class="sr-only">Compartilhar no Facebook</span>
  10 + </a>
  11 + </li>
  12 + <li>
  13 + <a socialshare
  14 + socialshare-provider="twitter"
  15 + socialshare-url="http://dialoga.gov.br"
  16 + socialshare-text="Conheça o Dialoga Brasil. Dialoga Brasil | O País fica melhor quando VOCÊ PARTICIPA."
  17 + socialshare-hastags="dialogabrasil"
  18 + title="Compartilhar no Twitter">
  19 + <span class="icon-circle icon-small icon-circle-social-twitter"><span class="icon icon-social-twitter"></span></span>
  20 + <span class="sr-only">Compartilhar no Twitter</span>
  21 + </a>
  22 + </li>
  23 + <li>
  24 + <a socialshare
  25 + socialshare-provider="gplus"
  26 + socialshare-url="http://dialoga.gov.br"
  27 + socialshare-text="Conheça o Dialoga Brasil. Dialoga Brasil | O País fica melhor quando VOCÊ PARTICIPA."
  28 + title="Compartilhar no Google Plus">
  29 + <span class="icon-circle icon-small icon-circle-social-googleplus"><span class="icon icon-social-googleplus"></span></span>
  30 + <span class="sr-only">Compartilhar no Google Plus</span>
  31 + </a>
  32 + </li>
  33 + <li>
  34 + <a href="mailto:contato@dialoga.gov.br?subject=Conheça o Dialoga Brasil" title="Enviar por email">
  35 + <span class="icon-circle icon-small icon-circle-social-whatsapp"><span class="icon icon-social-whatsapp"></span></span>
  36 + <span class="sr-only">Enviar por email</span>
  37 + </a>
  38 + </li>
  39 +</ul>
  40 +<!-- <div class="social-share">
  41 + <ul>
  42 + <li>
  43 + <a social-facebook custom-url="http://dialoga.gov.br">
  44 + <span class="icon icon-social-facebook"></span>
  45 + <span class="sr-only">Compartilhar no Facebook</span>
  46 + </a>
  47 + </li>
  48 + <li>
  49 + <a social-twitter custom-url="http://dialoga.gov.br" status="This status is #{{ ctrl.coolWord }}">
  50 + <span class="icon icon-social-twitter"></span>
  51 + <span class="sr-only">Compartilhar no Twitter</span>
  52 + </a>
  53 + </li>
  54 + <li>
  55 + <a social-gplus custom-url="http://dialoga.gov.br">
  56 + <span class="icon icon-social-google-plus"></span>
  57 + <span class="sr-only">Compartilhar no Google Plus</span>
  58 + </a>
  59 + </li>
  60 + <li>
  61 + <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">
  62 + <span class="icon icon-social-whatsapp"></span>
  63 + <span class="sr-only">Compartilhar no WhatsApp</span>
  64 + </a>
  65 + </li>
  66 + </ul>
  67 +</div>
  68 + -->
  69 +<!-- <ul>
  70 + <li><a href="http://dialoga.gov.br/#/programas/121492/sobre-o-programa" class="fb-share icon icon-facebook" data-caption="Brasil de Todas as Telas" data-description="Apoio ao audiovisual brasileiro: ampliação da produção, da difusão e do acesso"><span class="fa fa-facebook"></span><span class="sr-only">Compartilhar no Facebook</span></a></li>
  71 + <li><a href="https://twitter.com/intent/tweet?url=http%3A%2F%2Fdialoga.gov.br%2F%23%2Fprogramas%2F121492%2Fsobre-o-programa&amp;text=Apoio ao audiovisual brasileiro: ampliação da produção, da difusão e do acesso" target="_blank" class="tw-share icon icon-twitter popup"><span class="fa fa-twitter"></span><span class="sr-only">Compartilhar no Twitter</span></a></li>
  72 + <li><a href="https://plus.google.com/share?url=http%3A%2F%2Fdialoga.gov.br%2F%23%2Fprogramas%2F121492%2Fsobre-o-programa" target="_blank" class="gp-share icon icon-gplus popup"><span class="fa fa-google-plus"></span><span class="sr-only">Compartilhar no Google Plus</span></a></li>
  73 + <li><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" class="ws-share icon icon-whatsapp"><span class="fa fa-whatsapp"></span><span class="sr-only">Compartilhar no WhatsApp</span></a></li>
  74 +</ul> -->
... ...
src/app/components/social-share/social-share.scss 0 → 100644
  Diff comments   View file @c199511
... ... @@ -0,0 +1,2 @@
  1 +.social-share {
  2 +}
... ...
src/app/components/socialShare/socialShare.directive.js
View file @b5cfe51
... ... @@ -1,30 +0,0 @@
1   -(function() {
2   - 'use strict';
3   -
4   - angular
5   - .module('dialoga')
6   - .directive('socialShare', socialShare);
7   -
8   - /** @ngInject */
9   - function socialShare() {
10   - var directive = {
11   - restrict: 'E',
12   - templateUrl: 'app/components/socialShare/socialShare.html',
13   - scope: {
14   - },
15   - controller: SocialShareController,
16   - controllerAs: 'vm',
17   - bindToController: true
18   - };
19   -
20   - return directive;
21   -
22   - /** @ngInject */
23   - function SocialShareController($log) {
24   - $log.debug('SocialShareController');
25   -
26   - // var vm = this;
27   - }
28   - }
29   -
30   -})();
src/app/components/socialShare/socialShare.html
View file @b5cfe51
... ... @@ -1,35 +0,0 @@
1   -<div class="social-share">
2   - <ul>
3   - <li>
4   - <a social-facebook custom-url="http://dialoga.gov.br">
5   - <span class="icon icon-social-facebook"></span>
6   - <span class="sr-only">Compartilhar no Facebook</span>
7   - </a>
8   - </li>
9   - <li>
10   - <a social-twitter custom-url="http://dialoga.gov.br" status="This status is #{{ ctrl.coolWord }}">
11   - <span class="icon icon-social-twitter"></span>
12   - <span class="sr-only">Compartilhar no Twitter</span>
13   - </a>
14   - </li>
15   - <li>
16   - <a social-gplus custom-url="http://dialoga.gov.br">
17   - <span class="icon icon-social-google-plus"></span>
18   - <span class="sr-only">Compartilhar no Google Plus</span>
19   - </a>
20   - </li>
21   - <li>
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">
23   - <span class="icon icon-social-whatsapp"></span>
24   - <span class="sr-only">Compartilhar no WhatsApp</span>
25   - </a>
26   - </li>
27   - </ul>
28   -</div>
29   -
30   -<!-- <ul>
31   - <li><a href="http://dialoga.gov.br/#/programas/121492/sobre-o-programa" class="fb-share icon icon-facebook" data-caption="Brasil de Todas as Telas" data-description="Apoio ao audiovisual brasileiro: ampliação da produção, da difusão e do acesso"><span class="fa fa-facebook"></span><span class="sr-only">Compartilhar no Facebook</span></a></li>
32   - <li><a href="https://twitter.com/intent/tweet?url=http%3A%2F%2Fdialoga.gov.br%2F%23%2Fprogramas%2F121492%2Fsobre-o-programa&amp;text=Apoio ao audiovisual brasileiro: ampliação da produção, da difusão e do acesso" target="_blank" class="tw-share icon icon-twitter popup"><span class="fa fa-twitter"></span><span class="sr-only">Compartilhar no Twitter</span></a></li>
33   - <li><a href="https://plus.google.com/share?url=http%3A%2F%2Fdialoga.gov.br%2F%23%2Fprogramas%2F121492%2Fsobre-o-programa" target="_blank" class="gp-share icon icon-gplus popup"><span class="fa fa-google-plus"></span><span class="sr-only">Compartilhar no Google Plus</span></a></li>
34   - <li><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" class="ws-share icon icon-whatsapp"><span class="fa fa-whatsapp"></span><span class="sr-only">Compartilhar no WhatsApp</span></a></li>
35   -</ul> -->
src/app/components/socialShare/socialShare.scss
View file @b5cfe51
... ... @@ -1,24 +0,0 @@
1   -.social-share {
2   - ul {
3   - display: inline-block;
4   - vertical-align: middle;
5   - list-style: none;
6   - padding-left: 0;
7   - }
8   -
9   - li{
10   - display: inline-block;
11   - padding: 0 2px !important;
12   - vertical-align: top;
13   - }
14   -
15   - .social-share--description {
16   - display: inline-block;
17   - color: #000;
18   - font-size: 12px;
19   - font-weight: 300;
20   - padding-right: 10px;
21   - text-align: right;
22   - vertical-align: middle;
23   - }
24   -}
src/app/index.scss
  Diff comments   View file @c199511
... ... @@ -133,7 +133,7 @@ body {
133 133 }
134 134  
135 135  
136   -.dropdown-menu.dropdown-menu-social {
  136 +.social-share {
137 137 min-width: 200px;
138 138 background-color: #eee;
139 139 padding: 5px;
... ...
src/app/pages/programas/programa.html
  Diff comments   View file @c199511
... ... @@ -41,10 +41,8 @@
41 41 <p>Lorem ipsum dolor sit amet, ea veniam mucius ocurreret vix, ius ex nisl vidisse partiendo. Blandit nominavi cum ei, paulo quaestio his ei, eum minim salutandi in. Civibus albucius in quo, et eam posse facilisis. Debet suavitate sea ut, his ei feugiat fastidii eleifend. Quo ex quando maiestatis voluptatum, mel te perpetua maiestatis, sit ceteros legendos deserunt ea. Enim dolores moderatius eu pro, ad quo ignota aliquid meliore.</p>
42 42 </div>
43 43 <div class="program-preview--share">
44   - <ul class="list-inline">
45   - <li>Compartilhe este programa:</li>
46   - <li><social-share class="program-preview--share-directive"></social-share></li>
47   - </ul>
  44 + <div class="program-preview--share-label">Compartilhe este programa:</div>
  45 + <social-share class="program-preview--share-directive"></social-share>
48 46 </div>
49 47 <div class="program-preview--make-proposal">
50 48 <div class="row">
... ...
src/app/pages/programas/programas.scss
  Diff comments   View file @c199511
... ... @@ -51,6 +51,12 @@
51 51 position: relative;
52 52 }
53 53  
  54 + .program-preview--share-label,
  55 + .program-preview--share-directive {
  56 + display: inline-block;
  57 + vertical-align: middle;
  58 + }
  59 +
54 60 h2,
55 61 h3{
56 62 font-weight: bold;
... ...
src/assets/images/icons/social-share-small.png
View file @c199511

902 Bytes | W: | H:

1.67 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
src/assets/images/icons/sprite.png
View file @c199511

107 KB | W: | H:

107 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin