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

r241 - trunk/src
by Mario Gallegos 16 Mar '12

16 Mar '12

Author: mgallegos Date: 2012-03-16 02:05:42 +0100 (Fri, 16 Mar 2012) New Revision: 241 Modified: trunk/src/jquery.blockUI.js Log: Modified: trunk/src/jquery.blockUI.js =================================================================== --- trunk/src/jquery.blockUI.js 2012-03-16 00:57:29 UTC (rev 240) +++ trunk/src/jquery.blockUI.js 2012-03-16 01:05:42 UTC (rev 241) @@ -104,7 +104,8 @@ overlayCSS: { backgroundColor: '#000', opacity: 0.4, - cursor: 'default' + cursor: 'default', + border: '1px solid #FFFFFF' }, // styles applied when using $.growlUI @@ -113,9 +114,9 @@ top: '10px', left: '', right: '10px', - border: '1px solid #000', + border: '1px solid #FFFFFF', padding: '5px', - opacity: 0.6, + opacity: 0.4, cursor: 'default', color: '#fff', backgroundColor: '#000',

1 0

r240 - trunk/wp-theme
by Mario Gallegos 16 Mar '12

16 Mar '12

Author: mgallegos Date: 2012-03-16 01:57:29 +0100 (Fri, 16 Mar 2012) New Revision: 240 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-16 00:40:40 UTC (rev 239) +++ trunk/wp-theme/mc2-form.php 2012-03-16 00:57:29 UTC (rev 240) @@ -69,7 +69,7 @@ <img src="/mc/0.1/images/step1.png" alt="step1" class="mc-steps-number-v2" /> <div id="mc-form-optional-non-profit"> <div class="blockMe1" style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 45px;border: 1px solid #B7C4C8;padding-bottom: 10px;"> - <label id="mc-optional-non-profit" style="color: #444;"><?php _e("Optional", "mc"); ?></label> + <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"/> <?php _e("We are registered as Non-profit, check this webpage:", "mc"); ?> @@ -116,7 +116,7 @@ <img src="/mc/0.1/images/step2.png" alt="step2" class="mc-steps-number-v2" /> <div id="mc-form-optional-reproducible"> <div class="blockMe2" style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 35px;border: 1px solid #B7C4C8;margin-bottom: 20px;"> - <label id="mc-optional-reproducible" style="color: #444;"><?php _e("Optional", "mc"); ?></label> + <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"/> <?php _e("We have Terms of Use of our contents in this webpage:", "mc"); ?> @@ -182,7 +182,7 @@ <img src="/mc/0.1/images/step3.png" alt="step3" class="mc-steps-number-v2" /> <div id="mc-form-optional-reinforcing"> <div class="blockMe3" style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 35px;border: 1px solid #B7C4C8;"> - <label id="mc-optional-reinforcing" style="color: #444;"><?php _e("Which area is the main focus of your initiative?", "mc"); ?></label> + <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> @@ -223,7 +223,7 @@ <img src="/mc/0.1/images/step4.png" alt="step4" class="mc-steps-number-v2" /> <div id="mc-form-optional-grassroots"> <div class="blockMe4" style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 105px;border: 1px solid #B7C4C8;"> - <label id="mc-optional-grassroots" style="color: #444;"><?php _e("Optional", "mc"); ?></label> + <label id="mc-optional-grassroots" style="color: #444;background-color: #F9F9F9;"><?php _e("Optional", "mc"); ?></label> <label class="optional-labels-fields"> <input type="checkbox" name="decisions-general-assemblies" value="S" id="decisions-general-assemblies"/> <?php _e("We take decisions mainly through general assemblies", "mc"); ?>

1 0

r239 - in trunk: src wp-theme
by Mario Gallegos 16 Mar '12

16 Mar '12

Author: mgallegos Date: 2012-03-16 01:40:40 +0100 (Fri, 16 Mar 2012) New Revision: 239 Modified: trunk/src/jquery.blockUI.js trunk/wp-theme/mc2-form.php Log: Modified: trunk/src/jquery.blockUI.js =================================================================== --- trunk/src/jquery.blockUI.js 2012-03-16 00:37:06 UTC (rev 238) +++ trunk/src/jquery.blockUI.js 2012-03-16 00:40:40 UTC (rev 239) @@ -113,7 +113,7 @@ top: '10px', left: '', right: '10px', - border: 'none', + border: '1px solid #000', padding: '5px', opacity: 0.6, cursor: 'default', Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-16 00:37:06 UTC (rev 238) +++ trunk/wp-theme/mc2-form.php 2012-03-16 00:40:40 UTC (rev 239) @@ -182,7 +182,7 @@ <img src="/mc/0.1/images/step3.png" alt="step3" class="mc-steps-number-v2" /> <div id="mc-form-optional-reinforcing"> <div class="blockMe3" style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 35px;border: 1px solid #B7C4C8;"> - <label id="mc-optional-reinforcing"><?php _e("Which area is the main focus of your initiative?", "mc"); ?></label> + <label id="mc-optional-reinforcing" style="color: #444;"><?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>

1 0

r238 - in trunk: src wp-theme
by Mario Gallegos 16 Mar '12

16 Mar '12

Author: mgallegos Date: 2012-03-16 01:37:06 +0100 (Fri, 16 Mar 2012) New Revision: 238 Modified: trunk/src/jquery.blockUI.js trunk/wp-theme/mc2-form.php Log: Modified: trunk/src/jquery.blockUI.js =================================================================== --- trunk/src/jquery.blockUI.js 2012-03-16 00:28:38 UTC (rev 237) +++ trunk/src/jquery.blockUI.js 2012-03-16 00:37:06 UTC (rev 238) @@ -88,7 +88,7 @@ left: '35%', textAlign: 'center', color: '#000', - border: '3px solid #aaa', + border: '3px solid #000', backgroundColor:'#fff', cursor: 'default' }, Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-16 00:28:38 UTC (rev 237) +++ trunk/wp-theme/mc2-form.php 2012-03-16 00:37:06 UTC (rev 238) @@ -69,7 +69,7 @@ <img src="/mc/0.1/images/step1.png" alt="step1" class="mc-steps-number-v2" /> <div id="mc-form-optional-non-profit"> <div class="blockMe1" style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 45px;border: 1px solid #B7C4C8;padding-bottom: 10px;"> - <label id="mc-optional-non-profit"><?php _e("Optional", "mc"); ?></label> + <label id="mc-optional-non-profit" style="color: #444;"><?php _e("Optional", "mc"); ?></label> <label class="optional-labels-fields"> <input type="checkbox" name="registered-non-profit" value="S" id="registered-non-profit"/> <?php _e("We are registered as Non-profit, check this webpage:", "mc"); ?> @@ -116,7 +116,7 @@ <img src="/mc/0.1/images/step2.png" alt="step2" class="mc-steps-number-v2" /> <div id="mc-form-optional-reproducible"> <div class="blockMe2" style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 35px;border: 1px solid #B7C4C8;margin-bottom: 20px;"> - <label id="mc-optional-reproducible"><?php _e("Optional", "mc"); ?></label> + <label id="mc-optional-reproducible" style="color: #444;"><?php _e("Optional", "mc"); ?></label> <label class="optional-labels-fields"> <input type="checkbox" name="terms-of-use" value="S" id="terms-of-use"/> <?php _e("We have Terms of Use of our contents in this webpage:", "mc"); ?> @@ -223,7 +223,7 @@ <img src="/mc/0.1/images/step4.png" alt="step4" class="mc-steps-number-v2" /> <div id="mc-form-optional-grassroots"> <div class="blockMe4" style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 105px;border: 1px solid #B7C4C8;"> - <label id="mc-optional-grassroots"><?php _e("Optional", "mc"); ?></label> + <label id="mc-optional-grassroots" style="color: #444;"><?php _e("Optional", "mc"); ?></label> <label class="optional-labels-fields"> <input type="checkbox" name="decisions-general-assemblies" value="S" id="decisions-general-assemblies"/> <?php _e("We take decisions mainly through general assemblies", "mc"); ?>

1 0

r237 - trunk/src
by Mario Gallegos 16 Mar '12

16 Mar '12

Author: mgallegos Date: 2012-03-16 01:28:38 +0100 (Fri, 16 Mar 2012) New Revision: 237 Modified: trunk/src/mc-dia-form.js trunk/src/mc-dia-form2.js Log: Modified: trunk/src/mc-dia-form.js =================================================================== --- trunk/src/mc-dia-form.js 2012-03-16 00:24:51 UTC (rev 236) +++ trunk/src/mc-dia-form.js 2012-03-16 00:28:38 UTC (rev 237) @@ -7,10 +7,10 @@ $j(cat_id + ",#mc-form-icon-" + $id).click( function () { - //if ($id != "rc") { + if ($id != "rc") { $j(cat_id).addClass("mc-form-descbox-selected"); $j("#mc-cat-selected-"+ $id).slideDown(); - //} + } $j("#mc-form-" + $id2).removeClass("mc-form-descbox-selected"); $j("#mc-cat-selected-"+ $id2).slideUp(); // $j("#mc-form-more-link-" + $id2).show('slow'); Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2012-03-16 00:24:51 UTC (rev 236) +++ trunk/src/mc-dia-form2.js 2012-03-16 00:28:38 UTC (rev 237) @@ -7,10 +7,10 @@ $j(cat_id + ",#mc-form-icon-" + $id).click( function () { - if ($id != "rc") { + // if ($id != "rc") { $j(cat_id).addClass("mc-form-descbox-selected"); $j("#mc-cat-selected-"+ $id).slideDown(); - } + //} $j("#mc-form-" + $id2).removeClass("mc-form-descbox-selected"); $j("#mc-cat-selected-"+ $id2).slideUp(); // $j("#mc-form-more-link-" + $id2).show('slow');

1 0

r236 - in trunk: src wp-theme
by Mario Gallegos 16 Mar '12

16 Mar '12

Author: mgallegos Date: 2012-03-16 01:24:51 +0100 (Fri, 16 Mar 2012) New Revision: 236 Modified: trunk/src/mc-dia-form.js trunk/wp-theme/mc2-form.php Log: Modified: trunk/src/mc-dia-form.js =================================================================== --- trunk/src/mc-dia-form.js 2012-03-16 00:21:17 UTC (rev 235) +++ trunk/src/mc-dia-form.js 2012-03-16 00:24:51 UTC (rev 236) @@ -7,10 +7,10 @@ $j(cat_id + ",#mc-form-icon-" + $id).click( function () { - if ($id != "rc") { + //if ($id != "rc") { $j(cat_id).addClass("mc-form-descbox-selected"); $j("#mc-cat-selected-"+ $id).slideDown(); - } + //} $j("#mc-form-" + $id2).removeClass("mc-form-descbox-selected"); $j("#mc-cat-selected-"+ $id2).slideUp(); // $j("#mc-form-more-link-" + $id2).show('slow'); Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-16 00:21:17 UTC (rev 235) +++ trunk/wp-theme/mc2-form.php 2012-03-16 00:24:51 UTC (rev 236) @@ -15,7 +15,7 @@ <div class="mc-form-required-info" id="mc-form-required-url"> <div class="label"> <label id="mc-required-title-url"><?php _e("Web address", "mc"); ?><span class="required-field">*</span></label> - <label id="infield-url" for="url" style="position: absolute;display: block;margin: 8px 5px 5px 50px;padding: 0;font-size: 14px;"><?php _e("something like http://example.com", "mc"); ?></label> + <label id="infield-url" for="url" style="position: absolute;display: block;margin: 11px 0px 5px 12px;padding: 0;font-size: 14px;"><?php _e("something like http://example.com", "mc"); ?></label>

1 0

r235 - in trunk: src wp-theme
by Mario Gallegos 16 Mar '12

16 Mar '12

Author: mgallegos Date: 2012-03-16 01:21:17 +0100 (Fri, 16 Mar 2012) New Revision: 235 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-03-16 00:15:52 UTC (rev 234) +++ trunk/src/mc-dia-form2.js 2012-03-16 00:21:17 UTC (rev 235) @@ -324,7 +324,7 @@ //$j("#mc-cat-rc-options").hide(function() {adjustHeights();}); $j("#mc-form-icon-result").hide(); conf_click_continue(); -$j('#label1').labelOver('over-apply'); +//$j('#label1').labelOver('over-apply'); // max_textsize(); $j(window).load(function () { doadjustwithsleep(0); }); Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-16 00:15:52 UTC (rev 234) +++ trunk/wp-theme/mc2-form.php 2012-03-16 00:21:17 UTC (rev 235) @@ -15,7 +15,10 @@ <div class="mc-form-required-info" id="mc-form-required-url"> <div class="label"> <label id="mc-required-title-url"><?php _e("Web address", "mc"); ?><span class="required-field">*</span></label> + <label id="infield-url" for="url" style="position: absolute;display: block;margin: 8px 5px 5px 50px;padding: 0;font-size: 14px;"><?php _e("something like http://example.com", "mc"); ?></label> +  <input type="text" name="url" value="" id="url" /> </div> </div> @@ -71,19 +74,19 @@ <input type="checkbox" name="registered-non-profit" value="S" id="registered-non-profit"/> <?php _e("We are registered as Non-profit, check this webpage:", "mc"); ?> </label> - <label id="infield-non-profit-website" for="non-profit-website" style="position: absolute;display: block;margin: 8px 5px 5px 50px;padding: 0;font-size: 14px;">something like http://example.com</label> + <label id="infield-non-profit-website" for="non-profit-website" style="position: absolute;display: block;margin: 8px 5px 5px 50px;padding: 0;font-size: 14px;"><?php _e("something like 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;"> <label class="optional-labels-fields"> <input type="checkbox" name="open-accounting" value="S" id="open-accounting" /> <?php _e("We have Open-accounting, check this webpage:", "mc"); ?> </label> - <label id="infield-open-accounting-website" for="open-accounting-website" style="position: absolute;display: block;margin: 8px 5px 5px 50px;padding: 0;font-size: 14px;">something like http://example.com</label> + <label id="infield-open-accounting-website" for="open-accounting-website" style="position: absolute;display: block;margin: 8px 5px 5px 50px;padding: 0;font-size: 14px;"><?php _e("something like 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;"> <label class="optional-labels-fields"> <input type="checkbox" name="accept-donations" value="S" id="accept-donations" /> <?php _e("We accept donations, check this webpage:", "mc"); ?> </label> - <label id="infield-donation-website" for="donation-website" style="position: absolute;display: block;margin: 8px 5px 5px 50px;padding: 0;font-size: 14px;">something like http://example.com</label> + <label id="infield-donation-website" for="donation-website" style="position: absolute;display: block;margin: 8px 5px 5px 50px;padding: 0;font-size: 14px;"><?php _e("something like http://example.com", "mc"); ?></label> <input type="text" name="donation-website" value="" id="donation-website" style="width: 330px;margin-left: 42px;margin-top: 5px;"> <div style="clear: both;"></div> </div> @@ -125,13 +128,13 @@ <input type="checkbox" name="creative-commons" value="S" id="creative-commons" /> <?php _e("Creative Commons, in this webpage:", "mc"); ?> </label> - <label id="infield-creative-commons-website" for="creative-commons-website" style="position: absolute;display: block;margin: 8px 5px 5px 50px;padding: 0;font-size: 14px;">something like http://example.com</label> + <label id="infield-creative-commons-website" for="creative-commons-website" style="position: absolute;display: block;margin: 8px 5px 5px 50px;padding: 0;font-size: 14px;"><?php _e("something like 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;"> <label class="optional-labels-fields" style="margin-left: 30px;"> <input type="checkbox" name="other-license" value="S" id="other-license" /> <?php _e("Other license, in this webpage:", "mc"); ?> </label> - <label id="infield-other-license-website" for="other-license-website" style="position: absolute;display: block;margin: 8px 5px 5px 50px;padding: 0;font-size: 14px;">something like http://example.com</label> + <label id="infield-other-license-website" for="other-license-website" style="position: absolute;display: block;margin: 8px 5px 5px 50px;padding: 0;font-size: 14px;"><?php _e("something like http://example.com", "mc"); ?></label> <input type="text" name="other-license-website" value="" id="other-license-commons-website" style="width: 330px;margin-left: 42px;margin-top: 5px;"> <label class="optional-labels-fields"> <?php _e("We share:", "mc"); ?> @@ -269,6 +272,7 @@ $j('#infield-open-accounting-website').inFieldLabels(); $j('#infield-creative-commons-website').inFieldLabels(); $j('#infield-other-license-website').inFieldLabels(); + $j('#infield-url').inFieldLabels(); $j('div.blockMe1').block({ message: null }); $j('div.blockMe2').block({ message: null }); $j('div.blockMe3').block({ message: null });

1 0

r234 - in trunk: src wp-theme
by Mario Gallegos 16 Mar '12

16 Mar '12

Author: mgallegos Date: 2012-03-16 01:15:52 +0100 (Fri, 16 Mar 2012) New Revision: 234 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-03-16 00:09:10 UTC (rev 233) +++ trunk/src/mc-dia-form2.js 2012-03-16 00:15:52 UTC (rev 234) @@ -22,12 +22,17 @@ //$j("#mc-cat-rc-options").slideDown(function() {adjustHeights();}); mc_rc="0"; update_logo($id); + $j('div.blockMe3').unblock(); } else if (cat_id == "#mc-form-nrc") { //$j("#mc-cat-rc-options").slideUp(function() {adjustHeights();}); reset_areas(); update_logo($id); } else if (cat_id == "#mc-form-np") { - $j('div.blockMe1').unblock(); + $j('div.blockMe1').unblock(); + } else if (cat_id == "#mc-form-rp") { + $j('div.blockMe2').unblock(); + } else if (cat_id == "#mc-form-gr") { + $j('div.blockMe4').unblock(); } else { update_logo($id); //$j("#mc-cat-rc-options").slideUp(function() {adjustHeights();}); Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-16 00:09:10 UTC (rev 233) +++ trunk/wp-theme/mc2-form.php 2012-03-16 00:15:52 UTC (rev 234) @@ -112,7 +112,7 @@ <div style="float: left;width: 500px;"> <img src="/mc/0.1/images/step2.png" alt="step2" class="mc-steps-number-v2" /> <div id="mc-form-optional-reproducible"> - <div style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 35px;border: 1px solid #B7C4C8;margin-bottom: 20px;"> + <div class="blockMe2" style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 35px;border: 1px solid #B7C4C8;margin-bottom: 20px;"> <label id="mc-optional-reproducible"><?php _e("Optional", "mc"); ?></label> <label class="optional-labels-fields"> <input type="checkbox" name="terms-of-use" value="S" id="terms-of-use"/> @@ -178,7 +178,7 @@ <div style="float: left;width: 500px;"> <img src="/mc/0.1/images/step3.png" alt="step3" class="mc-steps-number-v2" /> <div id="mc-form-optional-reinforcing"> - <div style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 35px;border: 1px solid #B7C4C8;"> + <div class="blockMe3" style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 35px;border: 1px solid #B7C4C8;"> <label id="mc-optional-reinforcing"><?php _e("Which area is the main focus of your initiative?", "mc"); ?></label> <div class="mc-cat-rc-options" id="mc-cat-rc-options"> <!-- @@ -219,7 +219,7 @@ <div style="float: left;width: 500px;"> <img src="/mc/0.1/images/step4.png" alt="step4" class="mc-steps-number-v2" /> <div id="mc-form-optional-grassroots"> - <div style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 105px;border: 1px solid #B7C4C8;"> + <div class="blockMe4" style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 105px;border: 1px solid #B7C4C8;"> <label id="mc-optional-grassroots"><?php _e("Optional", "mc"); ?></label> <label class="optional-labels-fields"> <input type="checkbox" name="decisions-general-assemblies" value="S" id="decisions-general-assemblies"/> @@ -270,6 +270,8 @@ $j('#infield-creative-commons-website').inFieldLabels(); $j('#infield-other-license-website').inFieldLabels(); $j('div.blockMe1').block({ message: null }); - + $j('div.blockMe2').block({ message: null }); + $j('div.blockMe3').block({ message: null }); + $j('div.blockMe4').block({ message: null }); //$( "#format" ).buttonset(); </script> \ No newline at end of file

1 0

r233 - trunk/src
by Mario Gallegos 16 Mar '12

16 Mar '12

Author: mgallegos Date: 2012-03-16 01:09:10 +0100 (Fri, 16 Mar 2012) New Revision: 233 Modified: trunk/src/mc-dia-form2.js Log: Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2012-03-16 00:03:49 UTC (rev 232) +++ trunk/src/mc-dia-form2.js 2012-03-16 00:09:10 UTC (rev 233) @@ -312,8 +312,8 @@ select_area("bo"); select_area("to"); select_area("di"); -confInputValidation("#url"); -confInputValidation("#ininame"); +//confInputValidation("#url"); +//confInputValidation("#ininame"); $j("#mc-dia-continue-btn").addClass("mc-dia-continue-btn-disabled"); //$j("#mc-cat-rc-options").hide(function() {adjustHeights();});

1 0

r232 - in trunk: src wp-theme
by Mario Gallegos 16 Mar '12

16 Mar '12

Author: mgallegos Date: 2012-03-16 01:03:49 +0100 (Fri, 16 Mar 2012) New Revision: 232 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-03-15 23:59:11 UTC (rev 231) +++ trunk/src/mc-dia-form2.js 2012-03-16 00:03:49 UTC (rev 232) @@ -1,138 +1,138 @@ -//var $ = jQuery.noConflict(); +var $j = jQuery.noConflict(); // categories selection function select_cat($id, $id2) { var cat_id = "#mc-form-" + $id; - $(cat_id + ",#mc-form-icon-" + $id).click( + $j(cat_id + ",#mc-form-icon-" + $id).click( function () { if ($id != "rc") { - $(cat_id).addClass("mc-form-descbox-selected"); - $("#mc-cat-selected-"+ $id).slideDown(); + $j(cat_id).addClass("mc-form-descbox-selected"); + $j("#mc-cat-selected-"+ $id).slideDown(); } - $("#mc-form-" + $id2).removeClass("mc-form-descbox-selected"); - $("#mc-cat-selected-"+ $id2).slideUp(); - // $("#mc-form-more-link-" + $id2).show('slow'); - $("#mc-form-less-link-" + $id2).hide(); - // $("#mc-form-" + $id).removeAttr("title"); - // $("#mc-form-" + $id2).attr("title", click_to_select); - $("#mc-form-more-text-" + $id2).slideUp(function() {adjustHeights();}); + $j("#mc-form-" + $id2).removeClass("mc-form-descbox-selected"); + $j("#mc-cat-selected-"+ $id2).slideUp(); + // $j("#mc-form-more-link-" + $id2).show('slow'); + $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();}); if (cat_id == "#mc-form-rc") { - //$("#mc-cat-rc-options").slideDown(function() {adjustHeights();}); + //$j("#mc-cat-rc-options").slideDown(function() {adjustHeights();}); mc_rc="0"; update_logo($id); } else if (cat_id == "#mc-form-nrc") { - //$("#mc-cat-rc-options").slideUp(function() {adjustHeights();}); + //$j("#mc-cat-rc-options").slideUp(function() {adjustHeights();}); reset_areas(); update_logo($id); } else if (cat_id == "#mc-form-np") { - $('div.blockMe1').unblock(); + $j('div.blockMe1').unblock(); } else { update_logo($id); - //$("#mc-cat-rc-options").slideUp(function() {adjustHeights();}); + //$j("#mc-cat-rc-options").slideUp(function() {adjustHeights();}); } }); }; function hover_cat($id) { var cat_id = "#mc-form-" + $id; - $(cat_id + ",#mc-form-icon-" + $id).hover( + $j(cat_id + ",#mc-form-icon-" + $id).hover( function () { - $(cat_id).addClass("mc-form-descbox-high"); - //if ($('#mc-form-less-link-'+$id).is(':hidden')) - // $("#mc-form-more-link-"+$id).show(); + $j(cat_id).addClass("mc-form-descbox-high"); + //if ($j('#mc-form-less-link-'+$id).is(':hidden')) + // $j("#mc-form-more-link-"+$id).show(); }, function () { - $(cat_id).removeClass("mc-form-descbox-high"); - //if ($('#mc-form-less-link-'+$id).is(':hidden')) - // $("#mc-form-more-link-"+$id).hide(); + $j(cat_id).removeClass("mc-form-descbox-high"); + //if ($j('#mc-form-less-link-'+$id).is(':hidden')) + // $j("#mc-form-more-link-"+$id).hide(); }); }; // More links function click_more_link($id) { - $("#mc-form-more-link-" + $id).click( + $j("#mc-form-more-link-" + $id).click( function (event) { event.stopPropagation(); - $(this).hide(); + $j(this).hide(); /*if ($id == "rc") { - $("#mc-cat-rc-options").slideDown(); + $j("#mc-cat-rc-options").slideDown(); }*/ - $("#mc-form-less-link-" + $id).show('slow'); - $("#mc-form-more-text-" + $id).show('slow',function() {adjustHeights();}); + $j("#mc-form-less-link-" + $id).show('slow'); + $j("#mc-form-more-text-" + $id).show('slow',function() {adjustHeights();}); }); }; function click_less_link($id) { - $("#mc-form-less-link-" + $id).click( + $j("#mc-form-less-link-" + $id).click( function (event) { event.stopPropagation(); - $(this).hide(); + $j(this).hide(); /*if ($id == "rc") { - $("#mc-cat-rc-options").slideUp(); + $j("#mc-cat-rc-options").slideUp(); }*/ - $("#mc-form-more-link-" + $id).show('slow'); - $("#mc-form-more-text-" + $id).slideUp(function() {adjustHeights();}); - //if ($id == "rc") { $("#mc-cat-rc-options").slideUp(function() {adjustHeights();});} + $j("#mc-form-more-link-" + $id).show('slow'); + $j("#mc-form-more-text-" + $id).slideUp(function() {adjustHeights();}); + //if ($id == "rc") { $j("#mc-cat-rc-options").slideUp(function() {adjustHeights();});} }); }; function hover_more_link($id) { - $("#mc-form-more-link-" + $id).hover( + $j("#mc-form-more-link-" + $id).hover( function () { - $(this).addClass("mc-form-link-high"); + $j(this).addClass("mc-form-link-high"); }, function () { - $(this).removeClass("mc-form-link-high"); + $j(this).removeClass("mc-form-link-high"); }); }; function hover_less_link($id) { - $("#mc-form-less-link-" + $id).hover( + $j("#mc-form-less-link-" + $id).hover( function () { - $(this).addClass("mc-form-link-high"); + $j(this).addClass("mc-form-link-high"); }, function () { - $(this).removeClass("mc-form-link-high"); + $j(this).removeClass("mc-form-link-high"); }); }; function hide_initial($id) { - $("#mc-form-more-link-" + $id).hide(); - //$("#mc-form-more-text-" + $id).hide(); - $("#mc-form-less-link-" + $id).hide(); + $j("#mc-form-more-link-" + $id).hide(); + //$j("#mc-form-more-text-" + $id).hide(); + $j("#mc-form-less-link-" + $id).hide(); }; function dclick_toggle($id) { - $("#mc-form-" + $id).dblclick( + $j("#mc-form-" + $id).dblclick( function () { var id_text = "#mc-form-more-text-" + $id; var id_link = "#mc-form-more-link-" + $id; - if ($(id_text).is(':visible')) { $(id_text).slideUp(); $(id_link).slideDown(); } - else { $(id_text).slideDown(); $(id_link).slideUp(); }; + if ($j(id_text).is(':visible')) { $j(id_text).slideUp(); $j(id_link).slideDown(); } + else { $j(id_text).slideDown(); $j(id_link).slideUp(); }; });}; function reset_areas() { mc_rc="0"; - $("#mc-cat-rc-option-box-ec").removeClass("mc-cat-rc-option-box-selected"); - $("#mc-cat-rc-option-box-bo").removeClass("mc-cat-rc-option-box-selected"); - $("#mc-cat-rc-option-box-to").removeClass("mc-cat-rc-option-box-selected"); - $("#mc-cat-rc-option-box-di").removeClass("mc-cat-rc-option-box-selected"); - $("#mc-form-icon-rc").attr({src : "/mc/0.1/images/rc60.png"}); - $("#mc-cat-selected-rc").slideUp(); + $j("#mc-cat-rc-option-box-ec").removeClass("mc-cat-rc-option-box-selected"); + $j("#mc-cat-rc-option-box-bo").removeClass("mc-cat-rc-option-box-selected"); + $j("#mc-cat-rc-option-box-to").removeClass("mc-cat-rc-option-box-selected"); + $j("#mc-cat-rc-option-box-di").removeClass("mc-cat-rc-option-box-selected"); + $j("#mc-form-icon-rc").attr({src : "/mc/0.1/images/rc60.png"}); + $j("#mc-cat-selected-rc").slideUp(); } function select_area($id) { var cat_id = "#mc-cat-rc-option-box-" + $id; - $(cat_id + ",#mc-cat-rc-option-icon-" + $id).click( + $j(cat_id + ",#mc-cat-rc-option-icon-" + $id).click( function (event) { event.stopPropagation(); reset_areas(); - $("#mc-form-rc").addClass("mc-form-descbox-selected"); - $("#mc-cat-selected-rc").slideDown(); - $(cat_id).addClass("mc-cat-rc-option-box-selected"); - $("#mc-form-icon-rc").attr({src : "/mc/0.1/images/rc" + $id + "60.png"}); + $j("#mc-form-rc").addClass("mc-form-descbox-selected"); + $j("#mc-cat-selected-rc").slideDown(); + $j(cat_id).addClass("mc-cat-rc-option-box-selected"); + $j("#mc-form-icon-rc").attr({src : "/mc/0.1/images/rc" + $id + "60.png"}); update_logo($id); }); }; @@ -145,12 +145,12 @@ var idcat1 = "#mc-form-category-group-" + $id1; var idcat2 = "#mc-form-category-group-" + $id2; var ids = idcat1 + "," + idcat2; - $(ids).each(function(){ - $(this).height('auto'); - if (maxHeight < $(this).height()) {maxHeight = $(this).height();} + $j(ids).each(function(){ + $j(this).height('auto'); + if (maxHeight < $j(this).height()) {maxHeight = $j(this).height();} }); - if($(idcat1).height() < maxHeight) { $(idcat1).height(maxHeight); }; - if($(idcat2).height() < maxHeight) { $(idcat2).height(maxHeight); }; + if($j(idcat1).height() < maxHeight) { $j(idcat1).height(maxHeight); }; + if($j(idcat2).height() < maxHeight) { $j(idcat2).height(maxHeight); }; } function adjustHeights() { @@ -182,30 +182,30 @@ icon_url = "/mc/0.1/images/" + mc_category + "-120x90-0.1.png"; } if (icon_url != "") { - $("#mc-form-icon-result").attr({src : icon_url}); - $("#mc-form-icon-result").show('fast'); + $j("#mc-form-icon-result").attr({src : icon_url}); + $j("#mc-form-icon-result").show('fast'); } else { - $("#mc-form-icon-result").hide(); + $j("#mc-form-icon-result").hide(); } checkIfFormReady(); } function checkIfFormReady() { - urlIni = $('#url').val(); - nameIni = $('#ininame').val(); - keywordsIni = $('#keywords').val(); + urlIni = $j('#url').val(); + nameIni = $j('#ininame').val(); + keywordsIni = $j('#keywords').val(); if (mc_category != "" && nameIni.length > 0 && urlIni.length > 0) { - $("#mc-dia-continue-btn").addClass("mc-dia-continue-btn-enabled"); - $("#mc-dia-continue-btn").removeClass("mc-dia-continue-btn-disabled"); - $("#mc-dia-continue-btn").effect("highlight", {}, 2000); + $j("#mc-dia-continue-btn").addClass("mc-dia-continue-btn-enabled"); + $j("#mc-dia-continue-btn").removeClass("mc-dia-continue-btn-disabled"); + $j("#mc-dia-continue-btn").effect("highlight", {}, 2000); } else { - $("#mc-dia-continue-btn").addClass("mc-dia-continue-btn-disabled"); - $("#mc-dia-continue-btn").removeClass("mc-dia-continue-btn-enabled"); + $j("#mc-dia-continue-btn").addClass("mc-dia-continue-btn-disabled"); + $j("#mc-dia-continue-btn").removeClass("mc-dia-continue-btn-enabled"); } } function confInputValidation($id) { - $($id).bind("change keyup", function(event) { + $j($id).bind("change keyup", function(event) { checkIfFormReady(); }); } @@ -241,7 +241,7 @@ }; function conf_click_continue() { - $("#mc-dia-continue-btn").click( + $j("#mc-dia-continue-btn").click( function (event) { event.stopPropagation(); if (mc_category != "" && urlIni.length > 0 && nameIni.length > 0) { @@ -258,11 +258,11 @@ // http://www.richreuter.com/2008/08/01/UsingJQueryToResizeTextBoxesToMaxLengt… function max_textsize() { - $('input[type=text]').each(function() { - var max_length = $(this).attr('maxlength'); + $j('input[type=text]').each(function() { + var max_length = $j(this).attr('maxlength'); var multiplier = (max_length > 10) ? 7.3 : 8; var w = (max_length * multiplier) + "px"; - $(this).width(w); + $j(this).width(w); }); } @@ -271,10 +271,10 @@ $.fn.labelOver = function(overClass) { return this.each(function() { - var label = $(this); + var label = $j(this); var f = label.attr('for'); if (f) { - var input = $('#' + f); + var input = $j('#' + f); this.hide = function() { label.css({ textIndent: -10000 }); @@ -302,7 +302,7 @@ var nameIni = ""; var urlIni = ""; var keywordsIni = ""; -// var click_to_select = $("#mc-form-gr").attr("title"); // store of title value +// var click_to_select = $j("#mc-form-gr").attr("title"); // store of title value conf_link("np"); conf_link("rp"); @@ -315,12 +315,12 @@ confInputValidation("#url"); confInputValidation("#ininame"); -$("#mc-dia-continue-btn").addClass("mc-dia-continue-btn-disabled"); -//$("#mc-cat-rc-options").hide(function() {adjustHeights();}); -$("#mc-form-icon-result").hide(); +$j("#mc-dia-continue-btn").addClass("mc-dia-continue-btn-disabled"); +//$j("#mc-cat-rc-options").hide(function() {adjustHeights();}); +$j("#mc-form-icon-result").hide(); conf_click_continue(); -$('#label1').labelOver('over-apply'); +$j('#label1').labelOver('over-apply'); // max_textsize(); -$(window).load(function () { doadjustwithsleep(0); }); +$j(window).load(function () { doadjustwithsleep(0); }); Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-15 23:59:11 UTC (rev 231) +++ trunk/wp-theme/mc2-form.php 2012-03-16 00:03:49 UTC (rev 232) @@ -262,14 +262,14 @@ <script type="text/javascript" src="/mc/0.1/mc-dia-form2.js"></script> <script type="text/javascript"> - $('#languages').tagsInput({width:'415px',defaultText:'Add a language'}); - $('#keywords').tagsInput({width:'415px',defaultText:'Add a keyword'}); - $('#infield-donation-website').inFieldLabels(); - $('#infield-non-profit-website').inFieldLabels(); - $('#infield-open-accounting-website').inFieldLabels(); - $('#infield-creative-commons-website').inFieldLabels(); - $('#infield-other-license-website').inFieldLabels(); - $('div.blockMe1').block({ message: null }); + $j('#languages').tagsInput({width:'415px',defaultText:'Add a language'}); + $j('#keywords').tagsInput({width:'415px',defaultText:'Add a keyword'}); + $j('#infield-donation-website').inFieldLabels(); + $j('#infield-non-profit-website').inFieldLabels(); + $j('#infield-open-accounting-website').inFieldLabels(); + $j('#infield-creative-commons-website').inFieldLabels(); + $j('#infield-other-license-website').inFieldLabels(); + $j('div.blockMe1').block({ message: null }); //$( "#format" ).buttonset(); </script> \ No newline at end of file

1 0