June 2012 - Movecommons-commits - lists.ourproject.org

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

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

05 Jun '12

Author: mgallegos Date: 2012-06-05 20:18:52 +0200 (Tue, 05 Jun 2012) New Revision: 471 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:04:40 UTC (rev 470) +++ trunk/src/mc-dia-form2.js 2012-06-05 18:18:52 UTC (rev 471) @@ -2,9 +2,10 @@ // categories selection -function clickCheckBox(id){ +function clickCheckBox(id,answer){ if($j('#'+id+'-checkbox').val()=='N'){ - $('#'+id+'-checkbox').val('S'); + 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"); $j("#mc-cat-selected-"+ id).slideDown(); if(id=='np'){ @@ -30,7 +31,8 @@ } } else{ - $('#'+id+'-checkbox').val('N'); + if (!$j("#mc-form-" + id).is('.mc-form-descbox-selected')) return; + $j('#'+id+'-checkbox').val('N'); $j("#mc-form-" + id).removeClass("mc-form-descbox-selected"); $j("#mc-cat-selected-"+ id).slideUp(); if(id=='np'){

1 0

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

05 Jun '12

Author: mgallegos Date: 2012-06-05 20:04:40 +0200 (Tue, 05 Jun 2012) New Revision: 470 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-06-05 18:00:12 UTC (rev 469) +++ trunk/wp-theme/mc2-form.php 2012-06-05 18:04:40 UTC (rev 470) @@ -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" /><label for="step3-yes" style="font-size: 14px;">Yes</label> - <input type="radio" id="step3-no" name="radio" /><label for="step3-no" style="font-size: 14px;">No</label> + <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> </div> </div> <div class="mc-form-rounded mc-form-category-group-v2 float-left" id="mc-form-category-group-b"> @@ -153,7 +153,7 @@ <div id="mc-form-more-link-rp" class="mc-form-link"><?php _e("What is this?", "mc"); ?></div> <div id="mc-form-less-link-rp" class="mc-form-link"><?php _e("less info", "mc"); ?></div> --> - <div class="mc-form-descbox-header"><?php _e("Reproducible", "mc"); ?><input id="rp-checkbox" name="rp-checkbox" type="checkbox" value="N" onclick="clickCheckBox('rp')"></div> + <div class="mc-form-descbox-header"><?php _e("Reproducible", "mc"); ?><input id="rp-checkbox" name="rp-checkbox" type="hidden" value="N"></div> <div class="mc-form-descbox-intro"><?php _e("Your initiative is visible, open and transparent, which allows it to be adapted by others", "mc"); ?></div> <div id="mc-form-more-text-rp" class="mc-form-more-text-v2"> <?php _e("<ul> <li>The initiative is easily visible to anyone, providing the necessary online material</li> <li>The initiative has transparent procedures and results</li> <li>The initiative allows others to copy and adapt their procedures and materials, probably using <a href=\"http://creativecommons.org/\">Creative Commons</a> licenses for them</li> </ul>", "mc"); ?> @@ -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" /><label for="step4-yes" style="font-size: 14px;">Yes</label> - <input type="radio" id="step4-no" name="radio" /><label for="step4-no" style="font-size: 14px;">No</label> + <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> </div> </div> <div class="mc-form-rounded mc-form-category-group-v2 float-left" style="padding-top: 35px;" id="mc-form-category-group-c"> @@ -244,7 +244,7 @@ <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="checkbox" value="N" onclick="clickCheckBox('rc')"></div> + <div class="mc-form-descbox-header"><?php _e("Reinforcing the Commons", "mc"); ?><input id="rc-checkbox" name="rc-checkbox" type="hidden" value="N"></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"); ?> @@ -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" /><label for="step5-yes" style="font-size: 14px;">Yes</label> - <input type="radio" id="step5-no" name="radio" /><label for="step5-no" style="font-size: 14px;">No</label> + <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> </div> </div> <div class="mc-form-rounded mc-form-category-group-v2 float-left" id="mc-form-category-group-d"> @@ -306,7 +306,7 @@ <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-header"><?php _e("Grassroots", "mc"); ?><input id="gr-checkbox" name="gr-checkbox" type="hidden" value="N"></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"); ?>

1 0

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

05 Jun '12

Author: mgallegos Date: 2012-06-05 20:00:12 +0200 (Tue, 05 Jun 2012) New Revision: 469 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-06-05 16:41:16 UTC (rev 468) +++ trunk/wp-theme/mc2-form.php 2012-06-05 18:00:12 UTC (rev 469) @@ -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" /><label for="step2-yes" style="font-size: 14px;">Yes</label> - <input type="radio" id="step2-no" name="radio" /><label for="step2-no" style="font-size: 14px;">No</label> + <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> </div> </div> <div class="mc-form-rounded mc-form-category-group-v2 float-left" id="mc-form-category-group-a"> @@ -83,7 +83,7 @@ <div id="mc-form-more-link-np" class="mc-form-link"><?php _e("What is this?", "mc"); ?></div> <div id="mc-form-less-link-np" class="mc-form-link"><?php _e("less info", "mc"); ?></div> --> - <div class="mc-form-descbox-header"><?php _e("Non-Profit", "mc"); ?><input id="np-checkbox" name="np-checkbox" type="checkbox" value="N" onclick="clickCheckBox('np')"></div> + <div class="mc-form-descbox-header"><?php _e("Non-Profit", "mc"); ?><input id="np-checkbox" name="np-checkbox" type="hidden" value="N"></div> <div class="mc-form-descbox-intro"><?php _e("Your initiative does not seek economic benefit", "mc"); ?></div> <div id="mc-form-more-text-np" class="mc-form-more-text-v2"> <?php _e("<ul> <li>The initiative does not seek economic benefit</li> <li>Any surplus funds of the initiative are used to help pursue its goals instead of distributing them to owners or shareholders.</li> </ul>", "mc"); ?> @@ -405,10 +405,10 @@ $j('#infield-other-license-website').inFieldLabels(); //$j('#infield-url').inFieldLabels(); $j('#infield-terms-of-use-website').inFieldLabels(); - $j('#np-checkbox').checkbox(); + /*$j('#np-checkbox').checkbox(); $j('#rp-checkbox').checkbox(); $j('#rc-checkbox').checkbox(); - $j('#gr-checkbox').checkbox(); + $j('#gr-checkbox').checkbox();*/ $j('button').button(); $j( "#step2-radio").buttonset(); $j( "#step3-radio").buttonset();

1 0

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

05 Jun '12

Author: mgallegos Date: 2012-06-05 18:41:16 +0200 (Tue, 05 Jun 2012) New Revision: 468 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-06-05 16:33:18 UTC (rev 467) +++ trunk/wp-theme/mc2-form.php 2012-06-05 16:41:16 UTC (rev 468) @@ -231,7 +231,7 @@ </div> </div> <div style="width: 100%;float: left;margin-bottom: 20px;"> - <div class="label2" style="margin-left: 185px;float: left;"><?php _e("4. Does your initiative Reinforce the Commons?", "mc"); ?></div> + <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" /><label for="step4-yes" style="font-size: 14px;">Yes</label> <input type="radio" id="step4-no" name="radio" /><label for="step4-no" style="font-size: 14px;">No</label> @@ -293,7 +293,7 @@ </div> </div> <div style="width: 100%;float: left;margin-bottom: 20px;"> - <div class="label2" style="margin-left: 185px;float: left;"><?php _e("5. Is your initiative driven by horizontal collective decisions?", "mc"); ?></div> + <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" /><label for="step5-yes" style="font-size: 14px;">Yes</label> <input type="radio" id="step5-no" name="radio" /><label for="step5-no" style="font-size: 14px;">No</label>

1 0