Author: mgallegos Date: 2012-11-13 17:50:05 +0100 (Tue, 13 Nov 2012) New Revision: 587 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-11-07 21:36:24 UTC (rev 586) +++ trunk/src/mc-dia-form2.js 2012-11-13 16:50:05 UTC (rev 587) @@ -84,10 +84,6 @@ $j('#infield-other-license-website').hide(); $j('#submit_third').click(); } - if(id=='rc'){ - reset_areas(); - $j('#submit_fourth').click(); - } if(id=='gr'){ $("#decisions-general-assemblies").attr("disabled", "disabled"); $('#decisions-general-assemblies').attr('checked', false); @@ -97,8 +93,13 @@ $('#representatives-democratically').attr('checked', false); $("#decisions-voting").attr("disabled", "disabled"); $('#decisions-voting').attr('checked', false); - $j('#submit_fifth').click(); + $j('#submit_fourth').click(); } + if(id=='rc'){ + reset_areas(); + $j('#submit_fifth').click(); + } + } } @@ -233,11 +234,22 @@ } function validations_step4(){ - if($j('#rc-checkbox').val()=='A'){ + + if($j('#gr-checkbox').val()=='A'){ $j('#step4question').effect("shake", { times:3 }, 50); return true; } + return false; + } + + //original 4 + function validations_step5(){ + if($j('#rc-checkbox').val()=='A'){ + $j('#step5question').effect("shake", { times:3 }, 50); + return true; + } + if($j('#mc-form-icon-rc').attr('src')=='/mc/0.1/images/rc60.png' && $j('#rc-checkbox').val()=='S'){ $j('#mc-form-optional-reinforcing').effect("shake", { times:3 }, 50); return true; @@ -245,16 +257,7 @@ return false; } - - function validations_step5(){ - if($j('#gr-checkbox').val()=='A'){ - $j('#step5question').effect("shake", { times:3 }, 50); - return true; - } - - return false; - } function onClickImageMap(e){ switch (current_step) { @@ -304,23 +307,23 @@ $j('label[for*="step3-yes"]').addClass('ui-state-active'); else if ($j('#rp-checkbox').val()=='N') $j('label[for*="step3-no"]').addClass('ui-state-active'); - break; - case '#fourth_step': - $j('#progress_text').html('60% Complete'); - $j('#progress').css('width','204px'); - if($j('#rc-checkbox').val()=='S') - $j('label[for*="step4-yes"]').addClass('ui-state-active'); - else if ($j('#rc-checkbox').val()=='N') - $j('label[for*="step4-no"]').addClass('ui-state-active'); break; - case '#fifth_step': + case '#fourth_step': $j('#progress_text').html('60% Complete'); $j('#progress').css('width','204px'); if($j('#gr-checkbox').val()=='S') + $j('label[for*="step4-yes"]').addClass('ui-state-active'); + else if ($j('#gr-checkbox').val()=='N') + $j('label[for*="step4-no"]').addClass('ui-state-active'); + break; + case '#fifth_step': //4 original + $j('#progress_text').html('80% Complete');//Pasar a 80 + $j('#progress').css('width','272px');// Pasar a 272 + if($j('#rc-checkbox').val()=='S') $j('label[for*="step5-yes"]').addClass('ui-state-active'); - else if ($j('#gr-checkbox').val()=='N') + else if ($j('#rc-checkbox').val()=='N') $j('label[for*="step5-no"]').addClass('ui-state-active'); - break; + break; case '#sixth_step': $j('#progress_text').html('100% Complete'); $j('#progress').css('width','339px'); @@ -711,39 +714,40 @@ $j('#progress_text').html('60% Complete'); $j('#progress').css('width','204px'); - if($j('#rc-checkbox').val()=='S') - $j('label[for*="step4-yes"]').addClass('ui-state-active'); - else if ($j('#rc-checkbox').val()=='N') - $j('label[for*="step4-no"]').addClass('ui-state-active'); - + if($j('#gr-checkbox').val()=='S') + $j('label[for*="step5-yes"]').addClass('ui-state-active'); + else if ($j('#gr-checkbox').val()=='N') + $j('label[for*="step5-no"]').addClass('ui-state-active'); + //slide steps $j('#third_step').slideUp(); $j('#fourth_step').slideDown(); }); - $j('#p_submit_fourth').click(function(){ + $j('#p_submit_fourth').click(function(){ if(validations_step4()) return; - current_step='#third_step'; + current_step='#third_step'; - //update progress bar + //update progress bar $j('#progress_text').html('40% Complete'); $j('#progress').css('width','136px'); - + if($j('#rp-checkbox').val()=='S') $j('label[for*="step3-yes"]').addClass('ui-state-active'); else if ($j('#rp-checkbox').val()=='N') $j('label[for*="step3-no"]').addClass('ui-state-active'); - + //slide steps $j('#fourth_step').slideUp(); $j('#third_step').slideDown(); + }); $j('#submit_fourth').click(function(){ - + if(validations_step4()) return; @@ -761,33 +765,33 @@ //update progress bar $j('#progress_text').html('80% Complete'); - $j('#progress').css('width','272px'); + $j('#progress').css('width','272px'); - if($j('#gr-checkbox').val()=='S') - $j('label[for*="step5-yes"]').addClass('ui-state-active'); - else if ($j('#gr-checkbox').val()=='N') - $j('label[for*="step5-no"]').addClass('ui-state-active'); + if($j('#rc-checkbox').val()=='S') + $j('label[for*="step4-yes"]').addClass('ui-state-active'); + else if ($j('#rc-checkbox').val()=='N') + $j('label[for*="step4-no"]').addClass('ui-state-active'); //slide steps $j('#fourth_step').slideUp(); $j('#fifth_step').slideDown(); - + }); - $j('#p_submit_fifth').click(function(){ + $j('#p_submit_fifth').click(function(){ //original 4 if(validations_step5()) return; current_step='#fourth_step'; - - //update progress bar + + //update progress bar $j('#progress_text').html('60% Complete'); $j('#progress').css('width','204px'); - if($j('#rc-checkbox').val()=='S') + if($j('#gr-checkbox').val()=='S') $j('label[for*="step4-yes"]').addClass('ui-state-active'); - else if ($j('#rc-checkbox').val()=='N') + else if ($j('#gr-checkbox').val()=='N') $j('label[for*="step4-no"]').addClass('ui-state-active'); //slide steps @@ -795,7 +799,7 @@ $j('#fourth_step').slideDown(); }); - $j('#submit_fifth').click(function(){ + $j('#submit_fifth').click(function(){//original 4 if(validations_step5()) return; @@ -817,9 +821,10 @@ $j('#progress').css('width','339px'); $j('#fifth_step').slideUp(); - $j('#sixth_step').slideDown(); - + $j('#sixth_step').slideDown(); + }); + $j('#p_submit_sixth').click(function(){ @@ -829,9 +834,9 @@ $j('#progress_text').html('80% Complete'); $j('#progress').css('width','272px'); - if($j('#gr-checkbox').val()=='S') + if($j('#rc-checkbox').val()=='S') $j('label[for*="step5-yes"]').addClass('ui-state-active'); - else if ($j('#gr-checkbox').val()=='N') + else if ($j('#rc-checkbox').val()=='N') $j('label[for*="step5-no"]').addClass('ui-state-active'); //slide steps @@ -965,12 +970,12 @@ $j("#step3-yes").click(function(){clickCheckBox('rp','yes');}); $j("#step3-no").click(function(){clickCheckBox('rp','no');}); + + $j("#step4-yes").click(function(){clickCheckBox('gr','yes');}); + $j("#step4-no").click(function(){clickCheckBox('gr','no');}); - $j("#step4-yes").click(function(){clickCheckBox('rc','yes');}); - $j("#step4-no").click(function(){clickCheckBox('rc','no');}); - - $j("#step5-yes").click(function(){clickCheckBox('gr','yes');}); - $j("#step5-no").click(function(){clickCheckBox('gr','no');}); + $j("#step5-yes").click(function(){clickCheckBox('rc','yes');}); + $j("#step5-no").click(function(){clickCheckBox('rc','no');}); select_area("ec"); select_area("bo"); Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-11-07 21:36:24 UTC (rev 586) +++ trunk/wp-theme/mc2-form.php 2012-11-13 16:50:05 UTC (rev 587) @@ -230,88 +230,22 @@ </div><!-- End third slide --> <div class="clear"></div> - - <div id="fourth_step"><!-- Fourth slide --> - <div class="mc-cat-group-v2" id="mc-cat-group-c"> + + <div id="fourth_step"><!-- Fourth slide 5 original--> + <div class="mc-cat-group-v2" id="mc-cat-group-d"> <div style="float: left;" class="mc-form-category-group-a-v2"> <div id="fourthStepProgressLine" class="progressLine"> <img src="/mc/0.1/images/progressTransparentLine.png" usemap="#step4_image_map" class="map" style="border: 0px;float: left;"> <div class="complete" style="width: 295px;"> <div class="marker" style="background-position: -78px 0;"></div> </div> - </div> - <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> + <div style="width: 100%;float: left;margin-bottom: 20px;"> + <div id="step4question" class="label2" style="margin-left: 125px;float: left;"><?php _e("4. Is your initiative driven by horizontal collective decisions?", "mc"); ?></div> <div id="step4-radio" style="float: left;margin-left: 10px;margin-top: 10px;"> <input type="radio" id="step4-yes" name="radio"/><label for="step4-yes" style="font-size: 14px;color: #FFFFFF;">Yes</label> <input type="radio" id="step4-no" name="radio"/><label for="step4-no" style="font-size: 14px;color: #FFFFFF;">No</label> </div> - </div> - <div class="mc-form-rounded mc-form-category-group-v2 float-left" style="padding-top: 35px;" id="mc-form-category-group-c"> - <img src="/mc/0.1/images/cat-selected.png" alt="selected" class="mc-cat-selected mc-cat-selected-a" id="mc-cat-selected-rc" /> - <div id="mc-form-rc" class="mc-form-rounded mc-form-descbox mc-form-descbox-a"> - <!-- - <div id="mc-form-more-link-rc" class="mc-form-link"><?php _e("What is this?", "mc"); ?></div> - <div id="mc-form-less-link-rc" class="mc-form-link"><?php _e("less info", "mc"); ?></div> - --> - <div class="mc-form-descbox-header"><?php _e("Reinforcing the Commons", "mc"); ?><input id="rc-checkbox" name="rc-checkbox" type="hidden" value="A"></div> - <div class="mc-form-descbox-intro"><?php _e("Your initiative protectes/expands The Commons, resources that are collectively owned", "mc"); ?></div> - <div id="mc-form-more-text-rc" class="mc-form-more-text-v2"> - <?php _e("The Commons are those resources that are collectively owned or shared among populations. Thus, your initiative is promoting The Commons by focusing its work in protecting/expanding any of them in any particular area of action", "mc"); ?> - </div> - </div> - <div class="mc-form-icon mc-form-icon-a"> - <img id="mc-form-icon-rc" alt="rc" src="/mc/0.1/images/rc60.png" /> - </div> - </div> - <div style="float: left;width: auto;"> - <!--<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;"> - <label id="mc-optional-reinforcing" style="color: #444;background-color: #FEFBFD;"><?php _e("Which area is the main focus of your initiative?", "mc"); ?></label> - <div class="mc-cat-rc-options" id="mc-cat-rc-options"> - <!-- - <div class="mc-cat-rc-options-intro" id="mc-cat-rc-options-intro"><?php _e("Which area is the main focus of your initiative?", "mc"); ?></div> - --> - <div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-ec" style="margin-top: 15px;"> <div class="mc-cat-rc-option-text"><?php _e("Nature Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> - <?php _e("the natural environment: forests, seeds, the Moon", "mc"); ?></div></div><div class="mc-cat-rc-option-icon-v2" id="mc-cat-rc-option-icon-ec"><img src="/mc/0.1/images/rcec25.png" alt="ec" /></div><div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-bo"> <div class="mc-cat-rc-option-text"> - <?php _e("Body/Health Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> - <?php _e("the human bodies: blood donation, smiles, non-alienation", "mc"); ?></div></div><div class="mc-cat-rc-option-icon-v2" id="mc-cat-rc-option-icon-bo"><img src="/mc/0.1/images/rcbo25.png" alt="bo" /></div><div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-to"> <div class="mc-cat-rc-option-text"> - <?php _e("Town/Community/Society Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> - <?php _e("the socio-cultural spaces: language, music, streets, science", "mc"); ?></div></div><div class="mc-cat-rc-option-icon-v2" id="mc-cat-rc-option-icon-to"><img src="/mc/0.1/images/rcto25.png" alt="to" /></div><div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-di"> <div class="mc-cat-rc-option-text"> - <?php _e("Digital Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> - <?php _e("the cyberspace: internet, cyber-rights, Wikipedia", "mc"); ?></div></div><div class="mc-cat-rc-option-icon-v2" id="mc-cat-rc-option-icon-di"><img src="/mc/0.1/images/rcdi25.png" alt="di" /></div></div> - - </div> - </div> - </div> - <div class="clear"></div> - <div> - <button class="submit buttonp" type="submit" name="p_submit_fourth" id="p_submit_fourth" ><?php _e("Previous", "mc"); ?></button> - <button class="submit buttonn" type="submit" name="submit_fourth" id="submit_fourth" value="" ><?php _e("Next", "mc"); ?></button> - </div> - <div class="clear"></div> - </div> - </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 id="fifthStepProgressLine" class="progressLine"> - <img src="/mc/0.1/images/progressTransparentLine.png" usemap="#step5_image_map" class="map" style="border: 0px;float: left;"> - <div class="complete" style="width: 386px;"> - <div class="marker" style="background-position: -104px 0;"></div> - </div> - </div> - <div style="width: 100%;float: left;margin-bottom: 20px;"> - <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"/><label for="step5-yes" style="font-size: 14px;color: #FFFFFF;">Yes</label> - <input type="radio" id="step5-no" name="radio"/><label for="step5-no" style="font-size: 14px;color: #FFFFFF;">No</label> - </div> </div> <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" /> @@ -357,14 +291,82 @@ </div> <div class="clear"></div> <div> - <button class="submit buttonp" type="submit" name="p_submit_fifth" id="p_submit_fifth"><?php _e("Previous", "mc"); ?></button> - <button class="submit buttonn" type="submit" name="submit_fifth" id="submit_fifth" onblur="$j('#decisions-general-assemblies').focus();" ><?php _e("Next", "mc"); ?></button> + <button class="submit buttonp" type="submit" name="p_submit_fourth" id="p_submit_fourth"><?php _e("Previous", "mc"); ?></button> + <button class="submit buttonn" type="submit" name="submit_fourth" id="submit_fourth" onblur="$j('#decisions-general-assemblies').focus();" ><?php _e("Next", "mc"); ?></button> </div> <div class="clear"></div> </div> </div> <div class="mc-clean"></div> - </div><!-- End Fifth slide --> + </div><!-- End Fourth slide --> + + <div id="fifth_step"><!-- Fifth slide 4 original --> + <div class="mc-cat-group-v2" id="mc-cat-group-c"> + <div style="float: left;" class="mc-form-category-group-a-v2"> + <div id="fifthStepProgressLine" class="progressLine"> + <img src="/mc/0.1/images/progressTransparentLine.png" usemap="#step5_image_map" class="map" style="border: 0px;float: left;"> + <div class="complete" style="width: 386px;"> + <div class="marker" style="background-position: -104px 0;"></div> + </div> + </div> + <div id="step5question" style="width: 100%;float: left;margin-bottom: 20px;"> + <div class="label2" style="margin-left: 170px;float: left;"><?php _e("5. Does your initiative Reinforce the Commons?", "mc"); ?></div> + <div id="step5-radio" style="float: left;margin-left: 10px;margin-top: 10px;"> + <input type="radio" id="step5-yes" name="radio"/><label for="step5-yes" style="font-size: 14px;color: #FFFFFF;">Yes</label> + <input type="radio" id="step5-no" name="radio"/><label for="step5-no" style="font-size: 14px;color: #FFFFFF;">No</label> + </div> + </div> + <div class="mc-form-rounded mc-form-category-group-v2 float-left" style="padding-top: 35px;" id="mc-form-category-group-c"> + <img src="/mc/0.1/images/cat-selected.png" alt="selected" class="mc-cat-selected mc-cat-selected-a" id="mc-cat-selected-rc" /> + <div id="mc-form-rc" class="mc-form-rounded mc-form-descbox mc-form-descbox-a"> + <!-- + <div id="mc-form-more-link-rc" class="mc-form-link"><?php _e("What is this?", "mc"); ?></div> + <div id="mc-form-less-link-rc" class="mc-form-link"><?php _e("less info", "mc"); ?></div> + --> + <div class="mc-form-descbox-header"><?php _e("Reinforcing the Commons", "mc"); ?><input id="rc-checkbox" name="rc-checkbox" type="hidden" value="A"></div> + <div class="mc-form-descbox-intro"><?php _e("Your initiative protectes/expands The Commons, resources that are collectively owned", "mc"); ?></div> + <div id="mc-form-more-text-rc" class="mc-form-more-text-v2"> + <?php _e("The Commons are those resources that are collectively owned or shared among populations. Thus, your initiative is promoting The Commons by focusing its work in protecting/expanding any of them in any particular area of action", "mc"); ?> + </div> + </div> + <div class="mc-form-icon mc-form-icon-a"> + <img id="mc-form-icon-rc" alt="rc" src="/mc/0.1/images/rc60.png" /> + </div> + </div> + <div style="float: left;width: auto;"> + <!--<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;"> + <label id="mc-optional-reinforcing" style="color: #444;background-color: #FEFBFD;"><?php _e("Which area is the main focus of your initiative?", "mc"); ?></label> + <div class="mc-cat-rc-options" id="mc-cat-rc-options"> + <!-- + <div class="mc-cat-rc-options-intro" id="mc-cat-rc-options-intro"><?php _e("Which area is the main focus of your initiative?", "mc"); ?></div> + --> + <div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-ec" style="margin-top: 15px;"> <div class="mc-cat-rc-option-text"><?php _e("Nature Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> + <?php _e("the natural environment: forests, seeds, the Moon", "mc"); ?></div></div><div class="mc-cat-rc-option-icon-v2" id="mc-cat-rc-option-icon-ec"><img src="/mc/0.1/images/rcec25.png" alt="ec" /></div><div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-bo"> <div class="mc-cat-rc-option-text"> + <?php _e("Body/Health Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> + <?php _e("the human bodies: blood donation, smiles, non-alienation", "mc"); ?></div></div><div class="mc-cat-rc-option-icon-v2" id="mc-cat-rc-option-icon-bo"><img src="/mc/0.1/images/rcbo25.png" alt="bo" /></div><div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-to"> <div class="mc-cat-rc-option-text"> + <?php _e("Town/Community/Society Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> + <?php _e("the socio-cultural spaces: language, music, streets, science", "mc"); ?></div></div><div class="mc-cat-rc-option-icon-v2" id="mc-cat-rc-option-icon-to"><img src="/mc/0.1/images/rcto25.png" alt="to" /></div><div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-di"> <div class="mc-cat-rc-option-text"> + <?php _e("Digital Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> + <?php _e("the cyberspace: internet, cyber-rights, Wikipedia", "mc"); ?></div></div><div class="mc-cat-rc-option-icon-v2" id="mc-cat-rc-option-icon-di"><img src="/mc/0.1/images/rcdi25.png" alt="di" /></div></div> + + </div> + </div> + </div> + <div class="clear"></div> + <div> + <button class="submit buttonp" type="submit" name="p_submit_fifth" id="p_submit_fifth" ><?php _e("Previous", "mc"); ?></button> + <button class="submit buttonn" type="submit" name="submit_fifth" id="submit_fifth" value="" ><?php _e("Next", "mc"); ?></button> + </div> + <div class="clear"></div> + </div> + </div> + <div class="mc-clean"></div> + </div><!-- End fifth slide --> + <div class="clear"></div> + <div id="sixth_step"><!--Sixth slide --> <div style="float: left;" class="mc-form-category-group-a-v2"> <div id="sixthStepProgressLine" class="progressLine">