Merge branch 'master' into staging

Matheus Machado Monteiro - SUPDE/DEDES/DEDS1
2 parents b8b643ff fb9115eb
Showing 3 changed files with 42 additions and 25 deletions Show diff stats
src/app/pages/programas/programa.controller.js
src/app/pages/programas/programa.html
src/app/pages/programas/programas.scss
@@ -99,7 +99,7 @@
         vm.loadingTopProposals = false;
         if (vm.article.archived) {
-          
+
           // show 'respostas e compromissos',
           // ONLY IF the proposal is below or equal 3th position.
           if (vm.search.proposal_id) {
@@ -107,7 +107,7 @@
             var proposal_id = parseInt(vm.search.proposal_id);
             for (var i = vm.proposalsTopRated.length - 1; i >= 0; i--) {
               var proposal = vm.proposalsTopRated[i];
-              
+
               if(proposal.id === proposal_id){
                 found = true;
                 break;
@@ -144,13 +144,13 @@
       // load content of 'proposal-box'
       if (!vm.article.archived) {
-        
+
         if (vm.search.proposal_id) {
           // load the proposal and set focus on proposal-box
           vm.loadProposalById(vm.search.proposal_id);
         }else {
           // load a random proposal at proposal-box
-          vm.loadRandomProposal(); 
+          vm.loadRandomProposal();
         }
       }
@@ -362,7 +362,7 @@
         proposal.response.content = data.articles[0].body;
         toggle();
-        
+
       }).catch(function(){
         proposal.response.error = false;
       }).finally(function(){
@@ -372,7 +372,7 @@
     function toggle () {
       var $el = angular.element('.gov-response-' + proposal.id);
-      
+
       if ($el.is(':visible')) {
         $el.slideUp();
       }else {
@@ -383,4 +383,6 @@
     }
   };
+
+
 })();
 \ No newline at end of file
@@ -48,7 +48,16 @@
                                         <div ng-bind-html="pagePrograma.article.summaryExtended"></div>
                                     </div>
                                     <div class="program-preview--share">
-                                        <div class="program-preview--share-label">COMPARTILHE ESTE <b>PROGRAMA</b></div>
+                                        <div ng-show="!pagePrograma.article.archived" class="program-preview--share-label">COMPARTILHE ESTE <b>PROGRAMA</b></div>
+                                        <div ng-show="pagePrograma.article.archived" class="row text-right">
+                                            <div class="col-xs-12">
+                                                <a ui-sref="ranking({tema: pagePrograma.category.slug, programa: pagePrograma.article.slug})" class="btn btn-link">
+                                                    <span>Ver Propostas</span>
+                                                    <span class="glyphicon glyphicon-chevron-right color-theme-common-fg" aria-hidden="true"></span>
+                                                </a>
+                                            </div>
+                                        </div>
+                                        <div ng-show="pagePrograma.article.archived" class="program-preview--share-label">COMPARTILHE ESSA <b>RESPOSTA</b></div>
                                         <div class="dropdown">
                                             <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>
                                             <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 @@
                             </div>
                         </div>
                         <!-- Preview > coluna da direita -->
-                        <div class="col-md-4">
+                        <div class="col-md-4 hidden-xs hidden-sm">
                             <div class="row" ng-if="!pagePrograma.article.archived">
                                 <!-- Top Proposals -->
                                 <div>
@@ -138,6 +147,7 @@
                         <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
                     </button>
                 </div>
+                <span class="pull-right font-140">Posição atualizada a cada x minutos</span>
                 <div class="proposal-extended-section-content">
                     <proposal-list proposals="pagePrograma.proposalsTopFive" archived="pagePrograma.article.archived"></proposal-list>
                     <div class="row text-center">
@@ -249,7 +259,7 @@
                                     <h3 class="color-theme-fg">{{($index+1)}}ª proposta mais votada:</h3>
                                     <p>{{::proposal.abstract}}</p>
                                     <div class="button--themed">
-                                        <button class="btn btn-block" ng-click="pagePrograma.toggleResponseVisibility(proposal)">
+                                        <button class="btn btn-block btn-responsive" ng-click="pagePrograma.toggleResponseVisibility(proposal)">
                                             Veja a resposta e o compromisso do governo
                                             <div class="button-left-icon">
                                                 <span class="glyphicon glyphicon-chevron-down pull-right color-theme-common-fg" aria-hidden="true"></span>
@@ -280,8 +290,8 @@
                                         FECHAR
                                         <div class="button-right-icon icon-circle icon-small icon-circle-close-response color-theme-common-bg pull-right">
                                             <span class="glyphicon glyphicon-remove icon-white" aria-hidden="true"></span>
-                                        </div>  
-                                    </button>  
+                                        </div>
+                                    </button>
                                 </div>
                             </div>
                         </div>
@@ -19,7 +19,7 @@
         &--box--content-wrapper {
             padding: 48px;
             position: relative;
-            
+
         }
         &--archived {
             .program-preview--box--content-wrapper {
@@ -104,7 +104,7 @@
         &--share {
             margin-bottom: 20px;
             position: relative;
-            
+
             .dropdown {
                 display: inline-block;
                 position: relative;
@@ -226,7 +226,7 @@
             transform: scale(0.7);
         }
     }
-    
+
     #section-archived-banner {
         position: relative;
         padding: 20px 0;
@@ -257,7 +257,7 @@
         .archived-banner--title2 {
             font-weight: bold;
-        }    
+        }
     }
     #section-response {
@@ -281,6 +281,11 @@
                 text-transform: uppercase;
                 letter-spacing: 1px;
             }
+
+            .btn-responsive {
+                white-space: normal !important;
+                word-wrap: break-word;
+            }
         }
         .button-left-icon {
@@ -304,13 +309,13 @@
         margin-bottom: 20px;
         width: 120px;
         background-color: #e1e1e1;
-        
+
         .icon-circle-close-response {
             width: 20px!important;
             height: 20px!important;
             color: #e1e1e1;
             font-size: 14px;
-        }    
+        }
     }
     .gov-response--link-item {
@@ -323,7 +328,7 @@
         margin-top: 40px;
         padding-left: 0px;
         padding-right: 0px;
-        
+
         .row {
             margin-bottom: 25px;
         }
@@ -331,7 +336,7 @@
         .row-compromissos {
             margin-left: 0px;
             margin-right: 0px;
-        }    
+        }
         ul {
             li {
@@ -342,27 +347,27 @@
         blockquote {
             min-height: 130px;
         }
-       
+
         .inside.inside-full-height.resposta3-pac {
             font-size: 130%;
-            
+
             @media (max-width: 992px){
-            padding-top: 5%;   
+            padding-top: 5%;
             }
             @media (min-width: 992px){
-            padding-top: 5%;   
+            padding-top: 5%;
             }
             @media (min-width: 1200px){
-            padding-top: 5%;   
+            padding-top: 5%;
             }
         }
         .bloco-padding-25 {
             padding: 25px;
         }
-        
+
         .list-no-style {
             list-style-type: none!important;
         }