- Movecommons-commits - lists.ourproject.org

r481 - trunk/wp-theme
by Mario Gallegos 05 Jun '12

05 Jun '12

Author: mgallegos Date: 2012-06-05 21:13:39 +0200 (Tue, 05 Jun 2012) New Revision: 481 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-06-05 19:09:48 UTC (rev 480) +++ trunk/wp-theme/mc2-form.php 2012-06-05 19:13:39 UTC (rev 481) @@ -117,13 +117,13 @@ <?php _e("We accept donations", "mc"); ?> </label> <label id="infield-donation-website" for="donation-website" style="position: absolute;display: none;margin: 8px 5px 5px 50px;padding: 0;font-size: 14px;"><?php _e("Check this website: http://example.com", "mc"); ?></label> - <input type="text" name="donation-website" value="" id="donation-website" style="width: 330px;margin-left: 42px;margin-top: 5px;display: none;" onblur="$j('#registered-non-profit').focus();"> + <input type="text" name="donation-website" value="" id="donation-website" style="width: 330px;margin-left: 42px;margin-top: 5px;display: none;"> <div style="clear: both;"></div> </div> </div> </div> <div class="clear"></div> - <button class="submit" type="submit" name="submit_second" id="submit_second" style="left: 750px;" onblur="if($j('#infield-donation-website').css('display')=='none') $j('#registered-non-profit').focus();"><?php _e("Next", "mc"); ?></button> + <button class="submit" type="submit" name="submit_second" id="submit_second" style="left: 750px;" onblur="$j('#registered-non-profit').focus();"><?php _e("Next", "mc"); ?></button> <div class="clear"></div> </div> </div> @@ -206,14 +206,14 @@ <?php _e("Methods / Procedures", "mc"); ?> </label> <label class="optional-labels-fields" style="margin-left: 30px;"> - <input type="checkbox" name="documentation" value="S" id="documentation" onblur="$j('#terms-of-use').focus();" disabled="disabled"/> + <input type="checkbox" name="documentation" value="S" id="documentation" disabled="disabled"/> <?php _e("Documentation", "mc"); ?> </label> </div> </div> </div> <div class="clear"></div> - <button class="submit" type="submit" name="submit_third" id="submit_third" style="left: 750px;"><?php _e("Next", "mc"); ?></button> + <button class="submit" type="submit" name="submit_third" id="submit_third" onblur="$j('#terms-of-use').focus();" style="left: 750px;"><?php _e("Next", "mc"); ?></button> <div class="clear"></div> </div> </div> @@ -339,14 +339,14 @@ <?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"/> + <input type="checkbox" name="meetings-transparent" value="S" id="meetings-transparent" tabindex="26" disabled="disabled"/> <?php _e("We have a board whose meetings are transparent", "mc"); ?> </label> </div> </div> </div> <div class="clear"></div> - <button class="submit" type="submit" name="submit_fifth" id="submit_fifth" value="" style="left: 750px;"><?php _e("Next", "mc"); ?></button> + <button class="submit" type="submit" name="submit_fifth" id="submit_fifth" onblur="$j('#decisions-general-assemblies').focus();" style="left: 750px;"><?php _e("Next", "mc"); ?></button> <div class="clear"></div> </div> </div>

1 0

r480 - trunk/wp-theme
by Mario Gallegos 05 Jun '12

05 Jun '12

Author: mgallegos Date: 2012-06-05 21:09:48 +0200 (Tue, 05 Jun 2012) New Revision: 480 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-06-05 19:08:51 UTC (rev 479) +++ trunk/wp-theme/mc2-form.php 2012-06-05 19:09:48 UTC (rev 480) @@ -51,11 +51,11 @@ <label for="languages"><?php _e("Language(s) (press enter or comma to separate)", "mc"); ?></label> <input type="hidden" name="keywords" id="keywords"/> <label for="keywords"><?php _e("Keywords (press enter or comma to separate)", "mc"); ?></label> - <input type="text" name="location" value="Location" id="location" onblur="$j('#ininame').focus();" class="firstStepInput"/> + <input type="text" name="location" value="Location" id="location" class="firstStepInput"/> <label for="location"><?php _e("Location....", "mc"); ?></label> </div> <div class="clear"></div> - <button class="submit" type="submit" name="submit_first" id="submit_first"><?php _e("Next", "mc"); ?></button> + <button class="submit" type="submit" name="submit_first" id="submit_first" onblur="$j('#ininame').focus();"><?php _e("Next", "mc"); ?></button> <div class="clear"></div> </div> <div class="clear"></div>

1 0

r479 - trunk/wp-theme
by Mario Gallegos 05 Jun '12

05 Jun '12

Author: mgallegos Date: 2012-06-05 21:08:51 +0200 (Tue, 05 Jun 2012) New Revision: 479 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-06-05 19:02:14 UTC (rev 478) +++ trunk/wp-theme/mc2-form.php 2012-06-05 19:08:51 UTC (rev 479) @@ -113,7 +113,7 @@ <label id="infield-open-accounting-website" for="open-accounting-website" style="position: absolute;display: none;margin: 8px 5px 5px 50px;padding: 0;font-size: 14px;"><?php _e("Check this website: http://example.com", "mc"); ?></label> <input type="text" name="open-accounting-website" value="" id="open-accounting-website" style="width: 330px;margin-left: 42px;margin-top: 5px;display: none;"> <label class="optional-labels-fields"> - <input type="checkbox" name="accept-donations" value="S" id="accept-donations" onblur="if($j('#infield-donation-website').css('display')=='none') $j('#registered-non-profit').focus();" disabled="disabled"/> + <input type="checkbox" name="accept-donations" value="S" id="accept-donations" disabled="disabled"/> <?php _e("We accept donations", "mc"); ?> </label> <label id="infield-donation-website" for="donation-website" style="position: absolute;display: none;margin: 8px 5px 5px 50px;padding: 0;font-size: 14px;"><?php _e("Check this website: http://example.com", "mc"); ?></label> @@ -123,7 +123,7 @@ </div> </div> <div class="clear"></div> - <button class="submit" type="submit" name="submit_second" id="submit_second" style="left: 750px;"><?php _e("Next", "mc"); ?></button> + <button class="submit" type="submit" name="submit_second" id="submit_second" style="left: 750px;" onblur="if($j('#infield-donation-website').css('display')=='none') $j('#registered-non-profit').focus();"><?php _e("Next", "mc"); ?></button> <div class="clear"></div> </div> </div>

1 0

r478 - trunk/src
by Mario Gallegos 05 Jun '12

05 Jun '12

Author: mgallegos Date: 2012-06-05 21:02:14 +0200 (Tue, 05 Jun 2012) New Revision: 478 Modified: trunk/src/mc-dia-form2.js Log: Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2012-06-05 18:46:21 UTC (rev 477) +++ trunk/src/mc-dia-form2.js 2012-06-05 19:02:14 UTC (rev 478) @@ -12,7 +12,7 @@ $("#registered-non-profit").removeAttr("disabled"); $("#open-accounting").removeAttr("disabled"); $("#accept-donations").removeAttr("disabled"); - $j("#mc-form-optional-non-profit").effect("shake", { times:3 }, 100); + $j("#mc-form-optional-non-profit").effect("shake", { times:2 }, 300); } if(id=='rp'){ $("#terms-of-use").removeAttr("disabled"); @@ -22,14 +22,18 @@ $("#projects-and-results").removeAttr("disabled"); $("#methods-procedures").removeAttr("disabled"); $("#documentation").removeAttr("disabled"); + $j("#mc-form-optional-reproducible").effect("shake", { times:2 }, 300); } if(id=='gr'){ $("#decisions-general-assemblies").removeAttr("disabled"); $("#decisions-consensus").removeAttr("disabled"); $("#representatives-democratically").removeAttr("disabled"); $("#meetings-transparent").removeAttr("disabled"); - $("#decisions-voting").removeAttr("disabled"); + $("#decisions-voting").removeAttr("disabled"); + $j("#mc-form-optional-grassroots").effect("shake", { times:2 }, 300); } + if(id=='rc') + $j("#mc-form-optional-reinforcing").effect("shake", { times:2 }, 300); } else{ $j('#'+id+'-checkbox').val('N');

1 0

r477 - trunk/src
by Mario Gallegos 05 Jun '12

05 Jun '12

Author: mgallegos Date: 2012-06-05 20:46:21 +0200 (Tue, 05 Jun 2012) New Revision: 477 Modified: trunk/src/mc-dia-form2.js Log: Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2012-06-05 18:41:32 UTC (rev 476) +++ trunk/src/mc-dia-form2.js 2012-06-05 18:46:21 UTC (rev 477) @@ -11,7 +11,8 @@ if(id=='np'){ $("#registered-non-profit").removeAttr("disabled"); $("#open-accounting").removeAttr("disabled"); - $("#accept-donations").removeAttr("disabled"); + $("#accept-donations").removeAttr("disabled"); + $j("#mc-form-optional-non-profit").effect("shake", { times:3 }, 100); } if(id=='rp'){ $("#terms-of-use").removeAttr("disabled");

1 0

r476 - trunk/src
by Mario Gallegos 05 Jun '12

05 Jun '12

Author: mgallegos Date: 2012-06-05 20:41:32 +0200 (Tue, 05 Jun 2012) New Revision: 476 Modified: trunk/src/mc-dia-form2.js Log: Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2012-06-05 18:36:55 UTC (rev 475) +++ trunk/src/mc-dia-form2.js 2012-06-05 18:41:32 UTC (rev 476) @@ -72,6 +72,10 @@ $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); @@ -83,12 +87,9 @@ $('#meetings-transparent').attr('checked', false); $("#decisions-voting").attr("disabled", "disabled"); $('#decisions-voting').attr('checked', false); - $j('#submit_fourth').click(); + $j('#submit_fifth').click(); } - if(id=='rc'){ - reset_areas(); - $j('#submit_fifth').click(); - } + } }

1 0

r475 - trunk/src
by Mario Gallegos 05 Jun '12

05 Jun '12

Author: mgallegos Date: 2012-06-05 20:36:55 +0200 (Tue, 05 Jun 2012) New Revision: 475 Modified: trunk/src/mc-dia-form2.js Log: Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2012-06-05 18:34:57 UTC (rev 474) +++ trunk/src/mc-dia-form2.js 2012-06-05 18:36:55 UTC (rev 475) @@ -85,9 +85,10 @@ $('#decisions-voting').attr('checked', false); $j('#submit_fourth').click(); } - if(id=='rc') + if(id=='rc'){ reset_areas(); $j('#submit_fifth').click(); + } } }

1 0

r474 - trunk/src
by Mario Gallegos 05 Jun '12

05 Jun '12

Author: mgallegos Date: 2012-06-05 20:34:57 +0200 (Tue, 05 Jun 2012) New Revision: 474 Modified: trunk/src/mc-dia-form2.js Log: Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2012-06-05 18:30:21 UTC (rev 473) +++ trunk/src/mc-dia-form2.js 2012-06-05 18:34:57 UTC (rev 474) @@ -30,8 +30,7 @@ $("#decisions-voting").removeAttr("disabled"); } } - else{ - if (!$j("#mc-form-" + id).is('.mc-form-descbox-selected')) return; + else{ $j('#'+id+'-checkbox').val('N'); $j("#mc-form-" + id).removeClass("mc-form-descbox-selected"); $j("#mc-cat-selected-"+ id).slideUp(); @@ -84,7 +83,7 @@ $('#meetings-transparent').attr('checked', false); $("#decisions-voting").attr("disabled", "disabled"); $('#decisions-voting').attr('checked', false); - $j('#submit_fourth').click(); + $j('#submit_fourth').click(); } if(id=='rc') reset_areas();

1 0

r473 - trunk/src
by Mario Gallegos 05 Jun '12

05 Jun '12

Author: mgallegos Date: 2012-06-05 20:30:21 +0200 (Tue, 05 Jun 2012) New Revision: 473 Modified: trunk/src/mc-dia-form2.js Log: Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2012-06-05 18:25:57 UTC (rev 472) +++ trunk/src/mc-dia-form2.js 2012-06-05 18:30:21 UTC (rev 473) @@ -48,6 +48,7 @@ $j('#infield-open-accounting-website').hide(); $j('#donation-website').hide(); $j('#infield-donation-website').hide(); + $j('#submit_second').click(); } if(id=='rp'){ $("#terms-of-use").attr("disabled", "disabled"); @@ -70,6 +71,7 @@ $j('#infield-creative-commons-website').hide(); $j('#other-license-website').hide(); $j('#infield-other-license-website').hide(); + $j('#submit_third').click(); } if(id=='gr'){ $("#decisions-general-assemblies").attr("disabled", "disabled"); @@ -82,9 +84,11 @@ $('#meetings-transparent').attr('checked', false); $("#decisions-voting").attr("disabled", "disabled"); $('#decisions-voting').attr('checked', false); + $j('#submit_fourth').click(); } if(id=='rc') reset_areas(); + $j('#submit_fifth').click(); } }

1 0

r472 - in trunk: src wp-theme
by Mario Gallegos 05 Jun '12

05 Jun '12

Author: mgallegos Date: 2012-06-05 20:25:57 +0200 (Tue, 05 Jun 2012) New Revision: 472 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 18:18:52 UTC (rev 471) +++ trunk/src/mc-dia-form2.js 2012-06-05 18:25:57 UTC (rev 472) @@ -3,7 +3,7 @@ // categories selection function clickCheckBox(id,answer){ - if($j('#'+id+'-checkbox').val()=='N'){ + if(answer=='yes'){ if ($j("#mc-form-" + id).is('.mc-form-descbox-selected')) return; $j('#'+id+'-checkbox').val('S'); $j("#mc-form-" + id).addClass("mc-form-descbox-selected"); Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-06-05 18:18:52 UTC (rev 471) +++ trunk/wp-theme/mc2-form.php 2012-06-05 18:25:57 UTC (rev 472) @@ -72,8 +72,8 @@ <div 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');"/><label for="step2-yes" style="font-size: 14px;">Yes</label> - <input type="radio" id="step2-no" name="radio" onclick="clickCheckBox('np');"/><label for="step2-no" style="font-size: 14px;">No</label> + <input type="radio" id="step2-yes" name="radio" onclick="clickCheckBox('np','yes');"/><label for="step2-yes" style="font-size: 14px;">Yes</label> + <input type="radio" id="step2-no" name="radio" onclick="clickCheckBox('np','no');"/><label for="step2-no" style="font-size: 14px;">No</label> </div> </div> <div class="mc-form-rounded mc-form-category-group-v2 float-left" id="mc-form-category-group-a"> @@ -142,8 +142,8 @@ <div 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');"/><label for="step3-yes" style="font-size: 14px;">Yes</label> - <input type="radio" id="step3-no" name="radio" onclick="clickCheckBox('rp');"/><label for="step3-no" style="font-size: 14px;">No</label> + <input type="radio" id="step3-yes" name="radio" onclick="clickCheckBox('rp','yes');"/><label for="step3-yes" style="font-size: 14px;">Yes</label> + <input type="radio" id="step3-no" name="radio" onclick="clickCheckBox('rp','no');"/><label for="step3-no" style="font-size: 14px;">No</label> </div> </div> <div class="mc-form-rounded mc-form-category-group-v2 float-left" id="mc-form-category-group-b"> @@ -233,8 +233,8 @@ <div 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');"/><label for="step4-yes" style="font-size: 14px;">Yes</label> - <input type="radio" id="step4-no" name="radio" onclick="clickCheckBox('rc');"/><label for="step4-no" style="font-size: 14px;">No</label> + <input type="radio" id="step4-yes" name="radio" onclick="clickCheckBox('rc','yes');"/><label for="step4-yes" style="font-size: 14px;">Yes</label> + <input type="radio" id="step4-no" name="radio" onclick="clickCheckBox('rc','no');"/><label for="step4-no" style="font-size: 14px;">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"> @@ -295,8 +295,8 @@ <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="step5-radio" style="float: left;margin-left: 10px;margin-top: 10px;"> - <input type="radio" id="step5-yes" name="radio" onclick="clickCheckBox('gr');"/><label for="step5-yes" style="font-size: 14px;">Yes</label> - <input type="radio" id="step5-no" name="radio" onclick="clickCheckBox('gr');"/><label for="step5-no" style="font-size: 14px;">No</label> + <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> </div> </div> <div class="mc-form-rounded mc-form-category-group-v2 float-left" id="mc-form-category-group-d">

1 0