Download as
Browse Code »

Commit 0fce3befb57aec94e51c3e16d82699001f23b8f2

Authored by Leonardo Merlin
2 parents fb30df4d cf152731
Exists in master and in 4 other branches build, build2, production, staging

Merge branch 'add-link-to-proposal-at-result-table'

Showing 4 changed files with 32 additions and 5 deletions   Show diff stats
index.html
  Diff comments   View file @0fce3be
... ... @@ -376,7 +376,7 @@
376 376 {{#each proposals}}
377 377 <tr>
378 378 <td class="">{{calcPosition @index ../pagination.per_page ../pagination.page}}°</td>
379   - <td class="abstract-text"><div class="truncate"><p class="truncated">{{stripTags abstract}}</p></div></td>
  379 + <td class="abstract-text"><div class="truncate"><p class="truncated"><a href="#/programas/{{../topic_id}}/propostas/{{id}}">{{stripTags abstract}}</a></p></div></td>
380 380 <td class="views value">{{hits}}</td>
381 381 <td class="votes-for value">{{votes_for}}</td>
382 382 <td class="votes-against value">{{votes_against}}</td>
... ...
js/footable.js
  Diff comments   View file @0fce3be
... ... @@ -426,7 +426,8 @@
426 426 if (!ft.hasAnyBreakpointColumn()) return;
427 427  
428 428 $table.find(opt.toggleSelector).unbind(trg.toggleRow).bind(trg.toggleRow, function (e) {
429   - var $row = $(this).is('tr') ? $(this) : $(this).parents('tr:first');
  429 + var $this = $(this);
  430 + var $row = $this.is('tr') ? $this : $this.parents('tr:first');
430 431 ft.toggleDetail($row);
431 432 });
432 433  
... ...
js/main.js
  Diff comments   View file @0fce3be
... ... @@ -260,16 +260,17 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
260 260 page: page,
261 261 };
262 262  
263   - // hack: add title to result table
  263 + // hack: add more info to result table
264 264 data.title = $resultsContainer.closest('.categories').find('.proposal-header .title').text();
  265 + data.topic_id = topic_id;
265 266  
266 267 $resultsContainer.html(resultsTemplate(data));
267 268 $resultsContainer.find('.loading').hide();
268 269 $resultsContainer.find('.results-content').show();
269   - $('.timeago').timeago();
  270 + $resultsContainer.find('.timeago').timeago();
270 271 $resultsContainer.show();
  272 + $resultsContainer.find('.footable').footable(); // must be called on visible elements.
271 273  
272   - $('.footable').footable();
273 274  
274 275 if(data.pagination.total > data.pagination.per_page) {
275 276 $resultsContainer.find('.paging').pagination({
... ... @@ -589,6 +590,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
589 590  
590 591 var regexProposals = /#\/programas/;
591 592 var regexCategory = /#\/temas/;
  593 + var regexPropostas = /\/propostas\//;
592 594 var regexHideBarra = /barra=false$/;
593 595 var regexArticle = /#\/artigo/;
594 596 var regexResultados = /resultados$/;
... ... @@ -610,6 +612,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
610 612 var isProposal = regexProposals.exec(hash) !== null;
611 613 var isCategory = regexCategory.exec(hash) !== null;
612 614 var isArticle = regexArticle.exec(hash) !== null;
  615 + var isPropostas = regexPropostas.exec(hash) !== null;
613 616 var isResultados = regexResultados.exec(hash) !== null;
614 617 var isSobreOPrograma = regexSobreOPrograma.exec(hash) !== null;
615 618 var isActivateUser = regexActivateUser.exec(hash) !== null;
... ... @@ -657,6 +660,17 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
657 660 scrollTop = proposalOffset.top;
658 661 }
659 662 }
  663 +
  664 +
  665 + if(isPropostas){
  666 + var $propostasContainer = $proposal.find('.support-proposal-container');
  667 +
  668 + proposalOffset = $propostasContainer.offset();
  669 + if(proposalOffset){
  670 + scrollTop = proposalOffset.top;
  671 + }
  672 +
  673 + }
660 674 }
661 675  
662 676 var categorySlug;
... ...
sass/style.sass
  Diff comments   View file @0fce3be
... ... @@ -940,6 +940,7 @@ td
940 940 text-align: center
941 941 width: 10%
942 942 .truncate
  943 + position: relative
943 944 display: table
944 945 table-layout: fixed
945 946 width: 100%
... ... @@ -949,6 +950,17 @@ td
949 950 overflow-x: hidden
950 951 text-overflow: ellipsis
951 952 white-space: nowrap
  953 + &:after
  954 + display: block
  955 + content: "[...]"
  956 + // content: "\e000"
  957 + position: absolute
  958 + top: 0
  959 + right: 2px
  960 + padding: 1px 3px
  961 + color: #888
  962 + background-color: #e0e0e0
  963 +
952 964 &.phone
953 965 .footable-toggle
954 966 float: right
... ...