[Movecommons-commits] r602 - in trunk: src wp-theme

[Mario Gallegos]

Author: mgallegos
Date: 2013-02-05 00:39:22 +0100 (Tue, 05 Feb 2013)
New Revision: 602

Modified:
   trunk/src/mc-dia-form2.js
   trunk/wp-theme/mc2-form.php
Log:
FEEDBACK - Enhancement #485: Exclusive subcategories majority/consensus

Modified: trunk/src/mc-dia-form2.js
===================================================================
--- trunk/src/mc-dia-form2.js	2013-02-04 23:14:44 UTC (rev 601)
+++ trunk/src/mc-dia-form2.js	2013-02-04 23:39:22 UTC (rev 602)
@@ -810,6 +810,18 @@
 	  }  
 	});
 	
+	$j("#decisions-voting").click(function(){		
+	  if($j("#decisions-voting").attr("checked"))	    
+	    if($j("#decisions-consensus").attr("checked"))	    	
+		    $j('#decisions-consensus').removeAttr('checked');
+	});
+	
+	$j("#decisions-consensus").click(function(){		
+	  if($j("#decisions-consensus").attr("checked"))	    
+	    if($j("#decisions-voting").attr("checked"))	    	
+		    $j('#decisions-voting').removeAttr('checked');
+	});
+	
 	$j("#step2-yes").click(function(){clickCheckBox('np','yes');});
 	$j("#step2-no").click(function(){clickCheckBox('np','no');});
 	

Modified: trunk/wp-theme/mc2-form.php
===================================================================
--- trunk/wp-theme/mc2-form.php	2013-02-04 23:14:44 UTC (rev 601)
+++ trunk/wp-theme/mc2-form.php	2013-02-04 23:39:22 UTC (rev 602)
@@ -274,13 +274,16 @@
 						    	<input type="checkbox" name="decisions-general-assemblies" value="S" id="decisions-general-assemblies" tabindex="22" disabled="disabled"/>
 						    	<?php _e("We take decisions mainly through general assemblies", "mc"); ?>
 					    	</label>
+					    	<label class="optional-labels-fields">					     						    	
+						    	<?php _e("We take decisions through:", "mc"); ?>
+					    	</label>
 					    	<label class="optional-labels-fields">					     
 						    	<input type="checkbox" name="decisions-voting" value="S" id="decisions-voting" tabindex="23" disabled="disabled"/>
-						    	<?php _e("We take decisions through majority voting", "mc"); ?>
+						    	<?php _e("Majority voting", "mc"); ?>
 					    	</label>
 					    	<label class="optional-labels-fields">					     
 						    	<input type="checkbox" name="decisions-consensus" value="S" id="decisions-consensus" tabindex="24" disabled="disabled"/>
-						    	<?php _e("We take decisions through consensus, instead of majority", "mc"); ?>
+						    	<?php _e("Consensus, instead of majority", "mc"); ?>
 					    	</label>
 					    	<label class="optional-labels-fields">					     
 						    	<input type="checkbox" name="representatives-democratically" value="S" id="representatives-democratically" tabindex="25" disabled="disabled"/>