Merge branch 'master' into template

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Product.php

templates/admin/default/admin-layout.tpl

@@ -138,9 +138,9 @@
                         </li>
                         {/loop}
 
-                        {loop name="menu-auth-content" type="auth" roles="ADMIN" permissions="admin.content.view"}
-                        <li class="{if $admin_current_location == 'content'}active{/if}" id="content_menu">
-                            <a href="{url path='/admin/content'}">{intl l="Content"}</a>
+                        {loop name="menu-auth-content" type="auth" roles="ADMIN" permissions="admin.folders.view"}
+                        <li class="{if $admin_current_location == 'folder'}active{/if}" id="folders_menu">
+                            <a href="{url path='/admin/folders'}">{intl l="Folders"}</a>
                         </li>
                         {/loop}
 

templates/admin/default/assets/js/jqplot/plugins/jqplot.blockRenderer.min.js

@@ -0,0 +1,3 @@
+/* jqPlot 1.0.8r1250 | (c) 2009-2013 Chris Leonello | jplot.com
+   jsDate | (c) 2010-2013 Chris Leonello
+ */(function(a){a.jqplot.BlockRenderer=function(){a.jqplot.LineRenderer.call(this)};a.jqplot.BlockRenderer.prototype=new a.jqplot.LineRenderer();a.jqplot.BlockRenderer.prototype.constructor=a.jqplot.BlockRenderer;a.jqplot.BlockRenderer.prototype.init=function(b){this.css={padding:"2px",border:"1px solid #999",textAlign:"center"};this.escapeHtml=false;this.insertBreaks=true;this.varyBlockColors=false;a.extend(true,this,b);if(this.css.backgroundColor){this.color=this.css.backgroundColor}else{if(this.css.background){this.color=this.css.background}else{if(!this.varyBlockColors){this.css.background=this.color}}}this.canvas=new a.jqplot.BlockCanvas();this.shadowCanvas=new a.jqplot.BlockCanvas();this.canvas._plotDimensions=this._plotDimensions;this.shadowCanvas._plotDimensions=this._plotDimensions;this._type="block";this.moveBlock=function(l,j,i,e){var c=this.canvas._elem.children(":eq("+l+")");this.data[l][0]=j;this.data[l][1]=i;this._plotData[l][0]=j;this._plotData[l][1]=i;this._stackData[l][0]=j;this._stackData[l][1]=i;this.gridData[l][0]=this._xaxis.series_u2p(j);this.gridData[l][1]=this._yaxis.series_u2p(i);var k=c.outerWidth();var f=c.outerHeight();var d=this.gridData[l][0]-k/2+"px";var g=this.gridData[l][1]-f/2+"px";if(e){if(parseInt(e,10)){e=parseInt(e,10)}c.animate({left:d,top:g},e)}else{c.css({left:d,top:g})}c=null}};a.jqplot.BlockRenderer.prototype.draw=function(q,o,r){if(this.plugins.pointLabels){this.plugins.pointLabels.show=false}var f,c,l,o,p,k,n,g,e,m;var b=(r!=undefined)?r:{};var j=new a.jqplot.ColorGenerator(this.seriesColors);this.canvas._elem.empty();for(f=0;f<this.gridData.length;f++){l=this.data[f];o=this.gridData[f];p="";k={};if(typeof l[2]=="string"){p=l[2]}else{if(typeof l[2]=="object"){k=l[2]}}if(typeof l[3]=="object"){k=l[3]}if(this.insertBreaks){p=p.replace(/ /g,"<br />")}k=a.extend(true,{},this.css,k);c=a('<div style="position:absolute;margin-left:auto;margin-right:auto;"></div>');this.canvas._elem.append(c);this.escapeHtml?c.text(p):c.html(p);delete k.position;delete k.marginRight;delete k.marginLeft;if(!k.background&&!k.backgroundColor&&!k.backgroundImage){k.background=j.next()}c.css(k);n=c.outerWidth();g=c.outerHeight();e=o[0]-n/2+"px";m=o[1]-g/2+"px";c.css({left:e,top:m});c=null}};a.jqplot.BlockCanvas=function(){a.jqplot.ElemContainer.call(this);this._ctx};a.jqplot.BlockCanvas.prototype=new a.jqplot.ElemContainer();a.jqplot.BlockCanvas.prototype.constructor=a.jqplot.BlockCanvas;a.jqplot.BlockCanvas.prototype.createElement=function(i,e,c){this._offsets=i;var b="jqplot-blockCanvas";if(e!=undefined){b=e}var g;if(this._elem){g=this._elem.get(0)}else{g=document.createElement("div")}if(c!=undefined){this._plotDimensions=c}var d=this._plotDimensions.width-this._offsets.left-this._offsets.right+"px";var f=this._plotDimensions.height-this._offsets.top-this._offsets.bottom+"px";this._elem=a(g);this._elem.css({position:"absolute",width:d,height:f,left:this._offsets.left,top:this._offsets.top});this._elem.addClass(b);return this._elem};a.jqplot.BlockCanvas.prototype.setContext=function(){this._ctx={canvas:{width:0,height:0},clearRect:function(){return null}};return this._ctx}})(jQuery);

templates/admin/default/assets/js/jqplot/plugins/jqplot.canvasAxisLabelRenderer.min.js

@@ -0,0 +1,3 @@
+/* jqPlot 1.0.8r1250 | (c) 2009-2013 Chris Leonello | jplot.com
+   jsDate | (c) 2010-2013 Chris Leonello
+ */(function(a){a.jqplot.CanvasAxisLabelRenderer=function(b){this.angle=0;this.axis;this.show=true;this.showLabel=true;this.label="";this.fontFamily='"Trebuchet MS", Arial, Helvetica, sans-serif';this.fontSize="11pt";this.fontWeight="normal";this.fontStretch=1;this.textColor="#666666";this.enableFontSupport=true;this.pt2px=null;this._elem;this._ctx;this._plotWidth;this._plotHeight;this._plotDimensions={height:null,width:null};a.extend(true,this,b);if(b.angle==null&&this.axis!="xaxis"&&this.axis!="x2axis"){this.angle=-90}var c={fontSize:this.fontSize,fontWeight:this.fontWeight,fontStretch:this.fontStretch,fillStyle:this.textColor,angle:this.getAngleRad(),fontFamily:this.fontFamily};if(this.pt2px){c.pt2px=this.pt2px}if(this.enableFontSupport){if(a.jqplot.support_canvas_text()){this._textRenderer=new a.jqplot.CanvasFontRenderer(c)}else{this._textRenderer=new a.jqplot.CanvasTextRenderer(c)}}else{this._textRenderer=new a.jqplot.CanvasTextRenderer(c)}};a.jqplot.CanvasAxisLabelRenderer.prototype.init=function(b){a.extend(true,this,b);this._textRenderer.init({fontSize:this.fontSize,fontWeight:this.fontWeight,fontStretch:this.fontStretch,fillStyle:this.textColor,angle:this.getAngleRad(),fontFamily:this.fontFamily})};a.jqplot.CanvasAxisLabelRenderer.prototype.getWidth=function(d){if(this._elem){return this._elem.outerWidth(true)}else{var f=this._textRenderer;var c=f.getWidth(d);var e=f.getHeight(d);var b=Math.abs(Math.sin(f.angle)*e)+Math.abs(Math.cos(f.angle)*c);return b}};a.jqplot.CanvasAxisLabelRenderer.prototype.getHeight=function(d){if(this._elem){return this._elem.outerHeight(true)}else{var f=this._textRenderer;var c=f.getWidth(d);var e=f.getHeight(d);var b=Math.abs(Math.cos(f.angle)*e)+Math.abs(Math.sin(f.angle)*c);return b}};a.jqplot.CanvasAxisLabelRenderer.prototype.getAngleRad=function(){var b=this.angle*Math.PI/180;return b};a.jqplot.CanvasAxisLabelRenderer.prototype.draw=function(c,f){if(this._elem){if(a.jqplot.use_excanvas&&window.G_vmlCanvasManager.uninitElement!==undefined){window.G_vmlCanvasManager.uninitElement(this._elem.get(0))}this._elem.emptyForce();this._elem=null}var e=f.canvasManager.getCanvas();this._textRenderer.setText(this.label,c);var b=this.getWidth(c);var d=this.getHeight(c);e.width=b;e.height=d;e.style.width=b;e.style.height=d;e=f.canvasManager.initCanvas(e);this._elem=a(e);this._elem.css({position:"absolute"});this._elem.addClass("jqplot-"+this.axis+"-label");e=null;return this._elem};a.jqplot.CanvasAxisLabelRenderer.prototype.pack=function(){this._textRenderer.draw(this._elem.get(0).getContext("2d"),this.label)}})(jQuery);

templates/admin/default/assets/js/jqplot/plugins/jqplot.canvasAxisTickRenderer.min.js

@@ -0,0 +1,3 @@
+/* jqPlot 1.0.8r1250 | (c) 2009-2013 Chris Leonello | jplot.com
+   jsDate | (c) 2010-2013 Chris Leonello
+ */(function(a){a.jqplot.CanvasAxisTickRenderer=function(b){this.mark="outside";this.showMark=true;this.showGridline=true;this.isMinorTick=false;this.angle=0;this.markSize=4;this.show=true;this.showLabel=true;this.labelPosition="auto";this.label="";this.value=null;this._styles={};this.formatter=a.jqplot.DefaultTickFormatter;this.formatString="";this.prefix="";this.fontFamily='"Trebuchet MS", Arial, Helvetica, sans-serif';this.fontSize="10pt";this.fontWeight="normal";this.fontStretch=1;this.textColor="#666666";this.enableFontSupport=true;this.pt2px=null;this._elem;this._ctx;this._plotWidth;this._plotHeight;this._plotDimensions={height:null,width:null};a.extend(true,this,b);var c={fontSize:this.fontSize,fontWeight:this.fontWeight,fontStretch:this.fontStretch,fillStyle:this.textColor,angle:this.getAngleRad(),fontFamily:this.fontFamily};if(this.pt2px){c.pt2px=this.pt2px}if(this.enableFontSupport){if(a.jqplot.support_canvas_text()){this._textRenderer=new a.jqplot.CanvasFontRenderer(c)}else{this._textRenderer=new a.jqplot.CanvasTextRenderer(c)}}else{this._textRenderer=new a.jqplot.CanvasTextRenderer(c)}};a.jqplot.CanvasAxisTickRenderer.prototype.init=function(b){a.extend(true,this,b);this._textRenderer.init({fontSize:this.fontSize,fontWeight:this.fontWeight,fontStretch:this.fontStretch,fillStyle:this.textColor,angle:this.getAngleRad(),fontFamily:this.fontFamily})};a.jqplot.CanvasAxisTickRenderer.prototype.getWidth=function(d){if(this._elem){return this._elem.outerWidth(true)}else{var f=this._textRenderer;var c=f.getWidth(d);var e=f.getHeight(d);var b=Math.abs(Math.sin(f.angle)*e)+Math.abs(Math.cos(f.angle)*c);return b}};a.jqplot.CanvasAxisTickRenderer.prototype.getHeight=function(d){if(this._elem){return this._elem.outerHeight(true)}else{var f=this._textRenderer;var c=f.getWidth(d);var e=f.getHeight(d);var b=Math.abs(Math.cos(f.angle)*e)+Math.abs(Math.sin(f.angle)*c);return b}};a.jqplot.CanvasAxisTickRenderer.prototype.getTop=function(b){if(this._elem){return this._elem.position().top}else{return null}};a.jqplot.CanvasAxisTickRenderer.prototype.getAngleRad=function(){var b=this.angle*Math.PI/180;return b};a.jqplot.CanvasAxisTickRenderer.prototype.setTick=function(b,d,c){this.value=b;if(c){this.isMinorTick=true}return this};a.jqplot.CanvasAxisTickRenderer.prototype.draw=function(c,f){if(!this.label){this.label=this.prefix+this.formatter(this.formatString,this.value)}if(this._elem){if(a.jqplot.use_excanvas&&window.G_vmlCanvasManager.uninitElement!==undefined){window.G_vmlCanvasManager.uninitElement(this._elem.get(0))}this._elem.emptyForce();this._elem=null}var e=f.canvasManager.getCanvas();this._textRenderer.setText(this.label,c);var b=this.getWidth(c);var d=this.getHeight(c);e.width=b;e.height=d;e.style.width=b;e.style.height=d;e.style.textAlign="left";e.style.position="absolute";e=f.canvasManager.initCanvas(e);this._elem=a(e);this._elem.css(this._styles);this._elem.addClass("jqplot-"+this.axis+"-tick");e=null;return this._elem};a.jqplot.CanvasAxisTickRenderer.prototype.pack=function(){this._textRenderer.draw(this._elem.get(0).getContext("2d"),this.label)}})(jQuery);

templates/admin/default/assets/js/jqplot/plugins/jqplot.ciParser.min.js

@@ -0,0 +1,3 @@
+/* jqPlot 1.0.8r1250 | (c) 2009-2013 Chris Leonello | jplot.com
+   jsDate | (c) 2010-2013 Chris Leonello
+ */(function(a){a.jqplot.ciParser=function(g,l){var m=[],o,n,h,f,e,c;if(typeof(g)=="string"){g=a.jqplot.JSON.parse(g,d)}else{if(typeof(g)=="object"){for(e in g){for(h=0;h<g[e].length;h++){for(c in g[e][h]){g[e][h][c]=d(c,g[e][h][c])}}}}else{return null}}function d(j,k){var i;if(k!=null){if(k.toString().indexOf("Date")>=0){i=/^\/Date\((-?[0-9]+)\)\/$/.exec(k);if(i){return parseInt(i[1],10)}}return k}}for(var b in g){o=[];n=g[b];switch(b){case"PriceTicks":for(h=0;h<n.length;h++){o.push([n[h]["TickDate"],n[h]["Price"]])}break;case"PriceBars":for(h=0;h<n.length;h++){o.push([n[h]["BarDate"],n[h]["Open"],n[h]["High"],n[h]["Low"],n[h]["Close"]])}break}m.push(o)}return m}})(jQuery);

templates/admin/default/assets/js/jqplot/plugins/jqplot.dragable.min.js

@@ -0,0 +1,3 @@
+/* jqPlot 1.0.8r1250 | (c) 2009-2013 Chris Leonello | jplot.com
+   jsDate | (c) 2010-2013 Chris Leonello
+ */(function(d){d.jqplot.Dragable=function(g){this.markerRenderer=new d.jqplot.MarkerRenderer({shadow:false});this.shapeRenderer=new d.jqplot.ShapeRenderer();this.isDragging=false;this.isOver=false;this._ctx;this._elem;this._point;this._gridData;this.color;this.constrainTo="none";d.extend(true,this,g)};function b(){d.jqplot.GenericCanvas.call(this);this.isDragging=false;this.isOver=false;this._neighbor;this._cursors=[]}b.prototype=new d.jqplot.GenericCanvas();b.prototype.constructor=b;d.jqplot.Dragable.parseOptions=function(i,h){var g=h||{};this.plugins.dragable=new d.jqplot.Dragable(g.dragable);this.isDragable=d.jqplot.config.enablePlugins};d.jqplot.Dragable.postPlotDraw=function(){if(this.plugins.dragable&&this.plugins.dragable.highlightCanvas){this.plugins.dragable.highlightCanvas.resetCanvas();this.plugins.dragable.highlightCanvas=null}this.plugins.dragable={previousCursor:"auto",isOver:false};this.plugins.dragable.dragCanvas=new b();this.eventCanvas._elem.before(this.plugins.dragable.dragCanvas.createElement(this._gridPadding,"jqplot-dragable-canvas",this._plotDimensions,this));var g=this.plugins.dragable.dragCanvas.setContext()};d.jqplot.preParseSeriesOptionsHooks.push(d.jqplot.Dragable.parseOptions);d.jqplot.postDrawHooks.push(d.jqplot.Dragable.postPlotDraw);d.jqplot.eventListenerHooks.push(["jqplotMouseMove",e]);d.jqplot.eventListenerHooks.push(["jqplotMouseDown",c]);d.jqplot.eventListenerHooks.push(["jqplotMouseUp",a]);function f(n,p){var q=n.series[p.seriesIndex];var m=q.plugins.dragable;var h=q.markerRenderer;var i=m.markerRenderer;i.style=h.style;i.lineWidth=h.lineWidth+2.5;i.size=h.size+5;if(!m.color){var l=d.jqplot.getColorComponents(h.color);var o=[l[0],l[1],l[2]];var k=(l[3]>=0.6)?l[3]*0.6:l[3]*(2-l[3]);m.color="rgba("+o[0]+","+o[1]+","+o[2]+","+k+")"}i.color=m.color;i.init();var g=(p.pointIndex>0)?p.pointIndex-1:0;var j=p.pointIndex+2;m._gridData=q.gridData.slice(g,j)}function e(o,l,h,t,m){if(m.plugins.dragable.dragCanvas.isDragging){var u=m.plugins.dragable.dragCanvas;var i=u._neighbor;var w=m.series[i.seriesIndex];var k=w.plugins.dragable;var r=w.gridData;var p=(k.constrainTo=="y")?i.gridData[0]:l.x;var n=(k.constrainTo=="x")?i.gridData[1]:l.y;var g=w._xaxis.series_p2u(p);var q=w._yaxis.series_p2u(n);var v=u._ctx;v.clearRect(0,0,v.canvas.width,v.canvas.height);if(i.pointIndex>0){k._gridData[1]=[p,n]}else{k._gridData[0]=[p,n]}m.series[i.seriesIndex].draw(u._ctx,{gridData:k._gridData,shadow:false,preventJqPlotSeriesDrawTrigger:true,color:k.color,markerOptions:{color:k.color,shadow:false},trendline:{show:false}});m.target.trigger("jqplotSeriesPointChange",[i.seriesIndex,i.pointIndex,[g,q],[p,n]])}else{if(t!=null){var j=m.series[t.seriesIndex];if(j.isDragable){var u=m.plugins.dragable.dragCanvas;if(!u.isOver){u._cursors.push(o.target.style.cursor);o.target.style.cursor="pointer"}u.isOver=true}}else{if(t==null){var u=m.plugins.dragable.dragCanvas;if(u.isOver){o.target.style.cursor=u._cursors.pop();u.isOver=false}}}}}function c(k,i,g,l,j){var m=j.plugins.dragable.dragCanvas;m._cursors.push(k.target.style.cursor);if(l!=null){var o=j.series[l.seriesIndex];var h=o.plugins.dragable;if(o.isDragable&&!m.isDragging){m._neighbor=l;m.isDragging=true;f(j,l);h.markerRenderer.draw(o.gridData[l.pointIndex][0],o.gridData[l.pointIndex][1],m._ctx);k.target.style.cursor="move";j.target.trigger("jqplotDragStart",[l.seriesIndex,l.pointIndex,i,g])}}else{var n=m._ctx;n.clearRect(0,0,n.canvas.width,n.canvas.height);m.isDragging=false}}function a(m,j,g,o,k){if(k.plugins.dragable.dragCanvas.isDragging){var p=k.plugins.dragable.dragCanvas;var q=p._ctx;q.clearRect(0,0,q.canvas.width,q.canvas.height);p.isDragging=false;var h=p._neighbor;var r=k.series[h.seriesIndex];var i=r.plugins.dragable;var n=(i.constrainTo=="y")?h.data[0]:g[r.xaxis];var l=(i.constrainTo=="x")?h.data[1]:g[r.yaxis];r.data[h.pointIndex][0]=n;r.data[h.pointIndex][1]=l;k.drawSeries({preventJqPlotSeriesDrawTrigger:true},h.seriesIndex);p._neighbor=null;m.target.style.cursor=p._cursors.pop();k.target.trigger("jqplotDragStop",[j,g])}}})(jQuery);

templates/admin/default/assets/js/jqplot/plugins/jqplot.enhancedLegendRenderer.min.js

@@ -0,0 +1,3 @@
+/* jqPlot 1.0.8r1250 | (c) 2009-2013 Chris Leonello | jplot.com
+   jsDate | (c) 2010-2013 Chris Leonello
+ */(function(c){c.jqplot.EnhancedLegendRenderer=function(){c.jqplot.TableLegendRenderer.call(this)};c.jqplot.EnhancedLegendRenderer.prototype=new c.jqplot.TableLegendRenderer();c.jqplot.EnhancedLegendRenderer.prototype.constructor=c.jqplot.EnhancedLegendRenderer;c.jqplot.EnhancedLegendRenderer.prototype.init=function(d){this.numberRows=null;this.numberColumns=null;this.seriesToggle="normal";this.seriesToggleReplot=false;this.disableIEFading=true;c.extend(true,this,d);if(this.seriesToggle){c.jqplot.postDrawHooks.push(b)}};c.jqplot.EnhancedLegendRenderer.prototype.draw=function(m,y){var f=this;if(this.show){var r=this._series;var u;var w="position:absolute;";w+=(this.background)?"background:"+this.background+";":"";w+=(this.border)?"border:"+this.border+";":"";w+=(this.fontSize)?"font-size:"+this.fontSize+";":"";w+=(this.fontFamily)?"font-family:"+this.fontFamily+";":"";w+=(this.textColor)?"color:"+this.textColor+";":"";w+=(this.marginTop!=null)?"margin-top:"+this.marginTop+";":"";w+=(this.marginBottom!=null)?"margin-bottom:"+this.marginBottom+";":"";w+=(this.marginLeft!=null)?"margin-left:"+this.marginLeft+";":"";w+=(this.marginRight!=null)?"margin-right:"+this.marginRight+";":"";this._elem=c('<table class="jqplot-table-legend" style="'+w+'"></table>');if(this.seriesToggle){this._elem.css("z-index","3")}var C=false,q=false,d,o;if(this.numberRows){d=this.numberRows;if(!this.numberColumns){o=Math.ceil(r.length/d)}else{o=this.numberColumns}}else{if(this.numberColumns){o=this.numberColumns;d=Math.ceil(r.length/this.numberColumns)}else{d=r.length;o=1}}var B,z,e,l,k,n,p,t,h,g;var v=0;for(B=r.length-1;B>=0;B--){if(o==1&&r[B]._stack||r[B].renderer.constructor==c.jqplot.BezierCurveRenderer){q=true}}for(B=0;B<d;B++){e=c(document.createElement("tr"));e.addClass("jqplot-table-legend");if(q){e.prependTo(this._elem)}else{e.appendTo(this._elem)}for(z=0;z<o;z++){if(v<r.length&&(r[v].show||r[v].showLabel)){u=r[v];n=this.labels[v]||u.label.toString();if(n){var x=u.color;if(!q){if(B>0){C=true}else{C=false}}else{if(B==d-1){C=false}else{C=true}}p=(C)?this.rowSpacing:"0";l=c(document.createElement("td"));l.addClass("jqplot-table-legend jqplot-table-legend-swatch");l.css({textAlign:"center",paddingTop:p});h=c(document.createElement("div"));h.addClass("jqplot-table-legend-swatch-outline");g=c(document.createElement("div"));g.addClass("jqplot-table-legend-swatch");g.css({backgroundColor:x,borderColor:x});l.append(h.append(g));k=c(document.createElement("td"));k.addClass("jqplot-table-legend jqplot-table-legend-label");k.css("paddingTop",p);if(this.escapeHtml){k.text(n)}else{k.html(n)}if(q){if(this.showLabels){k.prependTo(e)}if(this.showSwatches){l.prependTo(e)}}else{if(this.showSwatches){l.appendTo(e)}if(this.showLabels){k.appendTo(e)}}if(this.seriesToggle){var A;if(typeof(this.seriesToggle)==="string"||typeof(this.seriesToggle)==="number"){if(!c.jqplot.use_excanvas||!this.disableIEFading){A=this.seriesToggle}}if(this.showSwatches){l.bind("click",{series:u,speed:A,plot:y,replot:this.seriesToggleReplot},a);l.addClass("jqplot-seriesToggle")}if(this.showLabels){k.bind("click",{series:u,speed:A,plot:y,replot:this.seriesToggleReplot},a);k.addClass("jqplot-seriesToggle")}if(!u.show&&u.showLabel){l.addClass("jqplot-series-hidden");k.addClass("jqplot-series-hidden")}}C=true}}v++}l=k=h=g=null}}return this._elem};var a=function(j){var i=j.data,m=i.series,k=i.replot,h=i.plot,f=i.speed,l=m.index,g=false;if(m.canvas._elem.is(":hidden")||!m.show){g=true}var e=function(){if(k){var n={};if(c.isPlainObject(k)){c.extend(true,n,k)}h.replot(n);if(g&&f){var d=h.series[l];if(d.shadowCanvas._elem){d.shadowCanvas._elem.hide().fadeIn(f)}d.canvas._elem.hide().fadeIn(f);d.canvas._elem.nextAll(".jqplot-point-label.jqplot-series-"+d.index).hide().fadeIn(f)}}else{var d=h.series[l];if(d.canvas._elem.is(":hidden")||!d.show){if(typeof h.options.legend.showSwatches==="undefined"||h.options.legend.showSwatches===true){h.legend._elem.find("td").eq(l*2).addClass("jqplot-series-hidden")}if(typeof h.options.legend.showLabels==="undefined"||h.options.legend.showLabels===true){h.legend._elem.find("td").eq((l*2)+1).addClass("jqplot-series-hidden")}}else{if(typeof h.options.legend.showSwatches==="undefined"||h.options.legend.showSwatches===true){h.legend._elem.find("td").eq(l*2).removeClass("jqplot-series-hidden")}if(typeof h.options.legend.showLabels==="undefined"||h.options.legend.showLabels===true){h.legend._elem.find("td").eq((l*2)+1).removeClass("jqplot-series-hidden")}}}};m.toggleDisplay(j,e)};var b=function(){if(this.legend.renderer.constructor==c.jqplot.EnhancedLegendRenderer&&this.legend.seriesToggle){var d=this.legend._elem.detach();this.eventCanvas._elem.after(d)}}})(jQuery);

templates/admin/default/assets/js/jqplot/plugins/jqplot.json2.min.js

@@ -0,0 +1,3 @@
+/* jqPlot 1.0.8r1250 | (c) 2009-2013 Chris Leonello | jplot.com
+   jsDate | (c) 2010-2013 Chris Leonello
+ */(function($){$.jqplot.JSON=window.JSON;if(!window.JSON){$.jqplot.JSON={}}function f(n){return n<10?"0"+n:n}if(typeof Date.prototype.toJSON!=="function"){Date.prototype.toJSON=function(key){return isFinite(this.valueOf())?this.getUTCFullYear()+"-"+f(this.getUTCMonth()+1)+"-"+f(this.getUTCDate())+"T"+f(this.getUTCHours())+":"+f(this.getUTCMinutes())+":"+f(this.getUTCSeconds())+"Z":null};String.prototype.toJSON=Number.prototype.toJSON=Boolean.prototype.toJSON=function(key){return this.valueOf()}}var cx=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,escapable=/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,gap,indent,meta={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},rep;function quote(string){escapable.lastIndex=0;return escapable.test(string)?'"'+string.replace(escapable,function(a){var c=meta[a];return typeof c==="string"?c:"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+string+'"'}function str(key,holder){var i,k,v,length,mind=gap,partial,value=holder[key];if(value&&typeof value==="object"&&typeof value.toJSON==="function"){value=value.toJSON(key)}if(typeof rep==="function"){value=rep.call(holder,key,value)}switch(typeof value){case"string":return quote(value);case"number":return isFinite(value)?String(value):"null";case"boolean":case"null":return String(value);case"object":if(!value){return"null"}gap+=indent;partial=[];if(Object.prototype.toString.apply(value)==="[object Array]"){length=value.length;for(i=0;i<length;i+=1){partial[i]=str(i,value)||"null"}v=partial.length===0?"[]":gap?"[\n"+gap+partial.join(",\n"+gap)+"\n"+mind+"]":"["+partial.join(",")+"]";gap=mind;return v}if(rep&&typeof rep==="object"){length=rep.length;for(i=0;i<length;i+=1){k=rep[i];if(typeof k==="string"){v=str(k,value);if(v){partial.push(quote(k)+(gap?": ":":")+v)}}}}else{for(k in value){if(Object.hasOwnProperty.call(value,k)){v=str(k,value);if(v){partial.push(quote(k)+(gap?": ":":")+v)}}}}v=partial.length===0?"{}":gap?"{\n"+gap+partial.join(",\n"+gap)+"\n"+mind+"}":"{"+partial.join(",")+"}";gap=mind;return v}}if(typeof $.jqplot.JSON.stringify!=="function"){$.jqplot.JSON.stringify=function(value,replacer,space){var i;gap="";indent="";if(typeof space==="number"){for(i=0;i<space;i+=1){indent+=" "}}else{if(typeof space==="string"){indent=space}}rep=replacer;if(replacer&&typeof replacer!=="function"&&(typeof replacer!=="object"||typeof replacer.length!=="number")){throw new Error("$.jqplot.JSON.stringify")}return str("",{"":value})}}if(typeof $.jqplot.JSON.parse!=="function"){$.jqplot.JSON.parse=function(text,reviver){var j;function walk(holder,key){var k,v,value=holder[key];if(value&&typeof value==="object"){for(k in value){if(Object.hasOwnProperty.call(value,k)){v=walk(value,k);if(v!==undefined){value[k]=v}else{delete value[k]}}}}return reviver.call(holder,key,value)}text=String(text);cx.lastIndex=0;if(cx.test(text)){text=text.replace(cx,function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})}if(/^[\],:{}\s]*$/.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,""))){j=eval("("+text+")");return typeof reviver==="function"?walk({"":j},""):j}throw new SyntaxError("$.jqplot.JSON.parse")}}})(jQuery);

templates/admin/default/assets/js/jqplot/plugins/jqplot.mobile.min.js

@@ -0,0 +1,3 @@
+/* jqPlot 1.0.8r1250 | (c) 2009-2013 Chris Leonello | jplot.com
+   jsDate | (c) 2010-2013 Chris Leonello
+ */(function(b){function a(e,d,c){this.bindCustomEvents=function(){this.eventCanvas._elem.bind("vclick",{plot:this},this.onClick);this.eventCanvas._elem.bind("dblclick",{plot:this},this.onDblClick);this.eventCanvas._elem.bind("taphold",{plot:this},this.onDblClick);this.eventCanvas._elem.bind("vmousedown",{plot:this},this.onMouseDown);this.eventCanvas._elem.bind("vmousemove",{plot:this},this.onMouseMove);this.eventCanvas._elem.bind("mouseenter",{plot:this},this.onMouseEnter);this.eventCanvas._elem.bind("mouseleave",{plot:this},this.onMouseLeave);if(this.captureRightClick){this.eventCanvas._elem.bind("vmouseup",{plot:this},this.onRightClick);this.eventCanvas._elem.get(0).oncontextmenu=function(){return false}}else{this.eventCanvas._elem.bind("vmouseup",{plot:this},this.onMouseUp)}};this.plugins.mobile=true}b.jqplot.postInitHooks.push(a)})(jQuery);

templates/admin/default/assets/js/jqplot/plugins/jqplot.ohlcRenderer.min.js

@@ -0,0 +1,3 @@
+/* jqPlot 1.0.8r1250 | (c) 2009-2013 Chris Leonello | jplot.com
+   jsDate | (c) 2010-2013 Chris Leonello
+ */(function(a){a.jqplot.OHLCRenderer=function(){a.jqplot.LineRenderer.call(this);this.candleStick=false;this.tickLength="auto";this.bodyWidth="auto";this.openColor=null;this.closeColor=null;this.wickColor=null;this.fillUpBody=false;this.fillDownBody=true;this.upBodyColor=null;this.downBodyColor=null;this.hlc=false;this.lineWidth=1.5;this._tickLength;this._bodyWidth};a.jqplot.OHLCRenderer.prototype=new a.jqplot.LineRenderer();a.jqplot.OHLCRenderer.prototype.constructor=a.jqplot.OHLCRenderer;a.jqplot.OHLCRenderer.prototype.init=function(e){e=e||{};this.lineWidth=e.lineWidth||1.5;a.jqplot.LineRenderer.prototype.init.call(this,e);this._type="ohlc";var b=this._yaxis._dataBounds;var f=this._plotData;if(f[0].length<5){this.renderer.hlc=true;for(var c=0;c<f.length;c++){if(f[c][2]<b.min||b.min==null){b.min=f[c][2]}if(f[c][1]>b.max||b.max==null){b.max=f[c][1]}}}else{for(var c=0;c<f.length;c++){if(f[c][3]<b.min||b.min==null){b.min=f[c][3]}if(f[c][2]>b.max||b.max==null){b.max=f[c][2]}}}};a.jqplot.OHLCRenderer.prototype.draw=function(A,N,j){var J=this.data;var v=this._xaxis.min;var z=this._xaxis.max;var l=0;var K=J.length;var p=this._xaxis.series_u2p;var G=this._yaxis.series_u2p;var D,E,f,M,F,n,O,C;var y;var u=this.renderer;var s=(j!=undefined)?j:{};var k=(s.shadow!=undefined)?s.shadow:this.shadow;var B=(s.fill!=undefined)?s.fill:this.fill;var c=(s.fillAndStroke!=undefined)?s.fillAndStroke:this.fillAndStroke;u.bodyWidth=(s.bodyWidth!=undefined)?s.bodyWidth:u.bodyWidth;u.tickLength=(s.tickLength!=undefined)?s.tickLength:u.tickLength;A.save();if(this.show){var m,q,g,Q,t;for(var D=0;D<J.length;D++){if(J[D][0]<v){l=D}else{if(J[D][0]<z){K=D+1}}}var I=this.gridData[K-1][0]-this.gridData[l][0];var L=K-l;try{var P=Math.abs(this._xaxis.series_u2p(parseInt(this._xaxis._intervalStats[0].sortedIntervals[0].interval,10))-this._xaxis.series_u2p(0))}catch(H){var P=I/L}if(u.candleStick){if(typeof(u.bodyWidth)=="number"){u._bodyWidth=u.bodyWidth}else{u._bodyWidth=Math.min(20,P/1.65)}}else{if(typeof(u.tickLength)=="number"){u._tickLength=u.tickLength}else{u._tickLength=Math.min(10,P/3.5)}}for(var D=l;D<K;D++){m=p(J[D][0]);if(u.hlc){q=null;g=G(J[D][1]);Q=G(J[D][2]);t=G(J[D][3])}else{q=G(J[D][1]);g=G(J[D][2]);Q=G(J[D][3]);t=G(J[D][4])}y={};if(u.candleStick&&!u.hlc){n=u._bodyWidth;O=m-n/2;if(t<q){if(u.wickColor){y.color=u.wickColor}else{if(u.downBodyColor){y.color=u.upBodyColor}}f=a.extend(true,{},s,y);u.shapeRenderer.draw(A,[[m,g],[m,t]],f);u.shapeRenderer.draw(A,[[m,q],[m,Q]],f);y={};M=t;F=q-t;if(u.fillUpBody){y.fillRect=true}else{y.strokeRect=true;n=n-this.lineWidth;O=m-n/2}if(u.upBodyColor){y.color=u.upBodyColor;y.fillStyle=u.upBodyColor}C=[O,M,n,F]}else{if(t>q){if(u.wickColor){y.color=u.wickColor}else{if(u.downBodyColor){y.color=u.downBodyColor}}f=a.extend(true,{},s,y);u.shapeRenderer.draw(A,[[m,g],[m,q]],f);u.shapeRenderer.draw(A,[[m,t],[m,Q]],f);y={};M=q;F=t-q;if(u.fillDownBody){y.fillRect=true}else{y.strokeRect=true;n=n-this.lineWidth;O=m-n/2}if(u.downBodyColor){y.color=u.downBodyColor;y.fillStyle=u.downBodyColor}C=[O,M,n,F]}else{if(u.wickColor){y.color=u.wickColor}f=a.extend(true,{},s,y);u.shapeRenderer.draw(A,[[m,g],[m,Q]],f);y={};y.fillRect=false;y.strokeRect=false;O=[m-n/2,q];M=[m+n/2,t];n=null;F=null;C=[O,M]}}f=a.extend(true,{},s,y);u.shapeRenderer.draw(A,C,f)}else{E=s.color;if(u.openColor){s.color=u.openColor}if(!u.hlc){u.shapeRenderer.draw(A,[[m-u._tickLength,q],[m,q]],s)}s.color=E;if(u.wickColor){s.color=u.wickColor}u.shapeRenderer.draw(A,[[m,g],[m,Q]],s);s.color=E;if(u.closeColor){s.color=u.closeColor}u.shapeRenderer.draw(A,[[m,t],[m+u._tickLength,t]],s);s.color=E}}}A.restore()};a.jqplot.OHLCRenderer.prototype.drawShadow=function(b,d,c){};a.jqplot.OHLCRenderer.checkOptions=function(d,c,b){if(!b.highlighter){b.highlighter={showMarker:false,tooltipAxes:"y",yvalues:4,formatString:'<table class="jqplot-highlighter"><tr><td>date:</td><td>%s</td></tr><tr><td>open:</td><td>%s</td></tr><tr><td>hi:</td><td>%s</td></tr><tr><td>low:</td><td>%s</td></tr><tr><td>close:</td><td>%s</td></tr></table>'}}}})(jQuery);

templates/admin/default/assets/js/jqplot/plugins/jqplot.pointLabels.min.js

@@ -0,0 +1,3 @@
+/* jqPlot 1.0.8r1250 | (c) 2009-2013 Chris Leonello | jplot.com
+   jsDate | (c) 2010-2013 Chris Leonello
+ */(function(c){c.jqplot.PointLabels=function(e){this.show=c.jqplot.config.enablePlugins;this.location="n";this.labelsFromSeries=false;this.seriesLabelIndex=null;this.labels=[];this._labels=[];this.stackedValue=false;this.ypadding=6;this.xpadding=6;this.escapeHTML=true;this.edgeTolerance=-5;this.formatter=c.jqplot.DefaultTickFormatter;this.formatString="";this.hideZeros=false;this._elems=[];c.extend(true,this,e)};var a=["nw","n","ne","e","se","s","sw","w"];var d={nw:0,n:1,ne:2,e:3,se:4,s:5,sw:6,w:7};var b=["se","s","sw","w","nw","n","ne","e"];c.jqplot.PointLabels.init=function(j,h,f,g,i){var e=c.extend(true,{},f,g);e.pointLabels=e.pointLabels||{};if(this.renderer.constructor===c.jqplot.BarRenderer&&this.barDirection==="horizontal"&&!e.pointLabels.location){e.pointLabels.location="e"}this.plugins.pointLabels=new c.jqplot.PointLabels(e.pointLabels);this.plugins.pointLabels.setLabels.call(this)};c.jqplot.PointLabels.prototype.setLabels=function(){var f=this.plugins.pointLabels;var h;if(f.seriesLabelIndex!=null){h=f.seriesLabelIndex}else{if(this.renderer.constructor===c.jqplot.BarRenderer&&this.barDirection==="horizontal"){h=(this._plotData[0].length<3)?0:this._plotData[0].length-1}else{h=(this._plotData.length===0)?0:this._plotData[0].length-1}}f._labels=[];if(f.labels.length===0||f.labelsFromSeries){if(f.stackedValue){if(this._plotData.length&&this._plotData[0].length){for(var e=0;e<this._plotData.length;e++){f._labels.push(this._plotData[e][h])}}}else{var g=this.data;if(this.renderer.constructor===c.jqplot.BarRenderer&&this.waterfall){g=this._data}if(g.length&&g[0].length){for(var e=0;e<g.length;e++){f._labels.push(g[e][h])}}g=null}}else{if(f.labels.length){f._labels=f.labels}}};c.jqplot.PointLabels.prototype.xOffset=function(f,e,g){e=e||this.location;g=g||this.xpadding;var h;switch(e){case"nw":h=-f.outerWidth(true)-this.xpadding;break;case"n":h=-f.outerWidth(true)/2;break;case"ne":h=this.xpadding;break;case"e":h=this.xpadding;break;case"se":h=this.xpadding;break;case"s":h=-f.outerWidth(true)/2;break;case"sw":h=-f.outerWidth(true)-this.xpadding;break;case"w":h=-f.outerWidth(true)-this.xpadding;break;default:h=-f.outerWidth(true)-this.xpadding;break}return h};c.jqplot.PointLabels.prototype.yOffset=function(f,e,g){e=e||this.location;g=g||this.xpadding;var h;switch(e){case"nw":h=-f.outerHeight(true)-this.ypadding;break;case"n":h=-f.outerHeight(true)-this.ypadding;break;case"ne":h=-f.outerHeight(true)-this.ypadding;break;case"e":h=-f.outerHeight(true)/2;break;case"se":h=this.ypadding;break;case"s":h=this.ypadding;break;case"sw":h=this.ypadding;break;case"w":h=-f.outerHeight(true)/2;break;default:h=-f.outerHeight(true)-this.ypadding;break}return h};c.jqplot.PointLabels.draw=function(x,j,v){var t=this.plugins.pointLabels;t.setLabels.call(this);for(var w=0;w<t._elems.length;w++){t._elems[w].emptyForce()}t._elems.splice(0,t._elems.length);if(t.show){var r="_"+this._stackAxis+"axis";if(!t.formatString){t.formatString=this[r]._ticks[0].formatString;t.formatter=this[r]._ticks[0].formatter}var E=this._plotData;var D=this._prevPlotData;var A=this._xaxis;var q=this._yaxis;var z,f;for(var w=0,u=t._labels.length;w<u;w++){var o=t._labels[w];if(o==null||(t.hideZeros&&parseInt(o,10)==0)){continue}o=t.formatter(t.formatString,o);f=document.createElement("div");t._elems[w]=c(f);z=t._elems[w];z.addClass("jqplot-point-label jqplot-series-"+this.index+" jqplot-point-"+w);z.css("position","absolute");z.insertAfter(x.canvas);if(t.escapeHTML){z.text(o)}else{z.html(o)}var g=t.location;if((this.fillToZero&&E[w][1]<0)||(this.fillToZero&&this._type==="bar"&&this.barDirection==="horizontal"&&E[w][0]<0)||(this.waterfall&&parseInt(o,10))<0){g=b[d[g]]}var n=A.u2p(E[w][0])+t.xOffset(z,g);var h=q.u2p(E[w][1])+t.yOffset(z,g);if(this._stack&&!t.stackedValue){if(this.barDirection==="vertical"){h=(this._barPoints[w][0][1]+this._barPoints[w][1][1])/2+v._gridPadding.top-0.5*z.outerHeight(true)}else{n=(this._barPoints[w][2][0]+this._barPoints[w][0][0])/2+v._gridPadding.left-0.5*z.outerWidth(true)}}if(this.renderer.constructor==c.jqplot.BarRenderer){if(this.barDirection=="vertical"){n+=this._barNudge}else{h-=this._barNudge}}z.css("left",n);z.css("top",h);var k=n+z.width();var s=h+z.height();var C=t.edgeTolerance;var e=c(x.canvas).position().left;var y=c(x.canvas).position().top;var B=x.canvas.width+e;var m=x.canvas.height+y;if(n-C<e||h-C<y||k+C>B||s+C>m){z.remove()}z=null;f=null}}};c.jqplot.postSeriesInitHooks.push(c.jqplot.PointLabels.init);c.jqplot.postDrawSeriesHooks.push(c.jqplot.PointLabels.draw)})(jQuery);

templates/admin/default/assets/js/jqplot/plugins/jqplot.trendline.min.js

@@ -0,0 +1,3 @@
+/* jqPlot 1.0.8r1250 | (c) 2009-2013 Chris Leonello | jplot.com
+   jsDate | (c) 2010-2013 Chris Leonello
+ */(function(f){f.jqplot.Trendline=function(){this.show=f.jqplot.config.enablePlugins;this.color="#666666";this.renderer=new f.jqplot.LineRenderer();this.rendererOptions={marker:{show:false}};this.label="";this.type="linear";this.shadow=true;this.markerRenderer={show:false};this.lineWidth=1.5;this.shadowAngle=45;this.shadowOffset=1;this.shadowAlpha=0.07;this.shadowDepth=3;this.isTrendline=true};f.jqplot.postSeriesInitHooks.push(e);f.jqplot.postDrawSeriesHooks.push(g);f.jqplot.addLegendRowHooks.push(a);function a(k){var j=null;if(k.trendline&&k.trendline.show){var i=k.trendline.label.toString();if(i){j={label:i,color:k.trendline.color}}}return j}function e(m,k,j,i,l){if(this._type&&(this._type==="line"||this._type=="bar")){this.trendline=new f.jqplot.Trendline();i=i||{};f.extend(true,this.trendline,{color:this.color},j.trendline,i.trendline);this.trendline.renderer.init.call(this.trendline,null)}}function g(m,i){i=f.extend(true,{},this.trendline,i);if(this.trendline&&i.show){var k;var l=i.data||this.data;k=c(l,this.trendline.type);var j=i.gridData||this.renderer.makeGridData.call(this,k.data);this.trendline.renderer.draw.call(this.trendline,m,j,{showLine:true,shadow:this.trendline.shadow})}}function b(w,v,n){var u=(n==null)?"linear":n;var s=w.length;var t;var z;var o=0;var m=0;var r=0;var q=0;var l=0;var j=[];var k=[];if(u=="linear"){k=w;j=v}else{if(u=="exp"||u=="exponential"){for(var p=0;p<v.length;p++){if(v[p]<=0){s--}else{k.push(w[p]);j.push(Math.log(v[p]))}}}}for(var p=0;p<s;p++){o=o+k[p];m=m+j[p];q=q+k[p]*j[p];r=r+k[p]*k[p];l=l+j[p]*j[p]}t=(s*q-o*m)/(s*r-o*o);z=(m-t*o)/s;return[t,z]}function h(k,j){var i;i=b(k,j,"linear");return[i[0],i[1]]}function d(o,m){var k;var i=o;var n=m;k=b(i,n,"exp");var l=Math.exp(k[0]);var j=Math.exp(k[1]);return[l,j]}function c(l,j){var p=(j==null)?"linear":j;var n;var o;var r=[];var q=[];var m=[];for(k=0;k<l.length;k++){if(l[k]!=null&&l[k][0]!=null&&l[k][1]!=null){r.push(l[k][0]);q.push(l[k][1])}}if(p=="linear"){n=h(r,q);for(var k=0;k<r.length;k++){o=n[0]*r[k]+n[1];m.push([r[k],o])}}else{if(p=="exp"||p=="exponential"){n=d(r,q);for(var k=0;k<r.length;k++){o=n[1]*Math.pow(n[0],r[k]);m.push([r[k],o])}}}return{data:m,slope:n[0],intercept:n[1]}}})(jQuery);

templates/admin/default/assets/less/thelia/jqplot.less

@@ -0,0 +1,27 @@
+.jqplot-axis{
+	color: @gray-light;
+	font-family: @font-family-sans-serif;
+	font-size: @font-size-small;
+}
+
+.jqplot-yaxis{
+	margin-right: 10px;
+}
+.jqplot-xaxis{
+	margin-top: 10px;
+}
+
+.jqplot-highlighter-tooltip{
+	.tooltip-inner;
+}
+
+.jqplot-title{
+	text-transform: uppercase;
+	font-weight: bold;
+	font-size: 12px;
+	color: @gray;
+}
+
+.jqplot-series-canvas{
+	.opacity(0.7);
+}

templates/admin/default/assets/less/thelia/thelia.less

@@ -11,6 +11,7 @@
 @import "wizard.less";
 @import "bootstrap-editable.less";
 @import "bootstrap-switch.less";
+@import "jqplot.less";
 
 // -- Base styling ------------------------------------------------------------
 
@@ -254,6 +255,11 @@
     }
 }
 
+// -- Home --
+.dashboard hr{
+    margin-bottom: 10px;
+}
+
 // -- Editable tweaks ---------------------------------------------------------
 
 .editable-click, a.editable-click, a.editable-click:hover {

templates/admin/default/category-edit.html

@@ -286,6 +286,27 @@
 {/block}
 
 {block name="javascript-initialization"}
+
+<script src="/web/tinymce/tinymce.min.js"></script>
+<script>
+	tinymce.init({
+		selector: ".wysiwyg",
+		theme: "modern",
+		menubar : false,
+		language: "",
+		plugins: [
+		     "advlist autolink link image lists charmap print preview hr anchor pagebreak",
+		     "searchreplace wordcount visualblocks visualchars insertdatetime media nonbreaking",
+		     "table contextmenu directionality emoticons paste textcolor filemanager"
+		],
+		toolbar1: "undo redo | bold italic underline | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | styleselect | filemanager | link unlink anchor | image media | forecolor backcolor  | print preview code ",
+		image_advtab: true ,
+		external_filemanager_path:"/web/tinymce/plugins/filemanager/",
+		filemanager_title:"{intl l='Files manager'}" ,
+		external_plugins: { "filemanager" : "/web/tinymce/plugins/filemanager/plugin.min.js"}
+	 });
+</script>
+
 <script>
 
 $(function() {

templates/admin/default/folder-edit.html

@@ -0,0 +1,344 @@
+{extends file="admin-layout.tpl"}
+
+{block name="check-permissions"}admin.folder.view{/block}
+
+{block name="page-title"}{intl l='Edit folder'}{/block}
+
+{block name="main-content"}
+<div class="folder edit-folder">
+	<div id="wrapper" class="container">
+
+        {* include file="includes/folder-breadcrumb.html" editing_category="true" *}
+
+        <div class="row">
+            {loop name="folder_edit" type="folder" visible="*" id="{$folder_id}" backend_context="1" lang="$edit_language_id"}
+            <div class="col-md-12 general-block-decorator">
+                <div class="row">
+                    <div class="col-md-7 title">
+						{intl l='Edit folder %title' title=$TITLE}
+		            </div>
+
+	                <div class="col-md-5 actions">
+
+	                    {if $HAS_PREVIOUS != 0}
+			                <a href="{url path='/admin/folders/update' folder_id=$PREVIOUS}" class="btn btn-default" title="{intl l='Edit previous folder'}"><span class="glyphicon glyphicon-arrow-left"></span></a>
+                        {else}
+                            <a href="#" disabled="disabled" class="btn btn-default"><span class="glyphicon glyphicon-arrow-left"></span></a>
+		                {/if}
+
+		                <a  href="{$URL}" target="_blank" class="btn btn-default" title="{intl l='Preview folder page'}"><span class="glyphicon glyphicon-eye-open"></span></a>
+
+                        {if $HAS_NEXT != 0}
+                            <a href="{url path='/admin/folders/update' folder_id=$NEXT}" class="btn btn-default" title="{intl l='Edit next folder'}"><span class="glyphicon glyphicon-arrow-right"></span></a>
+                        {else}
+                            <a href="#" disabled="disabled" class="btn btn-default"><span class="glyphicon glyphicon-arrow-right"></span></a>
+                         {/if}
+	                </div>
+                </div>
+
+	            <div class="row">
+	                <div class="col-md-12">
+
+						<ul class="nav nav-tabs" id="tabbed-menu">
+		                    <li class="active"><a href="#general" data-toggle="tab">{intl l="General description"}</a></li>
+
+		                    <li><a href="#details" data-toggle="tab">{intl l="Details"}</a></li>
+		                    <li><a href="#images" data-toggle="tab">{intl l="Images"}</a></li>
+		                    <li><a href="#documents" data-toggle="tab">{intl l="Documents"}</a></li>
+		                    <li><a href="#modules" data-toggle="tab">{intl l="Modules"}</a></li>
+		 				</ul>
+
+		                <div class="tab-content">
+
+		                    <div class="tab-pane fade active in" id="general">
+
+			                    <div class="form-container">
+
+				                    {form name="thelia.admin.folder.modification"}
+				                    <form method="POST" action="{url path='/admin/folders/save'}" {form_enctype form=$form} class="clearfix">
+
+	                                    {include file="includes/inner-form-toolbar.html" close_url="{url path='/admin/folders' folder_id=$folder_id}"}
+
+			                            {* Be sure to get the folder ID, even if the form could not be validated *}
+			                            <input type="hidden" name="folder_id" value="{$folder_id}" />
+
+                                        <input type="hidden" name="current_tab" value="general" />
+
+			                            {form_hidden_fields form=$form}
+
+			                            {form_field form=$form field='success_url'}
+			                                <input type="hidden" name="{$name}" value="{url path='/admin/folder' folder_id={$folder_id}}" />
+			                            {/form_field}
+
+			                            {form_field form=$form field='locale'}
+			                                <input type="hidden" name="{$name}" value="{$edit_language_locale}" />
+			                            {/form_field}
+
+			                            {if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
+
+	                                    {include file="includes/standard-description-form-fields.html"}
+
+                                        {form_field form=$form field='url'}
+                                            <div class="form-group {if $error}has-error{/if}">
+                                                <label for="{$label_attr.for}" class="control-label">
+                                                    {intl l="{$label}"} :
+                                                </label>
+
+                                                <input type="text" id="{$label_attr.for}" required="required" name="{$name}" value="{$value}" title="{intl l='Rewritten URL'}" placeholder="{intl l='Rewriten URL'}" class="form-control">
+                                             </div>
+                                        {/form_field}
+
+						                <div class="row">
+						                    <div class="col-md-6">
+		                                        {form_field form=$form field='parent'}
+		                                            <div class="form-group {if $error}has-error{/if}">
+
+		                                                <label for="{$label_attr.for}" class="control-label">
+		                                                    {intl l="{$label}"} :
+		                                                </label>
+
+		                                                <select id="{$label_attr.for}" required="required" name="{$name}" class="form-control">
+		                                                      <option value="0">{intl l="Top level"}</option>
+
+                                                              {$myparent=$PARENT}
+		                                                      {loop name="fold-parent" type="folder-tree" visible="*" folder="0"}
+		                                                           <option value="{$ID}" style="padding-left: {3 + $LEVEL * 20}px" {if $myparent == $ID}selected="selected"{/if} {if $folder_id == $ID}disabled="disabled"{/if}>{$TITLE}</option>
+		                                                      {/loop}
+
+		                                                </select>
+		                                             </div>
+		                                        {/form_field}
+						                    </div>
+
+                                            <div class="col-md-6">
+									            {form_field form=$form field='visible'}
+									                <div class="form-group {if $error}has-error{/if}">
+									                    <label for="{$label_attr.for}" class="control-label">{intl l='Visibility'}</label>
+									                    <div class="checkbox">
+									                        <label>
+									                            <input type="checkbox" id="{$label_attr.for}" name="{$name}" value="1" {if $value != 0}checked="checked"{/if}>
+									                            {$label}
+									                        </label>
+									                    </div>
+									                </div>
+									            {/form_field}
+                                            </div>
+						                </div>
+
+                                        <div class="row">
+                                            <div class="col-md-12">
+                                                <div class="control-group">
+                                                    <lablel>&nbsp;</lablel>
+                                                    <div class="controls">
+                                                        <p>{intl l='Colder created on %date_create. Last modification: %date_change' date_create="{format_date date=$CREATE_DATE}" date_change="{format_date date=$UPDATE_DATE}"}</p>
+                                                    </div>
+                                                 </div>
+                                            </div>
+                                        </div>
+
+            	                    </form>
+				                    {/form}
+			                    </div>
+		                    </div>
+
+		                    <div class="tab-pane fade" id="details">
+		                        <div class="form-container">
+									<div class="form-group">
+									    <form action="{url path='/admin/folders/related-content/add'}" id="related_content_form">
+
+									        {include
+									            file="includes/inner-form-toolbar.html"
+									            hide_submit_buttons=true
+									            close_url="{url path='/admin/folders' folder_id=$folder_id}"
+									        }
+
+									        <input type="hidden" name="folder_id" value="{$folder_id}" />
+									        <input type="hidden" name="current_tab" value="details" />
+
+									        {ifloop rel="folders"}
+									        <div class="row">
+
+									            <div class="col-md-6">
+									                <div class="form-group">
+									                    <select name="folder_id" id="folder_id" class="form-control">
+									                        <option value="">Select a folder...</option>
+									                        {loop name="folders" type="folder" backend_context="1" lang="$edit_language_id"}
+									                            <option value="{$ID}">{$TITLE}</option>
+									                        {/loop}
+									                    </select>
+									                </div>
+									                <span class="help-block">{intl l='Select a folder to get its content'}</span>
+									            </div>
+
+									            <div class="col-md-6">
+									                <div id="content_selector" class="hide">
+									                    <div class="input-group">
+									                        <select required="required" name="content_id" id="content_id" class="form-control">
+									                            <option value="">Select a folder content...</option>
+									                        </select>
+									                        <span class="input-group-btn" id="content_add_button">
+									                           <button class="btn btn-default btn-primary action-btn" type="submit"><span class="glyphicon glyphicon-plus-sign"></span></button>
+									                        </span>
+									                    </div>
+
+									                    <span class="help-block">{intl l='Select a content and click (+) to add it to this category'}</span>
+									                </div>
+									            </div>
+
+									        </div>
+									        {/ifloop}
+
+									        {elseloop rel="folders"}
+									            <div class="alert alert-info">{intl l="No folders found"}</div>
+									        {/elseloop}
+
+									    </form>
+									</div>
+
+									<table class="table table-striped table-condensed table-left-aligned">
+									    <thead>
+									        <tr>
+									            <th>{intl l='ID'}</th>
+
+									            <th>{intl l='Attribute title'}</th>
+
+									            {module_include location='folder_contents_table_header'}
+
+									            <th class="actions">{intl l="Actions"}</th>
+									        </tr>
+									    </thead>
+
+									    <tbody>
+									        {loop name="assigned_contents" type="associated_content" folder="$folder_id" backend_context="1" lang="$edit_language_id"}
+									        <tr>
+									            <td>{$ID}</td>
+
+									            <td>
+									                {$TITLE}
+									            </td>
+
+									            {module_include location='folder_contents_table_row'}
+
+									            <td class="actions">
+									                <div class="btn-group">
+									                    {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.folder.content.delete"}
+									                       <a class="btn btn-default btn-xs delete-content" title="{intl l='Delete this content'}" href="#delete_content_dialog" data-id="{$ID}" data-toggle="modal">
+									                        <span class="glyphicon glyphicon-trash"></span>
+									                       </a>
+									                    {/loop}
+									                </div>
+									            </td>
+									        </tr>
+									         {/loop}
+
+									         {elseloop rel="assigned_contents"}
+									             <tr>
+									                 <td colspan="3">
+									                     <div class="alert alert-info">
+									                         {intl l="This folder contains no contents"}
+									                     </div>
+									                 </td>
+									             </tr>
+									         {/elseloop}
+									    </tbody>
+									</table>
+			                    </div>
+		                    </div>
+
+		                    <div class="tab-pane fade" id="images">
+		                    </div>
+
+		                    <div class="tab-pane fade" id="documents">
+		                    </div>
+
+		                    <div class="tab-pane fade" id="modules">
+		                    </div>
+		                 </div>
+                    </div>
+                </div>
+		    </div>
+            {/loop}
+ 		</div>
+	</div>
+</div>
+
+
+{* Delete related content confirmation dialog *}
+
+{capture "delete_content_dialog"}
+    <!-- <input type="hidden" name="category_id" value="{$category_id}" /> -->
+    <input type="hidden" name="content_id" id="content_delete_id" value="" />
+    <input type="hidden" name="folder_id" id="folder_delete_id" value="" />
+
+    <input type="hidden" name="current_tab" value="details" />
+{/capture}
+
+{include
+    file = "includes/generic-confirm-dialog.html"
+
+    dialog_id       = "delete_content_dialog"
+    dialog_title    = {intl l="Remove related content"}
+    dialog_message  = {intl l="Do you really want to remove this related content ?"}
+
+    form_action     = {url path='/admin/folders/related-content/delete'}
+    form_content    = {$smarty.capture.delete_content_dialog nofilter}
+}
+{/block}
+
+{block name="javascript-initialization"}
+<script>
+
+$(function() {
+
+    $('.use_default_rewriten_url').click(function(ev) {
+    	alert("Not functionnal");
+
+    	ev.preventDefault();
+    });
+
+    // Show proper tab, if defined
+    {if ! empty($current_tab)}
+    $('#tabbed-menu a[href="#{$current_tab}"]').tab('show')
+    {/if}
+
+
+    // Set proper content ID in delete content from
+    $('a.delete-content').click(function(ev) {
+        $('#content_delete_id').val($(this).data('id'));
+        $('#folder_delete_id').val($('#folder_id').val());
+    });
+
+    // Load content on folder selection
+    $('#folder_id').change(function(event) {
+        $.ajax({
+             url      : '{url path="/admin/folder/$folder_id/available-related-content/"}' + $(this).val() + '.xml',
+             type     : 'get',
+             dataType : 'json',
+             success  : function(json) {
+                 $('#content_id :not(:first-child)').remove();
+
+                 var have_content = false;
+
+                 $.each(json, function(idx, value) {
+                     $('#content_id').append($('<option>').text(value.title).attr('value', value.id));
+
+                     have_content = true; // Lame...
+                 });
+
+                 if (have_content)
+                     $('#content_selector').removeClass('hide');
+                 else
+                     $('#content_selector').addClass('hide');
+
+             }
+        });
+    });
+
+    // Initialize folder (id={$folder_id}) select value
+     {if $folder_id != 0}
+         $('#folder_id').val("{$folder_id}").change();
+     {/if}
+
+});
+</script>
+{/block}

templates/admin/default/folders.html

@@ -0,0 +1,626 @@
+{extends file="admin-layout.tpl"}
+
+{block name="page-title"}{intl l='Folders'}{/block}
+
+{block name="check-permissions"}admin.folders.view{/block}
+
+{block name="main-content"}
+<div class="folders">
+
+    <div id="wrapper" class="container">        
+        
+        {* include file="includes/folder-breadcrumb.html" *}
+
+        {module_include location='folders_top'}
+
+        <div class="row">
+            <div class="col-md-12">
+            <div class="general-block-decorator">
+
+                 <table class="table table-striped table-condensed" id="folder_list">
+                     <caption>
+                         {* display parent folder name, and get current folder ID *}
+                         {loop name="folder_title" type="folder" visible="*" id=$folder_id}
+                             {intl l="Folders in %fold" fold=$TITLE}
+                             {$fold_id = $ID}
+                         {/loop}
+                         {elseloop rel="folder_title"}
+                             {intl l="Top level folders"}
+                         {/elseloop}
+
+                         {module_include location='folder_list_caption'}
+
+                         {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.folders.create"}
+                         <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new folder'}" href="#folder_creation_dialog" data-toggle="modal">
+                             <span class="glyphicon glyphicon-plus-sign"></span>
+                         </a>
+                         {/loop}
+                     </caption>
+
+                     {ifloop rel="folder_list"}
+                         <thead>
+                             <tr>
+                                 <th class="object-title">
+                                 {admin_sortable_header
+                                    current_order=$folder_order
+                                    order='id'
+                                    reverse_order='id_reverse'
+                                    path={url path='/admin/folders' id_folder=$folder_id}
+                                    request_parameter_name='folder_order'
+                                    label="{intl l='ID'}"
+                                 }
+                                 </th>
+
+                                 <th class="object-image">&nbsp;</th>
+
+                                 <th class="object-title">
+                                 {admin_sortable_header
+                                    current_order=$folder_order
+                                    order='alpha'
+                                    reverse_order='alpha_reverse'
+                                    path={url path='/admin/folders' id_folder=$folder_id}
+                                    request_parameter_name='folder_order'
+                                    label="{intl l='Folder title'}"
+                                 }
+                                 </th>
+
+                                 {module_include location='folder_list_header'}
+
+                                 <th>
+                                 {admin_sortable_header
+                                    current_order=$folder_order
+                                    order='visible'
+                                    reverse_order='visible_reverse'
+                                    path={url path='/admin/folders' id_folder=$folder_id}
+                                    request_parameter_name='folder_order'
+                                    label="{intl l='Online'}"
+                                 }
+                                 </th>
+
+                                 <th>
+                                 {admin_sortable_header
+                                    current_order=$folder_order
+                                    order='manual'
+                                    reverse_order='manual_reverse'
+                                    path={url path='/admin/folders' id_folder=$folder_id}
+                                    request_parameter_name='folder_order'
+                                    label="{intl l='Position'}"
+                                 }
+                                 </th>
+
+                                 <th class="actions">{intl l='Actions'}</th>
+                             </tr>
+                         </thead>
+
+                         <tbody>
+                         {loop name="folder_list" type="folder" visible="*" parent=$folder_id order=$folder_order backend_context="1" lang=$lang_id}
+                         <tr>
+                             <td>{$ID}</td>
+
+                             <td>
+                             {loop type="image" name="folder_image" source="folder" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"}
+                               <a href="{url path='admin/folder' folder_id=$ID}" title="{intl l='Browse this folder'}"><img class="img-thumbnail" src="{$IMAGE_URL}" alt="{$TITLE}" /></a>
+                             {/loop}
+                             </td>
+
+                             <td class="object-title">
+                                  <a href="{url path='admin/folder' folder_id=$ID}" title="{intl l='Browse this folder'}">
+                                    {$TITLE}
+                                  </a>
+                             </td>
+
+                             {module_include location='folder_list_row'}
+
+                             <td>
+                                 {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.folders.edit"}
+                                     <div class="make-switch switch-small folderVisibleToggle" data-id="{$ID}"  data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                         <input type="checkbox" class="folderVisibleToggle" {if $VISIBLE == 1}checked="checked"{/if}>
+                                     </div>
+                                 {/loop}
+
+                                 {elseloop rel="can_change"}
+                                     <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                         <input type="checkbox" class="disabled" disabled="disabled" {if $VISIBLE == 1}checked="checked"{/if}>
+                                     </div>
+                                 {/elseloop}
+                             </td>
+
+                             <td>
+                             {admin_position_block
+                                 permission="admin.folders.edit"
+                                 path={url path='admin/folders/update-position' folder_id=$ID}
+                                 url_parameter="folder_id"
+                                 in_place_edit_class="folderPositionChange"
+                                 position=$POSITION
+                                 id=$ID
+                              }
+                             </td>
+
+                             <td class="actions">
+                                 <div class="btn-group">
+                                     <a class="btn btn-default btn-xs" title="{intl l='Browse this folder'}" href="{url path='admin/folder' folder_id=$ID}"><i class="glyphicon glyphicon-folder-open"></i></a>
+
+                                     {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.folders.edit"}
+                                        <a class="btn btn-default btn-xs" title="{intl l='Edit this folder'}" href="{url path='/admin/folders/update' folder_id=$ID}"><i class="glyphicon glyphicon-edit"></i></a>
+                                     {/loop}
+
+                                     {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.folders.delete"}
+                                        <a class="btn btn-default btn-xs folder-delete" title="{intl l='Delete this folder and all its contents'}"  href="#folder_delete_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
+                                     {/loop}
+                                 </div>
+                              </td>
+                         </tr>
+                         {/loop}
+                         </tbody>
+                     {/ifloop}
+
+                     {elseloop rel="folder_list"}
+                     <thead>
+                         <tr>
+                             <td class="message">
+                                 <div class="alert alert-info">
+                                 {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.folders.create"}
+                                     {intl l="This folder has no sub-folders. To create a new one, click the + button above."}
+                                 {/loop}
+
+                                 {elseloop rel="can_create"}
+                                    {intl l="This folder has no sub-folders."}
+                                 {/elseloop}
+                                 </div>
+                             </td>
+                         </tr>
+                     </thead>
+                     {/elseloop}
+                 </table>
+                </div>
+            </div>
+        </div>
+
+{* -- CONTENT MANAGEMENT ---------------------------------------------------- *}
+
+     <div class="row">
+         <div class="col-md-12">
+             <div class="general-block-decorator">
+
+                 <table class="table table-striped table-condensed">
+                     <caption>
+                         {* display parent folder name *}
+                         {loop name="folder_title" type="folder" visible="*" id=$folder_id}
+                             {intl l="Contents in %fold" fold=$TITLE}
+                         {/loop}
+
+                         {elseloop rel="folder_title"}
+                             {intl l="Top level Contents"}
+                         {/elseloop}
+
+                         {module_include location='content_list_caption'}
+
+                         <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new content'}" href="#content_creation_dialog" data-toggle="modal">
+                             <span class="glyphicon glyphicon-plus-sign"></span>
+                         </a>
+                     </caption>
+
+                     {ifloop rel="content_list"}
+                         <thead>
+                             <tr>
+                                 <th class="object-title">
+                                 {admin_sortable_header
+                                    current_order=$content_order
+                                    order='id'
+                                    reverse_order='id_reverse'
+                                    path={url path='/admin/folders' id_folder=$folder_id target='contents'}
+                                    label="{intl l='ID'}"
+                                 }
+
+                                 <th>&nbsp;</th>                                 
+
+                                 <th class="object-title">
+                                 {admin_sortable_header
+                                    current_order=$content_order
+                                    order='alpha'
+                                    reverse_order='alpha_reverse'
+                                    path={url path='/admin/folders' id_folder=$folder_id target='contents'}
+                                    label="{intl l='Content title'}"
+                                 }
+
+                                 {module_include location='content_list_header'}
+
+                                 <th>
+                                 {admin_sortable_header
+                                    current_order=$content_order
+                                    order='visible'
+                                    reverse_order='visible_reverse'
+                                    path={url path='/admin/folders' id_folder=$folder_id target='contents'}
+                                    label="{intl l='Online'}"
+                                 }
+                                 </th>
+
+                                 <th>
+                                 {admin_sortable_header
+                                    current_order=$content_order
+                                    order='manual'
+                                    reverse_order='manual_reverse'
+                                    path={url path='/admin/folders' id_folder=$folder_id target='contents'}
+                                    label="{intl l='Position'}"
+                                 }
+                                 </th>
+
+                                 <th>&nbsp;</th>
+                             </tr>
+                         </thead>
+
+                         <tbody>
+                         {loop name="content_list" type="content" visible="*" folder_default=$folder_id order=$content_order}
+                         <tr>
+                             <td>{$ID}</td>
+
+                             <td>
+                             {loop type="image" name="folder_image" source="content" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"}
+                               <a href="{url path='admin/content/edit' id=$ID}" title="{intl l='Edit this content'}">
+                                 <img src="{$IMAGE_URL}" alt="{$TITLE}" />
+                               </a>
+                             {/loop}
+
+                             <td class="object-title"><a href="{url path="/admin/content/update/$ID"}" title="{intl l='Edit this content'}">{$TITLE}</a></td>
+
+                             {module_include location='content_list_row'}
+
+                             <td>
+                                    {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.contents.edit"}
+                                        <div class="make-switch switch-small contentVisibleToggle" data-id="{$ID}"  data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                            <input type="checkbox" class="contentVisibleToggle" {if $VISIBLE == 1}checked="checked"{/if}>
+                                        </div>
+                                    {/loop}
+
+                                    {elseloop rel="can_change"}
+                                        <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                            <input type="checkbox" class="disabled" disabled="disabled" {if $VISIBLE == 1}checked="checked"{/if}>
+                                        </div>
+                                    {/elseloop}
+                             </td>
+
+                             <td>
+                             {admin_position_block
+                                 permission="admin.content.edit"
+                                 path={url path='/admin/contents/update-position' content_id=$ID}
+                                 url_parameter="content_id"
+                                 in_place_edit_class="contentPositionChange"
+                                 position=$POSITION
+                                 id=$ID
+                              }
+                             </td>
+
+                             <td>
+                                 <div class="btn-group">
+                                 {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.content.edit"}
+                                    <a class="btn btn-default btn-xs" title="{intl l='Edit this content'}" href="{url path="admin/content/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
+                                {/loop}
+
+                                 {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.content.delete"}
+                                       <a class="btn btn-default btn-xs content-delete" title="{intl l='Delete this content'}"  href="#content_delete_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
+                                 {/loop}
+                                 </div>
+                              </td>
+                         </tr>
+                         {/loop}
+                         </tbody>
+                     {/ifloop}
+
+                     {elseloop rel="content_list"}
+                     <thead>
+                         <tr>
+                             <td class="message"><div class="alert alert-info">{intl l="This folder doesn't contains any contents. To add a new content, <strong>click the + button</strong> above."}</div></td>
+                         </tr>
+                     </thead>
+                     {/elseloop}
+                 </table>
+
+
+             </div>
+            </div>
+        </div>
+
+        {module_include location='folders_bottom'}
+
+    </div>
+
+</div>
+
+
+{* -- Adding a new folder ------------------------------------------------- *}
+
+{form name="thelia.admin.folder.creation"}
+
+    {* Capture the dialog body, to pass it to the generic dialog *}
+    {capture "folder_creation_dialog"}
+
+        {form_hidden_fields form=$form}
+
+        {form_field form=$form field='success_url'}
+           {* on success, redirect to the edition page, _ID_ is replaced with the created object ID, see controller  *}
+           <input type="hidden" name="{$name}" value="{url path='/admin/folders/update' folder_id='_ID_'}" />
+        {/form_field}
+
+        {form_field form=$form field='parent'}
+           <input type="hidden" name="{$name}" value="{$folder_id}" />
+        {/form_field}
+
+        {form_field form=$form field='title'}
+            <div class="form-group {if $error}has-error{/if}">
+                <label for="{$label_attr.for}" class="control-label">{$label} : </label>
+                {loop type="lang" name="default-lang" default_only="1"}
+                    <div class="input-group">
+                        <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Folder title'}" placeholder="{intl l='Name'}">
+                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="$TITLE" /></span>
+                    </div>
+
+                    <div class="help-block">{intl l='Enter here the folder name in the default language (%title)' title="$TITLE"}</div>
+
+                    {* Switch edition to the current locale *}
+                    <input type="hidden" name="edit_language_id" value="{$ID}" />
+
+                    {form_field form=$form field='locale'}
+                        <input type="hidden" name="{$name}" value="{$LOCALE}" />
+                    {/form_field}
+                {/loop}
+            </div>
+        {/form_field}
+
+        {form_field form=$form field='visible'}
+            <div class="form-group {if $error}has-error{/if}">
+                <div class="checkbox">
+                    <label>
+                        <input type="checkbox" id="{$label_attr.for}" name="{$name}" value="1" checked="checked">
+                        {$label}
+                    </label>
+                </div>
+            </div>
+        {/form_field}
+
+        {module_include location='folder_create_form'}
+
+    {/capture}
+
+    {include
+        file = "includes/generic-create-dialog.html"
+
+        dialog_id    = "folder_creation_dialog"
+        dialog_title = {intl l="Create a new folder"}
+        dialog_body  = {$smarty.capture.folder_creation_dialog nofilter}
+
+        dialog_ok_label     = {intl l="Create this folder"}
+
+        form_action        = {url path='/admin/folders/create'}
+        form_enctype       = {form_enctype form=$form}
+        form_error_message = $form_error_message
+    }
+{/form}
+
+{* -- Adding a new content -------------------------------------------------- *}
+
+{form name="thelia.admin.content.creation"}
+
+    {* Capture the dialog body, to pass it to the generic dialog *}
+    {capture "content_creation_dialog"}
+
+        {form_hidden_fields form=$form}
+
+        {* Be sure to get the folder_id, even if the form could not be validated *}
+        <input type="hidden" name="folder_id" value="{$folder_id}" />
+
+        {form_field form=$form field='success_url'}
+           {* on success, redirect to the edition page, _ID_ is replaced with the created object ID, see controller  *}
+           <input type="hidden" name="{$name}" value="{url path='/admin/contents/update' content_id='_ID_'}" />
+        {/form_field}
+
+        {form_field form=$form field='default_folder'}
+           <input type="hidden" name="{$name}" value="{$folder_id}" />
+        {/form_field}        
+
+        {form_field form=$form field='title'}
+            <div class="form-group {if $error}has-error{/if}">
+                <label for="{$label_attr.for}" class="control-label">{$label} : </label>
+                {loop type="lang" name="default-lang" default_only="1"}
+                    <div class="input-group">
+                        <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Title'}">
+                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="$TITLE" /></span>
+                    </div>
+
+                    <div class="help-block">{intl l='Enter here the content name in the default language (%title)' title="$TITLE"}</div>
+
+                    {* Switch edition to the current locale *}
+                    <input type="hidden" name="edit_language_id" value="{$ID}" />
+
+                    {form_field form=$form field='locale'}
+                        <input type="hidden" name="{$name}" value="{$LOCALE}" />
+                    {/form_field}
+                {/loop}
+            </div>
+        {/form_field}
+
+        {form_field form=$form field='visible'}
+            <div class="form-group {if $error}has-error{/if}">
+                <div class="checkbox">
+                    <label>
+                        <input type="checkbox" id="{$label_attr.for}" name="{$name}" value="1" checked="checked">
+                        {$label}
+                    </label>
+                </div>
+            </div>
+        {/form_field}
+
+        {module_include location='content_create_form'}
+
+    {/capture}
+
+    {include
+        file = "includes/generic-create-dialog.html"
+
+        dialog_id    = "content_creation_dialog"
+        dialog_title = {intl l="Create a new content"}
+        dialog_body  = {$smarty.capture.content_creation_dialog nofilter}
+
+        dialog_ok_label     = {intl l="Create this content"}
+
+        form_action        = {url path='/admin/contents/create'}
+        form_enctype       = {form_enctype form=$form}
+        form_error_message = $form_error_message
+    }
+{/form}
+
+{* -- Delete folder confirmation dialog ----------------------------------- *}
+
+{capture "folder_delete_dialog"}
+    <input type="hidden" name="folder_id" id="folder_delete_id" value="" />
+
+    {module_include location='folder_delete_form'}
+
+{/capture}
+
+{include
+    file = "includes/generic-confirm-dialog.html"
+
+    dialog_id       = "folder_delete_dialog"
+    dialog_title    = {intl l="Delete folder"}
+    dialog_message  = {intl l="Do you really want to delete this folder and all its content ?"}
+
+    form_action         = {url path='/admin/folders/delete'}
+    form_content        = {$smarty.capture.folder_delete_dialog nofilter}
+}
+
+{* -- Delete content confirmation dialog ------------------------------------ *}
+
+{capture "content_delete_dialog"}
+    <input type="hidden" name="content_id" id="content_delete_id" value="" />
+    <input type="hidden" name="folder_id" value="{$folder_id}" />
+
+    {module_include location='content_delete_form'}
+
+{/capture}
+
+{include
+    file = "includes/generic-confirm-dialog.html"
+
+    dialog_id       = "content_delete_dialog"
+    dialog_title    = {intl l="Delete content"}
+    dialog_message  = {intl l="Do you really want to delete this content ?"}
+
+    form_action         = {url path='/admin/contents/delete'}
+    form_content        = {$smarty.capture.content_delete_dialog nofilter}
+}
+{/block}
+
+{block name="javascript-initialization"}
+
+    {javascripts file='assets/js/bootstrap-switch/bootstrap-switch.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
+
+    {javascripts file='assets/js/bootstrap-editable/bootstrap-editable.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
+
+    <script>
+        $(function() {
+
+            // Set proper folder ID in delete from
+            $('a.folder-delete').click(function(ev) {
+                $('#folder_delete_id').val($(this).data('id'));
+            });
+
+            // Set proper content ID in delete from
+            $('a.content-delete').click(function(ev) {
+                $('#content_delete_id').val($(this).data('id'));
+            });
+
+            // JS stuff for creation form
+            {include
+                file      = "includes/generic-js-dialog.html"
+                dialog_id = "folder_creation_dialog"
+                form_name = "thelia.admin.folder.creation"
+            }
+
+            {include
+                file      = "includes/generic-js-dialog.html"
+                dialog_id = "content_creation_dialog"
+                form_name = "thelia.admin.content.creation"
+            }
+
+            {* Toggle object visibility *}
+
+            $(".folderVisibleToggle").on('switch-change', function(event, data) {
+                $.ajax({
+                   url : "{url path='admin/folders/toggle-online'}",
+                   data : {
+                       folder_id : $(this).data('id'),
+                       action : 'visibilityToggle'
+                   }
+                });
+            });
+
+
+            $(".contentVisibleToggle").on('switch-change', function(event, data) {
+                $.ajax({
+                   url : "{url path='admin/contents/toggle-online'}",
+                   data : {
+                       content_id : $(this).data('id'),
+                       action : 'visibilityToggle'
+                   }
+                });
+            });
+
+            {* Inline editing of object position using bootstrap-editable *}
+
+            $('.folderPositionChange').editable({
+                type        : 'text',
+                title       : '{intl l="Enter new folder position"}',
+                mode        : 'popup',
+                inputclass  : 'input-mini',
+                placement   : 'left',
+                success     : function(response, newValue) {
+                    // The URL template
+                    var url = "{url path='/admin/folders/update-position' folder_id='__ID__' position='__POS__'}";
+
+                    // Perform subtitutions
+                    url = url.replace('__ID__', $(this).data('id'))
+                    .replace('__POS__', newValue);
+
+                    // Reload the page
+                    location.href = url;
+                }
+            });
+
+            $('.contentPositionChange').editable({
+                type        : 'text',
+                title       : '{intl l="Enter new content position"}',
+                mode        : 'popup',
+                inputclass  : 'input-mini',
+                placement   : 'left',
+                success     : function(response, newValue) {
+                    // The URL template
+                    var url = "{url path='/admin/contents/update-position' content_id='__ID__' position='__POS__'}";
+
+                    // Perform subtitutions
+                    url = url.replace('__ID__', $(this).data('id'))
+                    .replace('__POS__', newValue);
+
+                    // Reload the page
+                    location.href = url;
+                }
+            });
+
+            {* Change default status *}
+
+            $('.change-default').change(function(ev) {
+                var url = "{url path='/admin/folders/set-default' folder_id='__ID__'}";
+
+                // Perform ID subtitutions
+                url = url.replace('__ID__', $(this).val());
+
+                // Reload the page
+                location.href = url;
+            });
+
+        });
+    </script>
+{/block}

templates/admin/default/home.html

@@ -8,11 +8,381 @@
 
 		    {module_include location='home_top'}
 
-			<div class="col-md-12">
-			This is the administration home page. Put some interesting statistics here, and display useful information :)
+			<div class="col-md-12 general-block-decorator dashboard">
+
+				<div class="title title-without-tabs clearfix">
+					{intl l='Dashboard'}
+					<div class="btn-group pull-right">
+						<button type="button" class="btn btn-default"><span class="glyphicon glyphicon-chevron-left"></span></button>
+						<button type="button" class="btn btn-default disabled"><span class="glyphicon glyphicon-calendar"></span></button>
+						<button type="button" class="btn btn-default"><span class="glyphicon glyphicon-chevron-right"></span></button>
+					</div>
+				</div>
+
+				<div class="text-center clearfix">
+					<div class="btn-group">
+						<button type="button" class="btn btn-default active" data-toggle="jqplot" data-target="turnover"><span class="glyphicon glyphicon-euro"></span> {intl l="Turnover"}</button>
+						<button type="button" class="btn btn-primary" data-toggle="jqplot" data-target="registration"><span class="glyphicon glyphicon-user"></span> {intl l="Registrations"}</button>
+						<button type="button" class="btn btn-success" data-toggle="jqplot" data-target="orders"><span class="glyphicon glyphicon-shopping-cart"></span> {intl l="Orders"}</button>
+						<button type="button" class="btn btn-info" data-toggle="jqplot" data-target="first-orders"><span class="glyphicon glyphicon-thumbs-up"></span> {intl l="First orders"}</button>
+						<button type="button" class="btn btn-danger" data-toggle="jqplot" data-target="aborted-orders"><span class="glyphicon glyphicon-thumbs-down"></span> {intl l="Aborted orders"}</button>
+					</div>
+				</div>
+
+				<hr/>
+
+				<div class="jqplot-content">
+					<div id="jqplot"></div>
+
+					<div id="turnover" data-toggle="jqplot-serie" class="active"></div>
+					<div id="registration" data-toggle="jqplot-serie"></div>
+					<div id="orders" data-toggle="jqplot-serie"></div>
+					<div id="first-orders" data-toggle="jqplot-serie"></div>
+					<div id="aborted-orders" data-toggle="jqplot-serie"></div>
+				</div>
+
+ 			</div>
+
+
+	 		<div class="row">
+	 			<div class="col-md-4">
+					<div class="general-block-decorator">
+						<div class="title title-without-tabs">{intl l="Informations site"}</div>
+						<table class="table table-striped">
+							<tbody>
+								<tr>
+									<th>{intl l="Customers"}</th>
+	                                <td>1</td>
+								</tr>
+								<tr>
+									<th>{intl l="Sections"}</th>
+	                                <td>8</td>
+								</tr>
+								<tr>
+									<th>{intl l="Products"}</th>
+	                                <td>43</td>
+								</tr>
+								<tr>
+									<th>{intl l="Products online"}</th>
+	                                <td>43</td>
+								</tr>
+								<tr>
+									<th>{intl l="Products offline"}</th>
+	                                <td>0</td>
+								</tr>
+								<tr>
+									<th>{intl l="Orders"}</th>
+	                                <td>1</td>
+								</tr>
+								<tr>
+									<th>{intl l="Orders pending"}</th>
+	                                <td>1</td>
+								</tr>
+								<tr>
+									<th>{intl l="Orders treatment"}</th>
+	                                <td>0</td>
+								</tr>
+								<tr>
+									<th>{intl l="Shipped orders"}</th>
+	                                <td>0</td>
+								</tr>
+								<tr>
+									<th>{intl l="Canceled orders"}</th>
+	                                <td>0</td>
+								</tr>
+				            </tbody>
+				        </table>
+					</div>
+				</div>
+
+				<div class="col-md-4">
+					<div class="general-block-decorator">
+						<div class="title title-without-tabs">{intl l="Sales statistics"}</div>
+
+						<ul class="nav nav-tabs">
+							<li class="active"><a href="#statjour" data-toggle="tab">{intl l="Today"}</a></li>
+							<li><a href="#statmois" data-toggle="tab">{intl l="This month"}</a></li>
+							<li><a href="#statannee" data-toggle="tab">{intl l="This year"}</a></li>
+						</ul>
+
+						<div class="tab-content">
+							<div class="tab-pane fade active in" id="statjour">
+								<table class="table table-striped">
+	                                <tbody>
+	                                	<tr>
+	                                        <th>{intl l="C. A. TTC"}</th>
+	                                        <td>2000.00 €</td>
+	                                    </tr>
+	                                    <tr>
+	                                        <th>{intl l="C. A. TTC hors frais de port"}</th>
+	                                        <td>2500.00 €</td>
+	                                    </tr>
+	                                    <tr>
+	                                        <th>{intl l="C. A. TTC précédent"}</th>
+	                                        <td>1700.00 €</td>
+	                                    </tr>
+	                                    <tr>
+	                                        <th>{intl l="Commandes en instance"}</th>
+	                                        <td>4</td>
+	                                    </tr>
+	                                    <tr>
+	                                        <th>{intl l="Commandes en traitement"}</th>
+	                                        <td>52</td>
+	                                    </tr>
+	                                    <tr>
+	                                        <th>{intl l="Commandes annulées"}</th>
+	                                        <td>3</td>
+	                                    </tr>
+	                                    <tr>
+	                                        <th>{intl l="Panier moyen TTC"}</th>
+	                                        <td>25.00 €</td>
+	                                    </tr>
+	                           		</tbody>
+	                        	</table>
+	                        </div>
+							<div class="tab-pane fade" id="statmois">
+	                            <table class="table table-striped">
+	                                <tbody>
+	                                	<tr>
+	                                        <th>{intl l="C. A. TTC"}</th>
+	                                        <td>2000.00 €</td>
+	                                    </tr>
+	                                    <tr>
+	                                        <th>{intl l="C. A. TTC hors frais de port"}</th>
+	                                        <td>2500.00 €</td>
+	                                    </tr>
+	                                    <tr>
+	                                        <th>{intl l="C. A. TTC précédent"}</th>
+	                                        <td>1700.00 €</td>
+	                                    </tr>
+	                                    <tr>
+	                                        <th>{intl l="Commandes en instance"}</th>
+	                                        <td>4</td>
+	                                    </tr>
+	                                    <tr>
+	                                        <th>{intl l="Commandes en traitement"}</th>
+	                                        <td>52</td>
+	                                    </tr>
+	                                    <tr>
+	                                        <th>{intl l="Commandes annulées"}</th>
+	                                        <td>3</td>
+	                                    </tr>
+	                                    <tr>
+	                                        <th>{intl l="Panier moyen TTC"}</th>
+	                                        <td>25.00 €</td>
+	                                    </tr>
+	                           		</tbody>
+	                        	</table>
+							</div>
+							<div class="tab-pane fade" id="statannee">
+	                            <table class="table table-striped">
+	                                <tbody>
+	                                	<tr>
+	                                        <th>{intl l="C. A. TTC"}</th>
+	                                        <td>2000.00 €</td>
+	                                    </tr>
+	                                    <tr>
+	                                        <th>{intl l="C. A. TTC hors frais de port"}</th>
+	                                        <td>2500.00 €</td>
+	                                    </tr>
+	                                    <tr>
+	                                        <th>{intl l="C. A. TTC précédent"}</th>
+	                                        <td>1700.00 €</td>
+	                                    </tr>
+	                                    <tr>
+	                                        <th>{intl l="Commandes en instance"}</th>
+	                                        <td>4</td>
+	                                    </tr>
+	                                    <tr>
+	                                        <th>{intl l="Commandes en traitement"}</th>
+	                                        <td>52</td>
+	                                    </tr>
+	                                    <tr>
+	                                        <th>{intl l="Commandes annulées"}</th>
+	                                        <td>3</td>
+	                                    </tr>
+	                                    <tr>
+	                                        <th>{intl l="Panier moyen TTC"}</th>
+	                                        <td>25.00 €</td>
+	                                    </tr>
+	                           		</tbody>
+	                            </table>
+	                        </div>
+						</div>
+					</div>
+				</div>
+
+				<div class="col-md-4">
+					<div class="general-block-decorator">
+						<div class="title title-without-tabs">{intl l="Thelia informations"}</div>
+						<table class="table table-striped">
+								<tbody>
+								<tr>
+									<th>{intl l="Current version"}</th>
+									<td>V2.0.0-beta</td>
+								</tr>
+								<tr>
+									<th>{intl l="Latest version available"}</th>
+									<td><a href="">V1.5.4.2</a></td>
+								</tr>
+								<tr>
+									<th>{intl l="News"}</th>
+									<td><a href="" target="_blank">{intl l="Click here"}</a></td>
+								</tr>
+							</tbody>
+						</table>
+					</div>
+				</div>
+
 			</div>
 
 			{module_include location='home_bottom'}
 		</div>
 	</div>
+{/block}
+
+{block name="javascript-initialization"}
+
+	{javascripts file='assets/js/jqplot/jquery.jqplot.min.js'}
+        <script src="{$asset_url}"></script>
+
+		{javascripts file='assets/js/jqplot/plugins/jqplot.highlighter.min.js'}
+			<script type="text/javascript" src="{$asset_url}"></script>
+		{/javascripts}
+		{javascripts file='assets/js/jqplot/plugins/jqplot.barRenderer.min.js'}
+			<script type="text/javascript" src="{$asset_url}"></script>
+		{/javascripts}
+		{javascripts file='assets/js/jqplot/plugins/jqplot.pieRenderer.min.js'}
+			<script type="text/javascript" src="{$asset_url}"></script>
+		{/javascripts}
+
+        <script>
+
+        	(function($, window, document){
+
+			    $(function(){
+
+			    	var $elem			= $('#jqplot');
+
+		            var url 			= "{url file='/test_to_remove/admin-stats.json'}",
+		    			series 			= [],
+		    			seriesColors 	= [],
+		    			ticks 			= [],
+		    			days 			= 0,
+		    			jqplot;
+
+		    		var options = {
+	    				animate: true,
+	    				axesDefaults: {
+	    					tickOptions: { showMark: true, showGridline: true }
+	    				},
+	    				axes: {
+				            xaxis: {
+				                borderColor: '#ccc',
+				                ticks : ticks,
+				                tickOptions:    { showGridline: false }
+				            },
+				            yaxis: {
+								tickOptions: { showGridline: true, showMark: false, showLabel: false, shadow: false }
+							}
+				        },
+						seriesDefaults: {
+							lineWidth: 3,
+							shadow : false,
+							markerOptions: { shadow : false, style: 'filledCircle', size: 12 }
+						},
+						grid: {
+					        background: '#FFF',
+					        shadow : false,
+					        borderColor : '#FFF'
+					    },
+					    highlighter: {
+					    	show: true,
+					        sizeAdjust: 7,
+					        tooltipLocation: 'n',
+					        tooltipContentEditor: function(str, seriesIndex, pointIndex, plot){
+
+					        	// Return axis value : data value
+				                return ticks[pointIndex][1] + ': ' + plot.data[seriesIndex][pointIndex][1];
+				            }
+    					}
+					};
+
+					// Get datas Json
+					$.getJSON(url)
+		            .done(function(data) {
+
+			    		// Init series datas and colors
+						initJqplotDatas(series, seriesColors, options, data);
+
+						// Add days to xaxis
+						for(var i = 1; i < (days+1); i++){
+			    			ticks.push([i-1, i]);
+			    		}
+
+			    		// Start jqplot
+			    		var elementId = $elem.attr('id');
+			    		jqplot = $.jqplot(elementId, series, options);
+
+			    		$('[data-toggle="jqplot"]').each(function(){
+
+			    			$(this).click(function(){
+
+			    				if($('[data-toggle="jqplot-serie"].active').length > 1 || !$(this).hasClass('active')){
+
+				    				// Active button and jqplot-serie management
+				    				$(this).toggleClass('active');
+
+				    				var id = $(this).data('target');
+				    				$('[data-toggle="jqplot-serie"]#' + id).toggleClass('active');
+
+				    				// Reinit variables
+				    				series = [];
+				    				seriesColors = [];
+
+				    				// Init series datas and colors
+						    		initJqplotDatas(series, seriesColors, options, data);
+
+				    				// Restart jqplot
+				    				jqplot.destroy();
+				    				jqplot = $.jqplot(elementId, series, options);
+			    				}
+
+			    			});
+
+			    		});
+
+						$(window).bind('resize', function(event, ui) {
+	        				jqplot.replot( { resetAxes: true } );
+	    				});
+
+		            })
+		            .fail(function() {
+		                $elem.append('<div class="alert alert-danger">An error occurred while reading from JSON file</div>');
+		            });
+
+
+    				function initJqplotDatas(series, seriesColors, options, json){
+    					$('[data-toggle="jqplot-serie"].active').each(function(i){
+    						var position = $(this).index() - 1;
+			    			series.push(json.series[position].datas);
+			    			seriesColors.push(json.series[position].color);
+			    		});
+
+    					// Number of days to display ( = datas.length in one serie)
+    					days = json.series[0].datas.length;
+
+			    		// Graph title
+			    		options.title = json.title;
+
+			    		// Graph series colors
+			    		options.seriesColors = seriesColors;
+    				}
+
+			    });
+
+			}(window.jQuery, window, document));
+
+        </script>
+    {/javascripts}
 {/block}

templates/admin/default/includes/folder-breadcrumb.html

@@ -0,0 +1,26 @@
+{* Breadcrumb for folders browsing and editing *}
+
+<ul class="breadcrumb">
+	<li><a href="{url path='admin/home'}">Home</a></li>
+	<li><a href="{url path='admin/folders'}">Folders</a>
+
+	{ifloop rel="folder_path"}</li>
+		{loop name="folder_path" type="folder-path" visible="*" folder=$folder_id}
+			{if $ID == $folder_id}
+				<li class="active">
+				   {if $editing_folder == true}
+                       {intl l='Editing %fold' fold="{$TITLE}"}
+				   {else}
+                       {$TITLE} <a href="{url path='/admin/folders/update' folder_id=$ID}" title="{intl l='Edit this folder'}">{intl l="(edit)"}</a>
+			        {/if}
+				</li>
+			{else}
+			   <li><a href="{url path='/admin/folders' folder_id=" $ID" action='browse'}">{$TITLE}</a></li>
+			{/if}
+	   {/loop}
+	{/ifloop}
+
+	{elseloop rel="folder_path"}
+	    </li>
+	{/elseloop}
+</ul>

templates/admin/default/includes/standard-description-form-fields.html

@@ -25,7 +25,7 @@
         <span class="label-help-block">{intl l="The détailed description."}</span>
     </label>
 
-    <textarea name="{$name}" id="{$label_attr.for}" rows="10" class="form-control">{$value}</textarea>
+    <textarea name="{$name}" id="{$label_attr.for}" rows="10" class="form-control wysiwyg">{$value}</textarea>
 </div>
 {/form_field}
 

templates/admin/default/shipping-zones-edit.html

@@ -0,0 +1,111 @@
+{extends file="admin-layout.tpl"}
+
+{block name="page-title"}{intl l='Edit a shipping zone'}{/block}
+
+{block name="check-permissions"}admin.configuration.shipping-zones.edit{/block}
+
+{block name="main-content"}
+<div class="shipping-zones edit-shipping-zones">
+
+    <div id="wrapper" class="container">
+
+        <ul class="breadcrumb">
+            <li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
+            <li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a></li>
+            <li><a href="{url path='/admin/configuration/shipping-zones'}">{intl l="Shipping zones"}</a></li>
+            <li>{intl l='Editing shipping zone "%name"' name="{$TITLE}"}</li>
+        </ul>
+
+        <div class="row">
+            <div class="col-md-12">
+                <div class="general-block-decorator">
+                    
+                    <div class="col-md-12 title title-without-tabs">
+                        {intl l='Edit shipping zone %title' title=$TITLE}
+                    </div>
+
+                    <div class="form-container clearfix">
+                        <div class="col-md-4">
+                            
+                            <form method="POST" action="">
+                                <label class="control-label" for="">{intl l="Zones"}</label>
+
+                                <div class="input-group">                                    
+                                    <select name="" id="" class="form-control">
+                                        <option value="">1</option>
+                                        <option value="">2</option>
+                                        <option value="">3</option>
+                                        <option value="">4</option>
+                                        <option value="">5</option>
+                                    </select>
+                                    <span class="input-group-btn">
+                                        <button type="submit" class="btn btn-default btn-primary"><span class="glyphicon glyphicon-plus-sign"></span> {intl l="Add"}</button>
+                                    </span>
+                                </div>                                    
+                                
+                            </form>
+                            
+                        </div>
+
+                        <div class="col-md-8">
+                            <table class="table table-striped table-condensed">
+                                <thead>
+                                    <tr>
+                                        <th>{intl l="Zones"}</th>
+                                        <th>{intl l="Actions"}</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr>
+                                        <td>France</td>
+                                        <td>
+                                            <a class="btn btn-default btn-xs" title="{intl l='Delete this zone'}"  href="#delete_zone_dialog" data-id="{$ID}" data-toggle="modal">
+                                                <span class="glyphicon glyphicon-trash"></span>
+                                            </a>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>Zone 1</td>
+                                        <td>
+                                            <a class="btn btn-default btn-xs" title="{intl l='Delete this zone'}"  href="#delete_zone_dialog" data-id="{$ID}" data-toggle="modal">
+                                                <span class="glyphicon glyphicon-trash"></span>
+                                            </a>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>Zone 2</td>
+                                        <td>
+                                            <a class="btn btn-default btn-xs" title="{intl l='Delete this zone'}"  href="#delete_zone_dialog" data-id="{$ID}" data-toggle="modal">
+                                                <span class="glyphicon glyphicon-trash"></span>
+                                            </a>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                    
+                </div>
+            </div>
+        </div>
+
+    </div>
+</div>  
+
+    {* Delete related content confirmation dialog *}
+
+    {capture "delete_zone_dialog"}
+        
+    {/capture}
+
+    {include
+        file = "includes/generic-confirm-dialog.html"
+
+        dialog_id       = "delete_zone_dialog"
+        dialog_title    = {intl l="Remove zone"}
+        dialog_message  = {intl l="Do you really want to remove this zone ?"}
+
+        form_action     = {url path=''}
+        form_content    = {$smarty.capture.delete_zone_dialog nofilter}
+    }  
+{/block}

templates/admin/default/shipping-zones.html

@@ -0,0 +1,119 @@
+{extends file="admin-layout.tpl"}
+
+{block name="page-title"}{intl l='Thelia Shipping zones'}{/block}
+
+{block name="check-permissions"}admin.configuration.shipping-zones.view{/block}
+
+{block name="main-content"}
+<div class="shipping-zones">
+
+    <div id="wrapper" class="container">
+
+        <ul class="breadcrumb">
+            <li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
+            <li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a></li>
+            <li><a href="{url path='/admin/configuration/shipping-zones'}">{intl l="Shipping zones"}</a></li>
+        </ul>
+
+        {module_include location='shipping_zones_top'}
+
+        <div class="row">
+            <div class="col-md-12">
+                <div class="general-block-decorator">
+                    <table class="table table-striped table-condensed table-left-aligned">
+                        <caption>
+                           {intl l='Thelia Shipping zones'}                           
+                        </caption>
+                        <thead>
+	                        <tr>	                           
+                               <th>{intl l="Name"}</th>
+
+                               {module_include location='shipping_zones_table_header'}
+
+                               <th>{intl l="Actions"}</th>
+	                        </tr>
+                        </thead>
+
+                        <tbody>
+                            <tr>
+                               <td>So Colissimo</td>                                   
+
+                                {module_include location='shipping_zones_table_row'}
+
+                                <td>
+                                    {if ! $SECURED}
+                                        <div class="btn-group">
+                                           {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.shipping-zones.change"}
+                                               <a class="btn btn-default btn-xs shipping-zones-change" title="{intl l='Change this shipping zone'}" href="{url path="/admin/configuration/shipping-zones/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
+                                           {/loop}                                               
+                                        </div>
+                                    {else}
+                                        <i title="{intl l='This shipping zone could not be changed.'}" class="glyphicon glyphicon-ban-circle"></i>
+                                    {/if}
+                                </td>
+                            </tr>                           
+                            <tr>
+                               <td>Chronopost</td>                                   
+
+                                {module_include location='shipping_zones_table_row'}
+
+                                <td>
+                                    {if ! $SECURED}
+                                        <div class="btn-group">
+                                           {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.shipping-zones.change"}
+                                               <a class="btn btn-default btn-xs shipping-zones-change" title="{intl l='Change this shipping zone'}" href="{url path="/admin/configuration/shipping-zones/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
+                                           {/loop}                                               
+                                        </div>
+                                    {else}
+                                        <i title="{intl l='This shipping zone could not be changed.'}" class="glyphicon glyphicon-ban-circle"></i>
+                                    {/if}
+                                </td>
+                            </tr>                           
+                            <tr>
+                               <td>Kiala</td>                                   
+
+                                {module_include location='shipping_zones_table_row'}
+
+                                <td>
+                                    {if ! $SECURED}
+	                                    <div class="btn-group">
+                                           {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.shipping-zones.change"}
+                                               <a class="btn btn-default btn-xs shipping-zones-change" title="{intl l='Change this shipping zone'}" href="{url path="/admin/configuration/shipping-zones/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
+                                           {/loop}                                               
+	                                    </div>
+	                                {else}
+	                                    <i title="{intl l='This shipping zone could not be changed.'}" class="glyphicon glyphicon-ban-circle"></i>
+                                    {/if}
+                                </td>
+                            </tr>	                        
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+
+        {module_include location='shipping_zones_bottom'}
+
+    </div>
+</div>
+
+    {* Delete confirmation dialog *}
+
+    {capture "delete_dialog"}
+        <input type="hidden" name="shipping_zones_id" id="shipping_zones_delete_id" value="" />
+
+        {module_include location='shipping_zones_delete_form'}
+
+    {/capture}
+
+    {include
+        file = "includes/generic-confirm-dialog.html"
+
+        dialog_id       = "delete_dialog"
+        dialog_title    = {intl l="Delete shipping zone"}
+        dialog_message  = {intl l="Do you really want to delete this shipping zone ?"}
+
+        form_action         = {url path='/admin/configuration/shipping-zones/delete'}
+        form_content        = {$smarty.capture.delete_dialog nofilter}
+    }
+{/block}