[Movecommons-commits] r357 - in trunk: src src/images wp-theme
Mario Gallegos
mgallegos at ourproject.org
Sat May 19 20:52:34 CEST 2012
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-sliding
+ *
+ * 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> <!-- First slide -->
+<div id="slider1"><ul>
+ <li> <!-- First slide -->
<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><!-- End first slide -->
+ </li><!-- End first slide -->
- <div> <!-- Second slide -->
+ <li> <!-- Second slide -->
<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><!-- End second slide -->
- <div><!-- Third slide -->
+ </li><!-- End second slide -->
+ <li><!-- Third slide -->
<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><!-- End third slide -->
- <div><!-- Fourth slide -->
+ </li><!-- End third slide -->
+ <li><!-- Fourth slide -->
<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><!-- End Fourth slide -->
- <div><!-- Fifth slide -->
+ </li><!-- End Fourth slide -->
+ <li><!-- Fifth slide -->
<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><!-- End Fifth slide -->
+ </li><!-- End Fifth slide -->
-</div> <!-- End Slider -->
+</ul></div> <!-- End Slider -->
<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.easing.1.3.js'></script>
<script type='text/javascript' src='/mc/0.1/jquery.bxSlider.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/jquery-ui.css"/>
<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();
More information about the Movecommons-commits
mailing list