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

r356 - trunk/src
by Mario Gallegos 10 May '12

10 May '12

Author: mgallegos Date: 2012-05-11 01:29:55 +0200 (Fri, 11 May 2012) New Revision: 356 Modified: trunk/src/mc.css Log: Modified: trunk/src/mc.css =================================================================== --- trunk/src/mc.css 2012-05-10 23:22:36 UTC (rev 355) +++ trunk/src/mc.css 2012-05-10 23:29:55 UTC (rev 356) @@ -781,6 +781,10 @@ } +a.bx-next, a.bx-prev { + outline: none; +} + .bx-prev { position: absolute; top: 145px;

1 0

r355 - trunk/wp-theme
by Mario Gallegos 10 May '12

10 May '12

Author: mgallegos Date: 2012-05-11 01:22:36 +0200 (Fri, 11 May 2012) New Revision: 355 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-05-10 23:13:15 UTC (rev 354) +++ trunk/wp-theme/mc2-form.php 2012-05-10 23:22:36 UTC (rev 355) @@ -1,6 +1,7 @@ <div class="mc-form-header"> -<div class="mc-form-intro"><h2> - <?php _e("Frame your initiative or collective:", "mc"); ?></h2><?php echo qtrans_generateLanguageSelectCode("text"); ?><img src="/mc/0.1/images/" alt="" class="mc-form-icon-result" id="mc-form-icon-result" style="display: block; margin: 40px 60px;" /> +<div class="mc-form-intro"><h3> + <?php _e("Frame your initiative or collective:", "mc"); ?></h3> + <?php echo qtrans_generateLanguageSelectCode("text"); ?><img src="/mc/0.1/images/" alt="" class="mc-form-icon-result" id="mc-form-icon-result" style="display: block; margin: 40px 60px;" /> </div> <div class="mc-form-info"> <div><?php _e("Move Commons allows your collective/initiative:", "mc"); ?></div> @@ -18,7 +19,7 @@ </ul> </div> </div> - <div style="float: left;"><?php _e("Choose your MC logo here, clicking in the appropriate boxes...", "mc"); ?></div> + <div style="float: left;font-weight: bold;"><?php _e("Choose your MC logo here, clicking in the appropriate boxes...", "mc"); ?></div> </div> </div> <div class="mc-clean"></div>

1 0

r354 - trunk/src
by Mario Gallegos 10 May '12

10 May '12

Author: mgallegos Date: 2012-05-11 01:13:15 +0200 (Fri, 11 May 2012) New Revision: 354 Modified: trunk/src/mc-dia-form2.js Log: Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2012-05-10 23:10:49 UTC (rev 353) +++ trunk/src/mc-dia-form2.js 2012-05-10 23:13:15 UTC (rev 354) @@ -81,6 +81,8 @@ $("#decisions-voting").attr("disabled", "disabled"); $('#decisions-voting').attr('checked', false); } + if(id=='rc') + reset_areas(); } }

1 0

r353 - trunk/src
by Mario Gallegos 10 May '12

10 May '12

Author: mgallegos Date: 2012-05-11 01:10:49 +0200 (Fri, 11 May 2012) New Revision: 353 Modified: trunk/src/mc-dia-form2.js Log: Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2012-05-10 23:07:14 UTC (rev 352) +++ trunk/src/mc-dia-form2.js 2012-05-10 23:10:49 UTC (rev 353) @@ -218,6 +218,8 @@ var cat_id = "#mc-cat-rc-option-box-" + $id; $j(cat_id + ",#mc-cat-rc-option-icon-" + $id).click( function (event) { + if($j('#rc-checkbox').val()=='N') + return; event.stopPropagation(); reset_areas(); $j("#mc-form-rc").addClass("mc-form-descbox-selected");

1 0

r352 - trunk/src
by Mario Gallegos 10 May '12

10 May '12

Author: mgallegos Date: 2012-05-11 01:07:14 +0200 (Fri, 11 May 2012) New Revision: 352 Modified: trunk/src/mc-dia-form2.js Log: Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2012-05-10 23:06:00 UTC (rev 351) +++ trunk/src/mc-dia-form2.js 2012-05-10 23:07:14 UTC (rev 352) @@ -398,11 +398,11 @@ /*conf_link("np"); conf_link("rp"); conf_link("rc");*/ -conf_link("gr"); -/*select_area("ec"); +//conf_link("gr"); +select_area("ec"); select_area("bo"); select_area("to"); -select_area("di");*/ +select_area("di"); //confInputValidation("#url"); //confInputValidation("#ininame");

1 0

r351 - trunk/src
by Mario Gallegos 10 May '12

10 May '12

Author: mgallegos Date: 2012-05-11 01:06:00 +0200 (Fri, 11 May 2012) New Revision: 351 Modified: trunk/src/mc-dia-form2.js Log: Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2012-05-10 22:54:21 UTC (rev 350) +++ trunk/src/mc-dia-form2.js 2012-05-10 23:06:00 UTC (rev 351) @@ -21,6 +21,13 @@ $("#methods-procedures").removeAttr("disabled"); $("#documentation").removeAttr("disabled"); } + if(id=='gr'){ + $("#decisions-general-assemblies").removeAttr("disabled"); + $("#decisions-consensus").removeAttr("disabled"); + $("#representatives-democratically").removeAttr("disabled"); + $("#meetings-transparent").removeAttr("disabled"); + $("#decisions-voting").removeAttr("disabled"); + } } else{ $('#'+id+'-checkbox').val('N'); @@ -62,6 +69,18 @@ $j('#other-license-website').hide(); $j('#infield-other-license-website').hide(); } + if(id=='gr'){ + $("#decisions-general-assemblies").attr("disabled", "disabled"); + $('#decisions-general-assemblies').attr('checked', false); + $("#decisions-consensus").attr("disabled", "disabled"); + $('#decisions-consensus').attr('checked', false); + $("#representatives-democratically").attr("disabled", "disabled"); + $('#representatives-democratically').attr('checked', false); + $("#meetings-transparent").attr("disabled", "disabled"); + $('#meetings-transparent').attr('checked', false); + $("#decisions-voting").attr("disabled", "disabled"); + $('#decisions-voting').attr('checked', false); + } } } @@ -69,7 +88,7 @@ var cat_id = "#mc-form-" + $id; $j(cat_id + ",#mc-form-icon-" + $id).click( function () - { + {/* // if ($id != "rc") { $j(cat_id).addClass("mc-form-descbox-selected"); $j("#mc-cat-selected-"+ $id).slideDown(); @@ -80,7 +99,7 @@ $j("#mc-form-less-link-" + $id2).hide(); // $j("#mc-form-" + $id).removeAttr("title"); // $j("#mc-form-" + $id2).attr("title", click_to_select); - $j("#mc-form-more-text-" + $id2).slideUp(function() {adjustHeights();}); + $j("#mc-form-more-text-" + $id2).slideUp(function() {adjustHeights();});*/ if (cat_id == "#mc-form-rc") { //$j("#mc-cat-rc-options").slideDown(function() {adjustHeights();}); mc_rc="0"; @@ -298,16 +317,16 @@ //hover_more_link(nid); //hover_less_link(nid); //hover_less_link(nid); - hide_initial($id); - hide_initial(nid); - click_more_link($id); - click_more_link(nid); - click_less_link($id); - click_less_link(nid); + //hide_initial($id); + //hide_initial(nid); + //click_more_link($id); + //click_more_link(nid); + //click_less_link($id); + //click_less_link(nid); select_cat($id, nid); select_cat(nid, $id); - hover_cat($id); - hover_cat(nid); + //hover_cat($id); + //hover_cat(nid); // dclick_toggle($id); // dclick_toggle(nid); }; @@ -378,9 +397,9 @@ /*conf_link("np"); conf_link("rp"); -conf_link("rc"); +conf_link("rc");*/ conf_link("gr"); -//select_area("ec"); +/*select_area("ec"); select_area("bo"); select_area("to"); select_area("di");*/

1 0

r350 - in trunk: src wp-theme
by Mario Gallegos 10 May '12

10 May '12

Author: mgallegos Date: 2012-05-11 00:54:21 +0200 (Fri, 11 May 2012) New Revision: 350 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-05-10 22:46:02 UTC (rev 349) +++ trunk/src/mc-dia-form2.js 2012-05-10 22:54:21 UTC (rev 350) @@ -14,8 +14,8 @@ } if(id=='rp'){ $("#terms-of-use").removeAttr("disabled"); - $("#terms-of-use-website").removeAttr("disabled"); - $("#creative-commons-website").removeAttr("disabled"); + $("#creative-commons").removeAttr("disabled"); + $("#other-license").removeAttr("disabled"); $("#organization-structure").removeAttr("disabled"); $("#projects-and-results").removeAttr("disabled"); $("#methods-procedures").removeAttr("disabled"); @@ -43,10 +43,10 @@ if(id=='rp'){ $("#terms-of-use").attr("disabled", "disabled"); $('#terms-of-use').attr('checked', false); - $("#terms-of-use-website").attr("disabled", "disabled"); - $('#terms-of-use-website').attr('checked', false); - $("#creative-commons-website").attr("disabled", "disabled"); - $('#creative-commons-website').attr('checked', false); + $("#creative-commons").attr("disabled", "disabled"); + $('#creative-commons').attr('checked', false); + $("#other-license").attr("disabled", "disabled"); + $('#other-license').attr('checked', false); $("#organization-structure").attr("disabled", "disabled"); $('#organization-structure').attr('checked', false); $("#projects-and-results").attr("disabled", "disabled"); Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-05-10 22:46:02 UTC (rev 349) +++ trunk/wp-theme/mc2-form.php 2012-05-10 22:54:21 UTC (rev 350) @@ -150,7 +150,7 @@ <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;"> <label id="mc-optional-reproducible" style="color: #444;background-color: #F9F9F9;"><?php _e("Optional", "mc"); ?></label> <label class="optional-labels-fields"> - <input type="checkbox" name="terms-of-use" value="S" id="terms-of-use"/> + <input type="checkbox" name="terms-of-use" value="S" id="terms-of-use" disabled="disabled"/> <?php _e("We have Terms of Use of our contents", "mc"); ?> </label> <label id="infield-terms-of-use-website" for="terms-of-use-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> @@ -159,13 +159,13 @@ <?php _e("We use this license for sharing our contents:", "mc"); ?> </label> <label class="optional-labels-fields" style="margin-left: 30px;"> - <input type="checkbox" name="creative-commons" value="S" id="creative-commons"/> + <input type="checkbox" name="creative-commons" value="S" id="creative-commons" disabled="disabled"/> <?php _e("Creative Commons", "mc"); ?> </label> <label id="infield-creative-commons-website" for="creative-commons-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="creative-commons-website" value="" id="creative-commons-website" style="width: 330px;margin-left: 42px;margin-top: 5px;display: none;"> <label class="optional-labels-fields" style="margin-left: 30px;"> - <input type="checkbox" name="other-license" value="S" id="other-license" /> + <input type="checkbox" name="other-license" value="S" id="other-license" disabled="disabled"/> <?php _e("Other license", "mc"); ?> </label> <label id="infield-other-license-website" for="other-license-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> @@ -174,19 +174,19 @@ <?php _e("We share:", "mc"); ?> </label> <label class="optional-labels-fields" style="margin-left: 30px;"> - <input type="checkbox" name="organization-structure" value="S" id="organization-structure" /> + <input type="checkbox" name="organization-structure" value="S" id="organization-structure" disabled="disabled"/> <?php _e("Organization structure", "mc"); ?> </label> <label class="optional-labels-fields" style="margin-left: 30px;"> - <input type="checkbox" name="projects-and-results" value="S" id="projects-and-results" /> + <input type="checkbox" name="projects-and-results" value="S" id="projects-and-results" disabled="disabled"/> <?php _e("Projects and results", "mc"); ?> </label> <label class="optional-labels-fields" style="margin-left: 30px;"> - <input type="checkbox" name="methods-procedures" value="S" id="methods-procedures" /> + <input type="checkbox" name="methods-procedures" value="S" id="methods-procedures" disabled="disabled"/> <?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();"/> + <input type="checkbox" name="documentation" value="S" id="documentation" onblur="$j('#terms-of-use').focus();" disabled="disabled"/> <?php _e("Documentation", "mc"); ?> </label> </div>

1 0

r349 - trunk/src
by Mario Gallegos 10 May '12

10 May '12

Author: mgallegos Date: 2012-05-11 00:46:02 +0200 (Fri, 11 May 2012) New Revision: 349 Modified: trunk/src/mc-dia-form2.js Log: Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2012-05-10 22:35:54 UTC (rev 348) +++ trunk/src/mc-dia-form2.js 2012-05-10 22:46:02 UTC (rev 349) @@ -12,6 +12,15 @@ $("#open-accounting").removeAttr("disabled"); $("#accept-donations").removeAttr("disabled"); } + if(id=='rp'){ + $("#terms-of-use").removeAttr("disabled"); + $("#terms-of-use-website").removeAttr("disabled"); + $("#creative-commons-website").removeAttr("disabled"); + $("#organization-structure").removeAttr("disabled"); + $("#projects-and-results").removeAttr("disabled"); + $("#methods-procedures").removeAttr("disabled"); + $("#documentation").removeAttr("disabled"); + } } else{ $('#'+id+'-checkbox').val('N'); @@ -31,6 +40,28 @@ $j('#donation-website').hide(); $j('#infield-donation-website').hide(); } + if(id=='rp'){ + $("#terms-of-use").attr("disabled", "disabled"); + $('#terms-of-use').attr('checked', false); + $("#terms-of-use-website").attr("disabled", "disabled"); + $('#terms-of-use-website').attr('checked', false); + $("#creative-commons-website").attr("disabled", "disabled"); + $('#creative-commons-website').attr('checked', false); + $("#organization-structure").attr("disabled", "disabled"); + $('#organization-structure').attr('checked', false); + $("#projects-and-results").attr("disabled", "disabled"); + $('#projects-and-results').attr('checked', false); + $("#methods-procedures").attr("disabled", "disabled"); + $('#methods-procedures').attr('checked', false); + $("#documentation").attr("disabled", "disabled"); + $('#documentation').attr('checked', false); + $j('#terms-of-use-website').hide(); + $j('#infield-terms-of-use-website').hide(); + $j('#creative-commons-website').hide(); + $j('#infield-creative-commons-website').hide(); + $j('#other-license-website').hide(); + $j('#infield-other-license-website').hide(); + } } } @@ -409,6 +440,7 @@ } }); + $j("#creative-commons").click(function(){ if($j("#creative-commons").attr("checked")){ $j('#creative-commons-website').show();

1 0

r348 - trunk/src
by Mario Gallegos 10 May '12

10 May '12

Author: mgallegos Date: 2012-05-11 00:35:54 +0200 (Fri, 11 May 2012) New Revision: 348 Modified: trunk/src/mc-dia-form2.js Log: Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2012-05-10 22:31:00 UTC (rev 347) +++ trunk/src/mc-dia-form2.js 2012-05-10 22:35:54 UTC (rev 348) @@ -18,9 +18,12 @@ $j("#mc-form-" + id).removeClass("mc-form-descbox-selected"); $j("#mc-cat-selected-"+ id).slideUp(); if(id=='np'){ - $("registered-non-profit").attr("disabled", "disabled"); - $("open-accounting").attr("disabled", "disabled"); - $("accept-donations").attr("disabled", "disabled"); + $("#registered-non-profit").attr("disabled", "disabled"); + $('#registered-non-profit').attr('checked', false); + $("#open-accounting").attr("disabled", "disabled"); + $('#open-accounting').attr('checked', false); + $("#accept-donations").attr("disabled", "disabled"); + $('#accept-donations').attr('checked', false); $j('#non-profit-website').hide(); $j('#infield-non-profit-website').hide(); $j('#open-accounting-website').hide();

1 0

r347 - in trunk: src wp-theme
by Mario Gallegos 10 May '12

10 May '12

Author: mgallegos Date: 2012-05-11 00:31:00 +0200 (Fri, 11 May 2012) New Revision: 347 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-05-10 19:40:36 UTC (rev 346) +++ trunk/src/mc-dia-form2.js 2012-05-10 22:31:00 UTC (rev 347) @@ -7,11 +7,27 @@ $('#'+id+'-checkbox').val('S'); $j("#mc-form-" + id).addClass("mc-form-descbox-selected"); $j("#mc-cat-selected-"+ id).slideDown(); + if(id=='np'){ + $("#registered-non-profit").removeAttr("disabled"); + $("#open-accounting").removeAttr("disabled"); + $("#accept-donations").removeAttr("disabled"); + } } else{ $('#'+id+'-checkbox').val('N'); $j("#mc-form-" + id).removeClass("mc-form-descbox-selected"); - $j("#mc-cat-selected-"+ id).slideUp(); + $j("#mc-cat-selected-"+ id).slideUp(); + if(id=='np'){ + $("registered-non-profit").attr("disabled", "disabled"); + $("open-accounting").attr("disabled", "disabled"); + $("accept-donations").attr("disabled", "disabled"); + $j('#non-profit-website').hide(); + $j('#infield-non-profit-website').hide(); + $j('#open-accounting-website').hide(); + $j('#infield-open-accounting-website').hide(); + $j('#donation-website').hide(); + $j('#infield-donation-website').hide(); + } } } @@ -356,6 +372,7 @@ } }); + $j("#open-accounting").click(function(){ if($j("#open-accounting").attr("checked")){ $j('#open-accounting-website').show(); Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-05-10 19:40:36 UTC (rev 346) +++ trunk/wp-theme/mc2-form.php 2012-05-10 22:31:00 UTC (rev 347) @@ -97,19 +97,19 @@ <div class="blockMe1" style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 30px;border: 1px solid #B7C4C8;padding-bottom: 10px;"> <label id="mc-optional-non-profit" style="color: #444;background-color: #FEFBFD;"><?php _e("Optional", "mc"); ?></label> <label class="optional-labels-fields"> - <input type="checkbox" name="registered-non-profit" value="S" id="registered-non-profit"/> + <input type="checkbox" name="registered-non-profit" value="S" id="registered-non-profit" disabled="disabled"/> <?php _e("We are registered as Non-profit", "mc"); ?> </label> <label id="infield-non-profit-website" for="non-profit-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="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"/> + <input type="checkbox" name="open-accounting" value="S" id="open-accounting" disabled="disabled"/> <?php _e("We have 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" onblur="if($j('#infield-donation-website').css('display')=='none') $j('#registered-non-profit').focus();"/> + <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"/> <?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>

1 0