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

r221 - trunk/wp-theme
by Mario Gallegos 15 Mar '12

15 Mar '12

Author: mgallegos Date: 2012-03-15 19:59:57 +0100 (Thu, 15 Mar 2012) New Revision: 221 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-15 18:55:39 UTC (rev 220) +++ trunk/wp-theme/mc2-form.php 2012-03-15 18:59:57 UTC (rev 221) @@ -268,6 +268,7 @@ $('#infield-open-accounting-website').inFieldLabels(); $('#infield-creative-commons-website').inFieldLabels(); $('#infield-other-license-website').inFieldLabels(); + $("#mc-form-optional-non-profit").block({ message: null }); //$( "#format" ).buttonset(); </script> \ No newline at end of file

1 0

r220 - in trunk: src wp-theme
by Mario Gallegos 15 Mar '12

15 Mar '12

Author: mgallegos Date: 2012-03-15 19:55:39 +0100 (Thu, 15 Mar 2012) New Revision: 220 Added: trunk/src/jquery.blockUI.js Modified: trunk/wp-theme/mc2-form.php Log: Added: trunk/src/jquery.blockUI.js =================================================================== --- trunk/src/jquery.blockUI.js (rev 0) +++ trunk/src/jquery.blockUI.js 2012-03-15 18:55:39 UTC (rev 220) @@ -0,0 +1,499 @@ +/*! + * jQuery blockUI plugin + * Version 2.39 (23-MAY-2011) + * @requires jQuery v1.2.3 or later + * + * Examples at: http://malsup.com/jquery/block/ + * Copyright (c) 2007-2010 M. Alsup + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + * + * Thanks to Amir-Hossein Sobhi for some excellent contributions! + */ + +;(function($) { + +if (/1\.(0|1|2)\.(0|1|2)/.test($.fn.jquery) || /^1.1/.test($.fn.jquery)) { + alert('blockUI requires jQuery v1.2.3 or later! You are using v' + $.fn.jquery); + return; +} + +$.fn._fadeIn = $.fn.fadeIn; + +var noOp = function() {}; + +// this bit is to ensure we don't call setExpression when we shouldn't (with extra muscle to handle +// retarded userAgent strings on Vista) +var mode = document.documentMode || 0; +var setExpr = $.browser.msie && (($.browser.version < 8 && !mode) || mode < 8); +var ie6 = $.browser.msie && /MSIE 6.0/.test(navigator.userAgent) && !mode; + +// global $ methods for blocking/unblocking the entire page +$.blockUI = function(opts) { install(window, opts); }; +$.unblockUI = function(opts) { remove(window, opts); }; + +// convenience method for quick growl-like notifications (http://www.google.com/search?q=growl) +$.growlUI = function(title, message, timeout, onClose) { + var $m = $('<div class="growlUI"></div>'); + if (title) $m.append('<h1>'+title+'</h1>'); + if (message) $m.append('<h2>'+message+'</h2>'); + if (timeout == undefined) timeout = 3000; + $.blockUI({ + message: $m, fadeIn: 700, fadeOut: 1000, centerY: false, + timeout: timeout, showOverlay: false, + onUnblock: onClose, + css: $.blockUI.defaults.growlCSS + }); +}; + +// plugin method for blocking element content +$.fn.block = function(opts) { + return this.unblock({ fadeOut: 0 }).each(function() { + if ($.css(this,'position') == 'static') + this.style.position = 'relative'; + if ($.browser.msie) + this.style.zoom = 1; // force 'hasLayout' + install(this, opts); + }); +}; + +// plugin method for unblocking element content +$.fn.unblock = function(opts) { + return this.each(function() { + remove(this, opts); + }); +}; + +$.blockUI.version = 2.39; // 2nd generation blocking at no extra cost! + +// override these in your code to change the default behavior and style +$.blockUI.defaults = { + // message displayed when blocking (use null for no message) + message: '<h1>Please wait...</h1>', + + title: null, // title string; only used when theme == true + draggable: true, // only used when theme == true (requires jquery-ui.js to be loaded) + + theme: false, // set to true to use with jQuery UI themes + + // styles for the message when blocking; if you wish to disable + // these and use an external stylesheet then do this in your code: + // $.blockUI.defaults.css = {}; + css: { + padding: 0, + margin: 0, + width: '30%', + top: '40%', + left: '35%', + textAlign: 'center', + color: '#000', + border: '3px solid #aaa', + backgroundColor:'#fff', + cursor: 'wait' + }, + + // minimal style set used when themes are used + themedCSS: { + width: '30%', + top: '40%', + left: '35%' + }, + + // styles for the overlay + overlayCSS: { + backgroundColor: '#000', + opacity: 0.6, + cursor: 'wait' + }, + + // styles applied when using $.growlUI + growlCSS: { + width: '350px', + top: '10px', + left: '', + right: '10px', + border: 'none', + padding: '5px', + opacity: 0.6, + cursor: 'default', + color: '#fff', + backgroundColor: '#000', + '-webkit-border-radius': '10px', + '-moz-border-radius': '10px', + 'border-radius': '10px' + }, + + // IE issues: 'about:blank' fails on HTTPS and javascript:false is s-l-o-w + // (hat tip to Jorge H. N. de Vasconcelos) + iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank', + + // force usage of iframe in non-IE browsers (handy for blocking applets) + forceIframe: false, + + // z-index for the blocking overlay + baseZ: 1000, + + // set these to true to have the message automatically centered + centerX: true, // <-- only effects element blocking (page block controlled via css above) + centerY: true, + + // allow body element to be stetched in ie6; this makes blocking look better + // on "short" pages. disable if you wish to prevent changes to the body height + allowBodyStretch: true, + + // enable if you want key and mouse events to be disabled for content that is blocked + bindEvents: true, + + // be default blockUI will supress tab navigation from leaving blocking content + // (if bindEvents is true) + constrainTabKey: true, + + // fadeIn time in millis; set to 0 to disable fadeIn on block + fadeIn: 200, + + // fadeOut time in millis; set to 0 to disable fadeOut on unblock + fadeOut: 400, + + // time in millis to wait before auto-unblocking; set to 0 to disable auto-unblock + timeout: 0, + + // disable if you don't want to show the overlay + showOverlay: true, + + // if true, focus will be placed in the first available input field when + // page blocking + focusInput: true, + + // suppresses the use of overlay styles on FF/Linux (due to performance issues with opacity) + applyPlatformOpacityRules: true, + + // callback method invoked when fadeIn has completed and blocking message is visible + onBlock: null, + + // callback method invoked when unblocking has completed; the callback is + // passed the element that has been unblocked (which is the window object for page + // blocks) and the options that were passed to the unblock call: + // onUnblock(element, options) + onUnblock: null, + + // don't ask; if you really must know: http://groups.google.com/group/jquery-en/browse_thread/thread/36640a8730503… + quirksmodeOffsetHack: 4, + + // class name of the message block + blockMsgClass: 'blockMsg' +}; + +// private data and functions follow... + +var pageBlock = null; +var pageBlockEls = []; + +function install(el, opts) { + var full = (el == window); + var msg = opts && opts.message !== undefined ? opts.message : undefined; + opts = $.extend({}, $.blockUI.defaults, opts || {}); + opts.overlayCSS = $.extend({}, $.blockUI.defaults.overlayCSS, opts.overlayCSS || {}); + var css = $.extend({}, $.blockUI.defaults.css, opts.css || {}); + var themedCSS = $.extend({}, $.blockUI.defaults.themedCSS, opts.themedCSS || {}); + msg = msg === undefined ? opts.message : msg; + + // remove the current block (if there is one) + if (full && pageBlock) + remove(window, {fadeOut:0}); + + // if an existing element is being used as the blocking content then we capture + // its current place in the DOM (and current display style) so we can restore + // it when we unblock + if (msg && typeof msg != 'string' && (msg.parentNode || msg.jquery)) { + var node = msg.jquery ? msg[0] : msg; + var data = {}; + $(el).data('blockUI.history', data); + data.el = node; + data.parent = node.parentNode; + data.display = node.style.display; + data.position = node.style.position; + if (data.parent) + data.parent.removeChild(node); + } + + $(el).data('blockUI.onUnblock', opts.onUnblock); + var z = opts.baseZ; + + // blockUI uses 3 layers for blocking, for simplicity they are all used on every platform; + // layer1 is the iframe layer which is used to supress bleed through of underlying content + // layer2 is the overlay layer which has opacity and a wait cursor (by default) + // layer3 is the message content that is displayed while blocking + + var lyr1 = ($.browser.msie || opts.forceIframe) + ? $('<iframe class="blockUI" style="z-index:'+ (z++) +';display:none;border:none;margin:0;padding:0;position:absolute;width:100%;height:100%;top:0;left:0" src="'+opts.iframeSrc+'"></iframe>') + : $('<div class="blockUI" style="display:none"></div>'); + + var lyr2 = opts.theme + ? $('<div class="blockUI blockOverlay ui-widget-overlay" style="z-index:'+ (z++) +';display:none"></div>') + : $('<div class="blockUI blockOverlay" style="z-index:'+ (z++) +';display:none;border:none;margin:0;padding:0;width:100%;height:100%;top:0;left:0"></div>'); + + var lyr3, s; + if (opts.theme && full) { + s = '<div class="blockUI ' + opts.blockMsgClass + ' blockPage ui-dialog ui-widget ui-corner-all" style="z-index:'+(z+10)+';display:none;position:fixed">' + + '<div class="ui-widget-header ui-dialog-titlebar ui-corner-all blockTitle">'+(opts.title || ' ')+'</div>' + + '<div class="ui-widget-content ui-dialog-content"></div>' + + '</div>'; + } + else if (opts.theme) { + s = '<div class="blockUI ' + opts.blockMsgClass + ' blockElement ui-dialog ui-widget ui-corner-all" style="z-index:'+(z+10)+';display:none;position:absolute">' + + '<div class="ui-widget-header ui-dialog-titlebar ui-corner-all blockTitle">'+(opts.title || ' ')+'</div>' + + '<div class="ui-widget-content ui-dialog-content"></div>' + + '</div>'; + } + else if (full) { + s = '<div class="blockUI ' + opts.blockMsgClass + ' blockPage" style="z-index:'+(z+10)+';display:none;position:fixed"></div>'; + } + else { + s = '<div class="blockUI ' + opts.blockMsgClass + ' blockElement" style="z-index:'+(z+10)+';display:none;position:absolute"></div>'; + } + lyr3 = $(s); + + // if we have a message, style it + if (msg) { + if (opts.theme) { + lyr3.css(themedCSS); + lyr3.addClass('ui-widget-content'); + } + else + lyr3.css(css); + } + + // style the overlay + if (!opts.theme && (!opts.applyPlatformOpacityRules || !($.browser.mozilla && /Linux/.test(navigator.platform)))) + lyr2.css(opts.overlayCSS); + lyr2.css('position', full ? 'fixed' : 'absolute'); + + // make iframe layer transparent in IE + if ($.browser.msie || opts.forceIframe) + lyr1.css('opacity',0.0); + + //$([lyr1[0],lyr2[0],lyr3[0]]).appendTo(full ? 'body' : el); + var layers = [lyr1,lyr2,lyr3], $par = full ? $('body') : $(el); + $.each(layers, function() { + this.appendTo($par); + }); + + if (opts.theme && opts.draggable && $.fn.draggable) { + lyr3.draggable({ + handle: '.ui-dialog-titlebar', + cancel: 'li' + }); + } + + // ie7 must use absolute positioning in quirks mode and to account for activex issues (when scrolling) + var expr = setExpr && (!$.boxModel || $('object,embed', full ? null : el).length > 0); + if (ie6 || expr) { + // give body 100% height + if (full && opts.allowBodyStretch && $.boxModel) + $('html,body').css('height','100%'); + + // fix ie6 issue when blocked element has a border width + if ((ie6 || !$.boxModel) && !full) { + var t = sz(el,'borderTopWidth'), l = sz(el,'borderLeftWidth'); + var fixT = t ? '(0 - '+t+')' : 0; + var fixL = l ? '(0 - '+l+')' : 0; + } + + // simulate fixed position + $.each([lyr1,lyr2,lyr3], function(i,o) { + var s = o[0].style; + s.position = 'absolute'; + if (i < 2) { + full ? s.setExpression('height','Math.max(document.body.scrollHeight, document.body.offsetHeight) - (jQuery.boxModel?0:'+opts.quirksmodeOffsetHack+') + "px"') + : s.setExpression('height','this.parentNode.offsetHeight + "px"'); + full ? s.setExpression('width','jQuery.boxModel && document.documentElement.clientWidth || document.body.clientWidth + "px"') + : s.setExpression('width','this.parentNode.offsetWidth + "px"'); + if (fixL) s.setExpression('left', fixL); + if (fixT) s.setExpression('top', fixT); + } + else if (opts.centerY) { + if (full) s.setExpression('top','(document.documentElement.clientHeight || document.body.clientHeight) / 2 - (this.offsetHeight / 2) + (blah = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "px"'); + s.marginTop = 0; + } + else if (!opts.centerY && full) { + var top = (opts.css && opts.css.top) ? parseInt(opts.css.top) : 0; + var expression = '((document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + '+top+') + "px"'; + s.setExpression('top',expression); + } + }); + } + + // show the message + if (msg) { + if (opts.theme) + lyr3.find('.ui-widget-content').append(msg); + else + lyr3.append(msg); + if (msg.jquery || msg.nodeType) + $(msg).show(); + } + + if (($.browser.msie || opts.forceIframe) && opts.showOverlay) + lyr1.show(); // opacity is zero + if (opts.fadeIn) { + var cb = opts.onBlock ? opts.onBlock : noOp; + var cb1 = (opts.showOverlay && !msg) ? cb : noOp; + var cb2 = msg ? cb : noOp; + if (opts.showOverlay) + lyr2._fadeIn(opts.fadeIn, cb1); + if (msg) + lyr3._fadeIn(opts.fadeIn, cb2); + } + else { + if (opts.showOverlay) + lyr2.show(); + if (msg) + lyr3.show(); + if (opts.onBlock) + opts.onBlock(); + } + + // bind key and mouse events + bind(1, el, opts); + + if (full) { + pageBlock = lyr3[0]; + pageBlockEls = $(':input:enabled:visible',pageBlock); + if (opts.focusInput) + setTimeout(focus, 20); + } + else + center(lyr3[0], opts.centerX, opts.centerY); + + if (opts.timeout) { + // auto-unblock + var to = setTimeout(function() { + full ? $.unblockUI(opts) : $(el).unblock(opts); + }, opts.timeout); + $(el).data('blockUI.timeout', to); + } +}; + +// remove the block +function remove(el, opts) { + var full = (el == window); + var $el = $(el); + var data = $el.data('blockUI.history'); + var to = $el.data('blockUI.timeout'); + if (to) { + clearTimeout(to); + $el.removeData('blockUI.timeout'); + } + opts = $.extend({}, $.blockUI.defaults, opts || {}); + bind(0, el, opts); // unbind events + + if (opts.onUnblock === null) { + opts.onUnblock = $el.data('blockUI.onUnblock'); + $el.removeData('blockUI.onUnblock'); + } + + var els; + if (full) // crazy selector to handle odd field errors in ie6/7 + els = $('body').children().filter('.blockUI').add('body > .blockUI'); + else + els = $('.blockUI', el); + + if (full) + pageBlock = pageBlockEls = null; + + if (opts.fadeOut) { + els.fadeOut(opts.fadeOut); + setTimeout(function() { reset(els,data,opts,el); }, opts.fadeOut); + } + else + reset(els, data, opts, el); +}; + +// move blocking element back into the DOM where it started +function reset(els,data,opts,el) { + els.each(function(i,o) { + // remove via DOM calls so we don't lose event handlers + if (this.parentNode) + this.parentNode.removeChild(this); + }); + + if (data && data.el) { + data.el.style.display = data.display; + data.el.style.position = data.position; + if (data.parent) + data.parent.appendChild(data.el); + $(el).removeData('blockUI.history'); + } + + if (typeof opts.onUnblock == 'function') + opts.onUnblock(el,opts); +}; + +// bind/unbind the handler +function bind(b, el, opts) { + var full = el == window, $el = $(el); + + // don't bother unbinding if there is nothing to unbind + if (!b && (full && !pageBlock || !full && !$el.data('blockUI.isBlocked'))) + return; + if (!full) + $el.data('blockUI.isBlocked', b); + + // don't bind events when overlay is not in use or if bindEvents is false + if (!opts.bindEvents || (b && !opts.showOverlay)) + return; + + // bind anchors and inputs for mouse and key events + var events = 'mousedown mouseup keydown keypress'; + b ? $(document).bind(events, opts, handler) : $(document).unbind(events, handler); + +// former impl... +// var $e = $('a,:input'); +// b ? $e.bind(events, opts, handler) : $e.unbind(events, handler); +}; + +// event handler to suppress keyboard/mouse events when blocking +function handler(e) { + // allow tab navigation (conditionally) + if (e.keyCode && e.keyCode == 9) { + if (pageBlock && e.data.constrainTabKey) { + var els = pageBlockEls; + var fwd = !e.shiftKey && e.target === els[els.length-1]; + var back = e.shiftKey && e.target === els[0]; + if (fwd || back) { + setTimeout(function(){focus(back)},10); + return false; + } + } + } + var opts = e.data; + // allow events within the message content + if ($(e.target).parents('div.' + opts.blockMsgClass).length > 0) + return true; + + // allow events for content that is not being blocked + return $(e.target).parents().children().filter('div.blockUI').length == 0; +}; + +function focus(back) { + if (!pageBlockEls) + return; + var e = pageBlockEls[back===true ? pageBlockEls.length-1 : 0]; + if (e) + e.focus(); +}; + +function center(el, x, y) { + var p = el.parentNode, s = el.style; + var l = ((p.offsetWidth - el.offsetWidth)/2) - sz(p,'borderLeftWidth'); + var t = ((p.offsetHeight - el.offsetHeight)/2) - sz(p,'borderTopWidth'); + if (x) s.left = l > 0 ? (l+'px') : '0'; + if (y) s.top = t > 0 ? (t+'px') : '0'; +}; + +function sz(el, p) { + return parseInt($.css(el,p))||0; +}; + +})(jQuery); Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-15 17:16:17 UTC (rev 219) +++ trunk/wp-theme/mc2-form.php 2012-03-15 18:55:39 UTC (rev 220) @@ -256,6 +256,7 @@ <script type="text/javascript" src="/mc/0.1/jquery.tagsinput.min.js"></script> <script type='text/javascript' src='https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/jquery-ui.min.js'></script> <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> <link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/black-tie/jquer…"/> <script type="text/javascript" src="/mc/0.1/mc-dia-form2.js"></script>

1 0

r219 - trunk/wp-theme
by Mario Gallegos 15 Mar '12

15 Mar '12

Author: mgallegos Date: 2012-03-15 18:16:17 +0100 (Thu, 15 Mar 2012) New Revision: 219 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-15 01:42:21 UTC (rev 218) +++ trunk/wp-theme/mc2-form.php 2012-03-15 17:16:17 UTC (rev 219) @@ -65,7 +65,7 @@ <div style="float: left;width: 500px;"> <img src="/mc/0.1/images/step1.png" alt="step1" class="mc-steps-number-v2" /> <div id="mc-form-optional-non-profit"> - <div style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 35px;border: 1px solid #B7C4C8;"> + <div 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 class="optional-labels-fields"> <input type="checkbox" name="registered-non-profit" value="S" id="registered-non-profit"/> @@ -93,7 +93,7 @@ <div class="mc-cat-group-b-v2" id="mc-cat-group-b"> <div style="float: left;" class="mc-form-category-group-b-v2"> - <div class="mc-form-rounded mc-form-category-group-v2 float-left" id="mc-form-category-group-b"> + <div class="mc-form-rounded mc-form-category-group-v2 float-left" id="mc-form-category-group-b" style="margin-top: 32px;"> <img src="/mc/0.1/images/cat-selected.png" alt="selected" class="mc-cat-selected mc-cat-selected-a" id="mc-cat-selected-rp" /> <div id="mc-form-rp" class="mc-form-rounded mc-form-descbox mc-form-descbox-a" title="<?php _e("Click to select", "mc"); ?>"> <div id="mc-form-more-link-rp" class="mc-form-link"><?php _e("What is this?", "mc"); ?></div> @@ -111,7 +111,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;"> + <div 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"/> @@ -159,7 +159,7 @@ <div class="mc-cat-group-c-v2" id="mc-cat-group-c"> <div style="float: left;" class="mc-form-category-group-c-v2"> - <div class="mc-form-rounded mc-form-category-group-v2 float-left" id="mc-form-category-group-c"> + <div class="mc-form-rounded mc-form-category-group-v2 float-left" style="padding-top: 35px;" id="mc-form-category-group-c"> <img src="/mc/0.1/images/cat-selected.png" alt="selected" class="mc-cat-selected mc-cat-selected-a" id="mc-cat-selected-rc" /> <div id="mc-form-rc" class="mc-form-rounded mc-form-descbox mc-form-descbox-a" title="<?php _e("Click to select", "mc"); ?>"> <div id="mc-form-more-link-rc" class="mc-form-link"><?php _e("What is this?", "mc"); ?></div> @@ -218,7 +218,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: 35px;border: 1px solid #B7C4C8;"> + <div 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"/>

1 0

r218 - trunk/wp-theme
by Mario Gallegos 15 Mar '12

15 Mar '12

Author: mgallegos Date: 2012-03-15 02:42:21 +0100 (Thu, 15 Mar 2012) New Revision: 218 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-15 01:36:20 UTC (rev 217) +++ trunk/wp-theme/mc2-form.php 2012-03-15 01:42:21 UTC (rev 218) @@ -124,10 +124,14 @@ <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> + <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> + <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> + <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"); ?> </label> @@ -260,6 +264,9 @@ $('#keywords').tagsInput({width:'415px',defaultText:'Add a keyword'}); $('#infield-donation-website').inFieldLabels(); $('#infield-non-profit-website').inFieldLabels(); - $('#infield-open-accounting-website').inFieldLabels(); + $('#infield-open-accounting-website').inFieldLabels(); + $('#infield-creative-commons-website').inFieldLabels(); + $('#infield-other-license-website').inFieldLabels(); + //$( "#format" ).buttonset(); </script> \ No newline at end of file

1 0

r217 - trunk/wp-theme
by Mario Gallegos 15 Mar '12

15 Mar '12

Author: mgallegos Date: 2012-03-15 02:36:20 +0100 (Thu, 15 Mar 2012) New Revision: 217 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-15 01:31:06 UTC (rev 216) +++ trunk/wp-theme/mc2-form.php 2012-03-15 01:36:20 UTC (rev 217) @@ -71,19 +71,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: 5px 5px 5px 6px;padding: 0;">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;">something like http://example.com</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: 5px 5px 5px 6px;padding: 0;">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;">something like http://example.com</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: 5px 5px 5px 6px;padding: 0;">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;">something like http://example.com</label> <input type="text" name="donation-website" value="" id="donation-website" style="width: 330px;margin-left: 42px;margin-top: 5px;"> </div> </div>

1 0

r216 - trunk/wp-theme
by Mario Gallegos 15 Mar '12

15 Mar '12

Author: mgallegos Date: 2012-03-15 02:31:06 +0100 (Thu, 15 Mar 2012) New Revision: 216 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-15 01:26:58 UTC (rev 215) +++ trunk/wp-theme/mc2-form.php 2012-03-15 01:31:06 UTC (rev 216) @@ -72,19 +72,19 @@ <?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: 5px 5px 5px 6px;padding: 0;">something like http://example.com</label> - <input type="text" name="non-profit-website" value="" id="non-profit-website"> + <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: 5px 5px 5px 6px;padding: 0;">something like http://example.com</label> - <input type="text" name="open-accounting-website" value="" id="open-accounting-website"> + <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: 5px 5px 5px 6px;padding: 0;">something like http://example.com</label> - <input type="text" name="donation-website" value="" id="donation-website"> + <input type="text" name="donation-website" value="" id="donation-website" style="width: 330px;margin-left: 42px;margin-top: 5px;"> </div> </div> </div>

1 0

r215 - trunk/wp-theme
by Mario Gallegos 15 Mar '12

15 Mar '12

Author: mgallegos Date: 2012-03-15 02:26:58 +0100 (Thu, 15 Mar 2012) New Revision: 215 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-15 01:23:42 UTC (rev 214) +++ trunk/wp-theme/mc2-form.php 2012-03-15 01:26:58 UTC (rev 215) @@ -71,19 +71,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;top: 0;left: 0;display: block;margin: 5px 5px 5px 6px;padding: 0;">something like http://example.com</label> + <label id="infield-non-profit-website" for="non-profit-website" style="position: absolute;display: block;margin: 5px 5px 5px 6px;padding: 0;">something like http://example.com</label> <input type="text" name="non-profit-website" value="" id="non-profit-website"> <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">something like http://example.com</label> + <label id="infield-open-accounting-website" for="open-accounting-website" style="position: absolute;display: block;margin: 5px 5px 5px 6px;padding: 0;">something like http://example.com</label> <input type="text" name="open-accounting-website" value="" id="open-accounting-website"> <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">something like http://example.com</label> + <label id="infield-donation-website" for="donation-website" style="position: absolute;display: block;margin: 5px 5px 5px 6px;padding: 0;">something like http://example.com</label> <input type="text" name="donation-website" value="" id="donation-website"> </div> </div>

1 0

r214 - trunk/wp-theme
by Mario Gallegos 15 Mar '12

15 Mar '12

Author: mgallegos Date: 2012-03-15 02:23:42 +0100 (Thu, 15 Mar 2012) New Revision: 214 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-15 01:17:00 UTC (rev 213) +++ trunk/wp-theme/mc2-form.php 2012-03-15 01:23:42 UTC (rev 214) @@ -71,7 +71,7 @@ <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">something like http://example.com</label> + <label id="infield-non-profit-website" for="non-profit-website" style="position: absolute;top: 0;left: 0;display: block;margin: 5px 5px 5px 6px;padding: 0;">something like http://example.com</label> <input type="text" name="non-profit-website" value="" id="non-profit-website"> <label class="optional-labels-fields"> <input type="checkbox" name="open-accounting" value="S" id="open-accounting" />

1 0

r213 - in trunk: src wp-theme
by Mario Gallegos 15 Mar '12

15 Mar '12

Author: mgallegos Date: 2012-03-15 02:17:00 +0100 (Thu, 15 Mar 2012) New Revision: 213 Added: trunk/src/jquery.infieldlabel.min.js Modified: trunk/wp-theme/mc2-form.php Log: Added: trunk/src/jquery.infieldlabel.min.js =================================================================== --- trunk/src/jquery.infieldlabel.min.js (rev 0) +++ trunk/src/jquery.infieldlabel.min.js 2012-03-15 01:17:00 UTC (rev 213) @@ -0,0 +1,12 @@ +/* + * In-Field Label jQuery Plugin + * http://fuelyourcoding.com/scripts/infield.html + * + * Copyright (c) 2009 Doug Neiner + * Dual licensed under the MIT and GPL licenses. + * Uses the same license as jQuery, see: + * http://docs.jquery.com/License + * + * @version 0.1 + */ +(function($){$.InFieldLabels=function(b,c,d){var f=this;f.$label=$(b);f.label=b;f.$field=$(c);f.field=c;f.$label.data("InFieldLabels",f);f.showing=true;f.init=function(){f.options=$.extend({},$.InFieldLabels.defaultOptions,d);if(f.$field.val()!=""){f.$label.hide();f.showing=false};f.$field.focus(function(){f.fadeOnFocus()}).blur(function(){f.checkForEmpty(true)}).bind('keydown.infieldlabel',function(e){f.hideOnChange(e)}).change(function(e){f.checkForEmpty()}).bind('onPropertyChange',function(){f.checkForEmpty()})};f.fadeOnFocus=function(){if(f.showing){f.setOpacity(f.options.fadeOpacity)}};f.setOpacity=function(a){f.$label.stop().animate({opacity:a},f.options.fadeDuration);f.showing=(a>0.0)};f.checkForEmpty=function(a){if(f.$field.val()==""){f.prepForShow();f.setOpacity(a?1.0:f.options.fadeOpacity)}else{f.setOpacity(0.0)}};f.prepForShow=function(e){if(!f.showing){f.$label.css({opacity:0.0}).show();f.$field.bind('keydown.infieldlabel',function(e){f.hideOnChange(e)})}};f.hideOnChange=function(e){if((e.keyCode==16)||(e.keyCode==9))return;if(f.showing){f.$label.hide();f.showing=false};f.$field.unbind('keydown.infieldlabel')};f.init()};$.InFieldLabels.defaultOptions={fadeOpacity:0.5,fadeDuration:300};$.fn.inFieldLabels=function(c){return this.each(function(){var a=$(this).attr('for');if(!a)return;var b=$("input#"+a+"[type='text'],"+"input#"+a+"[type='password'],"+"textarea#"+a);if(b.length==0)return;(new $.InFieldLabels(this,b[0],c))})}})(jQuery); \ No newline at end of file Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-15 00:22:20 UTC (rev 212) +++ trunk/wp-theme/mc2-form.php 2012-03-15 01:17:00 UTC (rev 213) @@ -69,16 +69,22 @@ <label id="mc-optional-non-profit"><?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", "mc"); ?> + <?php _e("We are registered as Non-profit, check this webpage:", "mc"); ?> </label> + <label id="infield-non-profit-website" for="non-profit-website">something like http://example.com</label> + <input type="text" name="non-profit-website" value="" id="non-profit-website"> <label class="optional-labels-fields"> <input type="checkbox" name="open-accounting" value="S" id="open-accounting" /> - <?php _e("We have Open-accounting", "mc"); ?> + <?php _e("We have Open-accounting, check this webpage:", "mc"); ?> </label> + <label id="infield-open-accounting-website" for="open-accounting-website">something like http://example.com</label> + <input type="text" name="open-accounting-website" value="" id="open-accounting-website"> <label class="optional-labels-fields"> <input type="checkbox" name="accept-donations" value="S" id="accept-donations" /> - <?php _e("We accept donations", "mc"); ?> - </label> + <?php _e("We accept donations, check this webpage:", "mc"); ?> + </label> + <label id="infield-donation-website" for="donation-website">something like http://example.com</label> + <input type="text" name="donation-website" value="" id="donation-website"> </div> </div> </div> @@ -109,7 +115,7 @@ <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"/> - <?php _e("We have Terms of Use of our contents in this webpage:", "mc"); ?> + <?php _e("We have Terms of Use of our contents in this webpage:", "mc"); ?> </label> <label class="optional-labels-fields"> <?php _e("We use this license for sharing our contents:", "mc"); ?> @@ -239,145 +245,21 @@ </div> </div> <div class="mc-clean"></div> -  + + <div class="mc-dia-continue-btn" id="mc-dia-continue-btn"><?php _e("Continue", "mc"); ?></div> <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script> <script type="text/javascript" src="/mc/0.1/jquery.tagsinput.min.js"></script> <script type='text/javascript' src='https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/jquery-ui.min.js'></script> +<script type='text/javascript' src='/mc/0.1/jquery.infieldlabel.min.js'></script> <link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/black-tie/jquer…"/> <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(); //$( "#format" ).buttonset(); </script> \ No newline at end of file

1 0

r212 - in trunk: src wp-theme
by Mario Gallegos 15 Mar '12

15 Mar '12

Author: mgallegos Date: 2012-03-15 01:22:20 +0100 (Thu, 15 Mar 2012) New Revision: 212 Modified: trunk/src/mc.css trunk/wp-theme/mc2-form.php Log: Modified: trunk/src/mc.css =================================================================== --- trunk/src/mc.css 2012-03-15 00:17:49 UTC (rev 211) +++ trunk/src/mc.css 2012-03-15 00:22:20 UTC (rev 212) @@ -365,6 +365,15 @@ width: 25px; } +.mc-cat-rc-option-icon-v2 { + position: relative; + z-index: 50; + top: -18px; + left: 38px; + margin-bottom: -10px; + width: 25px; +} + .mc-form-icon-result { width: 120px; height: 90px; Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-15 00:17:49 UTC (rev 211) +++ trunk/wp-theme/mc2-form.php 2012-03-15 00:22:20 UTC (rev 212) @@ -174,13 +174,13 @@ <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> --> <div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-ec" style="margin-top: 15px;"> <div class="mc-cat-rc-option-text"><?php _e("Nature Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> - <?php _e("the natural environment: forests, seeds, the Moon", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-ec"><img src="/mc/0.1/images/rcec25.png" alt="ec" /></div><div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-bo"> <div class="mc-cat-rc-option-text"> + <?php _e("the natural environment: forests, seeds, the Moon", "mc"); ?></div></div><div class="mc-cat-rc-option-icon-v2" id="mc-cat-rc-option-icon-ec"><img src="/mc/0.1/images/rcec25.png" alt="ec" /></div><div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-bo"> <div class="mc-cat-rc-option-text"> <?php _e("Body/Health Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> - <?php _e("the human bodies: blood donation, smiles, non-alienation", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-bo"><img src="/mc/0.1/images/rcbo25.png" alt="bo" /></div><div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-to"> <div class="mc-cat-rc-option-text"> + <?php _e("the human bodies: blood donation, smiles, non-alienation", "mc"); ?></div></div><div class="mc-cat-rc-option-icon-v2" id="mc-cat-rc-option-icon-bo"><img src="/mc/0.1/images/rcbo25.png" alt="bo" /></div><div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-to"> <div class="mc-cat-rc-option-text"> <?php _e("Town/Community/Society Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> - <?php _e("the socio-cultural spaces: language, music, streets, science", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-to"><img src="/mc/0.1/images/rcto25.png" alt="to" /></div><div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-di"> <div class="mc-cat-rc-option-text"> + <?php _e("the socio-cultural spaces: language, music, streets, science", "mc"); ?></div></div><div class="mc-cat-rc-option-icon-v2" id="mc-cat-rc-option-icon-to"><img src="/mc/0.1/images/rcto25.png" alt="to" /></div><div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-di"> <div class="mc-cat-rc-option-text"> <?php _e("Digital Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> - <?php _e("the cyberspace: internet, cyber-rights, Wikipedia", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-di"><img src="/mc/0.1/images/rcdi25.png" alt="di" /></div></div> + <?php _e("the cyberspace: internet, cyber-rights, Wikipedia", "mc"); ?></div></div><div class="mc-cat-rc-option-icon-v2" id="mc-cat-rc-option-icon-di"><img src="/mc/0.1/images/rcdi25.png" alt="di" /></div></div> </div> </div>

1 0