September 2012 - Movecommons-commits

r515 - trunk/src
by Mario Gallegos 21 Sep '12

21 Sep '12

Author: mgallegos Date: 2012-09-21 21:18:23 +0200 (Fri, 21 Sep 2012) New Revision: 515 Modified: trunk/src/mc-dia-form2.js Log: Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2012-09-20 20:07:27 UTC (rev 514) +++ trunk/src/mc-dia-form2.js 2012-09-21 19:18:23 UTC (rev 515) @@ -603,7 +603,7 @@ if($j("#registered-non-profit").attr("checked")) if($j.trim($j('#non-profit-website').val())==""){ $j('#non-profit-website').addClass('error'); - $j(this).effect("shake", { times:3 }, 50); + $j('#non-profit-website').effect("shake", { times:3 }, 50); error=true; } else @@ -612,16 +612,16 @@ if($j("#open-accounting").attr("checked")) if($j.trim($j('#open-accounting-website').val())==""){ $j('#open-accounting-website').addClass('error'); - $j(this).effect("shake", { times:3 }, 50); + $j('#open-accounting-website').effect("shake", { times:3 }, 50); error=true; } else $j('#open-accounting-website').addClass('valid'); if($j("#accept-donations").attr("checked")) - if($j.trim($j('#accept-donations').val())==""){ - $j('#accept-donations').addClass('error'); - $j(this).effect("shake", { times:3 }, 50); + if($j.trim($j('#donation-website').val())==""){ + $j('#donation-website').addClass('error'); + $j('#donation-website').effect("shake", { times:3 }, 50); error=true; } else @@ -642,34 +642,44 @@ $j('#submit_third').click(function(){ -/* //update progress bar - $j('#progress_text').html('100% Complete'); - $j('#progress').css('width','339px'); - - //prepare the fourth step - var fields = new Array( - $j('#username').val(), - $j('#password').val(), - $j('#email').val(), - $j('#firstname').val() + ' ' + $j('#lastname').val(), - $j('#age').val(), - $j('#gender').val(), - $j('#country').val() - ); - var tr = $j('#fourth_step tr'); - tr.each(function(){ - //alert( fields[$(this).index()] ) - $j(this).children('td:nth-child(2)').html(fields[$j(this).index()]); - }); - - //slide steps - $j('#third_step').slideUp(); - $j('#fourth_step').slideDown(); -*/ + + var error=false; + if($j('#rp-checkbox').val()=='A'){ $j('#step3question').effect("shake", { times:3 }, 50); return; } + + if($j("#terms-of-use").attr("checked")) + if($j.trim($j('#terms-of-use-website').val())==""){ + $j('#terms-of-use-website').addClass('error'); + $j('#terms-of-use-website').effect("shake", { times:3 }, 50); + error=true; + } + else + $j('#terms-of-use-website').addClass('valid'); + + if($j("#creative-commons").attr("checked")) + if($j.trim($j('#creative-commons-website').val())==""){ + $j('#creative-commons-website').addClass('error'); + $j('#creative-commons-website').effect("shake", { times:3 }, 50); + error=true; + } + else + $j('#creative-commons-website').addClass('valid'); + + if($j("#other-license").attr("checked")) + if($j.trim($j('#other-license-website').val())==""){ + $j('#other-license-website').addClass('error'); + $j('#other-license-website').effect("shake", { times:3 }, 50); + error=true; + } + else + $j('#other-license-website').addClass('valid'); + + if(error) + return; + //update progress bar $j('#progress_text').html('60% Complete'); $j('#progress').css('width','204px');

1 0

r514 - in trunk: src wp-theme
by Mario Gallegos 20 Sep '12

20 Sep '12

Author: mgallegos Date: 2012-09-20 22:07:27 +0200 (Thu, 20 Sep 2012) New Revision: 514 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-09-20 19:33:50 UTC (rev 513) +++ trunk/src/mc-dia-form2.js 2012-09-20 20:07:27 UTC (rev 514) @@ -592,39 +592,44 @@ $j('#submit_second').click(function(){ - //remove classes - /*$j('#second_step input').removeClass('error').removeClass('valid'); - - var emailPattern = /^[a-zA-Z0-9._-]+(a)[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/; - var fields = $j('#second_step input[type=text]'); - var error = 0; - fields.each(function(){ - var value = $j(this).val(); - if( value.length<1 || value==field_values[$j(this).attr('id')] || ( $j(this).attr('id')=='email' && !emailPattern.test(value) ) ) { - $j(this).addClass('error'); - $j(this).effect("shake", { times:3 }, 50); - - error++; - } else { - $j(this).addClass('valid'); - } - }); - - if(!error) { - //update progress bar - $j('#progress_text').html('66% Complete'); - $j('#progress').css('width','226px'); - - //slide steps - $j('#second_step').slideUp(); - $j('#third_step').slideDown(); - } else return false;*/ + var error=false; + if($j('#np-checkbox').val()=='A'){ $j('#step2question').effect("shake", { times:3 }, 50); return; } - + + if($j("#registered-non-profit").attr("checked")) + if($j.trim($j('#non-profit-website').val())==""){ + $j('#non-profit-website').addClass('error'); + $j(this).effect("shake", { times:3 }, 50); + error=true; + } + else + $j('#non-profit-website').addClass('valid'); + + if($j("#open-accounting").attr("checked")) + if($j.trim($j('#open-accounting-website').val())==""){ + $j('#open-accounting-website').addClass('error'); + $j(this).effect("shake", { times:3 }, 50); + error=true; + } + else + $j('#open-accounting-website').addClass('valid'); + + if($j("#accept-donations").attr("checked")) + if($j.trim($j('#accept-donations').val())==""){ + $j('#accept-donations').addClass('error'); + $j(this).effect("shake", { times:3 }, 50); + error=true; + } + else + $j('#accept-donations').addClass('valid'); + + if(error) + return; + //update progress bar $j('#progress_text').html('40% Complete'); $j('#progress').css('width','136px'); Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-09-20 19:33:50 UTC (rev 513) +++ trunk/wp-theme/mc2-form.php 2012-09-20 20:07:27 UTC (rev 514) @@ -398,14 +398,14 @@  <script type='text/javascript' src='/mc/0.1/jquery.infieldlabel.min.js'></script> -<script type='text/javascript' src='/mc/0.1/jquery.blockUI.js'></script> -<script type='text/javascript' src='/mc/0.1/jquery.checkbox.min.js'></script> <script type="text/javascript" src="/mc/0.1/jquery.inputfocus-0.9.min.js"></script> <script type="text/javascript" src="/mc/0.1/mc-dia-form2.js"></script> <link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/ui-darkness/jqu…"/> -<link rel="stylesheet" type="text/css" href="/mc/0.1/jquery.checkbox.css"/> <link rel="stylesheet" type="text/css" href="/mc/0.1/mc-dia-form2.css"/>

1 0

r513 - trunk/wp-theme
by Mario Gallegos 20 Sep '12

20 Sep '12

Author: mgallegos Date: 2012-09-20 21:33:50 +0200 (Thu, 20 Sep 2012) New Revision: 513 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-09-18 19:33:43 UTC (rev 512) +++ trunk/wp-theme/mc2-form.php 2012-09-20 19:33:50 UTC (rev 513) @@ -108,13 +108,13 @@ <input type="text" name="non-profit-website" value="" id="non-profit-website" style="width: 330px;margin-left: 42px;margin-top: 5px;display: none;"> <label class="optional-labels-fields"> <input type="checkbox" name="open-accounting" value="S" id="open-accounting" disabled="disabled"/> - <?php _e("We have Open-accounting", "mc"); ?> + <?php _e("We have a webpage where our accounting is public (Open-accounting)", "mc"); ?> </label> <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" disabled="disabled"/> - <?php _e("We accept donations", "mc"); ?> + <?php _e("We have a webpage to receive online 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;">

1 0

r512 - trunk/wp-theme
by Mario Gallegos 18 Sep '12

18 Sep '12

Author: mgallegos Date: 2012-09-18 21:33:43 +0200 (Tue, 18 Sep 2012) New Revision: 512 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-09-18 19:15:13 UTC (rev 511) +++ trunk/wp-theme/mc2-form.php 2012-09-18 19:33:43 UTC (rev 512) @@ -72,8 +72,8 @@ <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> - <input type="radio" id="step2-no" name="radio" onclick="clickCheckBox('np','no');"/><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;color: #FFFFFF;">Yes</label> + <input type="radio" id="step2-no" name="radio" onclick="clickCheckBox('np','no');"/><label for="step2-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-a"> @@ -142,8 +142,8 @@ <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> - <input type="radio" id="step3-no" name="radio" onclick="clickCheckBox('rp','no');"/><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;color: #FFFFFF;">Yes</label> + <input type="radio" id="step3-no" name="radio" onclick="clickCheckBox('rp','no');"/><label for="step3-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-b"> @@ -233,8 +233,8 @@ <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> - <input type="radio" id="step4-no" name="radio" onclick="clickCheckBox('rc','no');"/><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;color: #FFFFFF;">Yes</label> + <input type="radio" id="step4-no" name="radio" onclick="clickCheckBox('rc','no');"/><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"> @@ -295,8 +295,8 @@ <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" 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> + <input type="radio" id="step5-yes" name="radio" onclick="clickCheckBox('gr','yes');"/><label for="step5-yes" style="font-size: 14px;color: #FFFFFF;">Yes</label> + <input type="radio" id="step5-no" name="radio" onclick="clickCheckBox('gr','no');"/><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">

1 0

r511 - trunk/wp-theme
by Mario Gallegos 18 Sep '12

18 Sep '12

Author: mgallegos Date: 2012-09-18 21:15:13 +0200 (Tue, 18 Sep 2012) New Revision: 511 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-09-18 19:10:49 UTC (rev 510) +++ trunk/wp-theme/mc2-form.php 2012-09-18 19:15:13 UTC (rev 511) @@ -404,7 +404,7 @@ <script type='text/javascript' src='/mc/0.1/jquery.checkbox.min.js'></script> <script type="text/javascript" src="/mc/0.1/jquery.inputfocus-0.9.min.js"></script> <script type="text/javascript" src="/mc/0.1/mc-dia-form2.js"></script> -<link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/black-tie/jquer…"/> +<link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/ui-darkness/jqu…"/> <link rel="stylesheet" type="text/css" href="/mc/0.1/jquery.checkbox.css"/> <link rel="stylesheet" type="text/css" href="/mc/0.1/mc-dia-form2.css"/>

1 0

r510 - trunk/wp-theme
by Mario Gallegos 18 Sep '12

18 Sep '12

Author: mgallegos Date: 2012-09-18 21:10:49 +0200 (Tue, 18 Sep 2012) New Revision: 510 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-09-13 16:03:29 UTC (rev 509) +++ trunk/wp-theme/mc2-form.php 2012-09-18 19:10:49 UTC (rev 510) @@ -404,7 +404,7 @@ <script type='text/javascript' src='/mc/0.1/jquery.checkbox.min.js'></script> <script type="text/javascript" src="/mc/0.1/jquery.inputfocus-0.9.min.js"></script> <script type="text/javascript" src="/mc/0.1/mc-dia-form2.js"></script> -<link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/ui-lightness/jq…"/> +<link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/black-tie/jquer…"/> <link rel="stylesheet" type="text/css" href="/mc/0.1/jquery.checkbox.css"/> <link rel="stylesheet" type="text/css" href="/mc/0.1/mc-dia-form2.css"/>

1 0

r509 - trunk/src
by Vicente J. Ruiz Jurado 13 Sep '12

13 Sep '12

Author: vjrj_ Date: 2012-09-13 18:03:29 +0200 (Thu, 13 Sep 2012) New Revision: 509 Modified: trunk/src/mc-dia-form2.css trunk/src/mc.css Log: Modified: trunk/src/mc-dia-form2.css =================================================================== --- trunk/src/mc-dia-form2.css 2012-07-05 11:21:24 UTC (rev 508) +++ trunk/src/mc-dia-form2.css 2012-09-13 16:03:29 UTC (rev 509) @@ -119,9 +119,8 @@ #first_step label { color: #666; - font-size: 13px; - font-weight: bold; - line-height: 14px; + font-size: 16px; + line-height: 20px; float: right; margin: 13px -25px; width: 270px; Modified: trunk/src/mc.css =================================================================== --- trunk/src/mc.css 2012-07-05 11:21:24 UTC (rev 508) +++ trunk/src/mc.css 2012-09-13 16:03:29 UTC (rev 509) @@ -773,7 +773,7 @@ } .required-field { - margin-left: 5px; + margin: 0px 2px 0 -7px; color:#FF4B33; font-weight:bold; }

1 0