Changeset 25997 for extensions

Timestamp:

Dec 17, 2013, 11:22:53 PM (11 years ago)

Author:

Miklfe

Message:

 

Location:

extensions/Slim

Files:

• Slim.php (modified) (3 diffs)
• admin/admin.tpl (modified) (2 diffs)
• images/Lytebox/blank.gif (added)
• js/jcarousel.skeleton.js (added)
• js/jquery.columnizer.js (added)
• js/jquery.hoverIntent.js (added)
• js/jquery.jcarousel.js (added)
• js/jquery.jcarousel.min.js (modified) (1 diff)
• js/menu.js (modified) (1 diff)
• local_head.tpl (modified) (2 diffs)
• template/comments.tpl (modified) (1 diff)
• template/header.tpl (modified) (2 diffs)
• template/identification.tpl (modified) (1 diff)
• template/index.tpl (modified) (4 diffs)
• template/mainpage_categories.tpl (modified) (1 diff)
• template/menubar.tpl (modified) (1 diff)
• template/menubar_categories.tpl (modified) (1 diff)
• template/notification.tpl (modified) (1 diff)
• template/password.tpl (modified) (1 diff)
• template/picture.tpl (modified) (1 diff)
• template/profile.tpl (modified) (1 diff)
• template/register.tpl (modified) (1 diff)
• template/search.tpl (modified) (1 diff)
• template/tags.tpl (modified) (1 diff)
• template/thumbnails.tpl (modified) (2 diffs)
• theme.css (modified) (6 diffs)
• themeconf.inc.php (modified) (4 diffs)

extensions/Slim/Slim.php

@@ -2 +2 @@
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-global $conf, $template,$smarty, $repeat;
+global $conf, $template;
         $params = array_merge(unserialize($conf['Slim']));
-        
+        $template->assign('Slim', $params);
+
         
         
@@ -13 +14 @@
 <link rel="stylesheet" type="text/css" href="themes/Slim/theme_black.css">
 
-                ',$smarty, $repeat);
+                ');
                 };
 if ($params['color_theme'] == 3 )
@@ -20 +21 @@
 <link rel="stylesheet" type="text/css" href="themes/Slim/theme_grey.css">
 
-                ',$smarty, $repeat);
+                ');
                 };
 

extensions/Slim/admin/admin.tpl

@@ -1 +1 @@
 {html_head}
-        <script src="themes/Slim/admin/js/jquery.screwdefaultbuttonsV2.min.js" type="text/javascript"></script>
         <style media="screen" type="text/css">
                 {literal}
@@ -6 +5 @@
                 {/literal}
         </style>
-
-        <script type="text/javascript">
-        {literal}
-                $(function(){
-                
-                        $('input:radio').screwDefaultButtons({
-                                image: 'url("themes/Slim/admin/images/radioSmall_Blue.png")',
-                                width: 35,
-                                height: 35
-                        });
-                        
-                });
-        {/literal}
-        </script>
 {/html_head}
         

extensions/Slim/js/jquery.jcarousel.min.js

@@ -12 +12 @@
  * Inspired by the "Carousel Component" by Bill Scott
  *   http://billwscott.com/carousel/
- */
+*/
 
 (function(g){var q={vertical:!1,rtl:!1,start:1,offset:1,size:null,scroll:3,visible:null,animation:"normal",easing:"swing",auto:0,wrap:null,initCallback:null,setupCallback:null,reloadCallback:null,itemLoadCallback:null,itemFirstInCallback:null,itemFirstOutCallback:null,itemLastInCallback:null,itemLastOutCallback:null,itemVisibleInCallback:null,itemVisibleOutCallback:null,animationStepCallback:null,buttonNextHTML:"<div></div>",buttonPrevHTML:"<div></div>",buttonNextEvent:"click",buttonPrevEvent:"click", buttonNextCallback:null,buttonPrevCallback:null,itemFallbackDimension:null},m=!1;g(window).bind("load.jcarousel",function(){m=!0});g.jcarousel=function(a,c){this.options=g.extend({},q,c||{});this.autoStopped=this.locked=!1;this.buttonPrevState=this.buttonNextState=this.buttonPrev=this.buttonNext=this.list=this.clip=this.container=null;if(!c||c.rtl===void 0)this.options.rtl=(g(a).attr("dir")||g("html").attr("dir")||"").toLowerCase()=="rtl";this.wh=!this.options.vertical?"width":"height";this.lt=!this.options.vertical? this.options.rtl?"right":"left":"top";for(var b="",d=a.className.split(" "),f=0;f<d.length;f++)if(d[f].indexOf("jcarousel-skin")!=-1){g(a).removeClass(d[f]);b=d[f];break}a.nodeName.toUpperCase()=="UL"||a.nodeName.toUpperCase()=="OL"?(this.list=g(a),this.clip=this.list.parents(".jcarousel-clip"),this.container=this.list.parents(".jcarousel-container")):(this.container=g(a),this.list=this.container.find("ul,ol").eq(0),this.clip=this.container.find(".jcarousel-clip"));if(this.clip.size()===0)this.clip= this.list.wrap("<div></div>").parent();if(this.container.size()===0)this.container=this.clip.wrap("<div></div>").parent();b!==""&&this.container.parent()[0].className.indexOf("jcarousel-skin")==-1&&this.container.wrap('<div class=" '+b+'"></div>');this.buttonPrev=g(".jcarousel-prev",this.container);if(this.buttonPrev.size()===0&&this.options.buttonPrevHTML!==null)this.buttonPrev=g(this.options.buttonPrevHTML).appendTo(this.container);this.buttonPrev.addClass(this.className("jcarousel-prev"));this.buttonNext= g(".jcarousel-next",this.container);if(this.buttonNext.size()===0&&this.options.buttonNextHTML!==null)this.buttonNext=g(this.options.buttonNextHTML).appendTo(this.container);this.buttonNext.addClass(this.className("jcarousel-next"));this.clip.addClass(this.className("jcarousel-clip")).css({position:"relative"});this.list.addClass(this.className("jcarousel-list")).css({overflow:"hidden",position:"relative",top:0,margin:0,padding:0}).css(this.options.rtl?"right":"left",0);this.container.addClass(this.className("jcarousel-container")).css({position:"relative"}); !this.options.vertical&&this.options.rtl&&this.container.addClass("jcarousel-direction-rtl").attr("dir","rtl");var j=this.options.visible!==null?Math.ceil(this.clipping()/this.options.visible):null,b=this.list.children("li"),e=this;if(b.size()>0){var h=0,i=this.options.offset;b.each(function(){e.format(this,i++);h+=e.dimension(this,j)});this.list.css(this.wh,h+100+"px");if(!c||c.size===void 0)this.options.size=b.size()}this.container.css("display","block");this.buttonNext.css("display","block");this.buttonPrev.css("display", "block");this.funcNext=function(){e.next()};this.funcPrev=function(){e.prev()};this.funcResize=function(){e.resizeTimer&&clearTimeout(e.resizeTimer);e.resizeTimer=setTimeout(function(){e.reload()},100)};this.options.initCallback!==null&&this.options.initCallback(this,"init");!m&&g.browser.safari?(this.buttons(!1,!1),g(window).bind("load.jcarousel",function(){e.setup()})):this.setup()};var f=g.jcarousel;f.fn=f.prototype={jcarousel:"0.2.8"};f.fn.extend=f.extend=g.extend;f.fn.extend({setup:function(){this.prevLast= this.prevFirst=this.last=this.first=null;this.animating=!1;this.tail=this.resizeTimer=this.timer=null;this.inTail=!1;if(!this.locked){this.list.css(this.lt,this.pos(this.options.offset)+"px");var a=this.pos(this.options.start,!0);this.prevFirst=this.prevLast=null;this.animate(a,!1);g(window).unbind("resize.jcarousel",this.funcResize).bind("resize.jcarousel",this.funcResize);this.options.setupCallback!==null&&this.options.setupCallback(this)}},reset:function(){this.list.empty();this.list.css(this.lt, "0px");this.list.css(this.wh,"10px");this.options.initCallback!==null&&this.options.initCallback(this,"reset");this.setup()},reload:function(){this.tail!==null&&this.inTail&&this.list.css(this.lt,f.intval(this.list.css(this.lt))+this.tail);this.tail=null;this.inTail=!1;this.options.reloadCallback!==null&&this.options.reloadCallback(this);if(this.options.visible!==null){var a=this,c=Math.ceil(this.clipping()/this.options.visible),b=0,d=0;this.list.children("li").each(function(f){b+=a.dimension(this, c);f+1<a.first&&(d=b)});this.list.css(this.wh,b+"px");this.list.css(this.lt,-d+"px")}this.scroll(this.first,!1)},lock:function(){this.locked=!0;this.buttons()},unlock:function(){this.locked=!1;this.buttons()},size:function(a){if(a!==void 0)this.options.size=a,this.locked||this.buttons();return this.options.size},has:function(a,c){if(c===void 0||!c)c=a;if(this.options.size!==null&&c>this.options.size)c=this.options.size;for(var b=a;b<=c;b++){var d=this.get(b);if(!d.length||d.hasClass("jcarousel-item-placeholder"))return!1}return!0}, get:function(a){return g(">.jcarousel-item-"+a,this.list)},add:function(a,c){var b=this.get(a),d=0,p=g(c);if(b.length===0)for(var j,e=f.intval(a),b=this.create(a);;){if(j=this.get(--e),e<=0||j.length){e<=0?this.list.prepend(b):j.after(b);break}}else d=this.dimension(b);p.get(0).nodeName.toUpperCase()=="LI"?(b.replaceWith(p),b=p):b.empty().append(c);this.format(b.removeClass(this.className("jcarousel-item-placeholder")),a);p=this.options.visible!==null?Math.ceil(this.clipping()/this.options.visible): null;d=this.dimension(b,p)-d;a>0&&a<this.first&&this.list.css(this.lt,f.intval(this.list.css(this.lt))-d+"px");this.list.css(this.wh,f.intval(this.list.css(this.wh))+d+"px");return b},remove:function(a){var c=this.get(a);if(c.length&&!(a>=this.first&&a<=this.last)){var b=this.dimension(c);a<this.first&&this.list.css(this.lt,f.intval(this.list.css(this.lt))+b+"px");c.remove();this.list.css(this.wh,f.intval(this.list.css(this.wh))-b+"px")}},next:function(){this.tail!==null&&!this.inTail?this.scrollTail(!1): this.scroll((this.options.wrap=="both"||this.options.wrap=="last")&&this.options.size!==null&&this.last==this.options.size?1:this.first+this.options.scroll)},prev:function(){this.tail!==null&&this.inTail?this.scrollTail(!0):this.scroll((this.options.wrap=="both"||this.options.wrap=="first")&&this.options.size!==null&&this.first==1?this.options.size:this.first-this.options.scroll)},scrollTail:function(a){if(!this.locked&&!this.animating&&this.tail){this.pauseAuto();var c=f.intval(this.list.css(this.lt)), c=!a?c-this.tail:c+this.tail;this.inTail=!a;this.prevFirst=this.first;this.prevLast=this.last;this.animate(c)}},scroll:function(a,c){!this.locked&&!this.animating&&(this.pauseAuto(),this.animate(this.pos(a),c))},pos:function(a,c){var b=f.intval(this.list.css(this.lt));if(this.locked||this.animating)return b;this.options.wrap!="circular"&&(a=a<1?1:this.options.size&&a>this.options.size?this.options.size:a);for(var d=this.first>a,g=this.options.wrap!="circular"&&this.first<=1?1:this.first,j=d?this.get(g): this.get(this.last),e=d?g:g-1,h=null,i=0,k=!1,l=0;d?--e>=a:++e<a;){h=this.get(e);k=!h.length;if(h.length===0&&(h=this.create(e).addClass(this.className("jcarousel-item-placeholder")),j[d?"before":"after"](h),this.first!==null&&this.options.wrap=="circular"&&this.options.size!==null&&(e<=0||e>this.options.size)))j=this.get(this.index(e)),j.length&&(h=this.add(e,j.clone(!0)));j=h;l=this.dimension(h);k&&(i+=l);if(this.first!==null&&(this.options.wrap=="circular"||e>=1&&(this.options.size===null||e<= this.options.size)))b=d?b+l:b-l}for(var g=this.clipping(),m=[],o=0,n=0,j=this.get(a-1),e=a;++o;){h=this.get(e);k=!h.length;if(h.length===0){h=this.create(e).addClass(this.className("jcarousel-item-placeholder"));if(j.length===0)this.list.prepend(h);else j[d?"before":"after"](h);if(this.first!==null&&this.options.wrap=="circular"&&this.options.size!==null&&(e<=0||e>this.options.size))j=this.get(this.index(e)),j.length&&(h=this.add(e,j.clone(!0)))}j=h;l=this.dimension(h);if(l===0)throw Error("jCarousel: No width/height set for items. This will cause an infinite loop. Aborting..."); this.options.wrap!="circular"&&this.options.size!==null&&e>this.options.size?m.push(h):k&&(i+=l);n+=l;if(n>=g)break;e++}for(h=0;h<m.length;h++)m[h].remove();i>0&&(this.list.css(this.wh,this.dimension(this.list)+i+"px"),d&&(b-=i,this.list.css(this.lt,f.intval(this.list.css(this.lt))-i+"px")));i=a+o-1;if(this.options.wrap!="circular"&&this.options.size&&i>this.options.size)i=this.options.size;if(e>i){o=0;e=i;for(n=0;++o;){h=this.get(e--);if(!h.length)break;n+=this.dimension(h);if(n>=g)break}}e=i-o+ 1;this.options.wrap!="circular"&&e<1&&(e=1);if(this.inTail&&d)b+=this.tail,this.inTail=!1;this.tail=null;if(this.options.wrap!="circular"&&i==this.options.size&&i-o+1>=1&&(d=f.intval(this.get(i).css(!this.options.vertical?"marginRight":"marginBottom")),n-d>g))this.tail=n-g-d;if(c&&a===this.options.size&&this.tail)b-=this.tail,this.inTail=!0;for(;a-- >e;)b+=this.dimension(this.get(a));this.prevFirst=this.first;this.prevLast=this.last;this.first=e;this.last=i;return b},animate:function(a,c){if(!this.locked&& !this.animating){this.animating=!0;var b=this,d=function(){b.animating=!1;a===0&&b.list.css(b.lt,0);!b.autoStopped&&(b.options.wrap=="circular"||b.options.wrap=="both"||b.options.wrap=="last"||b.options.size===null||b.last<b.options.size||b.last==b.options.size&&b.tail!==null&&!b.inTail)&&b.startAuto();b.buttons();b.notify("onAfterAnimation");if(b.options.wrap=="circular"&&b.options.size!==null)for(var c=b.prevFirst;c<=b.prevLast;c++)c!==null&&!(c>=b.first&&c<=b.last)&&(c<1||c>b.options.size)&&b.remove(c)}; this.notify("onBeforeAnimation");if(!this.options.animation||c===!1)this.list.css(this.lt,a+"px"),d();else{var f=!this.options.vertical?this.options.rtl?{right:a}:{left:a}:{top:a},d={duration:this.options.animation,easing:this.options.easing,complete:d};if(g.isFunction(this.options.animationStepCallback))d.step=this.options.animationStepCallback;this.list.animate(f,d)}}},startAuto:function(a){if(a!==void 0)this.options.auto=a;if(this.options.auto===0)return this.stopAuto();if(this.timer===null){this.autoStopped= !1;var c=this;this.timer=window.setTimeout(function(){c.next()},this.options.auto*1E3)}},stopAuto:function(){this.pauseAuto();this.autoStopped=!0},pauseAuto:function(){if(this.timer!==null)window.clearTimeout(this.timer),this.timer=null},buttons:function(a,c){if(a==null&&(a=!this.locked&&this.options.size!==0&&(this.options.wrap&&this.options.wrap!="first"||this.options.size===null||this.last<this.options.size),!this.locked&&(!this.options.wrap||this.options.wrap=="first")&&this.options.size!==null&& this.last>=this.options.size))a=this.tail!==null&&!this.inTail;if(c==null&&(c=!this.locked&&this.options.size!==0&&(this.options.wrap&&this.options.wrap!="last"||this.first>1),!this.locked&&(!this.options.wrap||this.options.wrap=="last")&&this.options.size!==null&&this.first==1))c=this.tail!==null&&this.inTail;var b=this;this.buttonNext.size()>0?(this.buttonNext.unbind(this.options.buttonNextEvent+".jcarousel",this.funcNext),a&&this.buttonNext.bind(this.options.buttonNextEvent+".jcarousel",this.funcNext), this.buttonNext[a?"removeClass":"addClass"](this.className("jcarousel-next-disabled")).attr("disabled",a?!1:!0),this.options.buttonNextCallback!==null&&this.buttonNext.data("jcarouselstate")!=a&&this.buttonNext.each(function(){b.options.buttonNextCallback(b,this,a)}).data("jcarouselstate",a)):this.options.buttonNextCallback!==null&&this.buttonNextState!=a&&this.options.buttonNextCallback(b,null,a);this.buttonPrev.size()>0?(this.buttonPrev.unbind(this.options.buttonPrevEvent+".jcarousel",this.funcPrev), c&&this.buttonPrev.bind(this.options.buttonPrevEvent+".jcarousel",this.funcPrev),this.buttonPrev[c?"removeClass":"addClass"](this.className("jcarousel-prev-disabled")).attr("disabled",c?!1:!0),this.options.buttonPrevCallback!==null&&this.buttonPrev.data("jcarouselstate")!=c&&this.buttonPrev.each(function(){b.options.buttonPrevCallback(b,this,c)}).data("jcarouselstate",c)):this.options.buttonPrevCallback!==null&&this.buttonPrevState!=c&&this.options.buttonPrevCallback(b,null,c);this.buttonNextState= a;this.buttonPrevState=c},notify:function(a){var c=this.prevFirst===null?"init":this.prevFirst<this.first?"next":"prev";this.callback("itemLoadCallback",a,c);this.prevFirst!==this.first&&(this.callback("itemFirstInCallback",a,c,this.first),this.callback("itemFirstOutCallback",a,c,this.prevFirst));this.prevLast!==this.last&&(this.callback("itemLastInCallback",a,c,this.last),this.callback("itemLastOutCallback",a,c,this.prevLast));this.callback("itemVisibleInCallback",a,c,this.first,this.last,this.prevFirst, this.prevLast);this.callback("itemVisibleOutCallback",a,c,this.prevFirst,this.prevLast,this.first,this.last)},callback:function(a,c,b,d,f,j,e){if(!(this.options[a]==null||typeof this.options[a]!="object"&&c!="onAfterAnimation")){var h=typeof this.options[a]=="object"?this.options[a][c]:this.options[a];if(g.isFunction(h)){var i=this;if(d===void 0)h(i,b,c);else if(f===void 0)this.get(d).each(function(){h(i,this,d,b,c)});else for(var a=function(a){i.get(a).each(function(){h(i,this,a,b,c)})},k=d;k<=f;k++)k!== null&&!(k>=j&&k<=e)&&a(k)}}},create:function(a){return this.format("<li></li>",a)},format:function(a,c){for(var a=g(a),b=a.get(0).className.split(" "),d=0;d<b.length;d++)b[d].indexOf("jcarousel-")!=-1&&a.removeClass(b[d]);a.addClass(this.className("jcarousel-item")).addClass(this.className("jcarousel-item-"+c)).css({"float":this.options.rtl?"right":"left","list-style":"none"}).attr("jcarouselindex",c);return a},className:function(a){return a+" "+a+(!this.options.vertical?"-horizontal":"-vertical")}, dimension:function(a,c){var b=g(a);if(c==null)return!this.options.vertical?b.outerWidth(!0)||f.intval(this.options.itemFallbackDimension):b.outerHeight(!0)||f.intval(this.options.itemFallbackDimension);else{var d=!this.options.vertical?c-f.intval(b.css("marginLeft"))-f.intval(b.css("marginRight")):c-f.intval(b.css("marginTop"))-f.intval(b.css("marginBottom"));g(b).css(this.wh,d+"px");return this.dimension(b)}},clipping:function(){return!this.options.vertical?this.clip[0].offsetWidth-f.intval(this.clip.css("borderLeftWidth"))- f.intval(this.clip.css("borderRightWidth")):this.clip[0].offsetHeight-f.intval(this.clip.css("borderTopWidth"))-f.intval(this.clip.css("borderBottomWidth"))},index:function(a,c){if(c==null)c=this.options.size;return Math.round(((a-1)/c-Math.floor((a-1)/c))*c)+1}});f.extend({defaults:function(a){return g.extend(q,a||{})},intval:function(a){a=parseInt(a,10);return isNaN(a)?0:a},windowLoaded:function(){m=!0}});g.fn.jcarousel=function(a){if(typeof a=="string"){var c=g(this).data("jcarousel"),b=Array.prototype.slice.call(arguments, 1);return c[a].apply(c,b)}else return this.each(function(){var b=g(this).data("jcarousel");b?(a&&g.extend(b.options,a),b.reload()):g(this).data("jcarousel",new f(this,a))})}})(jQuery);
+
+

extensions/Slim/js/menu.js

@@ -1 @@
-/*
- * jQuery Mega Drop Down Menu script by Soh Tanaka
- * http://www.sohtanaka.com/web-design/mega-drop-downs-w-css-jquery/
- * 
- */
 $(document).ready(function(){
+        $('.mcol').columnize({ columns: 4});
+        $.each($('.mcol li'), function() {
+                var $li = $(this),
+                        $test=$li.find('a');
+                if($test.length == 0){
+                        $li.remove()
+                }
+        })
+        
+        $('li.liSub:last-child dt').addClass('dd_wrapper');
+        $('li.liSub:last-child dd').addClass('sub');
+        $('ul#topnav li .sub').hide();
 
-        $("li.liSub:last-child dt").addClass('dd_wrapper');
-        $("li.liSub:last-child dd").addClass('sub');
+        function megaHoverOver(){
+                $(this).find('.sub').stop().slideDown(200);
+        };
+        
+        function megaHoverOut(){
+         $(this).find('.sub').stop().slideUp(200);
+        };
+
+        var $configSub  = {
+                                                over    : megaHoverOver,   
+                                                out             : megaHoverOut     
+                                                };
+
+        $('ul#topnav li').hoverIntent($configSub);
+        $('ul#topnav .sub ul li:last-child a').css('border', 'none');
+
+        
+        $('.cl_wrapper').hover(function(){
+                if($(this).next('div').is(':hidden')){
+                        $(this).addClass('activate').next('div').slideDown(200).attr(':visible');
+                }
+        });
+                
+        $('.cl_wrapper').click(function(){
+                if($(this).next('div').is(':visible')){
+                        $(this).next('div').slideUp(200, function(){
+                                $(this).hide()
+                        });
+                        $(this).removeClass('activate').next('div').attr(':hidden'); 
+                }
+        });
+        
+        $('.cc_wrapper').click(function(){
+                if($(this).next('div').is(':visible')){
+                        $(this).removeClass('activate').next('div').slideUp(200, function(){
+                                $(this).hide().attr(':hidden');
+                        });
+                } else {
+                        $(this).next('div').slideDown(200).attr(':visible');
+                }
+        });
+
+        $('.close').click(function(){
+                $(this).parent().slideUp(200, function(){
+                                $(this).hide().attr(':hidden')
+                        }).prev().removeClass('activate');
+        });
+                
+});
+        
 
 
 
-        function megaHoverOver(){
-                $(this).find(".sub").stop().fadeTo('slow', 1).show();
-                        
-        }
-        
-        function megaHoverOut(){
-         $(this).find(".sub").stop().fadeTo('slow', 0, function() {
-                  $(this).hide();
-          });
-        }
 
 
-        var configSub = {
-                 sensitivity: 2,                // number = sensitivity threshold (must be 1 or higher)    
-                 interval: 0,                   // number = milliseconds for onMouseOver polling interval    
-                 over: megaHoverOver,   // function = onMouseOver callback (REQUIRED)    
-                 timeout: 0,                    // number = milliseconds delay before onMouseOut    
-                 out: megaHoverOut              // function = onMouseOut callback (REQUIRED)    
-        };
-
-        $("ul#topnav li .sub").css({'opacity':'0'});
-        $("ul#topnav li").hoverIntent(configSub);
-        
-        var configSwitch = {
-                 sensitivity: 2,                // number = sensitivity threshold (must be 1 or higher)    
-                 interval: 0,                   // number = milliseconds for onMouseOver polling interval    
-                 over: switchBoxOver,   // function = onMouseOver callback (REQUIRED)    
-                 timeout: 0,                    // number = milliseconds delay before onMouseOut    
-                 out: switchBoxOut              // function = onMouseOut callback (REQUIRED)    
-        };
-
-        function switchBoxOver(){
-                $(this).find(".switchBox").stop().fadeTo('slow', 1).show();
-                        
-        }
-        
-        function switchBoxOut(){
-         $(this).find(".switchBox").stop().fadeTo('slow', 0, function() {
-                  $(this).hide();
-          });
-        }
-        $("ul.categoryActions li").hoverIntent(configSwitch);
-
-        
-        // Delete the border for the last li of the submenu
-        $("ul#topnav .sub ul li:last-child a").css("border", "none");
-
-        /*other menubar script*/
-        //open form login menu          
-        
-
-        
-        $(".cl_wrapper").next("div").hide();
-
-        
-        $(".cl_wrapper").hover(function(){
-        
-                if($(this).next("div").is(":hidden")){
-                        $(this).next("div").fadeTo('fast', 1);
-                        $(this).addClass('activate');
-                        $(this).next("div").attr(":visible")
-                }
-        });
-                
-        
-        $(".cl_wrapper").click(function(){
-                if($(this).next("div").is(":visible")){
-                $(this).next("div").fadeTo('slow', 0, function(){$(this).hide()});
-                $(this).removeClass('activate'); 
-                $(this).next("div").attr(":hidden")
-                }
-        });
-
-        $(".close").click(function(){
-                if($("#loger").is(":visible")){
-                        $("#loger").fadeTo('fast', 0, function(){$(this).hide()});
-                        $(".cl_wrapper").removeClass('activate');
-                        $("#loger").attr(":hidden");
-                }
-        });
-        
-        $(".cc_wrapper").click(function(){
-                if($(this).next("div").is(":visible")){
-                        $(this).next("div").fadeTo('slow', 0, function(){$(this).hide()});
-                        $(this).removeClass('activate'); 
-                        $(this).next("div").attr(":hidden")
-                }
-        });
-        
-        $(".cc_wrapper").click(function(){
-                if($(this).next("div").is(":hidden")){
-                        $(this).next("div").fadeTo('fast', 1);
-                        $(this).addClass('activate');
-                        $(this).next("div").attr(":visible")
-                }
-        });
-        
-
-        
-        
-        
 
 
-        // make column menubar_categorie
-        $('.mcol').makeacolumnlists({cols:4, colWidth:155, equalHeight: true, startN: 1});
-});

extensions/Slim/local_head.tpl

@@ -1 @@
-{php}
-        global $Slim;
-        $this->assign( 'Slim', $Slim );
-{/php}
-
-
 {if (($Slim.style_slim)!=3)}
 {combine_script id='lytebox' load='header' require='jquery' path='themes/Slim/js/lytebox.js'}
@@ -11 +5 @@
 {if (($Slim.style_slim)!=1)}
 {combine_script id='menu' load='header' require='jquery' path='themes/Slim/js/menu.js'}
-{combine_script id='hoverIntent' load='header' require='jquery' path='themes/Slim/js/jquery.hoverIntent.minified.js'}
-{combine_script id='columnizer' load='header' require='jquery' path='themes/Slim/js/columnizer.js'}
+{combine_script id='hoverIntent' load='header' require='jquery' path='themes/Slim/js/jquery.hoverIntent.js'}
+{combine_script id='columnizer' load='header' require='jquery' path='themes/Slim/js/jquery.columnizer.js'}
 {/if}

extensions/Slim/template/comments.tpl

@@ -1 @@
-{php}   global $Slim;   $this->assign( 'Slim', $Slim );{/php}
-
-
 {if ($Slim.style_slim)==3}
 {$MENUBAR}

extensions/Slim/template/header.tpl

@@ -1 @@
-{php}   global $Slim;   $this->assign( 'Slim', $Slim );{/php}
-
-
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="{$lang_info.code}" dir="{$lang_info.direction}">
@@ -60 +57 @@
 
 
-{combine_script id='jquery.jcarousel' load='header' require='jquery' path='themes/Slim/js/jquery.jcarousel.min.js'}
+{combine_script id='jcarousel' load='header' require='jquery' path='themes/Slim/js/jquery.jcarousel.js'}
+
 </head>
 

extensions/Slim/template/identification.tpl

@@ -1 @@
-{php}   global $Slim;   $this->assign( 'Slim', $Slim );{/php}
-
 {if ($Slim.style_slim)!=1}
 {$MENUBAR}

extensions/Slim/template/index.tpl

@@ -1 @@
-{php}   global $Slim;   $this->assign( 'Slim', $Slim );{/php}
-
 {if ($Slim.style_slim)!=1}
 {$MENUBAR}
@@ -23 +21 @@
 
         <div id="infoBlock">
-        <div class="titrePage{if isset($chronology.TITLE)} calendarTitleBar{/if}">
-
-                <ul class="categoryActions">
+<div class="titrePage{if isset($chronology.TITLE)} calendarTitleBar{/if}">
+
+        <ul class="categoryActions">
         {if !empty($image_orders)}
                         <li>{strip}<a id="sortOrderLink" title="{'Sort order'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
@@ -163 +161 @@
 
 {if !empty($THUMBNAILS)}
-        <ul class="thumbnails" id="thumbnails">
                 {$THUMBNAILS}
-        </ul>
+{footer_script}{literal}
+        $('.jcarousel')
+            .jcarousel({
+                 wrap: 'circular'
+            })          
+                        .jcarouselAutoscroll({
+                        autostart: false
+                        });     
+                        
+        $('.jcarousel-control-prev')
+            .on('jcarouselcontrol:active', function() {
+                $(this).removeClass('inactive');
+            })
+            .on('jcarouselcontrol:inactive', function() {
+                $(this).addClass('inactive');
+            })
+            .jcarouselControl({
+                target: '-=1'
+            });
+
+        $('.jcarousel-control-next')
+            .on('jcarouselcontrol:active', function() {
+                $(this).removeClass('inactive');
+            })
+            .on('jcarouselcontrol:inactive', function() {
+                $(this).addClass('inactive');
+            })
+            .jcarouselControl({
+                target: '+=1'
+            });
+{/literal}{/footer_script}
+
 {/if}
 
@@ -171 +199 @@
         {if !empty($CATEGORIES)}
                 {$CATEGORIES}
+                {footer_script}{literal}
+        $('.jcarousel')
+            .jcarousel({
+                 wrap: 'circular'
+            })          
+                        .jcarouselAutoscroll({
+                        interval: 3000,
+                        target: '+=1',
+                        autostart: true
+                        });     
+                        
+        $('.jcarousel-control-prev')
+            .on('jcarouselcontrol:active', function() {
+                $(this).removeClass('inactive');
+            })
+            .on('jcarouselcontrol:inactive', function() {
+                $(this).addClass('inactive');
+            })
+            .jcarouselControl({
+                target: '-=1'
+            });
+
+        $('.jcarousel-control-next')
+            .on('jcarouselcontrol:active', function() {
+                $(this).removeClass('inactive');
+            })
+            .on('jcarouselcontrol:inactive', function() {
+                $(this).addClass('inactive');
+            })
+            .jcarouselControl({
+                target: '+=1'
+            });
+                
+                $('.jcarousel')
+                        .on('mouseenter', function(){
+                                $(this).jcarouselAutoscroll('stop')
+                        })
+                        .on('mouseleave', function(){
+                                $(this).jcarouselAutoscroll('start')
+                        });
+{/literal}{/footer_script}
+
         {/if}
 {/if}

extensions/Slim/template/mainpage_categories.tpl

@@ -1 +1 @@
 {define_derivative name='carousel' width='300' height='300' min_width='300'}
-
-
-{html_style}
-.jcarousel-skin-cat .jcarousel-list li{ldelim}
-        min-width:{$carousel->max_width()}px;
-{/html_style}
-
-
-<div id="carouselcat">
-
+<div id="carousel">
 <div id="wrap">
-          <ul id="carousel" class="jcarousel-skin-cat">
-
-                {foreach from=$category_thumbnails item=cat}
-
-
-                        <li class="test">
-                                        <div class="illustration">
-                                                <a href="{$cat.URL}">
-                                                        <img src="{$pwg->derivative_url($carousel, $cat.representative.src_image)}" alt="{$cat.TN_ALT}" title="{$cat.NAME|@replace:'"':' '|@strip_tags:false} - {'display this album'|@translate}" min-width="{$carousel->max_width()}" height="{$carousel->max_height()-22}"/>
-                                                </a>
-                                        </div>
-                                        
-                                        <div class="CatMPdescription">
-                                                
+        <div class="jcarousel">
+                <ul>
+                        {foreach from=$category_thumbnails item=cat}
+                                <li>
+                                                <div class="illustration">
+                                                        <a href="{$cat.URL}">
+                                                                <img src="{$pwg->derivative_url($carousel, $cat.representative.src_image)}" alt="{$cat.TN_ALT}" title="{$cat.NAME|@replace:'"':' '|@strip_tags:false} - {'display this album'|@translate}" min-width="{$carousel->max_width()}" height="{$carousel->max_height()-22}"/>
+                                                        </a>
+                                                </div>
+                                                <div class="CatMPdescription">
                                                         <h3>
                                                                 <a href="{$cat.URL}">{$cat.NAME}</a>
                                                         </h3>
                                                         <div>
-                                                        {$cat.CAPTION_NB_IMAGES}
+                                                                {$cat.CAPTION_NB_IMAGES}
                                                         </div>  
-                                        </div>
-                        </li>
-                {/foreach}
-        </ul>
-{footer_script}{literal}
-function mycarousel_initCallback(carousel)
-{
-    // Pause autoscrolling if the user moves with the cursor over the clip.
-    carousel.clip.hover(function() {
-        carousel.stopAuto();
-    }, function() {
-        carousel.startAuto();
-    });
-};
-
-jQuery(document).ready(function() {
-    jQuery('#carousel').jcarousel({
-        auto: 1,
-                wrap: 'circular',
-                scroll: 2,
-                animation: 2000,
-                initCallback: mycarousel_initCallback,
-                
-    });
-});
-{/literal}{/footer_script}
+                                                </div>
+                                </li>
+                        {/foreach}
+                </ul>
+        </div>
 </div>
+        <a href="#" class="jcarousel-control-prev">&lsaquo;</a>
+    <a href="#" class="jcarousel-control-next">&rsaquo;</a>
 </div>

extensions/Slim/template/menubar.tpl

@@ -1 @@
-<div id="menubar">      
+<div id=menubar>        
 <span id="menu_start">
                 <a href="index.php?/categories"></a>

extensions/Slim/template/menubar_categories.tpl

@@ -1 @@
-        <span class="dd_wrapper">{'Categories'|@translate}</span>
+<span class="dd_wrapper">{'Albums'|@translate}</span>
         
-                <div class="sub" style="width:700px">
-                {assign var='ref_level' value=0}
-                        <div id="menu_cat_act">
-                                <div id="nbImg">
-                        <p class="totalImages">{$pwg->l10n_dec('%d image', '%d images', $block->data.NB_PICTURE)}</p>
-                                </div>
-                                <div id="filter">
-                                        {if isset($U_START_FILTER)}
-                                                <a href="{$U_START_FILTER}" class="pwg-state-default pwg-button menubarFilter" title="{'display only recently posted photos'|@translate}" rel="nofollow">
-                                                <span class="pwg-icon pwg-icon-filter"> </span>
-                                                </a>
-                                        {/if}
-                                        {if isset($U_STOP_FILTER)}
-                                        <a href="{$U_STOP_FILTER}" class="pwg-state-default pwg-button menubarFilter" title="{'return to the display of all photos'|@translate}"><span
-                                        class="pwg-icon pwg-icon-filter-del"> </span></a>
-                                        {/if}
-                                </div>
-
-                        </div>
+<div class="sub" style="width:700px">
+        <div id="menu_cat_act">
+                <div id="nbImg">
+                        <p class="totalImages">{$block->data.NB_PICTURE|@translate_dec:'%d photo':'%d photos'}</p>
+                </div>
+                <div id="filter">
+                        {if isset($U_START_FILTER)}
+                        <a href="{$U_START_FILTER}" class="pwg-state-default pwg-button menubarFilter" title="{'display only recently posted photos'|@translate}" rel="nofollow">
+                                <span class="pwg-icon pwg-icon-filter"> </span>
+                        </a>
+                        {/if}
+                        
+                        {if isset($U_STOP_FILTER)}
+                                <a href="{$U_STOP_FILTER}" class="pwg-state-default pwg-button menubarFilter" title="{'return to the display of all photos'|@translate}">
+                                <span class="pwg-icon pwg-icon-filter-del"> </span>
+                                </a>
+                        {/if}
+                </div>
+        </div>
+        <div class="mcol">
+        {assign var='ref_level' value=0}        
+        {foreach from=$block->data.MENU_CATEGORIES item=cat}
+                {if $cat.LEVEL > $ref_level}
+                        <ul>
+                {else}
+                        </li>
+                        {'</ul></li>'|@str_repeat:($ref_level-$cat.LEVEL)}
+                {/if}
+                        <li {if $cat.SELECTED}class="selected dontsplit"{/if}class="level{$cat.LEVEL} dontsplit">
+                                <a href="{$cat.URL}" {if $cat.IS_UPPERCAT}rel="up"{/if} title="{$cat.TITLE}" >{$cat.NAME}</a>
+                                {if $cat.count_images > 0}
+                                        <span class="{if $cat.nb_images > 0}menuInfoCat{else}menuInfoCatByChild{/if}" title="{$cat.TITLE}">[{$cat.count_images}]</span>
+                                {/if}
                                 
-                                
-                                {foreach from=$block->data.MENU_CATEGORIES item=cat}
-                                {if $cat.LEVEL > $ref_level}
-                                <ul class="mcol">
-                                {else}
-
-                                                </li>
-                                                        {'</ul></li>'|@str_repeat:$ref_level-$cat.LEVEL}
-                                                  {/if}
-                                                   <li {if $cat.SELECTED}class="selected"{/if}class="level{$cat.LEVEL}">
-                                                   <a href="{$cat.URL}" {if $cat.IS_UPPERCAT}rel="up"{/if} title="{$cat.TITLE}" >{$cat.NAME}   [{$cat.count_images}] </a>
-                                                  {assign var='ref_level' value=$cat.LEVEL}
-                                                {/foreach}
-                                        {'</li></ul>'|@str_repeat:$ref_level}   
-
-                                                {if isset($block->data.U_UPLOAD)}
-                                                
-                                        <ul>
-                                                
-                                                        <li>
-                                                                <a href="{$block->data.U_UPLOAD}">{'Upload a picture'|@translate}</a>
-                                                        </li>
-
-                                        </ul>
-                                                
-                                        {/if}
-                
-
-                </div>
+                                {if !empty($cat.icon_ts)}
+                                        <img title="{$cat.icon_ts.TITLE}" src="{$ROOT_URL}{$themeconf.icon_dir}/recent{if $cat.icon_ts.IS_CHILD_DATE}_by_child{/if}.png" class="icon" alt="(!)">
+                                {/if}
+                {assign var='ref_level' value=$cat.LEVEL}
+        {/foreach}
+        {'</li></ul>'|@str_repeat:$ref_level}   
+        </div>
+</div>

extensions/Slim/template/notification.tpl

@@ -1 @@
-{php}   global $Slim;   $this->assign( 'Slim', $Slim );{/php}
-
 {html_head} 
 <link rel="alternate" type="application/rss+xml" title="{'Photos only RSS feed'|@translate}" href="{$U_FEED_IMAGE_ONLY}"> 

extensions/Slim/template/password.tpl

@@ -1 @@
-{php}   global $Slim;   $this->assign( 'Slim', $Slim );{/php}
-
 {if ($Slim.style_slim)==1}
 

extensions/Slim/template/picture.tpl

@@ -69 +69 @@
                         <form method="post" action="{$comment_add.F_ACTION}" id="addComment">
                                 {if $comment_add.SHOW_AUTHOR}
-                                        <p><label for="author">{'Author'|@translate} :</label></p>
+                                        <p><label for="author">{'Author'|@translate}{if $comment_add.AUTHOR_MANDATORY} ({'mandatory'|@translate}){/if} :</label></p>
                                         <p><input type="text" name="author" id="author" value="{$comment_add.AUTHOR}"></p>
-                                        <p><label for="contentid">{'Comment'|@translate} :</label></p>
                                 {/if}
-                                <p><textarea name="content" id="contentid" rows="8" cols="100">{$comment_add.CONTENT}</textarea></p>
+                                {if $comment_add.SHOW_EMAIL}
+                                        <p><label for="email">{'Email'|@translate}{if $comment_add.EMAIL_MANDATORY} ({'mandatory'|@translate}){/if} :</label></p>
+                                        <p><input type="text" name="email" id="email" value="{$comment_add.EMAIL}"></p>
+                                {/if}
+                                <p><label for="website_url">{'Website'|@translate} :</label></p>
+                                <p><input type="text" name="website_url" id="website_url" value="{$comment_add.WEBSITE_URL}"></p>
+                                <p><label for="contentid">{'Comment'|@translate} ({'mandatory'|@translate}) :</label></p>
+                                <p><textarea name="content" id="contentid" rows="5" cols="100">{$comment_add.CONTENT}</textarea></p>
                                 <p><input type="hidden" name="key" value="{$comment_add.KEY}">
                                         <input type="submit" value="{'Submit'|@translate}"></p>

extensions/Slim/template/profile.tpl

@@ -1 @@
-{php}   global $Slim;   $this->assign( 'Slim', $Slim );{/php}
-
 {if ($Slim.style_slim)==1}
 {php}

extensions/Slim/template/register.tpl

@@ -1 @@
-{php}   global $Slim;   $this->assign( 'Slim', $Slim );{/php}
-
 {if ($Slim.style_slim)==1}
 {php}

extensions/Slim/template/search.tpl

@@ -1 @@
-{php}   global $Slim;   $this->assign( 'Slim', $Slim );{/php}
-
 {if ($Slim.style_slim)==1}
 {php}

extensions/Slim/template/tags.tpl

@@ -1 @@
-{php}   global $Slim;   $this->assign( 'Slim', $Slim );{/php}
-
 {if ($Slim.style_slim)==1}
 {php}

extensions/Slim/template/thumbnails.tpl

@@ -4 +4 @@
     $template->assign('cat_name', $page['category']['name']);
         
-        global $Slim;   $this->assign( 'Slim', $Slim );
 {/php}
 
 
-<div id="carouselthumb">
-<div id="wrap">
-<ul id="carousel" class="jcarousel-skin-cat">
-                {if !empty($category_thumbnails)}
-                
-                {foreach from=$category_thumbnails item=cat}
-
-
-                        <li>
+<div id="carousel">
+        <div id="wrap">
+                <div class="jcarousel">
+                        <ul>
+                        {if !empty($category_thumbnails)}
+                                {foreach from=$category_thumbnails item=cat}
+                                <li>
                                         <div class="illustration">
                                                 <a href="{$cat.URL}">
-                                                        <img src="{$pwg->derivative_url($carousel, $cat.representative.src_image)}" alt="{$cat.TN_ALT}" title="{$cat.NAME|@replace:'"':' '|@strip_tags:false} - {'display this album'|@translate}" min-width="{$carousel->max_width()}" height="{$carousel->max_height()}"/>
+                                                        <img src="{$pwg->derivative_url($carousel, $cat.representative.src_image)}" alt="{$cat.TN_ALT}" title="{$cat.NAME|@replace:'"':' '|@strip_tags:false} - {'display this album'|@translate}" min-width="{$carousel->max_width()}" height="{$carousel->max_height()-22}"/>
                                                 </a>
                                         </div>
-                                        
-                                                
-                                                <div class="CatMPdescription">
-                                                        <h3>
-                                                                <a href="{$cat.URL}">{$cat.NAME}</a>
-                                                        </h3>
-                                                        <div>
+                                        <div class="CatMPdescription">
+                                                <h3>
+                                                        <a href="{$cat.URL}">{$cat.NAME}</a>
+                                                </h3>
+                                                <div>
                                                         {$cat.CAPTION_NB_IMAGES}
-                                                        </div>  
-                                                </div>
-                        </li>
-                {/foreach}{/if}
-
-
-        {foreach from=$thumbnails item=thumbnail}
-        {assign var=derivative value=$pwg->derivative($carousel, $thumbnail.src_image)}
-                        <li>
-                                <div class="iIllustration">
-                                        <a href="{if ($Slim.style_slim)!=3}{$thumbnail.path}" class="lytebox" rev="slide:true group:name showNavigation:true navType:1 slideInterval:6000"{else}{$thumbnail.URL}"{/if} title="{$thumbnail.NAME|strip_tags:false|replace:'\'':'&#39;'|replace:'"':'&quot;'}">
-                                        <img class="thumbnail" src="{$derivative->get_url()}" alt="{$thumbnail.TN_ALT}" title="{$thumbnail.TN_TITLE}" height="{$carousel->max_height()}"/>
-                                                
+                                                </div>  
+                                        </div>
+                                </li>
+                                {/foreach}
+                        {/if}
+                                {foreach from=$thumbnails item=thumbnail}
+                                {assign var=derivative value=$pwg->derivative($carousel, $thumbnail.src_image)}
+                                <li>
+                                        <div class="illustration">
+                                                <a href="{if ($Slim.style_slim)!=3}{$thumbnail.path}" class="lytebox" rev="slide:true group:name showNavigation:true navType:1 slideInterval:6000"{else}{$thumbnail.URL}"{/if} title="{$thumbnail.NAME|strip_tags:false|replace:'\'':'&#39;'|replace:'"':'&quot;'}">
+                                                <img class="thumbnail" src="{$derivative->get_url()}" alt="{$thumbnail.TN_ALT}" title="{$thumbnail.TN_TITLE}" height="{$carousel->max_height()-22}"/>
                                                 {if $SHOW_THUMBNAIL_CAPTION }
                                                         <div class="CatMPdescription">
                                                                 <H3>
                                                                         {$thumbnail.NAME}
-                                                                        
                                                                         {if !empty($thumbnail.icon_ts)}
                                                                                 <img title="{$thumbnail.icon_ts.TITLE}" src="{$ROOT_URL}{$themeconf.icon_dir}/recent.png" alt="(!)">
@@ -53 +45 @@
                                                                 </h3>
                                                                 {if isset($thumbnail.NB_COMMENTS) or isset($thumbnail.NB_HITS)}
-                                                                <div>
+                                                                        <div>
                                                                         {if isset($thumbnail.NB_COMMENTS)}
                                                                                 <p class="{if 0==$thumbnail.NB_COMMENTS}zero {/if}nb-comments">
-                                                                                {$pwg->l10n_dec('%d comment', '%d comments',$thumbnail.NB_COMMENTS)}
+                                                                                        {$pwg->l10n_dec('%d comment', '%d comments',$thumbnail.NB_COMMENTS)}
                                                                                 </p>
                                                                         {/if}
                                                                         {if isset($thumbnail.NB_HITS)}
                                                                                 <p class="{if 0==$thumbnail.NB_HITS}zero {/if}nb-hits">
-                                                                                {$pwg->l10n_dec('%d hit', '%d hits',$thumbnail.NB_HITS)}
+                                                                                        {$pwg->l10n_dec('%d hit', '%d hits',$thumbnail.NB_HITS)}
                                                                                 </p>
                                                                         {/if}
-                                                                </div>
+                                                                        </div>
                                                                 {/if}
                                                         </div>
                                                 {/if}
-                                        </a>    
-                                </div>  
-                        </li>
-        {/foreach}
-</ul>
-{footer_script}{literal}
-function mycarousel_initCallback(carousel)
-{
-    // Pause autoscrolling if the user moves with the cursor over the clip.
-    carousel.clip.hover(function() {
-        carousel.stopAuto();
-    }, function() {
-        carousel.startAuto();
-    });
-};
-
-jQuery(document).ready(function() {
-    jQuery('#carousel').jcarousel({
-        auto: 0,
-                wrap: 'circular',
-                scroll: 2,
-                initCallback: mycarousel_initCallback,
-                
-    });
-});
-
-{/literal}{/footer_script}
-
+                                                </a>    
+                                        </div>  
+                                </li>
+                                {/foreach}
+                        </ul>
+                </div>
+        </div>
+        <a href="#" class="jcarousel-control-prev">&lsaquo;</a>
+    <a href="#" class="jcarousel-control-next">&rsaquo;</a>
 </div>
-</div>

extensions/Slim/theme.css

@@ -1 @@
-BODY{background:url("images/texture.png") #fff}
+BODY{background:url("images/texture.png")}
 BODY,H1,H3,INPUT.rateButtonSelected,H2,#menubar DT{color:#666}
 FIELDSET,INPUT,SELECT,TEXTAREA,.content .thumbnailCategory,.thumbnails .wrap2{background:#EFEFEF;border-radius:5px;border:1px solid #afafaf}
@@ -18 +18 @@
 .content H2{margin:3px 0 0}
 #infoBlock,#imageHeaderBar{background:rgba(239, 239, 239, 1);border-radius:3px;box-shadow:0 1px 1px rgba(0, 0, 0, 0.4) inset, 0 1px rgba(255, 255, 255, 0.4)}
-.switchBox{background:#5f5f5f}
+.switchBox{background:#5f5f5f; color:#fff}
+.switchBox a{color:#fff}
 #imageHeaderBar{width:auto;height:20px;margin:40px 50px 20px;padding:10px}
 #imageHeaderBar H2{background-image:none;border:none}
@@ -63 +64 @@
 #topnav{margin:0;padding:0 2px 0 0;list-style:none;height:30px;position:relative;z-index:999;display:inline-block}
 #topnav .liSub{float:left;position:relative;padding-right:2px}
-#topnav .sub, #topnav #loger{position:absolute;top:30px;margin-left:0;background:#FFF;padding:5px 8px 10px 5px;float:left;max-width:100em;min-width:200px;display:none;max-height:500px;overflow:auto;border-bottom-right-radius:10px;border-bottom-left-radius:10px;box-shadow:0px 0px 5px #5A5A5A;z-index:100}
+#topnav .sub, #topnav #loger{position:absolute;top:30px;margin-left:0;background:#eFeFeF;padding:5px 8px 10px 5px;float:left;max-width:100em;min-width:200px;max-height:500px;overflow:auto;border-bottom-right-radius:10px;border-bottom-left-radius:10px;border-left:1px solid rgba(0, 0, 0, 0.5);border-right:1px solid rgba(0, 0, 0, 0.5);border-bottom:1px solid rgba(0, 0, 0, 0.5);z-index:100}
 #topnav #loger{z-index:50}
 .sub{z-index:100;max-width:600px}
@@ -70 +71 @@
 .sub a:hover{color:#4c4c4c}
 ul#topnav .sub ul li,ul#topnav #loger ul li,ul#topnav .sub #menuTagCloud div{width:95%;color:#757575;background:none;font-size:10px;margin-bottom:2px;border:1px solid #CBCBCB;border-radius:10px}
-ul#topnav .sub ul li a,ul#topnav #loger ul li a{float:none;text-indent:0;height:auto;margin:0 8px;display:block;text-decoration:none;color:#757575;font-size:1.1em;text-shadow:none;text-transform:none;line-height:17px;padding:0 0 0 15px}
+ul#topnav .sub ul li a,ul#topnav #loger ul li a{float:none;text-indent:0;height:auto;margin:0 8px;display:inline;text-decoration:none;color:#757575;font-size:1.1em;text-shadow:none;text-transform:none;line-height:17px;padding:0 0 0 15px}
 ul#topnav .sub ul .level1 li,ul#topnav .sub ul .level1 li .selected{border:none;background:none}
 ul#topnav .sub ul li.selected a{background:url(images/menu/navlist_arrow_hover.png) no-repeat 0 4px;color:#4C4C4C;text-decoration:none;border:none}
@@ -158 +159 @@
 
 /*=========================================carousel======================================================*/
-<<<<<<< .mine
-=======
-/*#carousel{min-width:10000px}*/
->>>>>>> .r18905
-.jcarousel-item a:hover{border-bottom:none}
-.jcarousel-list li,.jcarousel-item{float:left;list-style:none}
-.jcarousel-container-horizontal .jcarousel-clip,.jcarousel-skin-cat .jcarousel-list li{position:relative}
-.jcarousel-skin-cat .jcarousel-list li{height:325px}
-.jcarousel-skin-cat .jcarousel-container{border:1px solid rgba(0,0,0,0.5);border-radius:8px;background:rgba(0,0,0,0.25);box-shadow:0 2px 6px rgba(0,0,0,0.5),inset 0 1px rgba(255,255,255,0.3),inset 0 2px rgba(255,255,255,0.2),inset 0 10px 20px rgba(255,255,255,0.25),inset 0 -15px 30px rgba(0,0,0,0.3)}
-.jcarousel-skin-cat{padding:40px}
-.jcarousel-container-horizontal{padding:30px 7px}
-.jcarousel-skin-cat .jcarousel-clip{max-height:323px;overflow:hidden}
-.jcarousel-skin-cat .jcarousel-item:hover,.jcarousel-skin-cat .jcarousel-item:focus{border-color:gray}
-.jcarousel-skin-cat .jcarousel-item-horizontal{margin-left:0;margin-right:7px;list-style:none}
-.jcarousel-skin-cat .jcarousel-direction-rtl .jcarousel-item-horizontal{margin-left:7px;margin-right:0}
-.jcarousel-skin-cat .jcarousel-next-horizontal{position:absolute;right:20px;width:32px;cursor:pointer;top:0;height:100%;background:url("images/next-horizontal.png") no-repeat 0 50%}
-.jcarousel-skin-cat .jcarousel-direction-rtl .jcarousel-next-horizontal{left:5px;right:auto;background:url("images/prev-horizontal.png")}
-.jcarousel-skin-cat .jcarousel-prev-horizontal{position:absolute;left:20px;width:32px;cursor:pointer;height:100%;background:url("images/prev-horizontal.png") no-repeat 0 50%;top:0}
-.jcarousel-skin-cat .jcarousel-direction-rtl .jcarousel-prev-horizontal{left:auto;right:5px;background:url("images/next-horizontal.png")}
-.jcarousel-skin-cat .jcarousel-next-horizontal:hover,.jcarousel-skin-cat .jcarousel-next-horizontal:focus,.jcarousel-skin-cat .jcarousel-prev-horizontal:hover,.jcarousel-skin-cat .jcarousel-prev-horizontal:focus{background-position:-32px 50%}
-.jcarousel-skin-cat .jcarousel-next-horizontal:active,.jcarousel-skin-cat .jcarousel-prev-horizontal:active{background-position:-64px 50%}
-.jcarousel-skin-cat .jcarousel-next-disabled-horizontal,.jcarousel-skin-cat .jcarousel-next-disabled-horizontal:hover,.jcarousel-skin-cat .jcarousel-next-disabled-horizontal:focus,.jcarousel-skin-cat .jcarousel-next-disabled-horizontal:active,.jcarousel-skin-cat .jcarousel-prev-disabled-horizontal,.jcarousel-skin-cat .jcarousel-prev-disabled-horizontal:hover,.jcarousel-skin-cat .jcarousel-prev-disabled-horizontal:focus,.jcarousel-skin-cat .jcarousel-prev-disabled-horizontal:active{cursor:default;background-position:-96px 0}
+#carousel{position:relative}
+.jcarousel{position:relative;overflow:hidden}
+.jcarousel ul{width:20000em;position:relative;list-style:none;margin:0;padding:0}
+.jcarousel li {float: left}
+#wrap{position:relative;margin:50px;padding:20px 20px 40px;border:1px solid rgba(0,0,0,0.5);border-radius:8px;background:rgba(0,0,0,0.25);box-shadow:0 2px 6px rgba(0,0,0,0.5),inset 0 1px rgba(255,255,255,0.3),inset 0 2px rgba(255,255,255,0.2),inset 0 10px 20px rgba(255,255,255,0.25),inset 0 -15px 30px rgba(0,0,0,0.3)}
+.jcarousel-control-prev,.jcarousel-control-next{position:absolute;top:160px;width:30px;height:30px;text-align:center;background:#4E443C;color:#fff;text-decoration:none;text-shadow:0 0 1px #000;font:24px/27px Arial, sans-serif;-webkit-border-radius:30px;-moz-border-radius:30px;border-radius:30px;-webkit-box-shadow:0 0 2px #999;-moz-box-shadow:0 0 2px #999;box-shadow:0 0 2px #999}
+.jcarousel-control-prev{left:80px}
+.jcarousel-control-next{right:80px}
+.jcarousel-control-prev:hover span,.jcarousel-control-next:hover span{display:block}
+.jcarousel-control-prev.inactive,.jcarousel-control-next.inactive{opacity: .5;cursor:default}
 
 /*=========================================Lytebox======================================================*/
@@ -213 +202 @@
 /*==========================================plugin=====================================================*/
 #mbContact dd{padding:0!important}
+
+

extensions/Slim/themeconf.inc.php

@@ -2 +2 @@
 /*
 Theme Name: Slim
-Version: auto
+Version: 1.3
 Description: Slim.
 Theme URI: http://piwigo.org/ext/extension_view.php?eid=643
@@ -32 +32 @@
         function modify_nb_thumbnail_page()
         {
-        global $user, $page;
+        global $user, $page, $conf;
                 $user['nb_image_page']=999;
                 $page['nb_image_page']=999;
+                $conf['nb_categories_page']=999;
         }
 }
-
 add_event_handler('get_categories_menu_sql_where', 'mic_get_categories_menu_sql_where', EVENT_HANDLER_PRIORITY_NEUTRAL, 3 );
 if(!function_exists('mic_get_categories_menu_sql_where'))
@@ -48 +48 @@
 }
 
-if($user['theme']=='Slim'){
-add_event_handler('loc_end_page_header', 'load_Slim' );
-
+add_event_handler('init', 'load_Slim' );
 function load_Slim()
 {
-global $user, $page; 
-if($page['body_id']=='theAdminPage' )
-{}
-else{
-if($user['theme']=='Slim')
-                {include('Slim.php');}
-                
-        }
+        include('Slim.php');
 }
 
@@ -74 +65 @@
 }
 }
-}
 ?>