[Movecommons-commits] r364 - trunk/src
Mario Gallegos
mgallegos at ourproject.org
Sat May 19 21:32:41 CEST 2012
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-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);
-
-
-
+/*
+ * Easy Slider 1.5 - 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
+ };
+
+ 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;
More information about the Movecommons-commits
mailing list