Merge branch 'master' of https://gitlab.com/participa/proposal-app

Caio Almeida
2 parents f9cb23c5 9d07adf3
Showing 3 changed files with 82 additions and 77 deletions Show diff stats
index.html
js/main.js
sass/_proposal_detail.scss
@@ -178,7 +178,8 @@
     </script>
     <script id="results" type='text/x-handlebars-template'>
-      <div class="results-content">
+      <div class="loading">Carregando...</div>
+      <div class="results-content hide">
         <a href="#" class="vote-result">Fechar</a>
         <table>
           <tr class="header">
@@ -162,9 +162,13 @@ function loadRandomProposal(topic_id, private_token) {
     $(document.body).on('click', '.vote-result', function(e) {
       $('.results-container').toggle();
       if($('.results-container').is(":visible")) {
+        $('.results-container .loading').show();
+        $('.results-container .results-content').hide();
         var url = host + '/api/v1/articles/' + topic_id + '/children' + '?private_token=' + private_token + '&limit=10&fields=id,name,abstract,votes_for,votes_against&content_type=ProposalsDiscussionPlugin::Proposal';
         $.getJSON(url).done(function( data ) {
           $('.results-container').html(resultsTemplate(data));
+          $('.results-container .loading').hide();
+          $('.results-container .results-content').show();
         });
         $('.experience-proposal-container').hide();
         $('.talk-proposal-container').hide();
@@ -86,87 +86,88 @@
       }
     }
   }
-  .results-container {
-    &:before {
-      content:"";
-      display:table;
-      clear:both;
-    }
-    .results-content {
-      border: 1px solid #00a9bd;
-      margin-top: 20px;
-      .vote-result {
-        font-weight: bolder;
-        font-size: 12px;
-        text-transform: uppercase;
-        color: gray;
-        border: none;
-        margin: 10px;
-        border-radius: 6px;
-        text-align: center;
-        text-decoration: none;
-        padding: 9px;
-        display: block;
-        float: right;
-      }
-    }
-    table {
-      clear: both;
-      margin-top: 20px;
-      tbody tr:nth-child(odd) {
-        background-color: #e5e5e5;
-      }
-      .abstract-text {
-        width: 80%;
-      }
-      .votes-for {
-        width: 10%;
-        text-align: center;
-      }
-      .votes-against {
-        @extend .votes-for;
-      }
-      .score {
-        @extend .votes-for;
-      }
-      .header {
-        line-height: 32px;
-        font-weight: bold;
-        text-align: center;
-        color: rgb(68, 68, 68);
-        .votes-for {
-          background-image: url(./images/result-like.png);
-          background-repeat: no-repeat;
-          display: inline-block;
-          background-position: center;
-        }
-        .votes-against {
-          background-image: url(./images/result-dislike.png);
+  @each $category, $color in $categories {
+    .#{$category}{
+      .results-container {
+        &:before {
+          content:"";
+          display:table;
+          clear:both;
         }
-        .score {
-          background-image: none;
+        .results-content {
+          border: 1px solid $color;
+          margin-top: 20px;
+          .vote-result {
+            font-weight: bolder;
+            font-size: 12px;
+            text-transform: uppercase;
+            color: gray;
+            border: none;
+            margin: 10px;
+            border-radius: 6px;
+            text-align: center;
+            text-decoration: none;
+            padding: 9px;
+            display: block;
+            float: right;
+          }
         }
-      }
+        table {
+          clear: both;
+          margin-top: 20px;
+          tbody tr:nth-child(odd) {
+            background-color: #e5e5e5;
+          }
-      .truncate {
-        display: table;
-        table-layout: fixed;
-        width: 100%;
-      }
-      .truncated {
-        overflow-x: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-      tr {
-        color: rgb(77, 77, 77);
+          .abstract-text {
+            width: 80%;
+          }
+          .votes-for {
+            width: 10%;
+            text-align: center;
+          }
+          .votes-against {
+            @extend .votes-for;
+          }
+          .score {
+            @extend .votes-for;
+          }
+          .header {
+            line-height: 32px;
+            font-weight: bold;
+            text-align: center;
+            color: rgb(68, 68, 68);
+            .votes-for {
+              background-image: url(./images/result-like.png);
+              background-repeat: no-repeat;
+              display: inline-block;
+              background-position: center;
+            }
+            .votes-against {
+              background-image: url(./images/result-dislike.png);
+            }
+            .score {
+              background-image: none;
+            }
+          }
+
+          .truncate {
+            display: table;
+            table-layout: fixed;
+            width: 100%;
+          }
+          .truncated {
+            overflow-x: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+          }
+          tr {
+            color: rgb(77, 77, 77);
+          }
+        }
       }
-    }
-  }
-  @each $category, $color in $categories {
-    .#{$category}{
       .proposal-header {
         .title {
           background: $color;
@@ -436,7 +437,6 @@
             }
           }
         }
-    
       }
       li{
         background-color: $color;