Download as
Browse Code »

Commit 99e875b2f9e8ec003097deb9468d018744a458f1

Authored by Leonardo Merlin
2 parents 5342526b 4308ae8f
Exists in master and in 5 other branches build, build2, contigency_plan_recaptcha, production, staging

Merge branch 'merlin'

Showing 3 changed files with 55 additions and 9 deletions   Show diff stats
index.html
  Diff comments   View file @99e875b
... ... @@ -257,7 +257,7 @@
257 257 <div class="section-content">
258 258 <div class="container-title box-title">Faça uma proposta</div>
259 259 <div class="subtitle box-subtitle">Qual a sua sugestão para melhorar este programa?</div>
260   - <div class="info box-info">Esta consulta termina em outubro de 2015. Até lá, todas as propostas serão lidas e as cinco mais pontuadas em cada programa receberão resposta oficial do governo.</div>
  260 + <div class="info box-info">Esta consulta termina em outubro de 2015. Até lá, todas as propostas serão lidas e as três mais pontuadas em cada programa receberão resposta oficial do governo.</div>
261 261 <div class="row">
262 262 <div class="col-sm-6 col-sm-offset-3">
263 263 <div class="button send-proposal-button button-send box-footer">
... ... @@ -281,7 +281,7 @@
281 281 </div>
282 282 </form>
283 283 <div class="success-proposal-sent success-sent hide button-send">
284   - <p>Sua proposta foi encaminhada com sucesso! Ela se tornará pública em até 24 horas e poderá ser apoiada por outros participantes.</p>
  284 + <p>Sua proposta foi encaminhada com sucesso! Ela se tornará pública em até 48 horas e poderá ser apoiada por outros participantes.</p>
285 285 <a href="#">Faça nova proposta</a>
286 286 </div>
287 287 <div class="clearfix"></div>
... ... @@ -474,9 +474,9 @@
474 474 <script id="social-share" type="text/x-handlebars-template">
475 475 <ul>
476 476 <li><a href="{{url}}" class="fb-share icon icon-facebook" data-caption="{{title}}" data-description="{{stripTags description}}"><span class="fa fa-facebook"></span><span class="sr-only">Compartilhar no Facebook</span></a></li>
477   - <li><a href="https://twitter.com/intent/tweet?url={{encodeURI url}}&text={{stripTags description}}" class="tw-share icon icon-twitter popup"><span class="fa fa-twitter"></span><span class="sr-only">Compartilhar no Twitter</span></a></li>
478   - <li><a href="https://plus.google.com/share?url={{encodeURI url}}" 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>
479   - <li><a href="whatsapp://send?text={{stripTags description}} {{encodeURI url}}" class="ws-share icon icon-whatsapp"><span class="fa fa-whatsapp"></span><span class="sr-only">Compartilhar no WhatsApp</span></a></li>
  477 + <li><a href="https://twitter.com/intent/tweet?url={{encodeURI url}}&text={{stripTags description}}" 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>
  478 + <li><a href="https://plus.google.com/share?url={{encodeURI url}}" 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>
  479 + <li><a href="whatsapp://send?text={{stripTags description}} {{encodeURI url}}" target="_blank" class="ws-share icon icon-whatsapp"><span class="fa fa-whatsapp"></span><span class="sr-only">Compartilhar no WhatsApp</span></a></li>
480 480 </ul>
481 481 </script>
482 482  
... ...
js/main.js
  Diff comments   View file @99e875b
... ... @@ -830,6 +830,40 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;, &#39;piwik&#39;], fun
830 830 .done(function( data ) {
831 831 data.host = host;
832 832 data.private_token = Main.private_token;
  833 +
  834 + // check youtube iframe
  835 + function forceWmodeIframe(article){
  836 + var abstract = article.abstract;
  837 + // console.log('article.abstract', article.abstract);
  838 +
  839 + var patternIframe = '<iframe src="';
  840 + var indexOfIframe = abstract.indexOf(patternIframe);
  841 +
  842 + if(indexOfIframe === -1){
  843 + return;
  844 + }
  845 +
  846 + var startSrcUrl = indexOfIframe + patternIframe.length;
  847 + var endSrcUrl = abstract.indexOf('"', startSrcUrl);
  848 + var url = abstract.substring(startSrcUrl , endSrcUrl);
  849 + // console.log('url', url);
  850 +
  851 + if(url.indexOf("wmode=opaque") !== -1){
  852 + // already in opaque mode
  853 + // console.debug('already in opaque mode');
  854 + return;
  855 + }
  856 + var c = '';
  857 + if(url.indexOf('?') !== -1){
  858 + c = '&';
  859 + }
  860 +
  861 + var resultUrl = url+c+"wmode=opaque";
  862 + article.abstract = abstract.replace(url, resultUrl);
  863 + // console.log('article.abstract', article.abstract);
  864 + };
  865 + forceWmodeIframe(data.article);
  866 +
833 867 resultsPlaceholder.innerHTML = template(data);
834 868 $('.login-container').html(loginTemplate());
835 869 $('.countdown').maxlength({text: '%left caracteres restantes'});
... ... @@ -1128,6 +1162,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;, &#39;piwik&#39;], fun
1128 1162 });
1129 1163  
1130 1164 $(document).on('click', '.social .fb-share', function(e) {
  1165 + e.preventDefault();
1131 1166 var link = $(this).attr('href');
1132 1167 FB.ui({
1133 1168 method: 'feed',
... ... @@ -1135,8 +1170,9 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;, &#39;piwik&#39;], fun
1135 1170 name: $(this).data('name') || 'Dialoga Brasil',
1136 1171 caption: $(this).data('caption') || 'dialoga.gov.br',
1137 1172 description: $(this).data('description'),
1138   - }, function(response){});
1139   - e.preventDefault();
  1173 + }, function(response){
  1174 + console.log('response', response);
  1175 + });
1140 1176 });
1141 1177  
1142 1178 $(document).on('click', '.new-user', function(e) {
... ...
sass/style.sass
  Diff comments   View file @99e875b
... ... @@ -1205,8 +1205,18 @@ td
1205 1205 font-weight: bold
1206 1206  
1207 1207 // 6.21 - captcha
1208   -.captcha
1209   - margin: 10px auto
  1208 +#serpro_captcha
  1209 + margin: 15px 0 10px 0
  1210 + &:before,
  1211 + &:after
  1212 + clear: both
  1213 + content: " "
  1214 + display: table
  1215 + #serpro_captcha_component_img_captcha_serpro_gov_br
  1216 + float: left
  1217 + #serpro_captcha_component_divButtons_captcha_serpro_gov_br
  1218 + float: left
  1219 + margin: 10px
1210 1220  
1211 1221 // ------------------------------------
1212 1222 // 7 - Modificadores
... ...