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

Mario Gallegos mgallegos at ourproject.org
Thu May 31 01:30:03 CEST 2012


Author: mgallegos
Date: 2012-05-31 01:30:03 +0200 (Thu, 31 May 2012)
New Revision: 417

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


Modified: trunk/src/mc-dia-form2.css
===================================================================
--- trunk/src/mc-dia-form2.css	2012-05-30 22:39:09 UTC (rev 416)
+++ trunk/src/mc-dia-form2.css	2012-05-30 23:30:03 UTC (rev 417)
@@ -30,7 +30,7 @@
     overflow: hidden;
     position: relative;*/
 }
-    #containerSlides #first_step, #second_step, #third_step, #fourth_step { display: none; }
+    #containerSlides #first_step, #second_step, #third_step, #fourth_step, #fifth_step { display: none; }
     #containerSlides #first_step { display: block; width: 754px;padding-top:25px;position: relative;margin: 0 auto;}
 
     #containerSlides .form { margin: 20px 72px 0 72px; }

Modified: trunk/src/mc-dia-form2.js
===================================================================
--- trunk/src/mc-dia-form2.js	2012-05-30 22:39:09 UTC (rev 416)
+++ trunk/src/mc-dia-form2.js	2012-05-30 23:30:03 UTC (rev 417)
@@ -565,7 +565,7 @@
         
         if(!error) {               
 	        //update progress bar
-	        $j('#progress_text').html('25% Complete');
+	        $j('#progress_text').html('20% Complete');
 	        $j('#progress').css('width','68px');
 	        
 	        //slide steps
@@ -577,7 +577,7 @@
 
     $j('#submit_second').click(function(){
         //remove classes
-        $j('#second_step input').removeClass('error').removeClass('valid');
+        /*$j('#second_step input').removeClass('error').removeClass('valid');
 
         var emailPattern = /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/;  
         var fields = $j('#second_step input[type=text]');
@@ -602,13 +602,21 @@
                 //slide steps
                 $j('#second_step').slideUp();
                 $j('#third_step').slideDown();     
-        } else return false;
+        } else return false;*/
 
+    	//update progress bar
+        $j('#progress_text').html('40% Complete');
+        $j('#progress').css('width','136px');
+        
+        //slide steps
+        $j('#second_step').slideUp();
+        $j('#third_step').slideDown();
+
     });
 
 
     $j('#submit_third').click(function(){
-        //update progress bar
+/*        //update progress bar
         $j('#progress_text').html('100% Complete');
         $j('#progress').css('width','339px');
 
@@ -630,13 +638,40 @@
                 
         //slide steps
         $j('#third_step').slideUp();
-        $j('#fourth_step').slideDown();            
+        $j('#fourth_step').slideDown();
+*/
+        //update progress bar
+        $j('#progress_text').html('60% Complete');
+        $j('#progress').css('width','204px');
+        
+        //slide steps
+        $j('#third_step').slideUp();
+        $j('#fourth_step').slideDown();
     });
 
 
     $j('#submit_fourth').click(function(){
-        //send information to server
-        alert('Data sent');
+    	
+    	//update progress bar
+        $j('#progress_text').html('80% Complete');
+        $j('#progress').css('width','272px');
+        
+        //slide steps
+        $j('#fourth_step').slideUp();
+        $j('#fifth_step').slideDown();
+        
     });
+    
+    $j('#submit_fifth').click(function(){
+        
+/*    	//update progress bar
+        $j('#progress_text').html('50% Complete');
+        $j('#progress').css('width','136px');
+        
+        //slide steps
+        $j('#second_step').slideUp();
+        $j('#third_step').slideDown();
+*/    	
+    });    
 
 });
\ No newline at end of file

Modified: trunk/wp-theme/mc2-form.php
===================================================================
--- trunk/wp-theme/mc2-form.php	2012-05-30 22:39:09 UTC (rev 416)
+++ trunk/wp-theme/mc2-form.php	2012-05-30 23:30:03 UTC (rev 417)
@@ -75,7 +75,7 @@
 			  		</div>
 			  	</div>
 			  	<div style="float: left;width: auto;">
-			  		<img src="/mc/0.1/images/step1.png" alt="step1" class="mc-steps-number-v2" />								  		
+			  		<!-- <img src="/mc/0.1/images/step1.png" alt="step1" class="mc-steps-number-v2" /> --> 								  		
 					<div style="float:right;width:10px;height:47px;"></div>						
 			  		<div id="mc-form-optional-non-profit" style="width: 500px;">
 			  			<!--<img src="/mc/0.1/images/button_cancel.png" alt="selected" id="button-close-a" style="display: inline;position: relative;top: -23px;z-index: 1000;left: 476px;"/> -->
@@ -105,6 +105,7 @@
 			  	</div>				
 		  	</div>		  	
 		  </div>
+		  <input class="submit" type="submit" name="submit_second" id="submit_second" value="" />
 		  <div class="mc-clean"></div>  
 	</div><!-- End second slide -->
 	<div class="clear"></div>		
@@ -131,7 +132,7 @@
 			  		</div>
 			  	</div>
 		  		<div style="float: left;width: auto;">		
-					<img src="/mc/0.1/images/step2.png" alt="step2" class="mc-steps-number-v2" />		  			  		
+					<!--<img src="/mc/0.1/images/step2.png" alt="step2" class="mc-steps-number-v2" />-->		  			  		
 			  		<div id="mc-form-optional-reproducible" style="width: 500px;">
 			  			<!--<img src="/mc/0.1/images/button_cancel.png" alt="selected" id="button-close-b" style="display: inline;position: relative;top: -23px;z-index: 1000;left: 476px;"/>-->
 			  			<div class="blockMe2" style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 30px;border: 1px solid #B7C4C8;margin-bottom: 20px;">
@@ -207,7 +208,7 @@
 			  		</div>			  		
 			  	</div>	
 			  	<div style="float: left;width: auto;">
-			  		<img src="/mc/0.1/images/step3.png" alt="step3" class="mc-steps-number-v2" />
+			  		<!--<img src="/mc/0.1/images/step3.png" alt="step3" class="mc-steps-number-v2" />-->
 			  		<div id="mc-form-optional-reinforcing" style="width: 500px;">
 			  			<!--<img src="/mc/0.1/images/button_cancel.png" alt="selected" id="button-close-c" style="display: inline;position: relative;top: -23px;z-index: 1000;left: 476px;"/>-->
 			  			<div class="blockMe3" style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 30px;border: 1px solid #B7C4C8;">			  				
@@ -230,10 +231,67 @@
 			  	</div>
 		  	</div>			  	
 		  </div>		  
-		  <div class="mc-clean"></div>
-		
+		  <div class="mc-clean"></div>		
 	</div><!-- End Fourth slide -->
 	<div class="clear"></div>		
+	<div id="fifth_step"><!-- Fifth slide -->	
+		<div class="mc-cat-group-v2" id="mc-cat-group-d">
+		  	<div style="float: left;" class="mc-form-category-group-a-v2">		  	
+			  	<div class="mc-form-rounded mc-form-category-group-v2 float-left" id="mc-form-category-group-d">			    
+				  	<img src="/mc/0.1/images/cat-selected.png" alt="selected" class="mc-cat-selected mc-cat-selected-a" id="mc-cat-selected-gr" />				  	
+				  	<div id="mc-form-gr" class="mc-form-rounded mc-form-descbox mc-form-descbox-a">
+				  		<!-- 
+				    	<div id="mc-form-more-link-gr" class="mc-form-link"><?php _e("What is this?", "mc"); ?></div>
+				    	<div id="mc-form-less-link-gr" class="mc-form-link"><?php _e("less info", "mc"); ?></div>
+				    	-->
+				    	<div class="mc-form-descbox-header"><?php _e("Grassroots", "mc"); ?><input id="gr-checkbox" name="gr-checkbox" type="checkbox" value="N" onclick="clickCheckBox('gr')"></div>
+				    	<div class="mc-form-descbox-intro"><?php _e("Your initiative is driven by horizontal collective decisions", "mc"); ?></div>
+					    <div id="mc-form-more-text-gr" class="mc-form-more-text-v2">
+							<?php _e("<ul> <li>The initiative follows collective decision-making procedures for tackling most issues</li> <li>The hierarchical structure is minimal or inexistent. That is, horizontal grassroots discussions of the members have a major weight when compared with vertical instructions from the board</li> </ul>", "mc"); ?>
+						</div>
+				  	</div>
+			  		<div class="mc-form-icon mc-form-icon-a">
+			    		<img id="mc-form-icon-gr" alt="rp" src="/mc/0.1/images/gr60.png" />
+			  		</div>
+			  	</div>
+			  	<div style="float: left;width: auto;">
+			  		<img src="/mc/0.1/images/step4.png" alt="step4" class="mc-steps-number-v2" />
+			  		<div id="mc-form-optional-grassroots" style="width: 500px;">
+			  			<!--<img src="/mc/0.1/images/button_cancel.png" alt="selected" id="button-close-d" style="display: inline;position: relative;top: -23px;z-index: 1000;left: 476px;"/>-->
+			  			<div class="blockMe4" style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 45px;border: 1px solid #B7C4C8;">
+					  		<label id="mc-optional-grassroots" style="color: #444;background-color: #F9F9F9;"><?php _e("Optional", "mc"); ?></label>					  
+					    	<label class="optional-labels-fields">					     
+						    	<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">					     
+						    	<input type="checkbox" name="decisions-voting" value="S" id="decisions-voting" tabindex="23" disabled="disabled"/>
+						    	<?php _e("We take decisions through 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"); ?>
+					    	</label>
+					    	<label class="optional-labels-fields">					     
+						    	<input type="checkbox" name="representatives-democratically" value="S" id="representatives-democratically" tabindex="25" disabled="disabled"/>
+						    	<?php _e("We have representatives chosen democratically", "mc"); ?>
+					    	</label>
+					    	<label class="optional-labels-fields">					     
+						    	<input type="checkbox" name="meetings-transparent" value="S" id="meetings-transparent" tabindex="26" onblur="$j('#decisions-general-assemblies').focus();" disabled="disabled"/>
+						    	<?php _e("We have a board whose meetings are transparent", "mc"); ?>
+					    	</label>  
+					  	</div>					  					  					  
+				  	</div>
+			  	</div>		  		  
+			  </div>	
+	  </div>
+	  <div class="mc-clean"></div>		
+	</div><!-- End Fifth slide -->	
+	
+	
+	
+	
+	
 </form>	 		
 </div> <!-- End Slider -->
 




More information about the Movecommons-commits mailing list