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

Tue Jun 5 21:43:21 CEST 2012

Author: mgallegos
Date: 2012-06-05 21:43:21 +0200 (Tue, 05 Jun 2012)
New Revision: 485

Modified:
   trunk/src/mc-dia-form2.js
   trunk/wp-theme/mc2-form.php
Log:


Modified: trunk/src/mc-dia-form2.js
===================================================================

--- trunk/src/mc-dia-form2.js	2012-06-05 19:34:08 UTC (rev 484)
+++ trunk/src/mc-dia-form2.js	2012-06-05 19:43:21 UTC (rev 485)
@@ -5,7 +5,7 @@
 function clickCheckBox(id,answer){
 	if(answer=='yes'){
 		if ($j("#mc-form-" + id).is('.mc-form-descbox-selected')) return;
-		$j('#'+id+'-checkbox').val('S');
+		$j('#'+id+'-checkbox').val('S'); 
 		$j("#mc-form-" + id).addClass("mc-form-descbox-selected");
 		$j("#mc-cat-selected-"+ id).slideDown();		
 		if(id=='np'){
@@ -615,6 +615,11 @@
                 $j('#second_step').slideUp();
                 $j('#third_step').slideDown();     
         } else return false;*/
+    	
+    	if($j('#np-checkbox').val()=='N'){
+    		$j('#step2question').effect("shake", { times:3 }, 50);
+    		return;
+    	}
 
     	//update progress bar
         $j('#progress_text').html('40% Complete');
@@ -652,6 +657,10 @@
         $j('#third_step').slideUp();
         $j('#fourth_step').slideDown();
 */
+    	if($j('#rp-checkbox').val()=='N'){
+    		$j('#step3question').effect("shake", { times:3 }, 50);
+    		return;
+    	}
         //update progress bar
         $j('#progress_text').html('60% Complete');
         $j('#progress').css('width','204px');
@@ -664,6 +673,11 @@
 
     $j('#submit_fourth').click(function(){
     	
+    	if($j('#rc-checkbox').val()=='N'){
+    		$j('#step4question').effect("shake", { times:3 }, 50);
+    		return;
+    	}
+    	
     	if($j('#mc-form-icon-rc').attr('src')=='/mc/0.1/images/rc60.png'){
     		 $j('#mc-form-optional-reinforcing').effect("shake", { times:3 }, 50);
     		 return;
@@ -681,6 +695,11 @@
     
     $j('#submit_fifth').click(function(){
     	
+    	if($j('#gr-checkbox').val()=='N'){
+    		$j('#step5question').effect("shake", { times:3 }, 50);
+    		return;
+    	}
+    	
     	$j('#fifth_step').slideUp();
         $j('#sixth_step').slideDown();
         

Modified: trunk/wp-theme/mc2-form.php
===================================================================
--- trunk/wp-theme/mc2-form.php	2012-06-05 19:34:08 UTC (rev 484)
+++ trunk/wp-theme/mc2-form.php	2012-06-05 19:43:21 UTC (rev 485)
@@ -69,7 +69,7 @@
 				        <div class="marker" style="background-position: -26px 0;"></div>
 				    </div>
 				</div>					
-				<div style="width: 100%;float: left;margin-bottom: 20px;">
+				<div id="step2question" style="width: 100%;float: left;margin-bottom: 20px;">
 					<div class="label2" style="margin-left: 185px;float: left;"><?php _e("2. Is your initiative Non-Profit?", "mc"); ?></div>
 					<div id="step2-radio" style="float: left;margin-left: 10px;margin-top: 10px;">
 						<input type="radio" id="step2-yes" name="radio" onclick="clickCheckBox('np','yes');"/><label for="step2-yes" style="font-size: 14px;">Yes</label>
@@ -139,7 +139,7 @@
 				        <div class="marker" style="background-position: -52px 0;"></div>
 				    </div>
 				</div>		  	
-				<div style="width: 100%;float: left;margin-bottom: 20px;">
+				<div id="step3question" style="width: 100%;float: left;margin-bottom: 20px;">
 					<div class="label2" style="margin-left: 185px;float: left;"><?php _e("3. Is your initiative Reproducible?", "mc"); ?></div>
 					<div id="step3-radio" style="float: left;margin-left: 10px;margin-top: 10px;">
 						<input type="radio" id="step3-yes" name="radio" onclick="clickCheckBox('rp','yes');"/><label for="step3-yes" style="font-size: 14px;">Yes</label>
@@ -230,7 +230,7 @@
 				        <div class="marker" style="background-position: -78px 0;"></div>
 				    </div>
 				</div>
-				<div style="width: 100%;float: left;margin-bottom: 20px;">
+				<div id="step4question" style="width: 100%;float: left;margin-bottom: 20px;">
 					<div class="label2" style="margin-left: 170px;float: left;"><?php _e("4. Does your initiative Reinforce the Commons?", "mc"); ?></div>
 					<div id="step4-radio" style="float: left;margin-left: 10px;margin-top: 10px;">
 						<input type="radio" id="step4-yes" name="radio" onclick="clickCheckBox('rc','yes');"/><label for="step4-yes" style="font-size: 14px;">Yes</label>
@@ -293,7 +293,7 @@
 				    </div>
 				</div>
 				<div style="width: 100%;float: left;margin-bottom: 20px;">
-					<div class="label2" style="margin-left: 125px;float: left;"><?php _e("5. Is your initiative driven by horizontal collective decisions?", "mc"); ?></div>
+					<div id="step5question" class="label2" style="margin-left: 125px;float: left;"><?php _e("5. Is your initiative driven by horizontal collective decisions?", "mc"); ?></div>
 					<div id="step5-radio" style="float: left;margin-left: 10px;margin-top: 10px;">
 						<input type="radio" id="step5-yes" name="radio" onclick="clickCheckBox('gr','yes');"/><label for="step5-yes" style="font-size: 14px;">Yes</label>
 						<input type="radio" id="step5-no" name="radio" onclick="clickCheckBox('gr','no');"/><label for="step5-no" style="font-size: 14px;">No</label>					


