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

Leandro Santos
2 parents d3601655 fb6c2c63
Showing 3 changed files with 13 additions and 7 deletions Show diff stats
index.html
js/main.js
sass/_proposal_categories.scss
@@ -32,7 +32,7 @@
       <ul id="proposal-categories">
         <div id="proposal-categories-container">
           {{#each article.categories}}
-            <li id='proposal-category-{{slug}}' class="proposal-category">
+            <li id='proposal-category-{{slug}}' class="proposal-category" data-category="{{slug}}">
               {{#link name id}}{{/link}}
               <div class="arrow-box" style="display: none"></div>
             </li>
@@ -64,8 +64,8 @@
           <div class='categories {{#each categories}}{{slug}} {{/each}}'>
             <ul>
               {{#each categories}}
-                <li class='category'>
-                  <a href="#"><span>{{name}}</span></a>
+                <li class='category proposal-category' data-category="{{slug}}">
+                  {{#link name id}}{{/link}}
                 </li>
               {{/each}}
             </ul>
@@ -70,11 +70,14 @@ $.getJSON(noosferoAPI)
       var item = this.href.split('#').pop();
       if($('#' + item).hasClass('proposal-category-items')){
         //Display Topics or Discussion by category
+        $('#proposal-categories').show();
         $('.proposal-category-items').hide();
+        $('.proposal-detail').hide();
         $('#' + item).show();
         $(".proposal-item").dotdotdot();
         $('.proposal-category .arrow-box').hide();
-        $(this).siblings('.arrow-box').show();
+        $(this).parent('.proposal-category').data('category')
+        $('#proposal-category-'+$(this).parent('.proposal-category').data('category')).find('.arrow-box').show();
       }
       event.preventDefault();
     });
@@ -104,7 +107,8 @@ $.getJSON(noosferoAPI)
 function loadRandomProposal(topic_id, private_token) {
   var url = host + '/api/v1/articles/' + topic_id + '/children' + '?private_token=' + private_token + '&limit=1&order=random()&_='+new Date().getTime()+'&fields=id,name,created_by';
   $.getJSON(url).done(function( data ) {
-    var article = data.articles.length > 0 ? data.articles[0] : null;
+    if(data.articles.length == 0) return;
+    var article = data.articles[0];
     $('.support-proposal-container').html(supportProposalTemplate(article));
     $(document.body).off('click', '.vote-actions .like');
     $(document.body).on('click', '.vote-actions .like', function(e) {
@@ -56,7 +56,6 @@
     color: #172938;
     margin: 0;
     padding-top: 5px;
-    background: #fff;
     margin-bottom: 10px;
     text-align: left;
   }
@@ -71,7 +70,6 @@
     font-family: asap_bold;
     font-size: 16px;
     text-decoration: none;
-    background: #fff;
   }
   .proposal-item {
@@ -84,6 +82,10 @@
     vertical-align: top;
   }
+  .proposal-item:hover {
+    background: #eeeff1;
+  }
+
   .proposal-category-items {
     text-align: left;
     border-radius: 6px;