Merge remote-tracking branch 'origin/master' into tracking_user_verifications_and_others

Conflicts:
	app/assets/javascripts/application.js

app/assets/javascripts/application.js

@@ -42,6 +42,7 @@
 //= require suggest
 //= require forms
 //= require tracks
+//= require valuation_spending_proposal_form
 
 var initialize_modules = function() {
   App.Comments.initialize();
@@ -58,7 +59,8 @@ var initialize_modules = function() {
   App.RegistrationForm.initialize();
   App.Suggest.initialize();
   App.Forms.initialize();
-  App.Tracks.initialize();  
+  App.Tracks.initialize();
+  App.ValuationSpendingProposalForm.initialize();
 };
 
 $(function(){

app/assets/javascripts/valuation_spending_proposal_form.js.coffee

@@ -0,0 +1,32 @@
+App.ValuationSpendingProposalForm =
+
+  showFeasibleFields: ->
+    $('#valuation_spending_proposal_edit_form #not_feasible_fields').hide('down')
+    $('#valuation_spending_proposal_edit_form #feasible_fields').show()
+
+  showNotFeasibleFields: ->
+    $('#valuation_spending_proposal_edit_form #feasible_fields').hide('down')
+    $('#valuation_spending_proposal_edit_form #not_feasible_fields').show()
+
+  showAllFields: ->
+    $('#valuation_spending_proposal_edit_form #feasible_fields').show('down')
+    $('#valuation_spending_proposal_edit_form #not_feasible_fields').show('down')
+
+  showFeasibilityFields: ->
+    feasible = $("#valuation_spending_proposal_edit_form input[type=radio][name='spending_proposal[feasible]']:checked").val()
+    if feasible == 'true'
+      App.ValuationSpendingProposalForm.showFeasibleFields()
+    else if feasible == 'false'
+      App.ValuationSpendingProposalForm.showNotFeasibleFields()
+
+
+  showFeasibilityFieldsOnChange: ->
+    $("#valuation_spending_proposal_edit_form input[type=radio][name='spending_proposal[feasible]']").change ->
+      App.ValuationSpendingProposalForm.showAllFields()
+      App.ValuationSpendingProposalForm.showFeasibilityFields()
+
+
+  initialize: ->
+    App.ValuationSpendingProposalForm.showFeasibilityFields()
+    App.ValuationSpendingProposalForm.showFeasibilityFieldsOnChange()
+    false

app/assets/stylesheets/layout.scss

@@ -421,10 +421,6 @@ header {
     }
   }
 
-  span {
-    color: $border;
-  }
-
   .input-group {
     padding-top: $line-height/4;
 
@@ -739,7 +735,7 @@ form {
     min-height: $line-height*13;
   }
 
-  .checkbox {
+  .checkbox, .radio {
     display: inline-block;
     font-weight: normal;
     line-height: $line-height;
@@ -879,7 +875,7 @@ img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar {
 }
 
 .user-deleted {
-  top: -9px;
+  top: -4px;
 }
 
 .user-permissions {
@@ -1388,7 +1384,7 @@ table {
     }
   }
 
-  .date {
+  .date-of-birth {
 
     select {
       float: left;
@@ -1550,6 +1546,7 @@ table {
 
   .comment {
     margin: $line-height/4 0;
+    position: relative;
 
     p {
       margin-bottom: 0;
@@ -1727,6 +1724,7 @@ table {
     td {
       padding-left: $line-height*1.5;
       position: relative;
+      word-break: break-all;
 
       &:before {
         color: $brand;

app/assets/stylesheets/participation.scss

@@ -70,7 +70,7 @@
     line-height: rem-calc(48);
     vertical-align: super;
 
-    span {
+    span.percentage {
       color: white;
       display: inline-block;
       font-size: rem-calc(16);
@@ -730,7 +730,7 @@
     @media (min-width: $small-breakpoint) {
       .like, .unlike {
 
-        span {
+        span.percentage {
           display: block;
           line-height: $line-height/2;
         }