Download as
Browse Code »

Commit 4cda49e6e5183ddf189f60b4b5df5d47069a9f50

Authored by Matheus Machado Monteiro - SUPDE/DEDES/DEDS1
2 parents b8b643ff fb9115eb
Exists in master and in 4 other branches feature-captcha, production, staging, the_glorious_return_of_piwik

Merge branch 'master' into staging

Showing 3 changed files with 42 additions and 25 deletions   Show diff stats
src/app/pages/programas/programa.controller.js
  Diff comments   View file @4cda49e
... ... @@ -99,7 +99,7 @@
99 99 vm.loadingTopProposals = false;
100 100  
101 101 if (vm.article.archived) {
102   -
  102 +
103 103 // show 'respostas e compromissos',
104 104 // ONLY IF the proposal is below or equal 3th position.
105 105 if (vm.search.proposal_id) {
... ... @@ -107,7 +107,7 @@
107 107 var proposal_id = parseInt(vm.search.proposal_id);
108 108 for (var i = vm.proposalsTopRated.length - 1; i >= 0; i--) {
109 109 var proposal = vm.proposalsTopRated[i];
110   -
  110 +
111 111 if(proposal.id === proposal_id){
112 112 found = true;
113 113 break;
... ... @@ -144,13 +144,13 @@
144 144  
145 145 // load content of 'proposal-box'
146 146 if (!vm.article.archived) {
147   -
  147 +
148 148 if (vm.search.proposal_id) {
149 149 // load the proposal and set focus on proposal-box
150 150 vm.loadProposalById(vm.search.proposal_id);
151 151 }else {
152 152 // load a random proposal at proposal-box
153   - vm.loadRandomProposal();
  153 + vm.loadRandomProposal();
154 154 }
155 155 }
156 156  
... ... @@ -362,7 +362,7 @@
362 362  
363 363 proposal.response.content = data.articles[0].body;
364 364 toggle();
365   -
  365 +
366 366 }).catch(function(){
367 367 proposal.response.error = false;
368 368 }).finally(function(){
... ... @@ -372,7 +372,7 @@
372 372  
373 373 function toggle () {
374 374 var $el = angular.element('.gov-response-' + proposal.id);
375   -
  375 +
376 376 if ($el.is(':visible')) {
377 377 $el.slideUp();
378 378 }else {
... ... @@ -383,4 +383,6 @@
383 383 }
384 384 };
385 385  
  386 +
  387 +
386 388 })();
387 389 \ No newline at end of file
... ...
src/app/pages/programas/programa.html
  Diff comments   View file @4cda49e
... ... @@ -48,7 +48,16 @@
48 48 <div ng-bind-html="pagePrograma.article.summaryExtended"></div>
49 49 </div>
50 50 <div class="program-preview--share">
51   - <div class="program-preview--share-label">COMPARTILHE ESTE <b>PROGRAMA</b></div>
  51 + <div ng-show="!pagePrograma.article.archived" class="program-preview--share-label">COMPARTILHE ESTE <b>PROGRAMA</b></div>
  52 + <div ng-show="pagePrograma.article.archived" class="row text-right">
  53 + <div class="col-xs-12">
  54 + <a ui-sref="ranking({tema: pagePrograma.category.slug, programa: pagePrograma.article.slug})" class="btn btn-link">
  55 + <span>Ver Propostas</span>
  56 + <span class="glyphicon glyphicon-chevron-right color-theme-common-fg" aria-hidden="true"></span>
  57 + </a>
  58 + </div>
  59 + </div>
  60 + <div ng-show="pagePrograma.article.archived" class="program-preview--share-label">COMPARTILHE ESSA <b>RESPOSTA</b></div>
52 61 <div class="dropdown">
53 62 <button id="dropdown-share-btn" class="btn btn-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="Mostrar ou esconder a lista redes sociais para compartilhamento"><span class="icon icon-social-share-small" aria-hidden="true"></span></button>
54 63 <social-share social-url="pagePrograma.$state.href('programa', {slug: pagePrograma.article.slug}, {absolute: true})" social-text="pagePrograma.article.title" social-image="pagePrograma.banner.src" arrow-class="social-share--arrow" class="dropdown-menu dropdown-menu-right"></social-share>
... ... @@ -67,7 +76,7 @@
67 76 </div>
68 77 </div>
69 78 <!-- Preview > coluna da direita -->
70   - <div class="col-md-4">
  79 + <div class="col-md-4 hidden-xs hidden-sm">
71 80 <div class="row" ng-if="!pagePrograma.article.archived">
72 81 <!-- Top Proposals -->
73 82 <div>
... ... @@ -138,6 +147,7 @@
138 147 <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
139 148 </button>
140 149 </div>
  150 + <span class="pull-right font-140">Posição atualizada a cada x minutos</span>
141 151 <div class="proposal-extended-section-content">
142 152 <proposal-list proposals="pagePrograma.proposalsTopFive" archived="pagePrograma.article.archived"></proposal-list>
143 153 <div class="row text-center">
... ... @@ -249,7 +259,7 @@
249 259 <h3 class="color-theme-fg">{{($index+1)}}ª proposta mais votada:</h3>
250 260 <p>{{::proposal.abstract}}</p>
251 261 <div class="button--themed">
252   - <button class="btn btn-block" ng-click="pagePrograma.toggleResponseVisibility(proposal)">
  262 + <button class="btn btn-block btn-responsive" ng-click="pagePrograma.toggleResponseVisibility(proposal)">
253 263 Veja a resposta e o compromisso do governo
254 264 <div class="button-left-icon">
255 265 <span class="glyphicon glyphicon-chevron-down pull-right color-theme-common-fg" aria-hidden="true"></span>
... ... @@ -280,8 +290,8 @@
280 290 FECHAR
281 291 <div class="button-right-icon icon-circle icon-small icon-circle-close-response color-theme-common-bg pull-right">
282 292 <span class="glyphicon glyphicon-remove icon-white" aria-hidden="true"></span>
283   - </div>
284   - </button>
  293 + </div>
  294 + </button>
285 295 </div>
286 296 </div>
287 297 </div>
... ...
src/app/pages/programas/programas.scss
  Diff comments   View file @4cda49e
... ... @@ -19,7 +19,7 @@
19 19 &--box--content-wrapper {
20 20 padding: 48px;
21 21 position: relative;
22   -
  22 +
23 23 }
24 24 &--archived {
25 25 .program-preview--box--content-wrapper {
... ... @@ -104,7 +104,7 @@
104 104 &--share {
105 105 margin-bottom: 20px;
106 106 position: relative;
107   -
  107 +
108 108 .dropdown {
109 109 display: inline-block;
110 110 position: relative;
... ... @@ -226,7 +226,7 @@
226 226 transform: scale(0.7);
227 227 }
228 228 }
229   -
  229 +
230 230 #section-archived-banner {
231 231 position: relative;
232 232 padding: 20px 0;
... ... @@ -257,7 +257,7 @@
257 257  
258 258 .archived-banner--title2 {
259 259 font-weight: bold;
260   - }
  260 + }
261 261 }
262 262  
263 263 #section-response {
... ... @@ -281,6 +281,11 @@
281 281 text-transform: uppercase;
282 282 letter-spacing: 1px;
283 283 }
  284 +
  285 + .btn-responsive {
  286 + white-space: normal !important;
  287 + word-wrap: break-word;
  288 + }
284 289 }
285 290  
286 291 .button-left-icon {
... ... @@ -304,13 +309,13 @@
304 309 margin-bottom: 20px;
305 310 width: 120px;
306 311 background-color: #e1e1e1;
307   -
  312 +
308 313 .icon-circle-close-response {
309 314 width: 20px!important;
310 315 height: 20px!important;
311 316 color: #e1e1e1;
312 317 font-size: 14px;
313   - }
  318 + }
314 319 }
315 320  
316 321 .gov-response--link-item {
... ... @@ -323,7 +328,7 @@
323 328 margin-top: 40px;
324 329 padding-left: 0px;
325 330 padding-right: 0px;
326   -
  331 +
327 332 .row {
328 333 margin-bottom: 25px;
329 334 }
... ... @@ -331,7 +336,7 @@
331 336 .row-compromissos {
332 337 margin-left: 0px;
333 338 margin-right: 0px;
334   - }
  339 + }
335 340  
336 341 ul {
337 342 li {
... ... @@ -342,27 +347,27 @@
342 347 blockquote {
343 348 min-height: 130px;
344 349 }
345   -
  350 +
346 351 .inside.inside-full-height.resposta3-pac {
347 352 font-size: 130%;
348   -
  353 +
349 354 @media (max-width: 992px){
350   - padding-top: 5%;
  355 + padding-top: 5%;
351 356 }
352 357  
353 358 @media (min-width: 992px){
354   - padding-top: 5%;
  359 + padding-top: 5%;
355 360 }
356 361  
357 362 @media (min-width: 1200px){
358   - padding-top: 5%;
  363 + padding-top: 5%;
359 364 }
360 365 }
361 366  
362 367 .bloco-padding-25 {
363 368 padding: 25px;
364 369 }
365   -
  370 +
366 371 .list-no-style {
367 372 list-style-type: none!important;
368 373 }
... ...