").append(b.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},b.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){b.fn[t]=function(e){return this.on(t,e)}}),b.each(["get","post"],function(e,n){b[n]=function(e,r,i,o){return b.isFunction(r)&&(o=o||i,i=r,r=t),b.ajax({url:e,type:n,dataType:o,data:r,success:i})}}),b.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Nn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":b.parseJSON,"text xml":b.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Mn(Mn(e,b.ajaxSettings),t):Mn(b.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,u,l,c,p=b.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?b(f):b.event,h=b.Deferred(),g=b.Callbacks("once memory"),m=p.statusCode||{},y={},v={},x=0,T="canceled",N={readyState:0,getResponseHeader:function(e){var t;if(2===x){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===x?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return x||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return x||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>x)for(t in e)m[t]=[m[t],e[t]];else N.always(e[N.status]);return this},abort:function(e){var t=e||T;return l&&l.abort(t),k(0,t),this}};if(h.promise(N).complete=g.add,N.success=N.done,N.error=N.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=b.trim(p.dataType||"*").toLowerCase().match(w)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?80:443))==(mn[3]||("http:"===mn[1]?80:443)))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=b.param(p.data,p.traditional)),qn(An,p,n,N),2===x)return N;u=p.global,u&&0===b.active++&&b.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Cn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(b.lastModified[o]&&N.setRequestHeader("If-Modified-Since",b.lastModified[o]),b.etag[o]&&N.setRequestHeader("If-None-Match",b.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&N.setRequestHeader("Content-Type",p.contentType),N.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)N.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,N,p)===!1||2===x))return N.abort();T="abort";for(i in{success:1,error:1,complete:1})N[i](p[i]);if(l=qn(jn,p,n,N)){N.readyState=1,u&&d.trigger("ajaxSend",[N,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){N.abort("timeout")},p.timeout));try{x=1,l.send(y,k)}catch(C){if(!(2>x))throw C;k(-1,C)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,C=n;2!==x&&(x=2,s&&clearTimeout(s),l=t,a=i||"",N.readyState=e>0?4:0,r&&(w=_n(p,N,r)),e>=200&&300>e||304===e?(p.ifModified&&(T=N.getResponseHeader("Last-Modified"),T&&(b.lastModified[o]=T),T=N.getResponseHeader("etag"),T&&(b.etag[o]=T)),204===e?(c=!0,C="nocontent"):304===e?(c=!0,C="notmodified"):(c=Fn(p,w),C=c.state,y=c.data,v=c.error,c=!v)):(v=C,(e||!C)&&(C="error",0>e&&(e=0))),N.status=e,N.statusText=(n||C)+"",c?h.resolveWith(f,[y,C,N]):h.rejectWith(f,[N,C,v]),N.statusCode(m),m=t,u&&d.trigger(c?"ajaxSuccess":"ajaxError",[N,p,c?y:v]),g.fireWith(f,[N,C]),u&&(d.trigger("ajaxComplete",[N,p]),--b.active||b.event.trigger("ajaxStop")))}return N},getScript:function(e,n){return b.get(e,t,n,"script")},getJSON:function(e,t,n){return b.get(e,t,n,"json")}});function _n(e,n,r){var i,o,a,s,u=e.contents,l=e.dataTypes,c=e.responseFields;for(s in c)s in r&&(n[c[s]]=r[s]);while("*"===l[0])l.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in u)if(u[s]&&u[s].test(o)){l.unshift(s);break}if(l[0]in r)a=l[0];else{for(s in r){if(!l[0]||e.converters[s+" "+l[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==l[0]&&l.unshift(a),r[a]):t}function Fn(e,t){var n,r,i,o,a={},s=0,u=e.dataTypes.slice(),l=u[0];if(e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u[1])for(i in e.converters)a[i.toLowerCase()]=e.converters[i];for(;r=u[++s];)if("*"!==r){if("*"!==l&&l!==r){if(i=a[l+" "+r]||a["* "+r],!i)for(n in a)if(o=n.split(" "),o[1]===r&&(i=a[l+" "+o[0]]||a["* "+o[0]])){i===!0?i=a[n]:a[n]!==!0&&(r=o[0],u.splice(s--,0,r));break}if(i!==!0)if(i&&e["throws"])t=i(t);else try{t=i(t)}catch(c){return{state:"parsererror",error:i?c:"No conversion from "+l+" to "+r}}}l=r}return{state:"success",data:t}}b.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return b.globalEval(e),e}}}),b.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),b.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=o.head||b("head")[0]||o.documentElement;return{send:function(t,i){n=o.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var On=[],Bn=/(=)\?(?=&|$)|\?\?/;b.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=On.pop()||b.expando+"_"+vn++;return this[e]=!0,e}}),b.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,u=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return u||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=b.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,u?n[u]=n[u].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||b.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,On.push(o)),s&&b.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}b.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=b.ajaxSettings.xhr(),b.support.cors=!!Rn&&"withCredentials"in Rn,Rn=b.support.ajax=!!Rn,Rn&&b.ajaxTransport(function(n){if(!n.crossDomain||b.support.cors){var r;return{send:function(i,o){var a,s,u=n.xhr();if(n.username?u.open(n.type,n.url,n.async,n.username,n.password):u.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)u[s]=n.xhrFields[s];n.mimeType&&u.overrideMimeType&&u.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)u.setRequestHeader(s,i[s])}catch(l){}u.send(n.hasContent&&n.data||null),r=function(e,i){var s,l,c,p;try{if(r&&(i||4===u.readyState))if(r=t,a&&(u.onreadystatechange=b.noop,$n&&delete Pn[a]),i)4!==u.readyState&&u.abort();else{p={},s=u.status,l=u.getAllResponseHeaders(),"string"==typeof u.responseText&&(p.text=u.responseText);try{c=u.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,l)},n.async?4===u.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},b(e).unload($n)),Pn[a]=r),u.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+x+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n,r,i=this.createTween(e,t),o=Yn.exec(t),a=i.cur(),s=+a||0,u=1,l=20;if(o){if(n=+o[2],r=o[3]||(b.cssNumber[e]?"":"px"),"px"!==r&&s){s=b.css(i.elem,e,!0)||n||1;do u=u||".5",s/=u,b.style(i.elem,e,s+r);while(u!==(u=i.cur()/a)&&1!==u&&--l)}i.unit=r,i.start=s,i.end=o[1]?s+(o[1]+1)*n:n}return i}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=b.now()}function Zn(e,t){b.each(t,function(t,n){var r=(Qn[t]||[]).concat(Qn["*"]),i=0,o=r.length;for(;o>i;i++)if(r[i].call(e,t,n))return})}function er(e,t,n){var r,i,o=0,a=Gn.length,s=b.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;for(;u>a;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),1>o&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:b.extend({},t),opts:b.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=b.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)l.tweens[n].run(1);return t?s.resolveWith(e,[l,t]):s.rejectWith(e,[l,t]),this}}),c=l.props;for(tr(c,l.opts.specialEasing);a>o;o++)if(r=Gn[o].call(l,e,c,l.opts))return r;return Zn(l,c),b.isFunction(l.opts.start)&&l.opts.start.call(e,l),b.fx.timer(b.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function tr(e,t){var n,r,i,o,a;for(i in e)if(r=b.camelCase(i),o=t[r],n=e[i],b.isArray(n)&&(o=n[1],n=e[i]=n[0]),i!==r&&(e[r]=n,delete e[i]),a=b.cssHooks[r],a&&"expand"in a){n=a.expand(n),delete e[r];for(i in n)i in e||(e[i]=n[i],t[i]=o)}else t[r]=o}b.Animation=b.extend(er,{tweener:function(e,t){b.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,u,l,c,p,f=this,d=e.style,h={},g=[],m=e.nodeType&&nn(e);n.queue||(c=b._queueHooks(e,"fx"),null==c.unqueued&&(c.unqueued=0,p=c.empty.fire,c.empty.fire=function(){c.unqueued||p()}),c.unqueued++,f.always(function(){f.always(function(){c.unqueued--,b.queue(e,"fx").length||c.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[d.overflow,d.overflowX,d.overflowY],"inline"===b.css(e,"display")&&"none"===b.css(e,"float")&&(b.support.inlineBlockNeedsLayout&&"inline"!==un(e.nodeName)?d.zoom=1:d.display="inline-block")),n.overflow&&(d.overflow="hidden",b.support.shrinkWrapBlocks||f.always(function(){d.overflow=n.overflow[0],d.overflowX=n.overflow[1],d.overflowY=n.overflow[2]}));for(i in t)if(a=t[i],Vn.exec(a)){if(delete t[i],u=u||"toggle"===a,a===(m?"hide":"show"))continue;g.push(i)}if(o=g.length){s=b._data(e,"fxshow")||b._data(e,"fxshow",{}),"hidden"in s&&(m=s.hidden),u&&(s.hidden=!m),m?b(e).show():f.done(function(){b(e).hide()}),f.done(function(){var t;b._removeData(e,"fxshow");for(t in h)b.style(e,t,h[t])});for(i=0;o>i;i++)r=g[i],l=f.createTween(r,m?s[r]:0),h[r]=s[r]||b.style(e,r),r in s||(s[r]=l.start,m&&(l.end=l.start,l.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}b.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(b.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?b.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=b.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){b.fx.step[e.prop]?b.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[b.cssProps[e.prop]]||b.cssHooks[e.prop])?b.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},b.each(["toggle","show","hide"],function(e,t){var n=b.fn[t];b.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),b.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=b.isEmptyObject(e),o=b.speed(t,n,r),a=function(){var t=er(this,b.extend({},e),o);a.finish=function(){t.stop(!0)},(i||b._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=b.timers,a=b._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&b.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=b._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=b.timers,a=r?r.length:0;for(n.finish=!0,b.queue(this,e,[]),i&&i.cur&&i.cur.finish&&i.cur.finish.call(this),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}b.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){b.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),b.speed=function(e,t,n){var r=e&&"object"==typeof e?b.extend({},e):{complete:n||!n&&t||b.isFunction(e)&&e,duration:e,easing:n&&t||t&&!b.isFunction(t)&&t};return r.duration=b.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in b.fx.speeds?b.fx.speeds[r.duration]:b.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){b.isFunction(r.old)&&r.old.call(this),r.queue&&b.dequeue(this,r.queue)},r},b.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},b.timers=[],b.fx=rr.prototype.init,b.fx.tick=function(){var e,n=b.timers,r=0;for(Xn=b.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||b.fx.stop(),Xn=t},b.fx.timer=function(e){e()&&b.timers.push(e)&&b.fx.start()},b.fx.interval=13,b.fx.start=function(){Un||(Un=setInterval(b.fx.tick,b.fx.interval))},b.fx.stop=function(){clearInterval(Un),Un=null},b.fx.speeds={slow:600,fast:200,_default:400},b.fx.step={},b.expr&&b.expr.filters&&(b.expr.filters.animated=function(e){return b.grep(b.timers,function(t){return e===t.elem}).length}),b.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){b.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,b.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},b.offset={setOffset:function(e,t,n){var r=b.css(e,"position");"static"===r&&(e.style.position="relative");var i=b(e),o=i.offset(),a=b.css(e,"top"),s=b.css(e,"left"),u=("absolute"===r||"fixed"===r)&&b.inArray("auto",[a,s])>-1,l={},c={},p,f;u?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),b.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(l.top=t.top-o.top+p),null!=t.left&&(l.left=t.left-o.left+f),"using"in t?t.using.call(e,l):i.css(l)}},b.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===b.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),b.nodeName(e[0],"html")||(n=e.offset()),n.top+=b.css(e[0],"borderTopWidth",!0),n.left+=b.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-b.css(r,"marginTop",!0),left:t.left-n.left-b.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||o.documentElement;while(e&&!b.nodeName(e,"html")&&"static"===b.css(e,"position"))e=e.offsetParent;return e||o.documentElement})}}),b.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);b.fn[e]=function(i){return b.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?b(a).scrollLeft():o,r?o:b(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return b.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}b.each({Height:"height",Width:"width"},function(e,n){b.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){b.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return b.access(this,function(n,r,i){var o;return b.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?b.css(n,r,s):b.style(n,r,i,s)},n,a?i:t,a,null)}})}),e.jQuery=e.$=b,"function"==typeof define&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return b})})(window);
/*! jQuery UI - v1.9.2 - 2012-12-26
* http://jqueryui.com
diff --git a/public/javascripts/jquery.autosize.js b/app/assets/javascripts/jquery.autosize.js
similarity index 100%
rename from public/javascripts/jquery.autosize.js
rename to app/assets/javascripts/jquery.autosize.js
diff --git a/public/javascripts/jquery.colorbox-min.js b/app/assets/javascripts/jquery.colorbox-min.js
similarity index 100%
rename from public/javascripts/jquery.colorbox-min.js
rename to app/assets/javascripts/jquery.colorbox-min.js
diff --git a/public/javascripts/jquery.infinitescroll.js b/app/assets/javascripts/jquery.infinitescroll.js
similarity index 100%
rename from public/javascripts/jquery.infinitescroll.js
rename to app/assets/javascripts/jquery.infinitescroll.js
diff --git a/public/javascripts/jquery.leanModal.min.js b/app/assets/javascripts/jquery.leanModal.min.js
similarity index 100%
rename from public/javascripts/jquery.leanModal.min.js
rename to app/assets/javascripts/jquery.leanModal.min.js
diff --git a/public/javascripts/jquery.min.js b/app/assets/javascripts/jquery.min.js
similarity index 100%
rename from public/javascripts/jquery.min.js
rename to app/assets/javascripts/jquery.min.js
diff --git a/public/javascripts/jstoolbar/jstoolbar-textile.min.js b/app/assets/javascripts/jstoolbar/jstoolbar-textile.min.js
similarity index 100%
rename from public/javascripts/jstoolbar/jstoolbar-textile.min.js
rename to app/assets/javascripts/jstoolbar/jstoolbar-textile.min.js
diff --git a/public/javascripts/jstoolbar/jstoolbar.js b/app/assets/javascripts/jstoolbar/jstoolbar.js
similarity index 100%
rename from public/javascripts/jstoolbar/jstoolbar.js
rename to app/assets/javascripts/jstoolbar/jstoolbar.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ar.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-ar.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-ar.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-ar.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-az.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-az.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-az.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-az.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-bg.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-bg.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-bg.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-bg.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-bs.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-bs.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-bs.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-bs.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ca.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-ca.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-ca.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-ca.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-cs.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-cs.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-cs.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-cs.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-da.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-da.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-da.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-da.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-de.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-de.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-de.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-de.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-en-gb.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-en-gb.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-en-gb.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-en-gb.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-en.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-en.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-en.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-en.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-es.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-es.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-es.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-es.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-et.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-et.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-et.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-et.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-eu.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-eu.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-eu.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-eu.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-fa.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-fa.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-fa.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-fa.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-fi.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-fi.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-fi.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-fi.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-fr.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-fr.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-fr.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-fr.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-gl.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-gl.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-gl.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-gl.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-he.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-he.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-he.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-he.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-hr.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-hr.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-hr.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-hr.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-hu.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-hu.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-hu.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-hu.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-id.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-id.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-id.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-id.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-it.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-it.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-it.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-it.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ja.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-ja.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-ja.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-ja.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ko.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-ko.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-ko.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-ko.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-lt.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-lt.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-lt.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-lt.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-lv.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-lv.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-lv.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-lv.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-mk.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-mk.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-mk.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-mk.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-mn.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-mn.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-mn.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-mn.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-nl.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-nl.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-nl.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-nl.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-no.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-no.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-no.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-no.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-pl.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-pl.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-pl.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-pl.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-pt-br.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-pt-br.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-pt.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-pt.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-pt.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-pt.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ro.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-ro.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-ro.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-ro.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ru.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-ru.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-ru.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-ru.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-sk.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-sk.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-sk.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-sk.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-sl.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-sl.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-sl.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-sl.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-sq.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-sq.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-sq.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-sq.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-sr-yu.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-sr-yu.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-sr-yu.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-sr-yu.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-sr.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-sr.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-sr.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-sr.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-sv.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-sv.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-sv.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-sv.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-th.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-th.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-th.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-th.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-tr.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-tr.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-tr.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-tr.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-uk.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-uk.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-uk.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-uk.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-vi.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-vi.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-vi.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-vi.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-zh.js b/app/assets/javascripts/jstoolbar/lang/jstoolbar-zh.js
similarity index 100%
rename from public/javascripts/jstoolbar/lang/jstoolbar-zh.js
rename to app/assets/javascripts/jstoolbar/lang/jstoolbar-zh.js
diff --git a/public/javascripts/jstoolbar/textile.js b/app/assets/javascripts/jstoolbar/textile.js
similarity index 100%
rename from public/javascripts/jstoolbar/textile.js
rename to app/assets/javascripts/jstoolbar/textile.js
diff --git a/public/assets/kindeditor/kindeditor-min.js b/app/assets/javascripts/kindeditor/kindeditor-min.js
similarity index 100%
rename from public/assets/kindeditor/kindeditor-min.js
rename to app/assets/javascripts/kindeditor/kindeditor-min.js
diff --git a/public/assets/kindeditor/kindeditor.js b/app/assets/javascripts/kindeditor/kindeditor.js
similarity index 99%
rename from public/assets/kindeditor/kindeditor.js
rename to app/assets/javascripts/kindeditor/kindeditor.js
index a6506bbf3..4f7f70eb6 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/app/assets/javascripts/kindeditor/kindeditor.js
@@ -223,7 +223,7 @@ var _INLINE_TAG_MAP = _toMap('a,abbr,acronym,b,basefont,bdo,big,br,button,cite,c
_VALUE_TAG_MAP = _toMap('input,button,textarea,select');
// Begining of modification by Macrow
function _getBasePath() {
- var refPath = '/assets/kindeditor/';
+ var refPath = 'assets/kindeditor/';
var els = document.getElementsByTagName('script'), src;
for (var i = 0, len = els.length; i < len; i++) {
src = els[i].src || '';
@@ -243,7 +243,7 @@ K.options = {
shadowMode : true,
loadStyleMode : true,
basePath : K.basePath,
- emotionsBasePath: 'http://forge.trustie.net', //TODO
+ emotionsBasePath: '/', //TODO
themesPath : K.basePath + 'themes/',
langPath : K.basePath + 'lang/',
pluginsPath : K.basePath + 'plugins/',
@@ -5464,7 +5464,7 @@ function _editor(options) {
_instances = [];
function _create(expr, options) {
options = options || {};
- options.emotionsBasePath = _undef(options.emotionsBasePath,'http://forge.trustie.net') // TODO
+ options.emotionsBasePath = _undef(options.emotionsBasePath,'/') // TODO
options.basePath = _undef(options.basePath, K.basePath);
options.themesPath = _undef(options.themesPath, options.basePath + 'themes/');
options.langPath = _undef(options.langPath, options.basePath + 'lang/');
diff --git a/public/assets/kindeditor/lang/ar.js b/app/assets/javascripts/kindeditor/lang/ar.js
similarity index 100%
rename from public/assets/kindeditor/lang/ar.js
rename to app/assets/javascripts/kindeditor/lang/ar.js
diff --git a/public/assets/kindeditor/lang/en.js b/app/assets/javascripts/kindeditor/lang/en.js
similarity index 100%
rename from public/assets/kindeditor/lang/en.js
rename to app/assets/javascripts/kindeditor/lang/en.js
diff --git a/public/assets/kindeditor/lang/ko.js b/app/assets/javascripts/kindeditor/lang/ko.js
similarity index 100%
rename from public/assets/kindeditor/lang/ko.js
rename to app/assets/javascripts/kindeditor/lang/ko.js
diff --git a/public/assets/kindeditor/lang/zh_CN.js b/app/assets/javascripts/kindeditor/lang/zh_CN.js
similarity index 100%
rename from public/assets/kindeditor/lang/zh_CN.js
rename to app/assets/javascripts/kindeditor/lang/zh_CN.js
diff --git a/public/assets/kindeditor/lang/zh_TW.js b/app/assets/javascripts/kindeditor/lang/zh_TW.js
similarity index 100%
rename from public/assets/kindeditor/lang/zh_TW.js
rename to app/assets/javascripts/kindeditor/lang/zh_TW.js
diff --git a/public/assets/kindeditor/pasteimg.js b/app/assets/javascripts/kindeditor/pasteimg.js
similarity index 100%
rename from public/assets/kindeditor/pasteimg.js
rename to app/assets/javascripts/kindeditor/pasteimg.js
index f08a768aa..a1bccd7c3 100644
--- a/public/assets/kindeditor/pasteimg.js
+++ b/app/assets/javascripts/kindeditor/pasteimg.js
@@ -296,6 +296,7 @@ https://github.com/layerssss/paste.js
function enablePasteImg(_editor) {
var editor = _editor,
name = 'paste';
+
if(editor.edit == undefined || editor.edit.iframe == undefined){
return;
}
@@ -303,9 +304,8 @@ function enablePasteImg(_editor) {
//var contentWindow = editor.iframeDoc;
//var contentWindow = document.getElementsByTagName('iframe')[0].contentWindow;
var nodeBody = contentWindow.document.getElementsByTagName('body')[0];
- console.log(nodeBody);
$(nodeBody).pastableContenteditable();
-
+ console.log(nodeBody);
dataURItoBlob = function(dataURI) {
// convert base64/URLEncoded data component to raw binary data held in a string
var byteString;
diff --git a/public/assets/kindeditor/plugins/anchor/anchor.js b/app/assets/javascripts/kindeditor/plugins/anchor/anchor.js
similarity index 100%
rename from public/assets/kindeditor/plugins/anchor/anchor.js
rename to app/assets/javascripts/kindeditor/plugins/anchor/anchor.js
diff --git a/public/assets/kindeditor/plugins/autoheight/autoheight.js b/app/assets/javascripts/kindeditor/plugins/autoheight/autoheight.js
similarity index 100%
rename from public/assets/kindeditor/plugins/autoheight/autoheight.js
rename to app/assets/javascripts/kindeditor/plugins/autoheight/autoheight.js
diff --git a/public/assets/kindeditor/plugins/baidumap/baidumap.js b/app/assets/javascripts/kindeditor/plugins/baidumap/baidumap.js
similarity index 100%
rename from public/assets/kindeditor/plugins/baidumap/baidumap.js
rename to app/assets/javascripts/kindeditor/plugins/baidumap/baidumap.js
diff --git a/public/assets/kindeditor/plugins/baidumap/index.html b/app/assets/javascripts/kindeditor/plugins/baidumap/index.html
similarity index 100%
rename from public/assets/kindeditor/plugins/baidumap/index.html
rename to app/assets/javascripts/kindeditor/plugins/baidumap/index.html
diff --git a/public/assets/kindeditor/plugins/baidumap/map.html b/app/assets/javascripts/kindeditor/plugins/baidumap/map.html
similarity index 100%
rename from public/assets/kindeditor/plugins/baidumap/map.html
rename to app/assets/javascripts/kindeditor/plugins/baidumap/map.html
diff --git a/public/assets/kindeditor/plugins/clearhtml/clearhtml.js b/app/assets/javascripts/kindeditor/plugins/clearhtml/clearhtml.js
similarity index 100%
rename from public/assets/kindeditor/plugins/clearhtml/clearhtml.js
rename to app/assets/javascripts/kindeditor/plugins/clearhtml/clearhtml.js
diff --git a/public/assets/kindeditor/plugins/code/code.js b/app/assets/javascripts/kindeditor/plugins/code/code.js
similarity index 100%
rename from public/assets/kindeditor/plugins/code/code.js
rename to app/assets/javascripts/kindeditor/plugins/code/code.js
diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/app/assets/javascripts/kindeditor/plugins/code/previewcode.css
similarity index 100%
rename from public/assets/kindeditor/plugins/code/previewcode.css
rename to app/assets/javascripts/kindeditor/plugins/code/previewcode.css
diff --git a/public/assets/kindeditor/plugins/emoticons/emoticons.js b/app/assets/javascripts/kindeditor/plugins/emoticons/emoticons.js
similarity index 97%
rename from public/assets/kindeditor/plugins/emoticons/emoticons.js
rename to app/assets/javascripts/kindeditor/plugins/emoticons/emoticons.js
index 7884f53fb..0d96aa948 100644
--- a/public/assets/kindeditor/plugins/emoticons/emoticons.js
+++ b/app/assets/javascripts/kindeditor/plugins/emoticons/emoticons.js
@@ -8,11 +8,12 @@
*******************************************************************************/
KindEditor.plugin('emoticons', function(K) {
- var self = this, name = 'emoticons',
- path = self.emotionsBasePath + (self.emoticonsPath || self.pluginsPath + 'emoticons/images/'),
+ var self = this, name = 'emoticons',
+ path = self.pluginsPath + 'emoticons/images/',
allowPreview = self.allowPreviewEmoticons === undefined ? true : self.allowPreviewEmoticons,
currentPageNum = 1;
+ console.log(self.pluginsPath);
self.clickToolbar(name, function() {
this.edit.focus();//���û����� �����ȡ�������� ����_getSel()Ϊ�� ����
var rows = 5, cols = 9, total = 135, startNum = 0,
diff --git a/public/assets/kindeditor/plugins/emoticons/images/0.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/0.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/0.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/0.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/1.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/1.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/1.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/1.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/10.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/10.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/10.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/10.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/100.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/100.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/100.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/100.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/101.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/101.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/101.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/101.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/102.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/102.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/102.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/102.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/103.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/103.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/103.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/103.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/104.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/104.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/104.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/104.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/105.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/105.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/105.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/105.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/106.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/106.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/106.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/106.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/107.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/107.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/107.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/107.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/108.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/108.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/108.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/108.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/109.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/109.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/109.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/109.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/11.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/11.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/11.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/11.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/110.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/110.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/110.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/110.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/111.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/111.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/111.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/111.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/112.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/112.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/112.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/112.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/113.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/113.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/113.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/113.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/114.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/114.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/114.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/114.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/115.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/115.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/115.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/115.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/116.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/116.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/116.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/116.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/117.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/117.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/117.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/117.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/118.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/118.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/118.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/118.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/119.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/119.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/119.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/119.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/12.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/12.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/12.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/12.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/120.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/120.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/120.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/120.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/121.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/121.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/121.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/121.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/122.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/122.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/122.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/122.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/123.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/123.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/123.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/123.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/124.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/124.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/124.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/124.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/125.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/125.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/125.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/125.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/126.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/126.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/126.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/126.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/127.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/127.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/127.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/127.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/128.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/128.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/128.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/128.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/129.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/129.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/129.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/129.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/13.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/13.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/13.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/13.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/130.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/130.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/130.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/130.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/131.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/131.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/131.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/131.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/132.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/132.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/132.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/132.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/133.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/133.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/133.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/133.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/134.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/134.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/134.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/134.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/14.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/14.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/14.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/14.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/15.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/15.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/15.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/15.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/16.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/16.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/16.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/16.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/17.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/17.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/17.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/17.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/18.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/18.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/18.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/18.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/19.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/19.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/19.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/19.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/2.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/2.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/2.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/2.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/20.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/20.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/20.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/20.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/21.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/21.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/21.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/21.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/22.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/22.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/22.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/22.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/23.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/23.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/23.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/23.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/24.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/24.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/24.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/24.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/25.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/25.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/25.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/25.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/26.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/26.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/26.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/26.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/27.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/27.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/27.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/27.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/28.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/28.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/28.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/28.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/29.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/29.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/29.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/29.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/3.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/3.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/3.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/3.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/30.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/30.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/30.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/30.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/31.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/31.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/31.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/31.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/32.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/32.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/32.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/32.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/33.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/33.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/33.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/33.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/34.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/34.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/34.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/34.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/35.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/35.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/35.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/35.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/36.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/36.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/36.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/36.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/37.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/37.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/37.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/37.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/38.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/38.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/38.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/38.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/39.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/39.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/39.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/39.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/4.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/4.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/4.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/4.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/40.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/40.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/40.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/40.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/41.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/41.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/41.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/41.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/42.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/42.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/42.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/42.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/43.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/43.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/43.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/43.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/44.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/44.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/44.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/44.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/45.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/45.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/45.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/45.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/46.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/46.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/46.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/46.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/47.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/47.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/47.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/47.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/48.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/48.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/48.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/48.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/49.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/49.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/49.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/49.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/5.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/5.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/5.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/5.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/50.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/50.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/50.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/50.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/51.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/51.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/51.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/51.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/52.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/52.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/52.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/52.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/53.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/53.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/53.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/53.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/54.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/54.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/54.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/54.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/55.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/55.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/55.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/55.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/56.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/56.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/56.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/56.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/57.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/57.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/57.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/57.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/58.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/58.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/58.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/58.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/59.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/59.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/59.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/59.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/6.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/6.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/6.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/6.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/60.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/60.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/60.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/60.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/61.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/61.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/61.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/61.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/62.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/62.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/62.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/62.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/63.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/63.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/63.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/63.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/64.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/64.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/64.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/64.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/65.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/65.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/65.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/65.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/66.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/66.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/66.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/66.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/67.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/67.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/67.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/67.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/68.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/68.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/68.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/68.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/69.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/69.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/69.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/69.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/7.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/7.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/7.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/7.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/70.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/70.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/70.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/70.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/71.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/71.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/71.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/71.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/72.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/72.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/72.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/72.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/73.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/73.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/73.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/73.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/74.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/74.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/74.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/74.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/75.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/75.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/75.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/75.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/76.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/76.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/76.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/76.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/77.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/77.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/77.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/77.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/78.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/78.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/78.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/78.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/79.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/79.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/79.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/79.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/8.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/8.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/8.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/8.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/80.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/80.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/80.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/80.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/81.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/81.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/81.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/81.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/82.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/82.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/82.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/82.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/83.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/83.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/83.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/83.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/84.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/84.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/84.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/84.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/85.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/85.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/85.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/85.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/86.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/86.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/86.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/86.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/87.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/87.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/87.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/87.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/88.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/88.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/88.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/88.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/89.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/89.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/89.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/89.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/9.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/9.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/9.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/9.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/90.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/90.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/90.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/90.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/91.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/91.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/91.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/91.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/92.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/92.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/92.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/92.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/93.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/93.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/93.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/93.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/94.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/94.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/94.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/94.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/95.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/95.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/95.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/95.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/96.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/96.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/96.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/96.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/97.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/97.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/97.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/97.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/98.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/98.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/98.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/98.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/99.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/99.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/99.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/99.gif
diff --git a/public/assets/kindeditor/plugins/emoticons/images/static.gif b/app/assets/javascripts/kindeditor/plugins/emoticons/images/static.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/emoticons/images/static.gif
rename to app/assets/javascripts/kindeditor/plugins/emoticons/images/static.gif
diff --git a/public/assets/kindeditor/plugins/filemanager/filemanager.js b/app/assets/javascripts/kindeditor/plugins/filemanager/filemanager.js
similarity index 100%
rename from public/assets/kindeditor/plugins/filemanager/filemanager.js
rename to app/assets/javascripts/kindeditor/plugins/filemanager/filemanager.js
diff --git a/public/assets/kindeditor/plugins/filemanager/images/file-16.gif b/app/assets/javascripts/kindeditor/plugins/filemanager/images/file-16.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/filemanager/images/file-16.gif
rename to app/assets/javascripts/kindeditor/plugins/filemanager/images/file-16.gif
diff --git a/public/assets/kindeditor/plugins/filemanager/images/file-64.gif b/app/assets/javascripts/kindeditor/plugins/filemanager/images/file-64.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/filemanager/images/file-64.gif
rename to app/assets/javascripts/kindeditor/plugins/filemanager/images/file-64.gif
diff --git a/public/assets/kindeditor/plugins/filemanager/images/folder-16.gif b/app/assets/javascripts/kindeditor/plugins/filemanager/images/folder-16.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/filemanager/images/folder-16.gif
rename to app/assets/javascripts/kindeditor/plugins/filemanager/images/folder-16.gif
diff --git a/public/assets/kindeditor/plugins/filemanager/images/folder-64.gif b/app/assets/javascripts/kindeditor/plugins/filemanager/images/folder-64.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/filemanager/images/folder-64.gif
rename to app/assets/javascripts/kindeditor/plugins/filemanager/images/folder-64.gif
diff --git a/public/assets/kindeditor/plugins/filemanager/images/go-up.gif b/app/assets/javascripts/kindeditor/plugins/filemanager/images/go-up.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/filemanager/images/go-up.gif
rename to app/assets/javascripts/kindeditor/plugins/filemanager/images/go-up.gif
diff --git a/public/assets/kindeditor/plugins/flash/flash.js b/app/assets/javascripts/kindeditor/plugins/flash/flash.js
similarity index 100%
rename from public/assets/kindeditor/plugins/flash/flash.js
rename to app/assets/javascripts/kindeditor/plugins/flash/flash.js
diff --git a/public/assets/kindeditor/plugins/image/image.js b/app/assets/javascripts/kindeditor/plugins/image/image.js
similarity index 100%
rename from public/assets/kindeditor/plugins/image/image.js
rename to app/assets/javascripts/kindeditor/plugins/image/image.js
diff --git a/public/assets/kindeditor/plugins/image/images/align_left.gif b/app/assets/javascripts/kindeditor/plugins/image/images/align_left.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/image/images/align_left.gif
rename to app/assets/javascripts/kindeditor/plugins/image/images/align_left.gif
diff --git a/public/assets/kindeditor/plugins/image/images/align_right.gif b/app/assets/javascripts/kindeditor/plugins/image/images/align_right.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/image/images/align_right.gif
rename to app/assets/javascripts/kindeditor/plugins/image/images/align_right.gif
diff --git a/public/assets/kindeditor/plugins/image/images/align_top.gif b/app/assets/javascripts/kindeditor/plugins/image/images/align_top.gif
similarity index 100%
rename from public/assets/kindeditor/plugins/image/images/align_top.gif
rename to app/assets/javascripts/kindeditor/plugins/image/images/align_top.gif
diff --git a/public/assets/kindeditor/plugins/image/images/refresh.png b/app/assets/javascripts/kindeditor/plugins/image/images/refresh.png
similarity index 100%
rename from public/assets/kindeditor/plugins/image/images/refresh.png
rename to app/assets/javascripts/kindeditor/plugins/image/images/refresh.png
diff --git a/public/assets/kindeditor/plugins/insertfile/insertfile.js b/app/assets/javascripts/kindeditor/plugins/insertfile/insertfile.js
similarity index 100%
rename from public/assets/kindeditor/plugins/insertfile/insertfile.js
rename to app/assets/javascripts/kindeditor/plugins/insertfile/insertfile.js
diff --git a/public/assets/kindeditor/plugins/less/less.js b/app/assets/javascripts/kindeditor/plugins/less/less.js
similarity index 100%
rename from public/assets/kindeditor/plugins/less/less.js
rename to app/assets/javascripts/kindeditor/plugins/less/less.js
diff --git a/public/assets/kindeditor/plugins/lineheight/lineheight.js b/app/assets/javascripts/kindeditor/plugins/lineheight/lineheight.js
similarity index 100%
rename from public/assets/kindeditor/plugins/lineheight/lineheight.js
rename to app/assets/javascripts/kindeditor/plugins/lineheight/lineheight.js
diff --git a/public/assets/kindeditor/plugins/link/link.js b/app/assets/javascripts/kindeditor/plugins/link/link.js
similarity index 100%
rename from public/assets/kindeditor/plugins/link/link.js
rename to app/assets/javascripts/kindeditor/plugins/link/link.js
diff --git a/public/assets/kindeditor/plugins/map/map.html b/app/assets/javascripts/kindeditor/plugins/map/map.html
similarity index 100%
rename from public/assets/kindeditor/plugins/map/map.html
rename to app/assets/javascripts/kindeditor/plugins/map/map.html
diff --git a/public/assets/kindeditor/plugins/map/map.js b/app/assets/javascripts/kindeditor/plugins/map/map.js
similarity index 100%
rename from public/assets/kindeditor/plugins/map/map.js
rename to app/assets/javascripts/kindeditor/plugins/map/map.js
diff --git a/public/assets/kindeditor/plugins/media/media.js b/app/assets/javascripts/kindeditor/plugins/media/media.js
similarity index 100%
rename from public/assets/kindeditor/plugins/media/media.js
rename to app/assets/javascripts/kindeditor/plugins/media/media.js
diff --git a/public/assets/kindeditor/plugins/media/media.old.js b/app/assets/javascripts/kindeditor/plugins/media/media.old.js
similarity index 100%
rename from public/assets/kindeditor/plugins/media/media.old.js
rename to app/assets/javascripts/kindeditor/plugins/media/media.old.js
diff --git a/public/assets/kindeditor/plugins/more/more.js b/app/assets/javascripts/kindeditor/plugins/more/more.js
similarity index 100%
rename from public/assets/kindeditor/plugins/more/more.js
rename to app/assets/javascripts/kindeditor/plugins/more/more.js
diff --git a/public/assets/kindeditor/plugins/multiimage/images/image.png b/app/assets/javascripts/kindeditor/plugins/multiimage/images/image.png
similarity index 100%
rename from public/assets/kindeditor/plugins/multiimage/images/image.png
rename to app/assets/javascripts/kindeditor/plugins/multiimage/images/image.png
diff --git a/public/assets/kindeditor/plugins/multiimage/images/select-files-en.png b/app/assets/javascripts/kindeditor/plugins/multiimage/images/select-files-en.png
similarity index 100%
rename from public/assets/kindeditor/plugins/multiimage/images/select-files-en.png
rename to app/assets/javascripts/kindeditor/plugins/multiimage/images/select-files-en.png
diff --git a/public/assets/kindeditor/plugins/multiimage/images/select-files-zh_CN.png b/app/assets/javascripts/kindeditor/plugins/multiimage/images/select-files-zh_CN.png
similarity index 100%
rename from public/assets/kindeditor/plugins/multiimage/images/select-files-zh_CN.png
rename to app/assets/javascripts/kindeditor/plugins/multiimage/images/select-files-zh_CN.png
diff --git a/public/assets/kindeditor/plugins/multiimage/images/swfupload.swf b/app/assets/javascripts/kindeditor/plugins/multiimage/images/swfupload.swf
similarity index 100%
rename from public/assets/kindeditor/plugins/multiimage/images/swfupload.swf
rename to app/assets/javascripts/kindeditor/plugins/multiimage/images/swfupload.swf
diff --git a/public/assets/kindeditor/plugins/multiimage/multiimage.js b/app/assets/javascripts/kindeditor/plugins/multiimage/multiimage.js
similarity index 100%
rename from public/assets/kindeditor/plugins/multiimage/multiimage.js
rename to app/assets/javascripts/kindeditor/plugins/multiimage/multiimage.js
diff --git a/public/assets/kindeditor/plugins/pagebreak/pagebreak.js b/app/assets/javascripts/kindeditor/plugins/pagebreak/pagebreak.js
similarity index 100%
rename from public/assets/kindeditor/plugins/pagebreak/pagebreak.js
rename to app/assets/javascripts/kindeditor/plugins/pagebreak/pagebreak.js
diff --git a/public/assets/kindeditor/plugins/plainpaste/plainpaste.js b/app/assets/javascripts/kindeditor/plugins/plainpaste/plainpaste.js
similarity index 100%
rename from public/assets/kindeditor/plugins/plainpaste/plainpaste.js
rename to app/assets/javascripts/kindeditor/plugins/plainpaste/plainpaste.js
diff --git a/public/assets/kindeditor/plugins/preview/preview.js b/app/assets/javascripts/kindeditor/plugins/preview/preview.js
similarity index 100%
rename from public/assets/kindeditor/plugins/preview/preview.js
rename to app/assets/javascripts/kindeditor/plugins/preview/preview.js
diff --git a/public/assets/kindeditor/plugins/quickformat/quickformat.js b/app/assets/javascripts/kindeditor/plugins/quickformat/quickformat.js
similarity index 100%
rename from public/assets/kindeditor/plugins/quickformat/quickformat.js
rename to app/assets/javascripts/kindeditor/plugins/quickformat/quickformat.js
diff --git a/public/assets/kindeditor/plugins/table/table.js b/app/assets/javascripts/kindeditor/plugins/table/table.js
similarity index 100%
rename from public/assets/kindeditor/plugins/table/table.js
rename to app/assets/javascripts/kindeditor/plugins/table/table.js
diff --git a/public/assets/kindeditor/plugins/template/html/1.html b/app/assets/javascripts/kindeditor/plugins/template/html/1.html
similarity index 100%
rename from public/assets/kindeditor/plugins/template/html/1.html
rename to app/assets/javascripts/kindeditor/plugins/template/html/1.html
diff --git a/public/assets/kindeditor/plugins/template/html/2.html b/app/assets/javascripts/kindeditor/plugins/template/html/2.html
similarity index 100%
rename from public/assets/kindeditor/plugins/template/html/2.html
rename to app/assets/javascripts/kindeditor/plugins/template/html/2.html
diff --git a/public/assets/kindeditor/plugins/template/html/3.html b/app/assets/javascripts/kindeditor/plugins/template/html/3.html
similarity index 100%
rename from public/assets/kindeditor/plugins/template/html/3.html
rename to app/assets/javascripts/kindeditor/plugins/template/html/3.html
diff --git a/public/assets/kindeditor/plugins/template/template.js b/app/assets/javascripts/kindeditor/plugins/template/template.js
similarity index 100%
rename from public/assets/kindeditor/plugins/template/template.js
rename to app/assets/javascripts/kindeditor/plugins/template/template.js
diff --git a/public/assets/kindeditor/plugins/wordpaste/wordpaste.js b/app/assets/javascripts/kindeditor/plugins/wordpaste/wordpaste.js
similarity index 100%
rename from public/assets/kindeditor/plugins/wordpaste/wordpaste.js
rename to app/assets/javascripts/kindeditor/plugins/wordpaste/wordpaste.js
diff --git a/public/assets/kindeditor/themes/common/anchor.gif b/app/assets/javascripts/kindeditor/themes/common/anchor.gif
similarity index 100%
rename from public/assets/kindeditor/themes/common/anchor.gif
rename to app/assets/javascripts/kindeditor/themes/common/anchor.gif
diff --git a/public/assets/kindeditor/themes/common/blank.gif b/app/assets/javascripts/kindeditor/themes/common/blank.gif
similarity index 100%
rename from public/assets/kindeditor/themes/common/blank.gif
rename to app/assets/javascripts/kindeditor/themes/common/blank.gif
diff --git a/public/assets/kindeditor/themes/common/flash.gif b/app/assets/javascripts/kindeditor/themes/common/flash.gif
similarity index 100%
rename from public/assets/kindeditor/themes/common/flash.gif
rename to app/assets/javascripts/kindeditor/themes/common/flash.gif
diff --git a/public/assets/kindeditor/themes/common/loading.gif b/app/assets/javascripts/kindeditor/themes/common/loading.gif
similarity index 100%
rename from public/assets/kindeditor/themes/common/loading.gif
rename to app/assets/javascripts/kindeditor/themes/common/loading.gif
diff --git a/public/assets/kindeditor/themes/common/media.gif b/app/assets/javascripts/kindeditor/themes/common/media.gif
similarity index 100%
rename from public/assets/kindeditor/themes/common/media.gif
rename to app/assets/javascripts/kindeditor/themes/common/media.gif
diff --git a/public/assets/kindeditor/themes/common/rm.gif b/app/assets/javascripts/kindeditor/themes/common/rm.gif
similarity index 100%
rename from public/assets/kindeditor/themes/common/rm.gif
rename to app/assets/javascripts/kindeditor/themes/common/rm.gif
diff --git a/public/assets/kindeditor/themes/default/background.png b/app/assets/javascripts/kindeditor/themes/default/background.png
similarity index 100%
rename from public/assets/kindeditor/themes/default/background.png
rename to app/assets/javascripts/kindeditor/themes/default/background.png
diff --git a/public/assets/kindeditor/themes/default/default.css b/app/assets/javascripts/kindeditor/themes/default/default.css
similarity index 100%
rename from public/assets/kindeditor/themes/default/default.css
rename to app/assets/javascripts/kindeditor/themes/default/default.css
diff --git a/public/assets/kindeditor/themes/default/default.png b/app/assets/javascripts/kindeditor/themes/default/default.png
similarity index 100%
rename from public/assets/kindeditor/themes/default/default.png
rename to app/assets/javascripts/kindeditor/themes/default/default.png
diff --git a/public/assets/kindeditor/themes/qq/editor.gif b/app/assets/javascripts/kindeditor/themes/qq/editor.gif
similarity index 100%
rename from public/assets/kindeditor/themes/qq/editor.gif
rename to app/assets/javascripts/kindeditor/themes/qq/editor.gif
diff --git a/public/assets/kindeditor/themes/qq/qq.css b/app/assets/javascripts/kindeditor/themes/qq/qq.css
similarity index 100%
rename from public/assets/kindeditor/themes/qq/qq.css
rename to app/assets/javascripts/kindeditor/themes/qq/qq.css
diff --git a/public/assets/kindeditor/themes/simple/simple.css b/app/assets/javascripts/kindeditor/themes/simple/simple.css
similarity index 100%
rename from public/assets/kindeditor/themes/simple/simple.css
rename to app/assets/javascripts/kindeditor/themes/simple/simple.css
diff --git a/app/assets/javascripts/memos.js b/app/assets/javascripts/memos.js
deleted file mode 100644
index dee720fac..000000000
--- a/app/assets/javascripts/memos.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.
diff --git a/public/javascripts/new_user.js b/app/assets/javascripts/new_user.js
similarity index 100%
rename from public/javascripts/new_user.js
rename to app/assets/javascripts/new_user.js
diff --git a/app/assets/javascripts/no_uses.js b/app/assets/javascripts/no_uses.js
deleted file mode 100644
index dee720fac..000000000
--- a/app/assets/javascripts/no_uses.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.
diff --git a/app/assets/javascripts/notificationcomments.js.coffee b/app/assets/javascripts/notificationcomments.js.coffee
deleted file mode 100644
index 761567942..000000000
--- a/app/assets/javascripts/notificationcomments.js.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/javascripts/open_source_projects.js b/app/assets/javascripts/open_source_projects.js
deleted file mode 100644
index dee720fac..000000000
--- a/app/assets/javascripts/open_source_projects.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.
diff --git a/public/javascripts/org.js b/app/assets/javascripts/org.js
similarity index 100%
rename from public/javascripts/org.js
rename to app/assets/javascripts/org.js
diff --git a/app/assets/javascripts/org_document_comment.js.coffee b/app/assets/javascripts/org_document_comment.js.coffee
deleted file mode 100644
index 761567942..000000000
--- a/app/assets/javascripts/org_document_comment.js.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/javascripts/org_member.js.coffee b/app/assets/javascripts/org_member.js.coffee
deleted file mode 100644
index 761567942..000000000
--- a/app/assets/javascripts/org_member.js.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/javascripts/org_projects.js.coffee b/app/assets/javascripts/org_projects.js.coffee
deleted file mode 100644
index 761567942..000000000
--- a/app/assets/javascripts/org_projects.js.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/javascripts/organizations.js.coffee b/app/assets/javascripts/organizations.js.coffee
deleted file mode 100644
index 761567942..000000000
--- a/app/assets/javascripts/organizations.js.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/public/javascripts/paste.js b/app/assets/javascripts/paste.js
similarity index 100%
rename from public/javascripts/paste.js
rename to app/assets/javascripts/paste.js
diff --git a/app/assets/javascripts/praise_tread.js b/app/assets/javascripts/praise_tread.js
deleted file mode 100644
index dee720fac..000000000
--- a/app/assets/javascripts/praise_tread.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.
diff --git a/public/javascripts/prettify.js b/app/assets/javascripts/prettify.js
similarity index 100%
rename from public/javascripts/prettify.js
rename to app/assets/javascripts/prettify.js
diff --git a/public/javascripts/project.js b/app/assets/javascripts/project.js
similarity index 100%
rename from public/javascripts/project.js
rename to app/assets/javascripts/project.js
diff --git a/public/javascripts/project_identifier.js b/app/assets/javascripts/project_identifier.js
similarity index 100%
rename from public/javascripts/project_identifier.js
rename to app/assets/javascripts/project_identifier.js
diff --git a/public/javascripts/raphael.js b/app/assets/javascripts/raphael.js
similarity index 100%
rename from public/javascripts/raphael.js
rename to app/assets/javascripts/raphael.js
diff --git a/public/javascripts/repository_navigation.js b/app/assets/javascripts/repository_navigation.js
similarity index 100%
rename from public/javascripts/repository_navigation.js
rename to app/assets/javascripts/repository_navigation.js
diff --git a/public/javascripts/revision_graph.js b/app/assets/javascripts/revision_graph.js
similarity index 100%
rename from public/javascripts/revision_graph.js
rename to app/assets/javascripts/revision_graph.js
diff --git a/app/assets/javascripts/school.js b/app/assets/javascripts/school.js
deleted file mode 100644
index dee720fac..000000000
--- a/app/assets/javascripts/school.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.
diff --git a/public/javascripts/seems_rateable/jRating.js b/app/assets/javascripts/seems_rateable/jRating.js
similarity index 100%
rename from public/javascripts/seems_rateable/jRating.js
rename to app/assets/javascripts/seems_rateable/jRating.js
diff --git a/public/javascripts/seems_rateable/rateable.js b/app/assets/javascripts/seems_rateable/rateable.js
similarity index 100%
rename from public/javascripts/seems_rateable/rateable.js
rename to app/assets/javascripts/seems_rateable/rateable.js
diff --git a/public/javascripts/select_list_move.js b/app/assets/javascripts/select_list_move.js
similarity index 100%
rename from public/javascripts/select_list_move.js
rename to app/assets/javascripts/select_list_move.js
diff --git a/app/assets/javascripts/shares.js b/app/assets/javascripts/shares.js
deleted file mode 100644
index dee720fac..000000000
--- a/app/assets/javascripts/shares.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.
diff --git a/public/javascripts/sidebar.js b/app/assets/javascripts/sidebar.js
similarity index 100%
rename from public/javascripts/sidebar.js
rename to app/assets/javascripts/sidebar.js
diff --git a/app/assets/javascripts/softapplications.js b/app/assets/javascripts/softapplications.js
deleted file mode 100644
index dee720fac..000000000
--- a/app/assets/javascripts/softapplications.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.
diff --git a/app/assets/javascripts/system_log.js.coffee b/app/assets/javascripts/system_log.js.coffee
deleted file mode 100644
index 761567942..000000000
--- a/app/assets/javascripts/system_log.js.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/javascripts/system_messages.js.coffee b/app/assets/javascripts/system_messages.js.coffee
deleted file mode 100644
index 761567942..000000000
--- a/app/assets/javascripts/system_messages.js.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/javascripts/teachers.js b/app/assets/javascripts/teachers.js
deleted file mode 100644
index dee720fac..000000000
--- a/app/assets/javascripts/teachers.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.
diff --git a/public/javascripts/user.js b/app/assets/javascripts/user.js
similarity index 100%
rename from public/javascripts/user.js
rename to app/assets/javascripts/user.js
diff --git a/public/javascripts/welcome.js b/app/assets/javascripts/welcome.js
similarity index 100%
rename from public/javascripts/welcome.js
rename to app/assets/javascripts/welcome.js
diff --git a/app/assets/javascripts/zipdown.js b/app/assets/javascripts/zipdown.js
deleted file mode 100644
index dee720fac..000000000
--- a/app/assets/javascripts/zipdown.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.
diff --git a/public/stylesheets/application.css b/app/assets/stylesheets/application.css
similarity index 100%
rename from public/stylesheets/application.css
rename to app/assets/stylesheets/application.css
diff --git a/app/assets/stylesheets/applied_project.css b/app/assets/stylesheets/applied_project.css
deleted file mode 100644
index afad32db0..000000000
--- a/app/assets/stylesheets/applied_project.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- Place all the styles related to the matching controller here.
- They will automatically be included in application.css.
-*/
diff --git a/app/assets/stylesheets/apply_project_masters.css b/app/assets/stylesheets/apply_project_masters.css
deleted file mode 100644
index afad32db0..000000000
--- a/app/assets/stylesheets/apply_project_masters.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- Place all the styles related to the matching controller here.
- They will automatically be included in application.css.
-*/
diff --git a/app/assets/stylesheets/attachment_type_edit.css b/app/assets/stylesheets/attachment_type_edit.css
deleted file mode 100644
index afad32db0..000000000
--- a/app/assets/stylesheets/attachment_type_edit.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- Place all the styles related to the matching controller here.
- They will automatically be included in application.css.
-*/
diff --git a/public/stylesheets/base.css b/app/assets/stylesheets/base.css
similarity index 100%
rename from public/stylesheets/base.css
rename to app/assets/stylesheets/base.css
diff --git a/public/stylesheets/bootstrap.css b/app/assets/stylesheets/bootstrap.css
similarity index 100%
rename from public/stylesheets/bootstrap.css
rename to app/assets/stylesheets/bootstrap.css
diff --git a/public/stylesheets/bootstrap/bootstrap-theme.min.css b/app/assets/stylesheets/bootstrap/bootstrap-theme.min.css
similarity index 100%
rename from public/stylesheets/bootstrap/bootstrap-theme.min.css
rename to app/assets/stylesheets/bootstrap/bootstrap-theme.min.css
diff --git a/public/stylesheets/bootstrap/bootstrap.min.css b/app/assets/stylesheets/bootstrap/bootstrap.min.css
similarity index 100%
rename from public/stylesheets/bootstrap/bootstrap.min.css
rename to app/assets/stylesheets/bootstrap/bootstrap.min.css
diff --git a/public/stylesheets/bootstrap_custom.css b/app/assets/stylesheets/bootstrap_custom.css
similarity index 100%
rename from public/stylesheets/bootstrap_custom.css
rename to app/assets/stylesheets/bootstrap_custom.css
diff --git a/public/stylesheets/buglist-div-use.css b/app/assets/stylesheets/buglist-div-use.css
similarity index 100%
rename from public/stylesheets/buglist-div-use.css
rename to app/assets/stylesheets/buglist-div-use.css
diff --git a/public/stylesheets/buglist-ichart.css b/app/assets/stylesheets/buglist-ichart.css
similarity index 100%
rename from public/stylesheets/buglist-ichart.css
rename to app/assets/stylesheets/buglist-ichart.css
diff --git a/public/stylesheets/buglist.css b/app/assets/stylesheets/buglist.css
similarity index 100%
rename from public/stylesheets/buglist.css
rename to app/assets/stylesheets/buglist.css
diff --git a/app/assets/stylesheets/contestnotifications.css b/app/assets/stylesheets/contestnotifications.css
deleted file mode 100644
index afad32db0..000000000
--- a/app/assets/stylesheets/contestnotifications.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- Place all the styles related to the matching controller here.
- They will automatically be included in application.css.
-*/
diff --git a/public/stylesheets/context_menu.css b/app/assets/stylesheets/context_menu.css
similarity index 100%
rename from public/stylesheets/context_menu.css
rename to app/assets/stylesheets/context_menu.css
diff --git a/public/stylesheets/context_menu_rtl.css b/app/assets/stylesheets/context_menu_rtl.css
similarity index 100%
rename from public/stylesheets/context_menu_rtl.css
rename to app/assets/stylesheets/context_menu_rtl.css
diff --git a/public/stylesheets/course_group.css b/app/assets/stylesheets/course_group.css
similarity index 100%
rename from public/stylesheets/course_group.css
rename to app/assets/stylesheets/course_group.css
diff --git a/public/stylesheets/courses.css b/app/assets/stylesheets/courses.css
similarity index 100%
rename from public/stylesheets/courses.css
rename to app/assets/stylesheets/courses.css
diff --git a/public/stylesheets/css.css b/app/assets/stylesheets/css.css
similarity index 100%
rename from public/stylesheets/css.css
rename to app/assets/stylesheets/css.css
diff --git a/app/assets/stylesheets/enterprises.css.scss b/app/assets/stylesheets/enterprises.css.scss
deleted file mode 100644
index 174f3a2ec..000000000
--- a/app/assets/stylesheets/enterprises.css.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the Enterprises controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/forums.css b/app/assets/stylesheets/forums.css
deleted file mode 100644
index afad32db0..000000000
--- a/app/assets/stylesheets/forums.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- Place all the styles related to the matching controller here.
- They will automatically be included in application.css.
-*/
diff --git a/public/stylesheets/header.css b/app/assets/stylesheets/header.css
similarity index 100%
rename from public/stylesheets/header.css
rename to app/assets/stylesheets/header.css
diff --git a/public/stylesheets/hubspot/messenger-theme-flat.css b/app/assets/stylesheets/hubspot/messenger-theme-flat.css
similarity index 100%
rename from public/stylesheets/hubspot/messenger-theme-flat.css
rename to app/assets/stylesheets/hubspot/messenger-theme-flat.css
diff --git a/public/stylesheets/hubspot/messenger-theme-future.css b/app/assets/stylesheets/hubspot/messenger-theme-future.css
similarity index 100%
rename from public/stylesheets/hubspot/messenger-theme-future.css
rename to app/assets/stylesheets/hubspot/messenger-theme-future.css
diff --git a/public/stylesheets/hubspot/messenger.css b/app/assets/stylesheets/hubspot/messenger.css
similarity index 100%
rename from public/stylesheets/hubspot/messenger.css
rename to app/assets/stylesheets/hubspot/messenger.css
diff --git a/public/stylesheets/images/225905790.jpg b/app/assets/stylesheets/images/225905790.jpg
similarity index 100%
rename from public/stylesheets/images/225905790.jpg
rename to app/assets/stylesheets/images/225905790.jpg
diff --git a/public/stylesheets/images/btn.png b/app/assets/stylesheets/images/btn.png
similarity index 100%
rename from public/stylesheets/images/btn.png
rename to app/assets/stylesheets/images/btn.png
diff --git a/public/stylesheets/images/close.png b/app/assets/stylesheets/images/close.png
similarity index 100%
rename from public/stylesheets/images/close.png
rename to app/assets/stylesheets/images/close.png
diff --git a/public/stylesheets/images/homepage_icon.png b/app/assets/stylesheets/images/homepage_icon.png
similarity index 100%
rename from public/stylesheets/images/homepage_icon.png
rename to app/assets/stylesheets/images/homepage_icon.png
diff --git a/public/stylesheets/images/homepage_icon2.png b/app/assets/stylesheets/images/homepage_icon2.png
similarity index 100%
rename from public/stylesheets/images/homepage_icon2.png
rename to app/assets/stylesheets/images/homepage_icon2.png
diff --git a/public/stylesheets/images/icons.png b/app/assets/stylesheets/images/icons.png
similarity index 100%
rename from public/stylesheets/images/icons.png
rename to app/assets/stylesheets/images/icons.png
diff --git a/public/stylesheets/images/img_floatbox.png b/app/assets/stylesheets/images/img_floatbox.png
similarity index 100%
rename from public/stylesheets/images/img_floatbox.png
rename to app/assets/stylesheets/images/img_floatbox.png
diff --git a/public/stylesheets/images/inputBg.png b/app/assets/stylesheets/images/inputBg.png
similarity index 100%
rename from public/stylesheets/images/inputBg.png
rename to app/assets/stylesheets/images/inputBg.png
diff --git a/public/stylesheets/images/nav_icon.png b/app/assets/stylesheets/images/nav_icon.png
similarity index 100%
rename from public/stylesheets/images/nav_icon.png
rename to app/assets/stylesheets/images/nav_icon.png
diff --git a/public/stylesheets/images/pic_ad.png b/app/assets/stylesheets/images/pic_ad.png
similarity index 100%
rename from public/stylesheets/images/pic_ad.png
rename to app/assets/stylesheets/images/pic_ad.png
diff --git a/public/stylesheets/images/pic_down.png b/app/assets/stylesheets/images/pic_down.png
similarity index 100%
rename from public/stylesheets/images/pic_down.png
rename to app/assets/stylesheets/images/pic_down.png
diff --git a/public/stylesheets/images/pic_ni.jpg b/app/assets/stylesheets/images/pic_ni.jpg
similarity index 100%
rename from public/stylesheets/images/pic_ni.jpg
rename to app/assets/stylesheets/images/pic_ni.jpg
diff --git a/public/stylesheets/images/pic_open01.png b/app/assets/stylesheets/images/pic_open01.png
similarity index 100%
rename from public/stylesheets/images/pic_open01.png
rename to app/assets/stylesheets/images/pic_open01.png
diff --git a/public/stylesheets/images/pic_open02.png b/app/assets/stylesheets/images/pic_open02.png
similarity index 100%
rename from public/stylesheets/images/pic_open02.png
rename to app/assets/stylesheets/images/pic_open02.png
diff --git a/public/stylesheets/images/pic_question.png b/app/assets/stylesheets/images/pic_question.png
similarity index 100%
rename from public/stylesheets/images/pic_question.png
rename to app/assets/stylesheets/images/pic_question.png
diff --git a/public/stylesheets/images/pic_select01.png b/app/assets/stylesheets/images/pic_select01.png
similarity index 100%
rename from public/stylesheets/images/pic_select01.png
rename to app/assets/stylesheets/images/pic_select01.png
diff --git a/public/stylesheets/images/pic_select02.png b/app/assets/stylesheets/images/pic_select02.png
similarity index 100%
rename from public/stylesheets/images/pic_select02.png
rename to app/assets/stylesheets/images/pic_select02.png
diff --git a/public/stylesheets/images/pic_top.jpg b/app/assets/stylesheets/images/pic_top.jpg
similarity index 100%
rename from public/stylesheets/images/pic_top.jpg
rename to app/assets/stylesheets/images/pic_top.jpg
diff --git a/public/stylesheets/images/pic_zan.png b/app/assets/stylesheets/images/pic_zan.png
similarity index 100%
rename from public/stylesheets/images/pic_zan.png
rename to app/assets/stylesheets/images/pic_zan.png
diff --git a/public/stylesheets/images/post_image_list.png b/app/assets/stylesheets/images/post_image_list.png
similarity index 100%
rename from public/stylesheets/images/post_image_list.png
rename to app/assets/stylesheets/images/post_image_list.png
diff --git a/public/stylesheets/images/resourceSearch_03.png b/app/assets/stylesheets/images/resourceSearch_03.png
similarity index 100%
rename from public/stylesheets/images/resourceSearch_03.png
rename to app/assets/stylesheets/images/resourceSearch_03.png
diff --git a/public/stylesheets/images/resourceSelect_03.png b/app/assets/stylesheets/images/resourceSelect_03.png
similarity index 100%
rename from public/stylesheets/images/resourceSelect_03.png
rename to app/assets/stylesheets/images/resourceSelect_03.png
diff --git a/public/stylesheets/images/resourceSelected_03.png b/app/assets/stylesheets/images/resourceSelected_03.png
similarity index 100%
rename from public/stylesheets/images/resourceSelected_03.png
rename to app/assets/stylesheets/images/resourceSelected_03.png
diff --git a/public/stylesheets/images/resourceUplaod_03.png b/app/assets/stylesheets/images/resourceUplaod_03.png
similarity index 100%
rename from public/stylesheets/images/resourceUplaod_03.png
rename to app/assets/stylesheets/images/resourceUplaod_03.png
diff --git a/public/stylesheets/images/resource_icon_list.png b/app/assets/stylesheets/images/resource_icon_list.png
similarity index 100%
rename from public/stylesheets/images/resource_icon_list.png
rename to app/assets/stylesheets/images/resource_icon_list.png
diff --git a/public/stylesheets/images/star.png b/app/assets/stylesheets/images/star.png
similarity index 100%
rename from public/stylesheets/images/star.png
rename to app/assets/stylesheets/images/star.png
diff --git a/public/stylesheets/jquery/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/app/assets/stylesheets/jquery/images/ui-bg_diagonals-thick_18_b81900_40x40.png
similarity index 100%
rename from public/stylesheets/jquery/images/ui-bg_diagonals-thick_18_b81900_40x40.png
rename to app/assets/stylesheets/jquery/images/ui-bg_diagonals-thick_18_b81900_40x40.png
diff --git a/public/stylesheets/jquery/images/ui-bg_diagonals-thick_20_666666_40x40.png b/app/assets/stylesheets/jquery/images/ui-bg_diagonals-thick_20_666666_40x40.png
similarity index 100%
rename from public/stylesheets/jquery/images/ui-bg_diagonals-thick_20_666666_40x40.png
rename to app/assets/stylesheets/jquery/images/ui-bg_diagonals-thick_20_666666_40x40.png
diff --git a/public/stylesheets/jquery/images/ui-bg_flat_10_000000_40x100.png b/app/assets/stylesheets/jquery/images/ui-bg_flat_10_000000_40x100.png
similarity index 100%
rename from public/stylesheets/jquery/images/ui-bg_flat_10_000000_40x100.png
rename to app/assets/stylesheets/jquery/images/ui-bg_flat_10_000000_40x100.png
diff --git a/public/stylesheets/jquery/images/ui-bg_glass_100_eef5fd_1x400.png b/app/assets/stylesheets/jquery/images/ui-bg_glass_100_eef5fd_1x400.png
similarity index 100%
rename from public/stylesheets/jquery/images/ui-bg_glass_100_eef5fd_1x400.png
rename to app/assets/stylesheets/jquery/images/ui-bg_glass_100_eef5fd_1x400.png
diff --git a/public/stylesheets/jquery/images/ui-bg_glass_100_f6f6f6_1x400.png b/app/assets/stylesheets/jquery/images/ui-bg_glass_100_f6f6f6_1x400.png
similarity index 100%
rename from public/stylesheets/jquery/images/ui-bg_glass_100_f6f6f6_1x400.png
rename to app/assets/stylesheets/jquery/images/ui-bg_glass_100_f6f6f6_1x400.png
diff --git a/public/stylesheets/jquery/images/ui-bg_glass_65_ffffff_1x400.png b/app/assets/stylesheets/jquery/images/ui-bg_glass_65_ffffff_1x400.png
similarity index 100%
rename from public/stylesheets/jquery/images/ui-bg_glass_65_ffffff_1x400.png
rename to app/assets/stylesheets/jquery/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/public/stylesheets/jquery/images/ui-bg_gloss-wave_35_759fcf_500x100.png b/app/assets/stylesheets/jquery/images/ui-bg_gloss-wave_35_759fcf_500x100.png
similarity index 100%
rename from public/stylesheets/jquery/images/ui-bg_gloss-wave_35_759fcf_500x100.png
rename to app/assets/stylesheets/jquery/images/ui-bg_gloss-wave_35_759fcf_500x100.png
diff --git a/public/stylesheets/jquery/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/app/assets/stylesheets/jquery/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
similarity index 100%
rename from public/stylesheets/jquery/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
rename to app/assets/stylesheets/jquery/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
diff --git a/public/stylesheets/jquery/images/ui-bg_highlight-soft_75_759fcf_1x100.png b/app/assets/stylesheets/jquery/images/ui-bg_highlight-soft_75_759fcf_1x100.png
similarity index 100%
rename from public/stylesheets/jquery/images/ui-bg_highlight-soft_75_759fcf_1x100.png
rename to app/assets/stylesheets/jquery/images/ui-bg_highlight-soft_75_759fcf_1x100.png
diff --git a/public/stylesheets/jquery/images/ui-icons_222222_256x240.png b/app/assets/stylesheets/jquery/images/ui-icons_222222_256x240.png
similarity index 100%
rename from public/stylesheets/jquery/images/ui-icons_222222_256x240.png
rename to app/assets/stylesheets/jquery/images/ui-icons_222222_256x240.png
diff --git a/public/stylesheets/jquery/images/ui-icons_759fcf_256x240.png b/app/assets/stylesheets/jquery/images/ui-icons_759fcf_256x240.png
similarity index 100%
rename from public/stylesheets/jquery/images/ui-icons_759fcf_256x240.png
rename to app/assets/stylesheets/jquery/images/ui-icons_759fcf_256x240.png
diff --git a/public/stylesheets/jquery/images/ui-icons_ffd27a_256x240.png b/app/assets/stylesheets/jquery/images/ui-icons_ffd27a_256x240.png
similarity index 100%
rename from public/stylesheets/jquery/images/ui-icons_ffd27a_256x240.png
rename to app/assets/stylesheets/jquery/images/ui-icons_ffd27a_256x240.png
diff --git a/public/stylesheets/jquery/images/ui-icons_ffffff_256x240.png b/app/assets/stylesheets/jquery/images/ui-icons_ffffff_256x240.png
similarity index 100%
rename from public/stylesheets/jquery/images/ui-icons_ffffff_256x240.png
rename to app/assets/stylesheets/jquery/images/ui-icons_ffffff_256x240.png
diff --git a/public/stylesheets/jquery/jquery-ui-1.9.2.css b/app/assets/stylesheets/jquery/jquery-ui-1.9.2.css
similarity index 100%
rename from public/stylesheets/jquery/jquery-ui-1.9.2.css
rename to app/assets/stylesheets/jquery/jquery-ui-1.9.2.css
diff --git a/public/stylesheets/jstoolbar.css b/app/assets/stylesheets/jstoolbar.css
similarity index 100%
rename from public/stylesheets/jstoolbar.css
rename to app/assets/stylesheets/jstoolbar.css
diff --git a/public/stylesheets/leftside.css b/app/assets/stylesheets/leftside.css
similarity index 100%
rename from public/stylesheets/leftside.css
rename to app/assets/stylesheets/leftside.css
diff --git a/public/stylesheets/leftside_new.css b/app/assets/stylesheets/leftside_new.css
similarity index 100%
rename from public/stylesheets/leftside_new.css
rename to app/assets/stylesheets/leftside_new.css
diff --git a/app/assets/stylesheets/memos.css b/app/assets/stylesheets/memos.css
deleted file mode 100644
index afad32db0..000000000
--- a/app/assets/stylesheets/memos.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- Place all the styles related to the matching controller here.
- They will automatically be included in application.css.
-*/
diff --git a/public/stylesheets/new_user.css b/app/assets/stylesheets/new_user.css
similarity index 100%
rename from public/stylesheets/new_user.css
rename to app/assets/stylesheets/new_user.css
diff --git a/app/assets/stylesheets/no_uses.css b/app/assets/stylesheets/no_uses.css
deleted file mode 100644
index afad32db0..000000000
--- a/app/assets/stylesheets/no_uses.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- Place all the styles related to the matching controller here.
- They will automatically be included in application.css.
-*/
diff --git a/app/assets/stylesheets/notificationcomments.css.scss b/app/assets/stylesheets/notificationcomments.css.scss
deleted file mode 100644
index aea714e47..000000000
--- a/app/assets/stylesheets/notificationcomments.css.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the notificationcomments controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/public/stylesheets/nyan.css b/app/assets/stylesheets/nyan.css
similarity index 100%
rename from public/stylesheets/nyan.css
rename to app/assets/stylesheets/nyan.css
diff --git a/app/assets/stylesheets/open_source_projects.css b/app/assets/stylesheets/open_source_projects.css
deleted file mode 100644
index afad32db0..000000000
--- a/app/assets/stylesheets/open_source_projects.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- Place all the styles related to the matching controller here.
- They will automatically be included in application.css.
-*/
diff --git a/public/stylesheets/org.css b/app/assets/stylesheets/org.css
similarity index 100%
rename from public/stylesheets/org.css
rename to app/assets/stylesheets/org.css
diff --git a/app/assets/stylesheets/org_document_comment.css.scss b/app/assets/stylesheets/org_document_comment.css.scss
deleted file mode 100644
index 9359415ae..000000000
--- a/app/assets/stylesheets/org_document_comment.css.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the org_document_comment controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/org_member.css.scss b/app/assets/stylesheets/org_member.css.scss
deleted file mode 100644
index 4bab7e008..000000000
--- a/app/assets/stylesheets/org_member.css.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the OrgMember controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/org_projects.css.scss b/app/assets/stylesheets/org_projects.css.scss
deleted file mode 100644
index 12f4fef6a..000000000
--- a/app/assets/stylesheets/org_projects.css.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the org_projects controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/organizations.css.scss b/app/assets/stylesheets/organizations.css.scss
deleted file mode 100644
index 39819880e..000000000
--- a/app/assets/stylesheets/organizations.css.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the organizations controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/public/stylesheets/pleft.css b/app/assets/stylesheets/pleft.css
similarity index 100%
rename from public/stylesheets/pleft.css
rename to app/assets/stylesheets/pleft.css
diff --git a/public/stylesheets/polls.css b/app/assets/stylesheets/polls.css
similarity index 100%
rename from public/stylesheets/polls.css
rename to app/assets/stylesheets/polls.css
diff --git a/app/assets/stylesheets/praise_tread.css b/app/assets/stylesheets/praise_tread.css
deleted file mode 100644
index afad32db0..000000000
--- a/app/assets/stylesheets/praise_tread.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- Place all the styles related to the matching controller here.
- They will automatically be included in application.css.
-*/
diff --git a/public/stylesheets/prettify.css b/app/assets/stylesheets/prettify.css
similarity index 100%
rename from public/stylesheets/prettify.css
rename to app/assets/stylesheets/prettify.css
diff --git a/public/stylesheets/project.css b/app/assets/stylesheets/project.css
similarity index 100%
rename from public/stylesheets/project.css
rename to app/assets/stylesheets/project.css
diff --git a/public/stylesheets/public.css b/app/assets/stylesheets/public.css
similarity index 100%
rename from public/stylesheets/public.css
rename to app/assets/stylesheets/public.css
diff --git a/public/stylesheets/public_new.css b/app/assets/stylesheets/public_new.css
similarity index 100%
rename from public/stylesheets/public_new.css
rename to app/assets/stylesheets/public_new.css
diff --git a/public/stylesheets/repository.css b/app/assets/stylesheets/repository.css
similarity index 100%
rename from public/stylesheets/repository.css
rename to app/assets/stylesheets/repository.css
diff --git a/public/stylesheets/resource.css b/app/assets/stylesheets/resource.css
similarity index 100%
rename from public/stylesheets/resource.css
rename to app/assets/stylesheets/resource.css
diff --git a/public/stylesheets/rtl.css b/app/assets/stylesheets/rtl.css
similarity index 100%
rename from public/stylesheets/rtl.css
rename to app/assets/stylesheets/rtl.css
diff --git a/app/assets/stylesheets/scaffold.css b/app/assets/stylesheets/scaffold.css
deleted file mode 100644
index 1ae700029..000000000
--- a/app/assets/stylesheets/scaffold.css
+++ /dev/null
@@ -1,56 +0,0 @@
-body { background-color: #fff; color: #333; }
-
-body, p, ol, ul, td {
- font-family: verdana, arial, helvetica, sans-serif;
- font-size: 13px;
- line-height: 18px;
-}
-
-pre {
- background-color: #eee;
- padding: 10px;
- font-size: 11px;
-}
-
-a { color: #000; }
-a:visited { color: #666; }
-a:hover { color: #fff; background-color:#000; }
-
-div.field, div.actions {
- margin-bottom: 10px;
-}
-
-#notice {
- color: green;
-}
-
-.field_with_errors {
- padding: 2px;
- background-color: red;
- display: table;
-}
-
-#error_explanation {
- width: 450px;
- border: 2px solid red;
- padding: 7px;
- padding-bottom: 0;
- margin-bottom: 20px;
- background-color: #f0f0f0;
-}
-
-#error_explanation h2 {
- text-align: left;
- font-weight: bold;
- padding: 5px 5px 5px 15px;
- font-size: 12px;
- margin: -7px;
- margin-bottom: 0px;
- background-color: #c00;
- color: #fff;
-}
-
-#error_explanation ul li {
- font-size: 12px;
- list-style: square;
-}
diff --git a/app/assets/stylesheets/school.css b/app/assets/stylesheets/school.css
deleted file mode 100644
index afad32db0..000000000
--- a/app/assets/stylesheets/school.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- Place all the styles related to the matching controller here.
- They will automatically be included in application.css.
-*/
diff --git a/public/stylesheets/scm.css b/app/assets/stylesheets/scm.css
similarity index 100%
rename from public/stylesheets/scm.css
rename to app/assets/stylesheets/scm.css
diff --git a/public/stylesheets/sec-analysis.css b/app/assets/stylesheets/sec-analysis.css
similarity index 100%
rename from public/stylesheets/sec-analysis.css
rename to app/assets/stylesheets/sec-analysis.css
diff --git a/app/assets/stylesheets/shares.css b/app/assets/stylesheets/shares.css
deleted file mode 100644
index afad32db0..000000000
--- a/app/assets/stylesheets/shares.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- Place all the styles related to the matching controller here.
- They will automatically be included in application.css.
-*/
diff --git a/app/assets/stylesheets/softapplications.css b/app/assets/stylesheets/softapplications.css
deleted file mode 100644
index afad32db0..000000000
--- a/app/assets/stylesheets/softapplications.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- Place all the styles related to the matching controller here.
- They will automatically be included in application.css.
-*/
diff --git a/app/assets/stylesheets/system_log.css.scss b/app/assets/stylesheets/system_log.css.scss
deleted file mode 100644
index aa1f18587..000000000
--- a/app/assets/stylesheets/system_log.css.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the system_log controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/system_messages.css.scss b/app/assets/stylesheets/system_messages.css.scss
deleted file mode 100644
index a9947d45a..000000000
--- a/app/assets/stylesheets/system_messages.css.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the SystemMessages controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/teachers.css b/app/assets/stylesheets/teachers.css
deleted file mode 100644
index afad32db0..000000000
--- a/app/assets/stylesheets/teachers.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- Place all the styles related to the matching controller here.
- They will automatically be included in application.css.
-*/
diff --git a/public/stylesheets/user_leftside.css b/app/assets/stylesheets/user_leftside.css
similarity index 100%
rename from public/stylesheets/user_leftside.css
rename to app/assets/stylesheets/user_leftside.css
diff --git a/public/stylesheets/users.css b/app/assets/stylesheets/users.css
similarity index 100%
rename from public/stylesheets/users.css
rename to app/assets/stylesheets/users.css
diff --git a/public/stylesheets/welcome.css b/app/assets/stylesheets/welcome.css
similarity index 100%
rename from public/stylesheets/welcome.css
rename to app/assets/stylesheets/welcome.css
diff --git a/app/assets/stylesheets/zipdown.css b/app/assets/stylesheets/zipdown.css
deleted file mode 100644
index afad32db0..000000000
--- a/app/assets/stylesheets/zipdown.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- Place all the styles related to the matching controller here.
- They will automatically be included in application.css.
-*/
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f4e0f88ff..fa5b50f7b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1636,7 +1636,7 @@ module ApplicationHelper
# stylesheet_link_tag('styles') # => picks styles.css from the current theme or defaults
# stylesheet_link_tag('styles', :plugin => 'foo) # => picks styles.css from plugin's assets
#
- def stylesheet_link_tag(*sources)
+ def redmine_stylesheet_link_tag(*sources)
options = sources.last.is_a?(Hash) ? sources.pop : {}
plugin = options.delete(:plugin)
sources = sources.map do |source|
@@ -1656,7 +1656,7 @@ module ApplicationHelper
# image_tag('image.png') # => picks image.png from the current theme or defaults
# image_tag('image.png', :plugin => 'foo) # => picks image.png from plugin's assets
#
- def image_tag(source, options={})
+ def redmine_image_tag(source, options={})
if plugin = options.delete(:plugin)
source = "/plugin_assets/#{plugin}/images/#{source}"
elsif current_theme && current_theme.images.include?(source)
@@ -1670,7 +1670,7 @@ module ApplicationHelper
# javascript_include_tag('scripts') # => picks scripts.js from defaults
# javascript_include_tag('scripts', :plugin => 'foo) # => picks scripts.js from plugin's assets
#
- def javascript_include_tag(*sources)
+ def redmine_javascript_include_tag(*sources)
options = sources.last.is_a?(Hash) ? sources.pop : {}
if plugin = options.delete(:plugin)
sources = sources.map do |source|
@@ -1736,7 +1736,9 @@ module ApplicationHelper
# Returns the javascript tags that are included in the html layout head
def javascript_heads
- tags = javascript_include_tag('jquery-1.8.3-ui-1.9.2-ujs-2.0.3', 'application', 'jquery.colorbox-min')
+ tags = javascript_include_tag('jquery-1.8.3-ui-1.9.2-ujs-2.0.3', 'application', 'jquery.colorbox-min',
+ "kindeditor/kindeditor",'kindeditor/pasteimg',"init_activity_KindEditor"
+ )
unless User.current.pref.warn_on_leaving_unsaved == '0'
tags << "\n".html_safe + javascript_tag("$(window).load(function(){ warnLeavingUnsaved('#{escape_javascript l(:text_warn_on_leaving_unsaved)}'); });")
end
diff --git a/app/helpers/avatar_helper.rb b/app/helpers/avatar_helper.rb
index 3f6802f59..1b4f2f053 100644
--- a/app/helpers/avatar_helper.rb
+++ b/app/helpers/avatar_helper.rb
@@ -7,7 +7,7 @@ module AvatarHelper
end
def relative_path
- "avatars" #File.join("images","avatars")
+ File.join("/images","avatars")
end
def storage_path
diff --git a/app/views/admin/messages.html.erb b/app/views/admin/messages.html.erb
index f87741dd9..e688b6483 100644
--- a/app/views/admin/messages.html.erb
+++ b/app/views/admin/messages.html.erb
@@ -1,4 +1,3 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>
<%=l(:label_system_message)%>
diff --git a/app/views/bids/edit.html.erb b/app/views/bids/edit.html.erb
index 554702d97..f7e6976f8 100644
--- a/app/views/bids/edit.html.erb
+++ b/app/views/bids/edit.html.erb
@@ -1,4 +1,3 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'prettify','/assets/kindeditor/pasteimg' %>
<%= stylesheet_link_tag 'prettify'%>
<%= labelled_form_for @bid,:html => { :multipart => true } do |f| %>
<%= render :partial => 'new_homework_form', :locals => { :bid => @bid, :bid_id => "edit_bid_#{@bid.id}",:f=>f,:edit_mode => true} %>
diff --git a/app/views/blog_comments/_edit.html.erb b/app/views/blog_comments/_edit.html.erb
index 375c948d4..07fa702bd 100644
--- a/app/views/blog_comments/_edit.html.erb
+++ b/app/views/blog_comments/_edit.html.erb
@@ -1,4 +1,4 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' ,'blog' %>
+<%= javascript_include_tag 'blog' %>
diff --git a/app/views/blog_comments/_new.html.erb b/app/views/blog_comments/_new.html.erb
index 48f152c4e..ced59d046 100644
--- a/app/views/blog_comments/_new.html.erb
+++ b/app/views/blog_comments/_new.html.erb
@@ -1,4 +1,4 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' ,'blog' %>
+<%= javascript_include_tag 'blog' %>
diff --git a/app/views/blog_comments/_reply_form.html.erb b/app/views/blog_comments/_reply_form.html.erb
index cc4c0e952..9f2137553 100644
--- a/app/views/blog_comments/_reply_form.html.erb
+++ b/app/views/blog_comments/_reply_form.html.erb
@@ -1,4 +1,3 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>
<%= f.text_field :title, { size: 60, id: "message_subject",:class=>"talk_input w585 fl" }.merge({ hidden: "hidden"}) %>
diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb
index cf24f0f2d..5c4e7afce 100644
--- a/app/views/blog_comments/show.html.erb
+++ b/app/views/blog_comments/show.html.erb
@@ -1,4 +1,4 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor",'blog' %>
+<%= javascript_include_tag 'blog' %>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>
-<%#= javascript_include_tag "/assets/kindeditor/kindeditor-min" %>
<%= render :partial => 'blogs/article_list', :locals => {:blog=>@user.blog,:topics => @user.blog.articles.reorder("#{BlogComment.table_name}.sticky desc,#{BlogComment.table_name}.created_on desc"), :page => 0, :user => @user} %>
diff --git a/app/views/boards/_course_new.html.erb b/app/views/boards/_course_new.html.erb
index 61bbb85d2..f751ecd0f 100644
--- a/app/views/boards/_course_new.html.erb
+++ b/app/views/boards/_course_new.html.erb
@@ -1,4 +1,3 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>
<%= error_messages_for 'message' %>
diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index 3fb97bd9d..dddf98386 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -1,4 +1,3 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor", '/assets/kindeditor/pasteimg', "init_activity_KindEditor" %>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_KindEditor" %>
diff --git a/app/views/courses/syllabus.html.erb b/app/views/courses/syllabus.html.erb
index bb3421cba..13aa75f91 100644
--- a/app/views/courses/syllabus.html.erb
+++ b/app/views/courses/syllabus.html.erb
@@ -1,4 +1,4 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor",'blog' %>
+<%= javascript_include_tag 'blog' %>
- <%= image_tag('../images/avatars/Project/0', :class => 'avatar2') %>
+ <%= image_tag('/images/avatars/Project/0', :class => 'avatar2') %>
diff --git a/app/views/open_source_projects/_show_bug.html.erb b/app/views/open_source_projects/_show_bug.html.erb
index 43ea2eac7..737ec979a 100644
--- a/app/views/open_source_projects/_show_bug.html.erb
+++ b/app/views/open_source_projects/_show_bug.html.erb
@@ -10,7 +10,7 @@
| <%= link_to image_tag(url_to_avatar(topic.author), :class => "avatar"), user_path(topic.author) if topic.author%>
- <%= image_tag('../images/avatars/User/0', :class => "avatar") unless topic.author%> |
+ <%= image_tag('/images/avatars/User/0', :class => "avatar") unless topic.author%>
diff --git a/app/views/open_source_projects/_show_memo.html.erb b/app/views/open_source_projects/_show_memo.html.erb
index 6633ccd75..c72282b25 100644
--- a/app/views/open_source_projects/_show_memo.html.erb
+++ b/app/views/open_source_projects/_show_memo.html.erb
@@ -10,7 +10,7 @@
| <%= link_to image_tag(url_to_avatar(topic.author), :class => "avatar"), user_path(topic.author) if topic.author%>
- <%= image_tag('../images/avatars/User/0', :class => "avatar") unless topic.author%> |
+ <%= image_tag('/images/avatars/User/0', :class => "avatar") unless topic.author%>
diff --git a/app/views/open_source_projects/_show_topics.html.erb b/app/views/open_source_projects/_show_topics.html.erb
index 38f689244..6d20ccce8 100644
--- a/app/views/open_source_projects/_show_topics.html.erb
+++ b/app/views/open_source_projects/_show_topics.html.erb
@@ -412,7 +412,7 @@
| <%= link_to image_tag(url_to_avatar(topic.author), :class => "avatar"), user_path(topic.author) if topic.author%>
- <%= image_tag('../images/avatars/User/0', :class => "avatar") unless topic.author%> |
+ <%= image_tag('/images/avatars/User/0', :class => "avatar") unless topic.author%>
diff --git a/app/views/open_source_projects/allbug.html.erb b/app/views/open_source_projects/allbug.html.erb
index d5c0c2e55..b4c0e896b 100644
--- a/app/views/open_source_projects/allbug.html.erb
+++ b/app/views/open_source_projects/allbug.html.erb
@@ -14,7 +14,7 @@
| <%= link_to image_tag(url_to_avatar(topic.author), :class => "avatar"), user_path(topic.author) if topic.author%>
- <%= image_tag('../images/avatars/User/0', :class => "avatar") unless topic.author%> |
+ <%= image_tag('/images/avatars/User/0', :class => "avatar") unless topic.author%>
diff --git a/app/views/org_document_comments/_new.html.erb b/app/views/org_document_comments/_new.html.erb
index 3a3356c66..ed35cc663 100644
--- a/app/views/org_document_comments/_new.html.erb
+++ b/app/views/org_document_comments/_new.html.erb
@@ -1,4 +1,3 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%>
+<%= javascript_include_tag "i18n/jquery.ui.datepicker-zh-CN.js" %>
| | | |