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

r366 - in trunk: src wp-theme
by Mario Gallegos 19 May '12

19 May '12

Author: mgallegos Date: 2012-05-19 21:56:55 +0200 (Sat, 19 May 2012) New Revision: 366 Modified: trunk/src/mc.css trunk/wp-theme/mc2-form.php Log: Modified: trunk/src/mc.css =================================================================== --- trunk/src/mc.css 2012-05-19 19:39:21 UTC (rev 365) +++ trunk/src/mc.css 2012-05-19 19:56:55 UTC (rev 366) @@ -118,9 +118,11 @@ heigth: 300px; } +/* .mc-cat-group-v2{ width: 905px; } +*/ .mc-form-category-group-a-v2 { border-bottom: 2px solid #b7c4c8; @@ -789,7 +791,7 @@ outline: none; } -/* + .bx-prev { position: absolute; top: 145px; @@ -840,4 +842,3 @@ #skip-link { display: none; } -*/ \ No newline at end of file Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-05-19 19:39:21 UTC (rev 365) +++ trunk/wp-theme/mc2-form.php 2012-05-19 19:56:55 UTC (rev 366) @@ -26,8 +26,8 @@ <div class="mc-clean"></div> --> -<div id="slider1"><ul> - <li>  +<div id="slider1"> + <div>  <div class="mc-cat-group-v2" style="padding: 22px;"> <div class="mc-form-required-info2" id="mc-form-required-name"> <div class="label"> @@ -69,9 +69,9 @@ </div> <div class="mc-clean"></div> </div> - </li> + </div> - <li>  + <div>   <div class="mc-cat-group-v2" id="mc-cat-group-a"> <div style="float: left;" class="mc-form-category-group-a-v2"> @@ -124,8 +124,8 @@ </div> </div> <div class="mc-clean"></div> - </li> - <li> + </div> + <div> <div class="mc-cat-group-v2" id="mc-cat-group-b"> <div style="float: left;" class="mc-form-category-group-a-v2"> @@ -199,8 +199,8 @@ </div> <div class="mc-clean"></div> - </li> - <li> + </div> + <div> <div class="mc-cat-group-v2" id="mc-cat-group-c"> <div style="float: left;" class="mc-form-category-group-a-v2"> <div class="mc-form-rounded mc-form-category-group-v2 float-left" style="padding-top: 35px;" id="mc-form-category-group-c"> @@ -247,7 +247,7 @@ <div class="mc-clean"></div> </li> - <li> + <div> <div class="mc-cat-group-v2" id="mc-cat-group-d"> <div style="float: left;" class="mc-form-category-group-a-v2"> @@ -301,9 +301,9 @@ </div> <div class="mc-clean"></div> - </li> + </div> -</ul></div>  +</div>  <div id="mc-form-optional-boxes"> @@ -329,20 +329,17 @@ <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.easySlider1.7.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> <script type='text/javascript' src='/mc/0.1/jquery.checkbox.min.js'></script> <script type="text/javascript" src="/mc/0.1/mc-dia-form2.js"></script> <link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/black-tie/jquer…"/> <link rel="stylesheet" type="text/css" href="/mc/0.1/jquery.checkbox.css"/> -<link rel="stylesheet" type="text/css" href="/mc/0.1/jquery.easySlider.css"/> + <script type="text/javascript"> $j('#languages').tagsInput({width:'400px',defaultText:'Add a language'}); $j('#keywords').tagsInput({width:'400px',defaultText:'Add a keyword'}); @@ -357,7 +354,7 @@ $j('#rp-checkbox').checkbox(); $j('#rc-checkbox').checkbox(); $j('#gr-checkbox').checkbox(); - $j('#slider1').easySlider(); + $j('#slider1').bxSlider(); //$j('div.blockMe1').block({ message: null }); //$j('div.blockMe2').block({ message: null }); //$j('div.blockMe3').block({ message: null });

1 0

r365 - trunk/src
by Mario Gallegos 19 May '12

19 May '12

Author: mgallegos Date: 2012-05-19 21:39:21 +0200 (Sat, 19 May 2012) New Revision: 365 Modified: trunk/src/jquery.easySlider.css trunk/src/mc.css Log: Modified: trunk/src/jquery.easySlider.css =================================================================== --- trunk/src/jquery.easySlider.css 2012-05-19 19:32:40 UTC (rev 364) +++ trunk/src/jquery.easySlider.css 2012-05-19 19:39:21 UTC (rev 365) @@ -6,7 +6,7 @@ } #slider li{ width:905px; - height:241px; + /*height:241px;*/ overflow:hidden; } #prevBtn, #nextBtn{ Modified: trunk/src/mc.css =================================================================== --- trunk/src/mc.css 2012-05-19 19:32:40 UTC (rev 364) +++ trunk/src/mc.css 2012-05-19 19:39:21 UTC (rev 365) @@ -118,9 +118,9 @@ heigth: 300px; } -/*.mc-cat-group-v2{ +.mc-cat-group-v2{ width: 905px; -}*/ +} .mc-form-category-group-a-v2 { border-bottom: 2px solid #b7c4c8;

1 0

r364 - trunk/src
by Mario Gallegos 19 May '12

19 May '12

Author: mgallegos Date: 2012-05-19 21:32:40 +0200 (Sat, 19 May 2012) New Revision: 364 Modified: trunk/src/jquery.easySlider.css trunk/src/jquery.easySlider1.7.js trunk/src/mc.css Log: Modified: trunk/src/jquery.easySlider.css =================================================================== --- trunk/src/jquery.easySlider.css 2012-05-19 19:25:59 UTC (rev 363) +++ trunk/src/jquery.easySlider.css 2012-05-19 19:32:40 UTC (rev 364) @@ -1,138 +1,31 @@ -/*body { - background:#fff url(../images/bg_body.gif) repeat-x; - font:80% Trebuchet MS, Arial, Helvetica, Sans-Serif; - color:#333; - line-height:180%; - margin:0; - padding:0; - text-align:center; +#slider{} +#slider ul, #slider li{ + margin:0; + padding:0; + list-style:none; } - h1{ - font-size:180%; - font-weight:normal; - margin:0; - padding:0 20px; - } - h2{ - font-size:160%; - font-weight:normal; - } - h3{ - font-size:140%; - font-weight:normal; - } -*/ - img{border:none;} - pre{ - display:block; - font:12px "Courier New", Courier, monospace; - padding:10px; - border:1px solid #bae2f0; - background:#e3f4f9; - margin:.5em 0; - width:674px; - } - - - .graphic, #prevBtn, #nextBtn, #slider1prev, #slider1next{ - margin:0; - padding:0; - display:block; - overflow:hidden; - text-indent:-8000px; - } - - - #container{ - margin:0 auto; - position:relative; - text-align:left; - width:696px; - background:#fff; - margin-bottom:2em; - } -/* #header{ - height:80px; - line-height:80px; - background:#5DC9E1; - color:#fff; - }*/ - #content{ - position:relative; - } - -/* Easy Slider */ - - #slider ul, #slider li, - #slider2 ul, #slider2 li{ - margin:0; - padding:0; - list-style:none; - } - #slider2{margin-top:1em;} - #slider li, #slider2 li{ - /* - define width and height of list item (slide) - entire slider area will adjust according to the parameters provided here - */ - width:696px; - height:241px; - overflow:hidden; - } - #prevBtn, #nextBtn, - #slider1next, #slider1prev{ - display:block; - width:30px; - height:77px; - position:absolute; - left:-30px; - top:71px; - z-index:1000; - } - #nextBtn, #slider1next{ - left:696px; - } - #prevBtn a, #nextBtn a, - #slider1next a, #slider1prev a{ - display:block; - position:relative; - width:30px; - height:77px; - background:url(/mc/0.1/images/btn_prev.gif) no-repeat 0 0; - } - #nextBtn a, #slider1next a{ - background:url(/mc/0.1/images/btn_next.gif) no-repeat 0 0; - } - - /* numeric controls */ - - ol#controls{ - margin:1em 0; - padding:0; - height:28px; - } - ol#controls li{ - margin:0 10px 0 0; - padding:0; - float:left; - list-style:none; - height:28px; - line-height:28px; - } - ol#controls li a{ - float:left; - height:28px; - line-height:28px; - border:1px solid #ccc; - background:#DAF3F8; - color:#555; - padding:0 10px; - text-decoration:none; - } - ol#controls li.current a{ - background:#5DC9E1; - color:#fff; - } - ol#controls li a:focus, #prevBtn a:focus, #nextBtn a:focus{outline:none;} - -/* // Easy Slider */ \ No newline at end of file +#slider li{ + width:905px; + height:241px; + overflow:hidden; + } +#prevBtn, #nextBtn{ + display:block; + width:30px; + height:77px; + position:absolute; + left:-30px; + top:71px; + } +#nextBtn{ + left:696px; + } +#prevBtn a, #nextBtn a{ + display:block; + width:30px; + height:77px; + background:url(/mc/0.1/images/btn_prev.gif) no-repeat 0 0; + } +#nextBtn a{ + background:url(/mc/0.1/images/btn_next.gif) no-repeat 0 0; + } \ No newline at end of file Modified: trunk/src/jquery.easySlider1.7.js =================================================================== --- trunk/src/jquery.easySlider1.7.js 2012-05-19 19:25:59 UTC (rev 363) +++ trunk/src/jquery.easySlider1.7.js 2012-05-19 19:32:40 UTC (rev 364) @@ -1,226 +1,175 @@ -/* - * Easy Slider 1.7 - jQuery plugin - * written by Alen Grakalic - * http://cssglobe.com/post/4004/easy-slider-15-the-easiest-jquery-plugin-for-… - * - * Copyright (c) 2009 Alen Grakalic (http://cssglobe.com) - * Dual licensed under the MIT (MIT-LICENSE.txt) - * and GPL (GPL-LICENSE.txt) licenses. - * - * Built for jQuery library - * http://jquery.com - * - */ - -/* - * markup example for $("#slider").easySlider(); - * - * <div id="slider"> - * <ul> - * <li><img src="images/01.jpg" alt="" /></li> - * <li><img src="images/02.jpg" alt="" /></li> - * <li><img src="images/03.jpg" alt="" /></li> - * <li><img src="images/04.jpg" alt="" /></li> - * <li><img src="images/05.jpg" alt="" /></li> - * </ul> - * </div> - * - */ - -(function($) { - - $.fn.easySlider = function(options){ - - // default configuration properties - var defaults = { - prevId: 'prevBtn', - prevText: 'Previous', - nextId: 'nextBtn', - nextText: 'Next', - controlsShow: true, - controlsBefore: '', - controlsAfter: '', - controlsFade: true, - firstId: 'firstBtn', - firstText: 'First', - firstShow: false, - lastId: 'lastBtn', - lastText: 'Last', - lastShow: false, - vertical: false, - speed: 800, - auto: false, - pause: 2000, - continuous: false, - numeric: false, - numericId: 'controls' - }; - - var options = $.extend(defaults, options); - - this.each(function() { - var obj = $(this); - var s = $("li", obj).length; - var w = $("li", obj).width(); - var h = $("li", obj).height(); - var clickable = true; - obj.width(w); - obj.height(h); - obj.css("overflow","hidden"); - var ts = s-1; - var t = 0; - $("ul", obj).css('width',s*w); - - if(options.continuous){ - $("ul", obj).prepend($("ul li:last-child", obj).clone().css("margin-left","-"+ w +"px")); - $("ul", obj).append($("ul li:nth-child(2)", obj).clone()); - $("ul", obj).css('width',(s+1)*w); - }; - - if(!options.vertical) $("li", obj).css('float','left'); - - if(options.controlsShow){ - var html = options.controlsBefore; - if(options.numeric){ - html += '<ol id="'+ options.numericId +'"></ol>'; - } else { - if(options.firstShow) html += '<span id="'+ options.firstId +'"><a href=\"javascript:void(0);\">'+ options.firstText +'</a></span>'; - html += ' <span id="'+ options.prevId +'"><a href=\"javascript:void(0);\">'+ options.prevText +'</a></span>'; - html += ' <span id="'+ options.nextId +'"><a href=\"javascript:void(0);\">'+ options.nextText +'</a></span>'; - if(options.lastShow) html += ' <span id="'+ options.lastId +'"><a href=\"javascript:void(0);\">'+ options.lastText +'</a></span>'; - }; - - html += options.controlsAfter; - $(obj).after(html); - }; - - if(options.numeric){ - for(var i=0;i<s;i++){ - $(document.createElement("li")) - .attr('id',options.numericId + (i+1)) - .html('<a rel='+ i +' href=\"javascript:void(0);\">'+ (i+1) +'</a>') - .appendTo($("#"+ options.numericId)) - .click(function(){ - animate($("a",$(this)).attr('rel'),true); - }); - }; - } else { - $("a","#"+options.nextId).click(function(){ - animate("next",true); - }); - $("a","#"+options.prevId).click(function(){ - animate("prev",true); - }); - $("a","#"+options.firstId).click(function(){ - animate("first",true); - }); - $("a","#"+options.lastId).click(function(){ - animate("last",true); - }); - }; - - function setCurrent(i){ - i = parseInt(i)+1; - $("li", "#" + options.numericId).removeClass("current"); - $("li#" + options.numericId + i).addClass("current"); - }; - - function adjust(){ - if(t>ts) t=0; - if(t<0) t=ts; - if(!options.vertical) { - $("ul",obj).css("margin-left",(t*w*-1)); - } else { - $("ul",obj).css("margin-left",(t*h*-1)); - } - clickable = true; - if(options.numeric) setCurrent(t); - }; - - function animate(dir,clicked){ - if (clickable){ - clickable = false; - var ot = t; - switch(dir){ - case "next": - t = (ot>=ts) ? (options.continuous ? t+1 : ts) : t+1; - break; - case "prev": - t = (t<=0) ? (options.continuous ? t-1 : 0) : t-1; - break; - case "first": - t = 0; - break; - case "last": - t = ts; - break; - default: - t = dir; - break; - }; - var diff = Math.abs(ot-t); - var speed = diff*options.speed; - if(!options.vertical) { - p = (t*w*-1); - $("ul",obj).animate( - { marginLeft: p }, - { queue:false, duration:speed, complete:adjust } - ); - } else { - p = (t*h*-1); - $("ul",obj).animate( - { marginTop: p }, - { queue:false, duration:speed, complete:adjust } - ); - }; - - if(!options.continuous && options.controlsFade){ - if(t==ts){ - $("a","#"+options.nextId).hide(); - $("a","#"+options.lastId).hide(); - } else { - $("a","#"+options.nextId).show(); - $("a","#"+options.lastId).show(); - }; - if(t==0){ - $("a","#"+options.prevId).hide(); - $("a","#"+options.firstId).hide(); - } else { - $("a","#"+options.prevId).show(); - $("a","#"+options.firstId).show(); - }; - }; - - if(clicked) clearTimeout(timeout); - if(options.auto && dir=="next" && !clicked){; - timeout = setTimeout(function(){ - animate("next",false); - },diff*options.speed+options.pause); - }; - - }; - - }; - // init - var timeout; - if(options.auto){; - timeout = setTimeout(function(){ - animate("next",false); - },options.pause); - }; - - if(options.numeric) setCurrent(0); - - if(!options.continuous && options.controlsFade){ - $("a","#"+options.prevId).hide(); - $("a","#"+options.firstId).hide(); - }; - - }); - - }; - -})(jQuery); - - - +/* + * Easy Slider 1.5 - jQuery plugin + * written by Alen Grakalic + * http://cssglobe.com/post/4004/easy-slider-15-the-easiest-jquery-plugin-for-… + * + * Copyright (c) 2009 Alen Grakalic (http://cssglobe.com) + * Dual licensed under the MIT (MIT-LICENSE.txt) + * and GPL (GPL-LICENSE.txt) licenses. + * + * Built for jQuery library + * http://jquery.com + * + */ + +/* + * markup example for $("#slider").easySlider(); + * + * <div id="slider"> + * <ul> + * <li><img src="images/01.jpg" alt="" /></li> + * <li><img src="images/02.jpg" alt="" /></li> + * <li><img src="images/03.jpg" alt="" /></li> + * <li><img src="images/04.jpg" alt="" /></li> + * <li><img src="images/05.jpg" alt="" /></li> + * </ul> + * </div> + * + */ + +(function($) { + + $.fn.easySlider = function(options){ + + // default configuration properties + var defaults = { + prevId: 'prevBtn', + prevText: 'Previous', + nextId: 'nextBtn', + nextText: 'Next', + controlsShow: true, + controlsBefore: '', + controlsAfter: '', + controlsFade: true, + firstId: 'firstBtn', + firstText: 'First', + firstShow: false, + lastId: 'lastBtn', + lastText: 'Last', + lastShow: false, + vertical: false, + speed: 800, + auto: false, + pause: 2000, + continuous: false + }; + + var options = $.extend(defaults, options); + + this.each(function() { + var obj = $(this); + var s = $("li", obj).length; + var w = $("li", obj).width(); + var h = $("li", obj).height(); + obj.width(w); + obj.height(h); + obj.css("overflow","hidden"); + var ts = s-1; + var t = 0; + $("ul", obj).css('width',s*w); + if(!options.vertical) $("li", obj).css('float','left'); + + if(options.controlsShow){ + var html = options.controlsBefore; + if(options.firstShow) html += '<span id="'+ options.firstId +'"><a href=\"javascript:void(0);\">'+ options.firstText +'</a></span>'; + html += ' <span id="'+ options.prevId +'"><a href=\"javascript:void(0);\">'+ options.prevText +'</a></span>'; + html += ' <span id="'+ options.nextId +'"><a href=\"javascript:void(0);\">'+ options.nextText +'</a></span>'; + if(options.lastShow) html += ' <span id="'+ options.lastId +'"><a href=\"javascript:void(0);\">'+ options.lastText +'</a></span>'; + html += options.controlsAfter; + $(obj).after(html); + }; + + $("a","#"+options.nextId).click(function(){ + animate("next",true); + }); + $("a","#"+options.prevId).click(function(){ + animate("prev",true); + }); + $("a","#"+options.firstId).click(function(){ + animate("first",true); + }); + $("a","#"+options.lastId).click(function(){ + animate("last",true); + }); + + function animate(dir,clicked){ + var ot = t; + switch(dir){ + case "next": + t = (ot>=ts) ? (options.continuous ? 0 : ts) : t+1; + break; + case "prev": + t = (t<=0) ? (options.continuous ? ts : 0) : t-1; + break; + case "first": + t = 0; + break; + case "last": + t = ts; + break; + default: + break; + }; + + var diff = Math.abs(ot-t); + var speed = diff*options.speed; + if(!options.vertical) { + p = (t*w*-1); + $("ul",obj).animate( + { marginLeft: p }, + speed + ); + } else { + p = (t*h*-1); + $("ul",obj).animate( + { marginTop: p }, + speed + ); + }; + + if(!options.continuous && options.controlsFade){ + if(t==ts){ + $("a","#"+options.nextId).hide(); + $("a","#"+options.lastId).hide(); + } else { + $("a","#"+options.nextId).show(); + $("a","#"+options.lastId).show(); + }; + if(t==0){ + $("a","#"+options.prevId).hide(); + $("a","#"+options.firstId).hide(); + } else { + $("a","#"+options.prevId).show(); + $("a","#"+options.firstId).show(); + }; + }; + + if(clicked) clearTimeout(timeout); + if(options.auto && dir=="next" && !clicked){; + timeout = setTimeout(function(){ + animate("next",false); + },diff*options.speed+options.pause); + }; + + }; + // init + var timeout; + if(options.auto){; + timeout = setTimeout(function(){ + animate("next",false); + },options.pause); + }; + + if(!options.continuous && options.controlsFade){ + $("a","#"+options.prevId).hide(); + $("a","#"+options.firstId).hide(); + }; + + }); + + }; + +})(jQuery); + + + Modified: trunk/src/mc.css =================================================================== --- trunk/src/mc.css 2012-05-19 19:25:59 UTC (rev 363) +++ trunk/src/mc.css 2012-05-19 19:32:40 UTC (rev 364) @@ -118,9 +118,9 @@ heigth: 300px; } -.mc-cat-group-v2{ +/*.mc-cat-group-v2{ width: 905px; -} +}*/ .mc-form-category-group-a-v2 { border-bottom: 2px solid #b7c4c8;

1 0

r363 - trunk/src
by Mario Gallegos 19 May '12

19 May '12

Author: mgallegos Date: 2012-05-19 21:25:59 +0200 (Sat, 19 May 2012) New Revision: 363 Modified: trunk/src/jquery.easySlider.css Log: Modified: trunk/src/jquery.easySlider.css =================================================================== --- trunk/src/jquery.easySlider.css 2012-05-19 19:22:34 UTC (rev 362) +++ trunk/src/jquery.easySlider.css 2012-05-19 19:25:59 UTC (rev 363) @@ -22,7 +22,7 @@ font-weight:normal; } */ - /*img{border:none;} + img{border:none;} pre{ display:block; font:12px "Courier New", Courier, monospace; @@ -51,15 +51,15 @@ background:#fff; margin-bottom:2em; } - #header{ +/* #header{ height:80px; line-height:80px; background:#5DC9E1; color:#fff; - } + }*/ #content{ position:relative; - }*/ + } /* Easy Slider */

1 0

r362 - trunk/src
by Mario Gallegos 19 May '12

19 May '12

Author: mgallegos Date: 2012-05-19 21:22:34 +0200 (Sat, 19 May 2012) New Revision: 362 Modified: trunk/src/jquery.easySlider.css Log: Modified: trunk/src/jquery.easySlider.css =================================================================== --- trunk/src/jquery.easySlider.css 2012-05-19 19:18:52 UTC (rev 361) +++ trunk/src/jquery.easySlider.css 2012-05-19 19:22:34 UTC (rev 362) @@ -22,7 +22,7 @@ font-weight:normal; } */ - img{border:none;} + /*img{border:none;} pre{ display:block; font:12px "Courier New", Courier, monospace; @@ -33,7 +33,7 @@ width:674px; } - /* image replacement */ + .graphic, #prevBtn, #nextBtn, #slider1prev, #slider1next{ margin:0; padding:0; @@ -41,7 +41,7 @@ overflow:hidden; text-indent:-8000px; } - /* // image replacement */ + #container{ margin:0 auto; @@ -59,7 +59,7 @@ } #content{ position:relative; - } + }*/ /* Easy Slider */

1 0

r361 - trunk/src
by Mario Gallegos 19 May '12

19 May '12

Author: mgallegos Date: 2012-05-19 21:18:52 +0200 (Sat, 19 May 2012) New Revision: 361 Modified: trunk/src/mc.css Log: Modified: trunk/src/mc.css =================================================================== --- trunk/src/mc.css 2012-05-19 19:14:51 UTC (rev 360) +++ trunk/src/mc.css 2012-05-19 19:18:52 UTC (rev 361) @@ -119,7 +119,7 @@ } .mc-cat-group-v2{ - width: 860px; + width: 905px; } .mc-form-category-group-a-v2 {

1 0

r360 - in trunk: src wp-theme
by Mario Gallegos 19 May '12

19 May '12

Author: mgallegos Date: 2012-05-19 21:14:51 +0200 (Sat, 19 May 2012) New Revision: 360 Modified: trunk/src/mc.css trunk/wp-theme/mc2-form.php Log: Modified: trunk/src/mc.css =================================================================== --- trunk/src/mc.css 2012-05-19 19:06:32 UTC (rev 359) +++ trunk/src/mc.css 2012-05-19 19:14:51 UTC (rev 360) @@ -118,6 +118,10 @@ heigth: 300px; } +.mc-cat-group-v2{ + width: 860px; +} + .mc-form-category-group-a-v2 { border-bottom: 2px solid #b7c4c8; border-left: 2px solid #b7c4c8; @@ -173,7 +177,7 @@ -moz-border-bottom-left-radius: 10px; -webkit-border-bottom-left-radius: 10px; - heigth: 300px; + /*heigth: 300px;*/ background-color: #FEFBFD; } @@ -191,7 +195,7 @@ border-left: 2px solid #b7c4c8; border-top: 2px solid #b7c4c8; border-right: 2px solid #b7c4c8; - heigth: 300px; + /*heigth: 300px;*/ background-color: #FEFBFD; } @@ -224,7 +228,7 @@ -khtml-border-bottom-left-radius: 10px; -moz-border-bottom-left-radius: 10px; -webkit-border-bottom-left-radius: 10px; - heigth: 300px; + /*heigth: 300px;*/ background-color: #f9f9f9; } Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-05-19 19:06:32 UTC (rev 359) +++ trunk/wp-theme/mc2-form.php 2012-05-19 19:14:51 UTC (rev 360) @@ -28,7 +28,7 @@ <div id="slider1"><ul> <li>  - <div class="mc-form-category-group-a-v2" style="padding: 22px;"> + <div class="mc-cat-group-v2" style="padding: 22px;"> <div class="mc-form-required-info2" id="mc-form-required-name"> <div class="label"> <label id="mc-required-title-name" style="background-color: #FEFBFD"><?php _e("Name of your initiative", "mc"); ?><span class="required-field">*</span></label> @@ -72,8 +72,8 @@ </li> <li>  - <label id="mc-optional-optional-boxes"><?php _e("Click on those you think corespond to your initiative:", "mc"); ?></label> - <div class="mc-cat-group-a-v2" id="mc-cat-group-a"> +  + <div class="mc-cat-group-v2" id="mc-cat-group-a"> <div style="float: left;" class="mc-form-category-group-a-v2"> <div class="mc-form-rounded mc-form-category-group-v2 float-left" id="mc-form-category-group-a"> <img src="/mc/0.1/images/cat-selected.png" alt="selected" class="mc-cat-selected mc-cat-selected-a" id="mc-cat-selected-np" /> @@ -127,7 +127,7 @@ </li> <li> - <div class="mc-cat-group-b-v2" id="mc-cat-group-b"> + <div class="mc-cat-group-v2" id="mc-cat-group-b"> <div style="float: left;" class="mc-form-category-group-a-v2"> <div class="mc-form-rounded mc-form-category-group-v2 float-left" id="mc-form-category-group-b"> <img src="/mc/0.1/images/cat-selected.png" alt="selected" class="mc-cat-selected mc-cat-selected-a" id="mc-cat-selected-rp" /> @@ -201,7 +201,7 @@ </li> <li> - <div class="mc-cat-group-c-v2" id="mc-cat-group-c"> + <div class="mc-cat-group-v2" id="mc-cat-group-c"> <div style="float: left;" class="mc-form-category-group-a-v2"> <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" /> @@ -249,7 +249,7 @@ </li> <li> - <div class="mc-cat-group-d-v2" id="mc-cat-group-d"> + <div class="mc-cat-group-v2" id="mc-cat-group-d"> <div style="float: left;" class="mc-form-category-group-a-v2"> <div class="mc-form-rounded mc-form-category-group-v2 float-left" id="mc-form-category-group-d"> <img src="/mc/0.1/images/cat-selected.png" alt="selected" class="mc-cat-selected mc-cat-selected-a" id="mc-cat-selected-gr" /> @@ -357,7 +357,7 @@ $j('#rp-checkbox').checkbox(); $j('#rc-checkbox').checkbox(); $j('#gr-checkbox').checkbox(); - //$j('#slider1').easySlider(); + $j('#slider1').easySlider(); //$j('div.blockMe1').block({ message: null }); //$j('div.blockMe2').block({ message: null }); //$j('div.blockMe3').block({ message: null });

1 0

r359 - trunk/wp-theme
by Mario Gallegos 19 May '12

19 May '12

Author: mgallegos Date: 2012-05-19 21:06:32 +0200 (Sat, 19 May 2012) New Revision: 359 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-05-19 19:00:23 UTC (rev 358) +++ trunk/wp-theme/mc2-form.php 2012-05-19 19:06:32 UTC (rev 359) @@ -3,6 +3,7 @@ <?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 id="slider1"><ul> <li>  @@ -350,12 +352,12 @@ $j('#infield-creative-commons-website').inFieldLabels(); $j('#infield-other-license-website').inFieldLabels(); $j('#infield-url').inFieldLabels(); - $j('#infield-terms-of-use-website').inFieldLabels(); - $j('#slider1').easySlider(); + $j('#infield-terms-of-use-website').inFieldLabels(); $j('#np-checkbox').checkbox(); $j('#rp-checkbox').checkbox(); $j('#rc-checkbox').checkbox(); $j('#gr-checkbox').checkbox(); + //$j('#slider1').easySlider(); //$j('div.blockMe1').block({ message: null }); //$j('div.blockMe2').block({ message: null }); //$j('div.blockMe3').block({ message: null });

1 0

r358 - trunk/src
by Mario Gallegos 19 May '12

19 May '12

Author: mgallegos Date: 2012-05-19 21:00:23 +0200 (Sat, 19 May 2012) New Revision: 358 Modified: trunk/src/jquery.easySlider.css Log: Modified: trunk/src/jquery.easySlider.css =================================================================== --- trunk/src/jquery.easySlider.css 2012-05-19 18:52:32 UTC (rev 357) +++ trunk/src/jquery.easySlider.css 2012-05-19 19:00:23 UTC (rev 358) @@ -98,10 +98,10 @@ position:relative; width:30px; height:77px; - background:url(../images/btn_prev.gif) no-repeat 0 0; + background:url(/mc/0.1/images/btn_prev.gif) no-repeat 0 0; } #nextBtn a, #slider1next a{ - background:url(../images/btn_next.gif) no-repeat 0 0; + background:url(/mc/0.1/images/btn_next.gif) no-repeat 0 0; } /* numeric controls */

1 0

r357 - in trunk: src src/images wp-theme
by Mario Gallegos 19 May '12

19 May '12

Author: mgallegos Date: 2012-05-19 20:52:32 +0200 (Sat, 19 May 2012) New Revision: 357 Added: trunk/src/images/bg_body.gif trunk/src/images/bg_header.gif trunk/src/images/btn_next.gif trunk/src/images/btn_prev.gif trunk/src/jquery.easySlider.css trunk/src/jquery.easySlider1.7.js Modified: trunk/src/mc.css trunk/wp-theme/mc2-form.php Log: Added: trunk/src/images/bg_body.gif =================================================================== (Binary files differ) Property changes on: trunk/src/images/bg_body.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/images/bg_header.gif =================================================================== (Binary files differ) Property changes on: trunk/src/images/bg_header.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/images/btn_next.gif =================================================================== (Binary files differ) Property changes on: trunk/src/images/btn_next.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/images/btn_prev.gif =================================================================== (Binary files differ) Property changes on: trunk/src/images/btn_prev.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/jquery.easySlider.css =================================================================== --- trunk/src/jquery.easySlider.css (rev 0) +++ trunk/src/jquery.easySlider.css 2012-05-19 18:52:32 UTC (rev 357) @@ -0,0 +1,138 @@ +/*body { + background:#fff url(../images/bg_body.gif) repeat-x; + font:80% Trebuchet MS, Arial, Helvetica, Sans-Serif; + color:#333; + line-height:180%; + margin:0; + padding:0; + text-align:center; + } + h1{ + font-size:180%; + font-weight:normal; + margin:0; + padding:0 20px; + } + h2{ + font-size:160%; + font-weight:normal; + } + h3{ + font-size:140%; + font-weight:normal; + } +*/ + img{border:none;} + pre{ + display:block; + font:12px "Courier New", Courier, monospace; + padding:10px; + border:1px solid #bae2f0; + background:#e3f4f9; + margin:.5em 0; + width:674px; + } + + /* image replacement */ + .graphic, #prevBtn, #nextBtn, #slider1prev, #slider1next{ + margin:0; + padding:0; + display:block; + overflow:hidden; + text-indent:-8000px; + } + /* // image replacement */ + + #container{ + margin:0 auto; + position:relative; + text-align:left; + width:696px; + background:#fff; + margin-bottom:2em; + } + #header{ + height:80px; + line-height:80px; + background:#5DC9E1; + color:#fff; + } + #content{ + position:relative; + } + +/* Easy Slider */ + + #slider ul, #slider li, + #slider2 ul, #slider2 li{ + margin:0; + padding:0; + list-style:none; + } + #slider2{margin-top:1em;} + #slider li, #slider2 li{ + /* + define width and height of list item (slide) + entire slider area will adjust according to the parameters provided here + */ + width:696px; + height:241px; + overflow:hidden; + } + #prevBtn, #nextBtn, + #slider1next, #slider1prev{ + display:block; + width:30px; + height:77px; + position:absolute; + left:-30px; + top:71px; + z-index:1000; + } + #nextBtn, #slider1next{ + left:696px; + } + #prevBtn a, #nextBtn a, + #slider1next a, #slider1prev a{ + display:block; + position:relative; + width:30px; + height:77px; + background:url(../images/btn_prev.gif) no-repeat 0 0; + } + #nextBtn a, #slider1next a{ + background:url(../images/btn_next.gif) no-repeat 0 0; + } + + /* numeric controls */ + + ol#controls{ + margin:1em 0; + padding:0; + height:28px; + } + ol#controls li{ + margin:0 10px 0 0; + padding:0; + float:left; + list-style:none; + height:28px; + line-height:28px; + } + ol#controls li a{ + float:left; + height:28px; + line-height:28px; + border:1px solid #ccc; + background:#DAF3F8; + color:#555; + padding:0 10px; + text-decoration:none; + } + ol#controls li.current a{ + background:#5DC9E1; + color:#fff; + } + ol#controls li a:focus, #prevBtn a:focus, #nextBtn a:focus{outline:none;} + +/* // Easy Slider */ \ No newline at end of file Added: trunk/src/jquery.easySlider1.7.js =================================================================== --- trunk/src/jquery.easySlider1.7.js (rev 0) +++ trunk/src/jquery.easySlider1.7.js 2012-05-19 18:52:32 UTC (rev 357) @@ -0,0 +1,226 @@ +/* + * Easy Slider 1.7 - jQuery plugin + * written by Alen Grakalic + * http://cssglobe.com/post/4004/easy-slider-15-the-easiest-jquery-plugin-for-… + * + * Copyright (c) 2009 Alen Grakalic (http://cssglobe.com) + * Dual licensed under the MIT (MIT-LICENSE.txt) + * and GPL (GPL-LICENSE.txt) licenses. + * + * Built for jQuery library + * http://jquery.com + * + */ + +/* + * markup example for $("#slider").easySlider(); + * + * <div id="slider"> + * <ul> + * <li><img src="images/01.jpg" alt="" /></li> + * <li><img src="images/02.jpg" alt="" /></li> + * <li><img src="images/03.jpg" alt="" /></li> + * <li><img src="images/04.jpg" alt="" /></li> + * <li><img src="images/05.jpg" alt="" /></li> + * </ul> + * </div> + * + */ + +(function($) { + + $.fn.easySlider = function(options){ + + // default configuration properties + var defaults = { + prevId: 'prevBtn', + prevText: 'Previous', + nextId: 'nextBtn', + nextText: 'Next', + controlsShow: true, + controlsBefore: '', + controlsAfter: '', + controlsFade: true, + firstId: 'firstBtn', + firstText: 'First', + firstShow: false, + lastId: 'lastBtn', + lastText: 'Last', + lastShow: false, + vertical: false, + speed: 800, + auto: false, + pause: 2000, + continuous: false, + numeric: false, + numericId: 'controls' + }; + + var options = $.extend(defaults, options); + + this.each(function() { + var obj = $(this); + var s = $("li", obj).length; + var w = $("li", obj).width(); + var h = $("li", obj).height(); + var clickable = true; + obj.width(w); + obj.height(h); + obj.css("overflow","hidden"); + var ts = s-1; + var t = 0; + $("ul", obj).css('width',s*w); + + if(options.continuous){ + $("ul", obj).prepend($("ul li:last-child", obj).clone().css("margin-left","-"+ w +"px")); + $("ul", obj).append($("ul li:nth-child(2)", obj).clone()); + $("ul", obj).css('width',(s+1)*w); + }; + + if(!options.vertical) $("li", obj).css('float','left'); + + if(options.controlsShow){ + var html = options.controlsBefore; + if(options.numeric){ + html += '<ol id="'+ options.numericId +'"></ol>'; + } else { + if(options.firstShow) html += '<span id="'+ options.firstId +'"><a href=\"javascript:void(0);\">'+ options.firstText +'</a></span>'; + html += ' <span id="'+ options.prevId +'"><a href=\"javascript:void(0);\">'+ options.prevText +'</a></span>'; + html += ' <span id="'+ options.nextId +'"><a href=\"javascript:void(0);\">'+ options.nextText +'</a></span>'; + if(options.lastShow) html += ' <span id="'+ options.lastId +'"><a href=\"javascript:void(0);\">'+ options.lastText +'</a></span>'; + }; + + html += options.controlsAfter; + $(obj).after(html); + }; + + if(options.numeric){ + for(var i=0;i<s;i++){ + $(document.createElement("li")) + .attr('id',options.numericId + (i+1)) + .html('<a rel='+ i +' href=\"javascript:void(0);\">'+ (i+1) +'</a>') + .appendTo($("#"+ options.numericId)) + .click(function(){ + animate($("a",$(this)).attr('rel'),true); + }); + }; + } else { + $("a","#"+options.nextId).click(function(){ + animate("next",true); + }); + $("a","#"+options.prevId).click(function(){ + animate("prev",true); + }); + $("a","#"+options.firstId).click(function(){ + animate("first",true); + }); + $("a","#"+options.lastId).click(function(){ + animate("last",true); + }); + }; + + function setCurrent(i){ + i = parseInt(i)+1; + $("li", "#" + options.numericId).removeClass("current"); + $("li#" + options.numericId + i).addClass("current"); + }; + + function adjust(){ + if(t>ts) t=0; + if(t<0) t=ts; + if(!options.vertical) { + $("ul",obj).css("margin-left",(t*w*-1)); + } else { + $("ul",obj).css("margin-left",(t*h*-1)); + } + clickable = true; + if(options.numeric) setCurrent(t); + }; + + function animate(dir,clicked){ + if (clickable){ + clickable = false; + var ot = t; + switch(dir){ + case "next": + t = (ot>=ts) ? (options.continuous ? t+1 : ts) : t+1; + break; + case "prev": + t = (t<=0) ? (options.continuous ? t-1 : 0) : t-1; + break; + case "first": + t = 0; + break; + case "last": + t = ts; + break; + default: + t = dir; + break; + }; + var diff = Math.abs(ot-t); + var speed = diff*options.speed; + if(!options.vertical) { + p = (t*w*-1); + $("ul",obj).animate( + { marginLeft: p }, + { queue:false, duration:speed, complete:adjust } + ); + } else { + p = (t*h*-1); + $("ul",obj).animate( + { marginTop: p }, + { queue:false, duration:speed, complete:adjust } + ); + }; + + if(!options.continuous && options.controlsFade){ + if(t==ts){ + $("a","#"+options.nextId).hide(); + $("a","#"+options.lastId).hide(); + } else { + $("a","#"+options.nextId).show(); + $("a","#"+options.lastId).show(); + }; + if(t==0){ + $("a","#"+options.prevId).hide(); + $("a","#"+options.firstId).hide(); + } else { + $("a","#"+options.prevId).show(); + $("a","#"+options.firstId).show(); + }; + }; + + if(clicked) clearTimeout(timeout); + if(options.auto && dir=="next" && !clicked){; + timeout = setTimeout(function(){ + animate("next",false); + },diff*options.speed+options.pause); + }; + + }; + + }; + // init + var timeout; + if(options.auto){; + timeout = setTimeout(function(){ + animate("next",false); + },options.pause); + }; + + if(options.numeric) setCurrent(0); + + if(!options.continuous && options.controlsFade){ + $("a","#"+options.prevId).hide(); + $("a","#"+options.firstId).hide(); + }; + + }); + + }; + +})(jQuery); + + + Modified: trunk/src/mc.css =================================================================== --- trunk/src/mc.css 2012-05-10 23:29:55 UTC (rev 356) +++ trunk/src/mc.css 2012-05-19 18:52:32 UTC (rev 357) @@ -785,6 +785,7 @@ outline: none; } +/* .bx-prev { position: absolute; top: 145px; @@ -815,7 +816,6 @@ display: none; } -/*pager*/ .bx-pager { text-align: center; } @@ -836,3 +836,4 @@ #skip-link { display: none; } +*/ \ No newline at end of file Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-05-10 23:29:55 UTC (rev 356) +++ trunk/wp-theme/mc2-form.php 2012-05-19 18:52:32 UTC (rev 357) @@ -24,8 +24,8 @@ </div> <div class="mc-clean"></div> -<div id="slider1"> - <div>  +<div id="slider1"><ul> + <li>  <div class="mc-form-category-group-a-v2" style="padding: 22px;"> <div class="mc-form-required-info2" id="mc-form-required-name"> <div class="label"> @@ -67,9 +67,9 @@ </div> <div class="mc-clean"></div> </div> - </div> + </li> - <div>  + <li>  <label id="mc-optional-optional-boxes"><?php _e("Click on those you think corespond to your initiative:", "mc"); ?></label> <div class="mc-cat-group-a-v2" id="mc-cat-group-a"> <div style="float: left;" class="mc-form-category-group-a-v2"> @@ -122,8 +122,8 @@ </div> </div> <div class="mc-clean"></div> - </div> - <div> + </li> + <li> <div class="mc-cat-group-b-v2" id="mc-cat-group-b"> <div style="float: left;" class="mc-form-category-group-a-v2"> @@ -197,8 +197,8 @@ </div> <div class="mc-clean"></div> - </div> - <div> + </li> + <li> <div class="mc-cat-group-c-v2" id="mc-cat-group-c"> <div style="float: left;" class="mc-form-category-group-a-v2"> <div class="mc-form-rounded mc-form-category-group-v2 float-left" style="padding-top: 35px;" id="mc-form-category-group-c"> @@ -244,8 +244,8 @@ </div> <div class="mc-clean"></div> - </div> - <div> + </li> + <li> <div class="mc-cat-group-d-v2" id="mc-cat-group-d"> <div style="float: left;" class="mc-form-category-group-a-v2"> @@ -299,9 +299,9 @@ </div> <div class="mc-clean"></div> - </div> + </li> -</div>  +</ul></div>  <div id="mc-form-optional-boxes"> @@ -328,14 +328,18 @@ <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.easySlider1.7.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> <script type='text/javascript' src='/mc/0.1/jquery.checkbox.min.js'></script> <script type="text/javascript" src="/mc/0.1/mc-dia-form2.js"></script> <link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/black-tie/jquer…"/> <link rel="stylesheet" type="text/css" href="/mc/0.1/jquery.checkbox.css"/> +<link rel="stylesheet" type="text/css" href="/mc/0.1/jquery.easySlider.css"/> <script type="text/javascript"> $j('#languages').tagsInput({width:'400px',defaultText:'Add a language'}); @@ -347,7 +351,7 @@ $j('#infield-other-license-website').inFieldLabels(); $j('#infield-url').inFieldLabels(); $j('#infield-terms-of-use-website').inFieldLabels(); - $j('#slider1').bxSlider(); + $j('#slider1').easySlider(); $j('#np-checkbox').checkbox(); $j('#rp-checkbox').checkbox(); $j('#rc-checkbox').checkbox();

1 0