/gi,"");
+ rep(/<\/p>/gi,"\n");
+ rep(/ |\u00a0/gi," ");
+ rep(/"/gi,"\"");
+ rep(/</gi,"<");
+ rep(/>/gi,">");
+ rep(/&/gi,"&");
+
+ // Hack to fix an annoying bug of TinyMCE where block formats don't
+ // work when forced_root_block = ''. So set forced_root_block = 'div'
+ // and then strip out the divs manually
+ rep(/
1){s(S,"rowSpan",O+1);continue}}else{if(M>0&&g[M-1][R]){V=g[M-1][R].elm;O=a(V,"rowSpan");if(O>1){s(V,"rowSpan",O+1);continue}}}N=f(S);s(N,"colSpan",S.colSpan);U.appendChild(N);P=S}}if(U.hasChildNodes()){if(!Q){G.insertAfter(U,T)}else{T.parentNode.insertBefore(U,T)}}}function h(N){var O,M;e(g,function(P,Q){e(P,function(S,R){if(j(S)){O=R;if(N){return false}}});if(N){return !O}});e(g,function(S,T){var P,Q,R;if(!S[O]){return}P=S[O].elm;if(P!=M){R=a(P,"colspan");Q=a(P,"rowspan");if(R==1){if(!N){G.insertAfter(f(P),P);u(O,T,Q-1,R)}else{P.parentNode.insertBefore(f(P),P);u(O,T,Q-1,R)}}else{s(P,"colSpan",P.colSpan+1)}M=P}})}function n(){var M=[];e(g,function(N,O){e(N,function(Q,P){if(j(Q)&&d.inArray(M,P)===-1){e(g,function(T){var R=T[P].elm,S;S=a(R,"colSpan");if(S>1){s(R,"colSpan",S-1)}else{G.remove(R)}});M.push(P)}})});q()}function m(){var N;function M(Q){var P,R,O;P=G.getNext(Q,"tr");e(Q.cells,function(S){var T=a(S,"rowSpan");if(T>1){s(S,"rowSpan",T-1);R=F(S);u(R.x,R.y,1,1)}});R=F(Q.cells[0]);e(g[R.y],function(S){var T;S=S.elm;if(S!=O){T=a(S,"rowSpan");if(T<=1){G.remove(S)}else{s(S,"rowSpan",T-1)}O=S}})}N=k();e(N.reverse(),function(O){M(O)});q()}function E(){var M=k();G.remove(M);q();return M}function J(){var M=k();e(M,function(O,N){M[N]=A(O,true)});return M}function B(O,N){var P=k(),M=P[N?0:P.length-1],Q=M.cells.length;e(g,function(S){var R;Q=0;e(S,function(U,T){if(U.real){Q+=U.colspan}if(U.elm.parentNode==M){R=1}});if(R){return false}});if(!N){O.reverse()}e(O,function(T){var S=T.cells.length,R;for(i=0;iN){N=R}if(Q>M){M=Q}if(S.real){U=S.colspan-1;T=S.rowspan-1;if(U){if(R+U>N){N=R+U}}if(T){if(Q+T>M){M=Q+T}}}}})});return{x:N,y:M}}function v(S){var P,O,U,T,N,M,Q,R;D=F(S);if(L&&D){P=Math.min(L.x,D.x);O=Math.min(L.y,D.y);U=Math.max(L.x,D.x);T=Math.max(L.y,D.y);N=U;M=T;for(y=O;y<=M;y++){S=g[y][P];if(!S.real){if(P-(S.colspan-1) N){N=x+Q}}if(R){if(y+R>M){M=y+R}}}}}G.removeClass(G.select("td.mceSelected,th.mceSelected"),"mceSelected");for(y=O;y<=M;y++){for(x=P;x<=N;x++){if(g[y][x]){G.addClass(g[y][x].elm,"mceSelected")}}}}}d.extend(this,{deleteTable:r,split:C,merge:p,insertRow:l,insertCol:h,deleteCols:n,deleteRows:m,cutRows:E,copyRows:J,pasteRows:B,getPos:F,setStartCell:w,setEndCell:v})}d.create("tinymce.plugins.TablePlugin",{init:function(g,h){var f,m,j=true;function l(p){var o=g.selection,n=g.dom.getParent(p||o.getNode(),"table");if(n){return new b(n,g.dom,o)}}function k(){g.getBody().style.webkitUserSelect="";if(j){g.dom.removeClass(g.dom.select("td.mceSelected,th.mceSelected"),"mceSelected");j=false}}e([["table","table.desc","mceInsertTable",true],["delete_table","table.del","mceTableDelete"],["delete_col","table.delete_col_desc","mceTableDeleteCol"],["delete_row","table.delete_row_desc","mceTableDeleteRow"],["col_after","table.col_after_desc","mceTableInsertColAfter"],["col_before","table.col_before_desc","mceTableInsertColBefore"],["row_after","table.row_after_desc","mceTableInsertRowAfter"],["row_before","table.row_before_desc","mceTableInsertRowBefore"],["row_props","table.row_desc","mceTableRowProps",true],["cell_props","table.cell_desc","mceTableCellProps",true],["split_cells","table.split_cells_desc","mceTableSplitCells",true],["merge_cells","table.merge_cells_desc","mceTableMergeCells",true]],function(n){g.addButton(n[0],{title:n[1],cmd:n[2],ui:n[3]})});if(!d.isIE){g.onClick.add(function(n,o){o=o.target;if(o.nodeName==="TABLE"){n.selection.select(o);n.nodeChanged()}})}g.onPreProcess.add(function(o,p){var n,q,r,t=o.dom,s;n=t.select("table",p.node);q=n.length;while(q--){r=n[q];t.setAttrib(r,"data-mce-style","");if((s=t.getAttrib(r,"width"))){t.setStyle(r,"width",s);t.setAttrib(r,"width","")}if((s=t.getAttrib(r,"height"))){t.setStyle(r,"height",s);t.setAttrib(r,"height","")}}});g.onNodeChange.add(function(q,o,s){var r;s=q.selection.getStart();r=q.dom.getParent(s,"td,th,caption");o.setActive("table",s.nodeName==="TABLE"||!!r);if(r&&r.nodeName==="CAPTION"){r=0}o.setDisabled("delete_table",!r);o.setDisabled("delete_col",!r);o.setDisabled("delete_table",!r);o.setDisabled("delete_row",!r);o.setDisabled("col_after",!r);o.setDisabled("col_before",!r);o.setDisabled("row_after",!r);o.setDisabled("row_before",!r);o.setDisabled("row_props",!r);o.setDisabled("cell_props",!r);o.setDisabled("split_cells",!r);o.setDisabled("merge_cells",!r)});g.onInit.add(function(r){var p,t,q=r.dom,u;f=r.windowManager;r.onMouseDown.add(function(w,z){if(z.button!=2){k();t=q.getParent(z.target,"td,th");p=q.getParent(t,"table")}});q.bind(r.getDoc(),"mouseover",function(C){var A,z,B=C.target;if(t&&(u||B!=t)&&(B.nodeName=="TD"||B.nodeName=="TH")){z=q.getParent(B,"table");if(z==p){if(!u){u=l(z);u.setStartCell(t);r.getBody().style.webkitUserSelect="none"}u.setEndCell(B);j=true}A=r.selection.getSel();try{if(A.removeAllRanges){A.removeAllRanges()}else{A.empty()}}catch(w){}C.preventDefault()}});r.onMouseUp.add(function(F,G){var z,B=F.selection,H,I=B.getSel(),w,C,A,E;if(t){if(u){F.getBody().style.webkitUserSelect=""}function D(J,L){var K=new d.dom.TreeWalker(J,J);do{if(J.nodeType==3&&d.trim(J.nodeValue).length!=0){if(L){z.setStart(J,0)}else{z.setEnd(J,J.nodeValue.length)}return}if(J.nodeName=="BR"){if(L){z.setStartBefore(J)}else{z.setEndBefore(J)}return}}while(J=(L?K.next():K.prev()))}H=q.select("td.mceSelected,th.mceSelected");if(H.length>0){z=q.createRng();C=H[0];E=H[H.length-1];z.setStartBefore(C);z.setEndAfter(C);D(C,1);w=new d.dom.TreeWalker(C,q.getParent(H[0],"table"));do{if(C.nodeName=="TD"||C.nodeName=="TH"){if(!q.hasClass(C,"mceSelected")){break}A=C}}while(C=w.next());D(A);B.setRng(z)}F.nodeChanged();t=u=p=null}});r.onKeyUp.add(function(w,z){k()});r.onKeyDown.add(function(w,z){n(w)});r.onMouseDown.add(function(w,z){if(z.button!=2){n(w)}});function o(D,z,A,F){var B=3,G=D.dom.getParent(z.startContainer,"TABLE"),C,w,E;if(G){C=G.parentNode}w=z.startContainer.nodeType==B&&z.startOffset==0&&z.endOffset==0&&F&&(A.nodeName=="TR"||A==C);E=(A.nodeName=="TD"||A.nodeName=="TH")&&!F;return w||E}function n(A){if(!d.isWebKit){return}var z=A.selection.getRng();var C=A.selection.getNode();var B=A.dom.getParent(z.startContainer,"TD,TH");if(!o(A,z,C,B)){return}if(!B){B=C}var w=B.lastChild;while(w.lastChild){w=w.lastChild}z.setEnd(w,w.nodeValue.length);A.selection.setRng(z)}r.plugins.table.fixTableCellSelection=n;if(r&&r.plugins.contextmenu){r.plugins.contextmenu.onContextMenu.add(function(A,w,C){var D,B=r.selection,z=B.getNode()||r.getBody();if(r.dom.getParent(C,"td")||r.dom.getParent(C,"th")||r.dom.select("td.mceSelected,th.mceSelected").length){w.removeAll();if(z.nodeName=="A"&&!r.dom.getAttrib(z,"name")){w.add({title:"advanced.link_desc",icon:"link",cmd:r.plugins.advlink?"mceAdvLink":"mceLink",ui:true});w.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"});w.addSeparator()}if(z.nodeName=="IMG"&&z.className.indexOf("mceItem")==-1){w.add({title:"advanced.image_desc",icon:"image",cmd:r.plugins.advimage?"mceAdvImage":"mceImage",ui:true});w.addSeparator()}w.add({title:"table.desc",icon:"table",cmd:"mceInsertTable",value:{action:"insert"}});w.add({title:"table.props_desc",icon:"table_props",cmd:"mceInsertTable"});w.add({title:"table.del",icon:"delete_table",cmd:"mceTableDelete"});w.addSeparator();D=w.addMenu({title:"table.cell"});D.add({title:"table.cell_desc",icon:"cell_props",cmd:"mceTableCellProps"});D.add({title:"table.split_cells_desc",icon:"split_cells",cmd:"mceTableSplitCells"});D.add({title:"table.merge_cells_desc",icon:"merge_cells",cmd:"mceTableMergeCells"});D=w.addMenu({title:"table.row"});D.add({title:"table.row_desc",icon:"row_props",cmd:"mceTableRowProps"});D.add({title:"table.row_before_desc",icon:"row_before",cmd:"mceTableInsertRowBefore"});D.add({title:"table.row_after_desc",icon:"row_after",cmd:"mceTableInsertRowAfter"});D.add({title:"table.delete_row_desc",icon:"delete_row",cmd:"mceTableDeleteRow"});D.addSeparator();D.add({title:"table.cut_row_desc",icon:"cut",cmd:"mceTableCutRow"});D.add({title:"table.copy_row_desc",icon:"copy",cmd:"mceTableCopyRow"});D.add({title:"table.paste_row_before_desc",icon:"paste",cmd:"mceTablePasteRowBefore"}).setDisabled(!m);D.add({title:"table.paste_row_after_desc",icon:"paste",cmd:"mceTablePasteRowAfter"}).setDisabled(!m);D=w.addMenu({title:"table.col"});D.add({title:"table.col_before_desc",icon:"col_before",cmd:"mceTableInsertColBefore"});D.add({title:"table.col_after_desc",icon:"col_after",cmd:"mceTableInsertColAfter"});D.add({title:"table.delete_col_desc",icon:"delete_col",cmd:"mceTableDeleteCol"})}else{w.add({title:"table.desc",icon:"table",cmd:"mceInsertTable"})}})}if(d.isWebKit){function v(C,N){var L=d.VK;var Q=N.keyCode;function O(Y,U,S){var T=Y?"previousSibling":"nextSibling";var Z=C.dom.getParent(U,"tr");var X=Z[T];if(X){z(C,U,X,Y);d.dom.Event.cancel(S);return true}else{var aa=C.dom.getParent(Z,"table");var W=Z.parentNode;var R=W.nodeName.toLowerCase();if(R==="tbody"||R===(Y?"tfoot":"thead")){var V=w(Y,aa,W,"tbody");if(V!==null){return K(Y,V,U,S)}}return M(Y,Z,T,aa,S)}}function w(V,T,U,X){var S=C.dom.select(">"+X,T);var R=S.indexOf(U);if(V&&R===0||!V&&R===S.length-1){return B(V,T)}else{if(R===-1){var W=U.tagName.toLowerCase()==="thead"?0:S.length-1;return S[W]}else{return S[R+(V?-1:1)]}}}function B(U,T){var S=U?"thead":"tfoot";var R=C.dom.select(">"+S,T);return R.length!==0?R[0]:null}function K(V,T,S,U){var R=J(T,V);R&&z(C,S,R,V);d.dom.Event.cancel(U);return true}function M(Y,U,R,X,W){var S=X[R];if(S){F(S);return true}else{var V=C.dom.getParent(X,"td,th");if(V){return O(Y,V,W)}else{var T=J(U,!Y);F(T);return d.dom.Event.cancel(W)}}}function J(S,R){var T=S&&S[R?"lastChild":"firstChild"];return T&&T.nodeName==="BR"?C.dom.getParent(T,"td,th"):T}function F(R){C.selection.setCursorLocation(R,0)}function A(){return Q==L.UP||Q==L.DOWN}function D(R){var T=R.selection.getNode();var S=R.dom.getParent(T,"tr");return S!==null}function P(S){var R=0;var T=S;while(T.previousSibling){T=T.previousSibling;R=R+a(T,"colspan")}return R}function E(T,R){var U=0;var S=0;e(T.children,function(V,W){U=U+a(V,"colspan");S=W;if(U>R){return false}});return S}function z(T,W,Y,V){var X=P(T.dom.getParent(W,"td,th"));var S=E(Y,X);var R=Y.childNodes[S];var U=J(R,V);F(U||R)}function H(R){var T=C.selection.getNode();var U=C.dom.getParent(T,"td,th");var S=C.dom.getParent(R,"td,th");return U&&U!==S&&I(U,S)}function I(S,R){return C.dom.getParent(S,"TABLE")===C.dom.getParent(R,"TABLE")}if(A()&&D(C)){var G=C.selection.getNode();setTimeout(function(){if(H(G)){O(!N.shiftKey&&Q===L.UP,G,N)}},0)}}r.onKeyDown.add(v)}if(!d.isIE){function s(){var w;for(w=r.getBody().lastChild;w&&w.nodeType==3&&!w.nodeValue.length;w=w.previousSibling){}if(w&&w.nodeName=="TABLE"){r.dom.add(r.getBody(),"p",null,' ')}}if(d.isGecko){r.onKeyDown.add(function(z,B){var w,A,C=z.dom;if(B.keyCode==37||B.keyCode==38){w=z.selection.getRng();A=C.getParent(w.startContainer,"table");if(A&&z.getBody().firstChild==A){if(c(w,A)){w=C.createRng();w.setStartBefore(A);w.setEndBefore(A);z.selection.setRng(w);B.preventDefault()}}}})}r.onKeyUp.add(s);r.onSetContent.add(s);r.onVisualAid.add(s);r.onPreProcess.add(function(w,A){var z=A.node.lastChild;if(z&&z.childNodes.length==1&&z.firstChild.nodeName=="BR"){w.dom.remove(z)}});if(d.isGecko){r.onKeyDown.add(function(z,B){if(B.keyCode===d.VK.ENTER&&B.shiftKey){var A=z.selection.getRng().startContainer;var C=q.getParent(A,"td,th");if(C){var w=z.getDoc().createTextNode("\uFEFF");q.insertAfter(w,A)}}})}s();r.startContent=r.getContent({format:"raw"})}});e({mceTableSplitCells:function(n){n.split()},mceTableMergeCells:function(o){var p,q,n;n=g.dom.getParent(g.selection.getNode(),"th,td");if(n){p=n.rowSpan;q=n.colSpan}if(!g.dom.select("td.mceSelected,th.mceSelected").length){f.open({url:h+"/merge_cells.htm",width:240+parseInt(g.getLang("table.merge_cells_delta_width",0)),height:110+parseInt(g.getLang("table.merge_cells_delta_height",0)),inline:1},{rows:p,cols:q,onaction:function(r){o.merge(n,r.cols,r.rows)},plugin_url:h})}else{o.merge()}},mceTableInsertRowBefore:function(n){n.insertRow(true)},mceTableInsertRowAfter:function(n){n.insertRow()},mceTableInsertColBefore:function(n){n.insertCol(true)},mceTableInsertColAfter:function(n){n.insertCol()},mceTableDeleteCol:function(n){n.deleteCols()},mceTableDeleteRow:function(n){n.deleteRows()},mceTableCutRow:function(n){m=n.cutRows()},mceTableCopyRow:function(n){m=n.copyRows()},mceTablePasteRowBefore:function(n){n.pasteRows(m,true)},mceTablePasteRowAfter:function(n){n.pasteRows(m)},mceTableDelete:function(n){n.deleteTable()}},function(o,n){g.addCommand(n,function(){var p=l();if(p){o(p);g.execCommand("mceRepaint");k()}})});e({mceInsertTable:function(n){f.open({url:h+"/table.htm",width:400+parseInt(g.getLang("table.table_delta_width",0)),height:320+parseInt(g.getLang("table.table_delta_height",0)),inline:1},{plugin_url:h,action:n?n.action:0})},mceTableRowProps:function(){f.open({url:h+"/row.htm",width:400+parseInt(g.getLang("table.rowprops_delta_width",0)),height:295+parseInt(g.getLang("table.rowprops_delta_height",0)),inline:1},{plugin_url:h})},mceTableCellProps:function(){f.open({url:h+"/cell.htm",width:400+parseInt(g.getLang("table.cellprops_delta_width",0)),height:295+parseInt(g.getLang("table.cellprops_delta_height",0)),inline:1},{plugin_url:h})}},function(o,n){g.addCommand(n,function(p,q){o(q)})})}});d.PluginManager.add("table",d.plugins.TablePlugin)})(tinymce);
\ No newline at end of file
+(function(d){var e=d.each;function c(g,h){var j=h.ownerDocument,f=j.createRange(),k;f.setStartBefore(h);f.setEnd(g.endContainer,g.endOffset);k=j.createElement("body");k.appendChild(f.cloneContents());return k.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi,"-").replace(/<[^>]+>/g,"").length==0}function a(g,f){return parseInt(g.getAttribute(f)||1)}function b(H,G,K){var g,L,D,o;t();o=G.getParent(K.getStart(),"th,td");if(o){L=F(o);D=I();o=z(L.x,L.y)}function A(N,M){N=N.cloneNode(M);N.removeAttribute("id");return N}function t(){var M=0;g=[];e(["thead","tbody","tfoot"],function(N){var O=G.select("> "+N+" tr",H);e(O,function(P,Q){Q+=M;e(G.select("> td, > th",P),function(W,R){var S,T,U,V;if(g[Q]){while(g[Q][R]){R++}}U=a(W,"rowspan");V=a(W,"colspan");for(T=Q;T '}return false}},"childNodes");M=A(M,false);s(M,"rowSpan",1);s(M,"colSpan",1);if(N){M.appendChild(N)}else{if(!d.isIE){M.innerHTML=' '}}return M}function q(){var M=G.createRng();e(G.select("tr",H),function(N){if(N.cells.length==0){G.remove(N)}});if(G.select("tr",H).length==0){M.setStartAfter(H);M.setEndAfter(H);K.setRng(M);G.remove(H);return}e(G.select("thead,tbody,tfoot",H),function(N){if(N.rows.length==0){G.remove(N)}});t();row=g[Math.min(g.length-1,L.y)];if(row){K.select(row[Math.min(row.length-1,L.x)].elm,true);K.collapse(true)}}function u(S,Q,U,R){var P,N,M,O,T;P=g[Q][S].elm.parentNode;for(M=1;M<=U;M++){P=G.getNext(P,"tr");if(P){for(N=S;N>=0;N--){T=g[Q+M][N].elm;if(T.parentNode==P){for(O=1;O<=R;O++){G.insertAfter(f(T),T)}break}}if(N==-1){for(O=1;O<=R;O++){P.insertBefore(f(P.cells[0]),P.cells[0])}}}}}function C(){e(g,function(M,N){e(M,function(P,O){var S,R,T,Q;if(j(P)){P=P.elm;S=a(P,"colspan");R=a(P,"rowspan");if(S>1||R>1){s(P,"rowSpan",1);s(P,"colSpan",1);for(Q=0;Q1){s(S,"rowSpan",O+1);continue}}else{if(M>0&&g[M-1][R]){V=g[M-1][R].elm;O=a(V,"rowSpan");if(O>1){s(V,"rowSpan",O+1);continue}}}N=f(S);s(N,"colSpan",S.colSpan);U.appendChild(N);P=S}}if(U.hasChildNodes()){if(!Q){G.insertAfter(U,T)}else{T.parentNode.insertBefore(U,T)}}}function h(N){var O,M;e(g,function(P,Q){e(P,function(S,R){if(j(S)){O=R;if(N){return false}}});if(N){return !O}});e(g,function(S,T){var P,Q,R;if(!S[O]){return}P=S[O].elm;if(P!=M){R=a(P,"colspan");Q=a(P,"rowspan");if(R==1){if(!N){G.insertAfter(f(P),P);u(O,T,Q-1,R)}else{P.parentNode.insertBefore(f(P),P);u(O,T,Q-1,R)}}else{s(P,"colSpan",P.colSpan+1)}M=P}})}function n(){var M=[];e(g,function(N,O){e(N,function(Q,P){if(j(Q)&&d.inArray(M,P)===-1){e(g,function(T){var R=T[P].elm,S;S=a(R,"colSpan");if(S>1){s(R,"colSpan",S-1)}else{G.remove(R)}});M.push(P)}})});q()}function m(){var N;function M(Q){var P,R,O;P=G.getNext(Q,"tr");e(Q.cells,function(S){var T=a(S,"rowSpan");if(T>1){s(S,"rowSpan",T-1);R=F(S);u(R.x,R.y,1,1)}});R=F(Q.cells[0]);e(g[R.y],function(S){var T;S=S.elm;if(S!=O){T=a(S,"rowSpan");if(T<=1){G.remove(S)}else{s(S,"rowSpan",T-1)}O=S}})}N=k();e(N.reverse(),function(O){M(O)});q()}function E(){var M=k();G.remove(M);q();return M}function J(){var M=k();e(M,function(O,N){M[N]=A(O,true)});return M}function B(O,N){if(!O){return}var P=k(),M=P[N?0:P.length-1],Q=M.cells.length;e(g,function(S){var R;Q=0;e(S,function(U,T){if(U.real){Q+=U.colspan}if(U.elm.parentNode==M){R=1}});if(R){return false}});if(!N){O.reverse()}e(O,function(T){var S=T.cells.length,R;for(i=0;iN){N=R}if(Q>M){M=Q}if(S.real){U=S.colspan-1;T=S.rowspan-1;if(U){if(R+U>N){N=R+U}}if(T){if(Q+T>M){M=Q+T}}}}})});return{x:N,y:M}}function v(S){var P,O,U,T,N,M,Q,R;D=F(S);if(L&&D){P=Math.min(L.x,D.x);O=Math.min(L.y,D.y);U=Math.max(L.x,D.x);T=Math.max(L.y,D.y);N=U;M=T;for(y=O;y<=M;y++){S=g[y][P];if(!S.real){if(P-(S.colspan-1) N){N=x+Q}}if(R){if(y+R>M){M=y+R}}}}}G.removeClass(G.select("td.mceSelected,th.mceSelected"),"mceSelected");for(y=O;y<=M;y++){for(x=P;x<=N;x++){if(g[y][x]){G.addClass(g[y][x].elm,"mceSelected")}}}}}d.extend(this,{deleteTable:r,split:C,merge:p,insertRow:l,insertCol:h,deleteCols:n,deleteRows:m,cutRows:E,copyRows:J,pasteRows:B,getPos:F,setStartCell:w,setEndCell:v})}d.create("tinymce.plugins.TablePlugin",{init:function(g,h){var f,m,j=true;function l(p){var o=g.selection,n=g.dom.getParent(p||o.getNode(),"table");if(n){return new b(n,g.dom,o)}}function k(){g.getBody().style.webkitUserSelect="";if(j){g.dom.removeClass(g.dom.select("td.mceSelected,th.mceSelected"),"mceSelected");j=false}}e([["table","table.desc","mceInsertTable",true],["delete_table","table.del","mceTableDelete"],["delete_col","table.delete_col_desc","mceTableDeleteCol"],["delete_row","table.delete_row_desc","mceTableDeleteRow"],["col_after","table.col_after_desc","mceTableInsertColAfter"],["col_before","table.col_before_desc","mceTableInsertColBefore"],["row_after","table.row_after_desc","mceTableInsertRowAfter"],["row_before","table.row_before_desc","mceTableInsertRowBefore"],["row_props","table.row_desc","mceTableRowProps",true],["cell_props","table.cell_desc","mceTableCellProps",true],["split_cells","table.split_cells_desc","mceTableSplitCells",true],["merge_cells","table.merge_cells_desc","mceTableMergeCells",true]],function(n){g.addButton(n[0],{title:n[1],cmd:n[2],ui:n[3]})});if(!d.isIE){g.onClick.add(function(n,o){o=o.target;if(o.nodeName==="TABLE"){n.selection.select(o);n.nodeChanged()}})}g.onPreProcess.add(function(o,p){var n,q,r,t=o.dom,s;n=t.select("table",p.node);q=n.length;while(q--){r=n[q];t.setAttrib(r,"data-mce-style","");if((s=t.getAttrib(r,"width"))){t.setStyle(r,"width",s);t.setAttrib(r,"width","")}if((s=t.getAttrib(r,"height"))){t.setStyle(r,"height",s);t.setAttrib(r,"height","")}}});g.onNodeChange.add(function(q,o,s){var r;s=q.selection.getStart();r=q.dom.getParent(s,"td,th,caption");o.setActive("table",s.nodeName==="TABLE"||!!r);if(r&&r.nodeName==="CAPTION"){r=0}o.setDisabled("delete_table",!r);o.setDisabled("delete_col",!r);o.setDisabled("delete_table",!r);o.setDisabled("delete_row",!r);o.setDisabled("col_after",!r);o.setDisabled("col_before",!r);o.setDisabled("row_after",!r);o.setDisabled("row_before",!r);o.setDisabled("row_props",!r);o.setDisabled("cell_props",!r);o.setDisabled("split_cells",!r);o.setDisabled("merge_cells",!r)});g.onInit.add(function(r){var p,t,q=r.dom,u;f=r.windowManager;r.onMouseDown.add(function(w,z){if(z.button!=2){k();t=q.getParent(z.target,"td,th");p=q.getParent(t,"table")}});q.bind(r.getDoc(),"mouseover",function(C){var A,z,B=C.target;if(t&&(u||B!=t)&&(B.nodeName=="TD"||B.nodeName=="TH")){z=q.getParent(B,"table");if(z==p){if(!u){u=l(z);u.setStartCell(t);r.getBody().style.webkitUserSelect="none"}u.setEndCell(B);j=true}A=r.selection.getSel();try{if(A.removeAllRanges){A.removeAllRanges()}else{A.empty()}}catch(w){}C.preventDefault()}});r.onMouseUp.add(function(F,G){var z,B=F.selection,H,I=B.getSel(),w,C,A,E;if(t){if(u){F.getBody().style.webkitUserSelect=""}function D(J,L){var K=new d.dom.TreeWalker(J,J);do{if(J.nodeType==3&&d.trim(J.nodeValue).length!=0){if(L){z.setStart(J,0)}else{z.setEnd(J,J.nodeValue.length)}return}if(J.nodeName=="BR"){if(L){z.setStartBefore(J)}else{z.setEndBefore(J)}return}}while(J=(L?K.next():K.prev()))}H=q.select("td.mceSelected,th.mceSelected");if(H.length>0){z=q.createRng();C=H[0];E=H[H.length-1];z.setStartBefore(C);z.setEndAfter(C);D(C,1);w=new d.dom.TreeWalker(C,q.getParent(H[0],"table"));do{if(C.nodeName=="TD"||C.nodeName=="TH"){if(!q.hasClass(C,"mceSelected")){break}A=C}}while(C=w.next());D(A);B.setRng(z)}F.nodeChanged();t=u=p=null}});r.onKeyUp.add(function(w,z){k()});r.onKeyDown.add(function(w,z){n(w)});r.onMouseDown.add(function(w,z){if(z.button!=2){n(w)}});function o(D,z,A,F){var B=3,G=D.dom.getParent(z.startContainer,"TABLE"),C,w,E;if(G){C=G.parentNode}w=z.startContainer.nodeType==B&&z.startOffset==0&&z.endOffset==0&&F&&(A.nodeName=="TR"||A==C);E=(A.nodeName=="TD"||A.nodeName=="TH")&&!F;return w||E}function n(A){if(!d.isWebKit){return}var z=A.selection.getRng();var C=A.selection.getNode();var B=A.dom.getParent(z.startContainer,"TD,TH");if(!o(A,z,C,B)){return}if(!B){B=C}var w=B.lastChild;while(w.lastChild){w=w.lastChild}z.setEnd(w,w.nodeValue.length);A.selection.setRng(z)}r.plugins.table.fixTableCellSelection=n;if(r&&r.plugins.contextmenu){r.plugins.contextmenu.onContextMenu.add(function(A,w,C){var D,B=r.selection,z=B.getNode()||r.getBody();if(r.dom.getParent(C,"td")||r.dom.getParent(C,"th")||r.dom.select("td.mceSelected,th.mceSelected").length){w.removeAll();if(z.nodeName=="A"&&!r.dom.getAttrib(z,"name")){w.add({title:"advanced.link_desc",icon:"link",cmd:r.plugins.advlink?"mceAdvLink":"mceLink",ui:true});w.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"});w.addSeparator()}if(z.nodeName=="IMG"&&z.className.indexOf("mceItem")==-1){w.add({title:"advanced.image_desc",icon:"image",cmd:r.plugins.advimage?"mceAdvImage":"mceImage",ui:true});w.addSeparator()}w.add({title:"table.desc",icon:"table",cmd:"mceInsertTable",value:{action:"insert"}});w.add({title:"table.props_desc",icon:"table_props",cmd:"mceInsertTable"});w.add({title:"table.del",icon:"delete_table",cmd:"mceTableDelete"});w.addSeparator();D=w.addMenu({title:"table.cell"});D.add({title:"table.cell_desc",icon:"cell_props",cmd:"mceTableCellProps"});D.add({title:"table.split_cells_desc",icon:"split_cells",cmd:"mceTableSplitCells"});D.add({title:"table.merge_cells_desc",icon:"merge_cells",cmd:"mceTableMergeCells"});D=w.addMenu({title:"table.row"});D.add({title:"table.row_desc",icon:"row_props",cmd:"mceTableRowProps"});D.add({title:"table.row_before_desc",icon:"row_before",cmd:"mceTableInsertRowBefore"});D.add({title:"table.row_after_desc",icon:"row_after",cmd:"mceTableInsertRowAfter"});D.add({title:"table.delete_row_desc",icon:"delete_row",cmd:"mceTableDeleteRow"});D.addSeparator();D.add({title:"table.cut_row_desc",icon:"cut",cmd:"mceTableCutRow"});D.add({title:"table.copy_row_desc",icon:"copy",cmd:"mceTableCopyRow"});D.add({title:"table.paste_row_before_desc",icon:"paste",cmd:"mceTablePasteRowBefore"}).setDisabled(!m);D.add({title:"table.paste_row_after_desc",icon:"paste",cmd:"mceTablePasteRowAfter"}).setDisabled(!m);D=w.addMenu({title:"table.col"});D.add({title:"table.col_before_desc",icon:"col_before",cmd:"mceTableInsertColBefore"});D.add({title:"table.col_after_desc",icon:"col_after",cmd:"mceTableInsertColAfter"});D.add({title:"table.delete_col_desc",icon:"delete_col",cmd:"mceTableDeleteCol"})}else{w.add({title:"table.desc",icon:"table",cmd:"mceInsertTable"})}})}if(d.isWebKit){function v(C,N){var L=d.VK;var Q=N.keyCode;function O(Y,U,S){var T=Y?"previousSibling":"nextSibling";var Z=C.dom.getParent(U,"tr");var X=Z[T];if(X){z(C,U,X,Y);d.dom.Event.cancel(S);return true}else{var aa=C.dom.getParent(Z,"table");var W=Z.parentNode;var R=W.nodeName.toLowerCase();if(R==="tbody"||R===(Y?"tfoot":"thead")){var V=w(Y,aa,W,"tbody");if(V!==null){return K(Y,V,U,S)}}return M(Y,Z,T,aa,S)}}function w(V,T,U,X){var S=C.dom.select(">"+X,T);var R=S.indexOf(U);if(V&&R===0||!V&&R===S.length-1){return B(V,T)}else{if(R===-1){var W=U.tagName.toLowerCase()==="thead"?0:S.length-1;return S[W]}else{return S[R+(V?-1:1)]}}}function B(U,T){var S=U?"thead":"tfoot";var R=C.dom.select(">"+S,T);return R.length!==0?R[0]:null}function K(V,T,S,U){var R=J(T,V);R&&z(C,S,R,V);d.dom.Event.cancel(U);return true}function M(Y,U,R,X,W){var S=X[R];if(S){F(S);return true}else{var V=C.dom.getParent(X,"td,th");if(V){return O(Y,V,W)}else{var T=J(U,!Y);F(T);return d.dom.Event.cancel(W)}}}function J(S,R){var T=S&&S[R?"lastChild":"firstChild"];return T&&T.nodeName==="BR"?C.dom.getParent(T,"td,th"):T}function F(R){C.selection.setCursorLocation(R,0)}function A(){return Q==L.UP||Q==L.DOWN}function D(R){var T=R.selection.getNode();var S=R.dom.getParent(T,"tr");return S!==null}function P(S){var R=0;var T=S;while(T.previousSibling){T=T.previousSibling;R=R+a(T,"colspan")}return R}function E(T,R){var U=0;var S=0;e(T.children,function(V,W){U=U+a(V,"colspan");S=W;if(U>R){return false}});return S}function z(T,W,Y,V){var X=P(T.dom.getParent(W,"td,th"));var S=E(Y,X);var R=Y.childNodes[S];var U=J(R,V);F(U||R)}function H(R){var T=C.selection.getNode();var U=C.dom.getParent(T,"td,th");var S=C.dom.getParent(R,"td,th");return U&&U!==S&&I(U,S)}function I(S,R){return C.dom.getParent(S,"TABLE")===C.dom.getParent(R,"TABLE")}if(A()&&D(C)){var G=C.selection.getNode();setTimeout(function(){if(H(G)){O(!N.shiftKey&&Q===L.UP,G,N)}},0)}}r.onKeyDown.add(v)}function s(){var w;for(w=r.getBody().lastChild;w&&w.nodeType==3&&!w.nodeValue.length;w=w.previousSibling){}if(w&&w.nodeName=="TABLE"){if(r.settings.forced_root_block){r.dom.add(r.getBody(),r.settings.forced_root_block,null,d.isIE?" ":' ')}else{r.dom.add(r.getBody(),"br",{"data-mce-bogus":"1"})}}}if(d.isGecko){r.onKeyDown.add(function(z,B){var w,A,C=z.dom;if(B.keyCode==37||B.keyCode==38){w=z.selection.getRng();A=C.getParent(w.startContainer,"table");if(A&&z.getBody().firstChild==A){if(c(w,A)){w=C.createRng();w.setStartBefore(A);w.setEndBefore(A);z.selection.setRng(w);B.preventDefault()}}}})}r.onKeyUp.add(s);r.onSetContent.add(s);r.onVisualAid.add(s);r.onPreProcess.add(function(w,A){var z=A.node.lastChild;if(z&&(z.nodeName=="BR"||(z.childNodes.length==1&&(z.firstChild.nodeName=="BR"||z.firstChild.nodeValue=="\u00a0")))&&z.previousSibling&&z.previousSibling.nodeName=="TABLE"){w.dom.remove(z)}});s();r.startContent=r.getContent({format:"raw"})});e({mceTableSplitCells:function(n){n.split()},mceTableMergeCells:function(o){var p,q,n;n=g.dom.getParent(g.selection.getNode(),"th,td");if(n){p=n.rowSpan;q=n.colSpan}if(!g.dom.select("td.mceSelected,th.mceSelected").length){f.open({url:h+"/merge_cells.htm",width:240+parseInt(g.getLang("table.merge_cells_delta_width",0)),height:110+parseInt(g.getLang("table.merge_cells_delta_height",0)),inline:1},{rows:p,cols:q,onaction:function(r){o.merge(n,r.cols,r.rows)},plugin_url:h})}else{o.merge()}},mceTableInsertRowBefore:function(n){n.insertRow(true)},mceTableInsertRowAfter:function(n){n.insertRow()},mceTableInsertColBefore:function(n){n.insertCol(true)},mceTableInsertColAfter:function(n){n.insertCol()},mceTableDeleteCol:function(n){n.deleteCols()},mceTableDeleteRow:function(n){n.deleteRows()},mceTableCutRow:function(n){m=n.cutRows()},mceTableCopyRow:function(n){m=n.copyRows()},mceTablePasteRowBefore:function(n){n.pasteRows(m,true)},mceTablePasteRowAfter:function(n){n.pasteRows(m)},mceTableDelete:function(n){n.deleteTable()}},function(o,n){g.addCommand(n,function(){var p=l();if(p){o(p);g.execCommand("mceRepaint");k()}})});e({mceInsertTable:function(n){f.open({url:h+"/table.htm",width:400+parseInt(g.getLang("table.table_delta_width",0)),height:320+parseInt(g.getLang("table.table_delta_height",0)),inline:1},{plugin_url:h,action:n?n.action:0})},mceTableRowProps:function(){f.open({url:h+"/row.htm",width:400+parseInt(g.getLang("table.rowprops_delta_width",0)),height:295+parseInt(g.getLang("table.rowprops_delta_height",0)),inline:1},{plugin_url:h})},mceTableCellProps:function(){f.open({url:h+"/cell.htm",width:400+parseInt(g.getLang("table.cellprops_delta_width",0)),height:295+parseInt(g.getLang("table.cellprops_delta_height",0)),inline:1},{plugin_url:h})}},function(o,n){g.addCommand(n,function(p,q){o(q)})})}});d.PluginManager.add("table",d.plugins.TablePlugin)})(tinymce);
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js
index 832b5e94..532b79c6 100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js
@@ -287,6 +287,21 @@
endX = startX + (cols - 1);
endY = startY + (rows - 1);
} else {
+ startPos = endPos = null;
+
+ // Calculate start/end pos by checking for selected cells in grid works better with context menu
+ each(grid, function(row, y) {
+ each(row, function(cell, x) {
+ if (isCellSelected(cell)) {
+ if (!startPos) {
+ startPos = {x: x, y: y};
+ }
+
+ endPos = {x: x, y: y};
+ }
+ });
+ });
+
// Use selection
startX = startPos.x;
startY = startPos.y;
@@ -551,6 +566,10 @@
};
function pasteRows(rows, before) {
+ // If we don't have any rows in the clipboard, return immediately
+ if(!rows)
+ return;
+
var selectedRows = getSelectedRows(),
targetRow = selectedRows[before ? 0 : selectedRows.length - 1],
targetCellCount = targetRow.cells.length;
@@ -599,6 +618,9 @@
else
dom.insertAfter(row, targetRow);
});
+
+ // Remove current selection
+ dom.removeClass(dom.select('td.mceSelected,th.mceSelected'), 'mceSelected');
};
function getPos(target) {
@@ -1216,80 +1238,86 @@
ed.onKeyDown.add(moveSelection);
}
-
+
// Fixes an issue on Gecko where it's impossible to place the caret behind a table
// This fix will force a paragraph element after the table but only when the forced_root_block setting is enabled
- if (!tinymce.isIE) {
- function fixTableCaretPos() {
- var last;
+ function fixTableCaretPos() {
+ var last;
- // Skip empty text nodes form the end
- for (last = ed.getBody().lastChild; last && last.nodeType == 3 && !last.nodeValue.length; last = last.previousSibling) ;
+ // Skip empty text nodes form the end
+ for (last = ed.getBody().lastChild; last && last.nodeType == 3 && !last.nodeValue.length; last = last.previousSibling) ;
- if (last && last.nodeName == 'TABLE')
- ed.dom.add(ed.getBody(), 'p', null, ' ');
- };
+ if (last && last.nodeName == 'TABLE') {
+ if (ed.settings.forced_root_block)
+ ed.dom.add(ed.getBody(), ed.settings.forced_root_block, null, tinymce.isIE ? ' ' : ' ');
+ else
+ ed.dom.add(ed.getBody(), 'br', {'data-mce-bogus': '1'});
+ }
+ };
- // Fixes an bug where it's impossible to place the caret before a table in Gecko
- // this fix solves it by detecting when the caret is at the beginning of such a table
- // and then manually moves the caret infront of the table
- if (tinymce.isGecko) {
- ed.onKeyDown.add(function(ed, e) {
- var rng, table, dom = ed.dom;
+ // Fixes an bug where it's impossible to place the caret before a table in Gecko
+ // this fix solves it by detecting when the caret is at the beginning of such a table
+ // and then manually moves the caret infront of the table
+ if (tinymce.isGecko) {
+ ed.onKeyDown.add(function(ed, e) {
+ var rng, table, dom = ed.dom;
- // On gecko it's not possible to place the caret before a table
- if (e.keyCode == 37 || e.keyCode == 38) {
- rng = ed.selection.getRng();
- table = dom.getParent(rng.startContainer, 'table');
+ // On gecko it's not possible to place the caret before a table
+ if (e.keyCode == 37 || e.keyCode == 38) {
+ rng = ed.selection.getRng();
+ table = dom.getParent(rng.startContainer, 'table');
- if (table && ed.getBody().firstChild == table) {
- if (isAtStart(rng, table)) {
- rng = dom.createRng();
+ if (table && ed.getBody().firstChild == table) {
+ if (isAtStart(rng, table)) {
+ rng = dom.createRng();
- rng.setStartBefore(table);
- rng.setEndBefore(table);
+ rng.setStartBefore(table);
+ rng.setEndBefore(table);
- ed.selection.setRng(rng);
+ ed.selection.setRng(rng);
- e.preventDefault();
- }
+ e.preventDefault();
}
}
- });
- }
-
- ed.onKeyUp.add(fixTableCaretPos);
- ed.onSetContent.add(fixTableCaretPos);
- ed.onVisualAid.add(fixTableCaretPos);
-
- ed.onPreProcess.add(function(ed, o) {
- var last = o.node.lastChild;
-
- if (last && last.childNodes.length == 1 && last.firstChild.nodeName == 'BR')
- ed.dom.remove(last);
+ }
});
-
-
- /**
- * Fixes bug in Gecko where shift-enter in table cell does not place caret on new line
- */
- if (tinymce.isGecko) {
- ed.onKeyDown.add(function(ed, e) {
- if (e.keyCode === tinymce.VK.ENTER && e.shiftKey) {
- var node = ed.selection.getRng().startContainer;
- var tableCell = dom.getParent(node, 'td,th');
- if (tableCell) {
- var zeroSizedNbsp = ed.getDoc().createTextNode("\uFEFF");
- dom.insertAfter(zeroSizedNbsp, node);
- }
- }
- });
- }
-
-
- fixTableCaretPos();
- ed.startContent = ed.getContent({format : 'raw'});
}
+
+ ed.onKeyUp.add(fixTableCaretPos);
+ ed.onSetContent.add(fixTableCaretPos);
+ ed.onVisualAid.add(fixTableCaretPos);
+
+ ed.onPreProcess.add(function(ed, o) {
+ var last = o.node.lastChild;
+
+ if (last && (last.nodeName == "BR" || (last.childNodes.length == 1 && (last.firstChild.nodeName == 'BR' || last.firstChild.nodeValue == '\u00a0'))) && last.previousSibling && last.previousSibling.nodeName == "TABLE") {
+ ed.dom.remove(last);
+ }
+ });
+
+
+ /**
+ * Fixes bug in Gecko where shift-enter in table cell does not place caret on new line
+ *
+ * Removed: Since the new enter logic seems to fix this one.
+ */
+ /*
+ if (tinymce.isGecko) {
+ ed.onKeyDown.add(function(ed, e) {
+ if (e.keyCode === tinymce.VK.ENTER && e.shiftKey) {
+ var node = ed.selection.getRng().startContainer;
+ var tableCell = dom.getParent(node, 'td,th');
+ if (tableCell) {
+ var zeroSizedNbsp = ed.getDoc().createTextNode("\uFEFF");
+ dom.insertAfter(zeroSizedNbsp, node);
+ }
+ }
+ });
+ }
+ */
+
+ fixTableCaretPos();
+ ed.startContent = ed.getContent({format : 'raw'});
});
// Register action commands
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/table/js/row.js b/library/tinymce/jscripts/tiny_mce/plugins/table/js/row.js
index a13d6959..0c678de4 100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/table/js/row.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/table/js/row.js
@@ -25,6 +25,7 @@ function init() {
var dir = dom.getAttrib(trElm, 'dir');
selectByValue(formObj, 'rowtype', rowtype);
+ setActionforRowType(formObj, rowtype);
// Any cells selected
if (dom.select('td.mceSelected,th.mceSelected', trElm).length == 0) {
@@ -234,4 +235,20 @@ function changedColor() {
formObj.style.value = dom.serializeStyle(st);
}
+function changedRowType() {
+ var formObj = document.forms[0];
+ var rowtype = getSelectValue(formObj, 'rowtype');
+
+ setActionforRowType(formObj, rowtype);
+
+}
+
+function setActionforRowType(formObj, rowtype) {
+ if (rowtype === "tbody") {
+ formObj.action.disabled = false;
+ } else {
+ selectByValue(formObj, 'action', "row");
+ formObj.action.disabled = true;
+ }
+}
tinyMCEPopup.onInit.add(init);
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/table/js/table.js b/library/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
index 0aafb5fd..1db243b6 100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
@@ -247,7 +247,10 @@ function insertTable() {
// Fixes a bug in IE where the caret cannot be placed after the table if the table is at the end of the document
if (tinymce.isIE && node.nextSibling == null) {
- dom.insertAfter(dom.create('p'), node);
+ if (inst.settings.forced_root_block)
+ dom.insertAfter(dom.create(inst.settings.forced_root_block), node);
+ else
+ dom.insertAfter(dom.create('br', {'data-mce-bogus': '1'}), node);
}
try {
@@ -304,6 +307,15 @@ function init() {
var formObj = document.forms[0];
var elm = dom.getParent(inst.selection.getNode(), "table");
+ // Hide advanced fields that isn't available in the schema
+ tinymce.each("summary id rules dir style frame".split(" "), function(name) {
+ var tr = tinyMCEPopup.dom.getParent(name, "tr") || tinyMCEPopup.dom.getParent("t" + name, "tr");
+
+ if (tr && !tinyMCEPopup.editor.schema.isValid("table", name)) {
+ tr.style.display = 'none';
+ }
+ });
+
action = tinyMCEPopup.getWindowArg('action');
if (!action)
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/table/row.htm b/library/tinymce/jscripts/tiny_mce/plugins/table/row.htm
index 1885401f..6ebef284 100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/table/row.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/table/row.htm
@@ -28,7 +28,7 @@
{#table_dlg.rowtype}
-
+
{#table_dlg.thead}
{#table_dlg.tbody}
{#table_dlg.tfoot}
@@ -83,8 +83,8 @@
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js
index 5e9deec8..4b8d5637 100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js
@@ -1 +1 @@
-(function(h){var i=h.DOM,g=h.dom.Event,c=h.extend,f=h.each,a=h.util.Cookie,e,d=h.explode;function b(m,k){var q,p=m.dom,n="",o,l;previewStyles=m.settings.preview_styles;if(previewStyles===false){return""}if(!previewStyles){previewStyles="font-family font-size font-weight text-decoration text-transform color background-color"}function j(r){return r.replace(/%(\w+)/g,"")}name=k.block||k.inline||"span";q=p.create(name);f(k.styles,function(s,r){s=j(s);if(s){p.setStyle(q,r,s)}});f(k.attributes,function(s,r){s=j(s);if(s){p.setAttrib(q,r,s)}});f(k.classes,function(r){r=j(r);if(!p.hasClass(q,r)){p.addClass(q,r)}});p.setStyles(q,{position:"absolute",left:-65535});m.getBody().appendChild(q);o=p.getStyle(m.getBody(),"fontSize",true);o=/px$/.test(o)?parseInt(o,10):0;f(previewStyles.split(" "),function(r){var s=p.getStyle(q,r,true);if(r=="background-color"&&/transparent|rgba\s*\([^)]+,\s*0\)/.test(s)){s=p.getStyle(m.getBody(),r,true);if(p.toHex(s).toLowerCase()=="#ffffff"){return}}if(r=="font-size"){if(/em|%$/.test(s)){if(o===0){return}s=parseFloat(s,10)/(/%$/.test(s)?100:1);s=(s*o)+"px"}}n+=r+":"+s+";"});p.remove(q);return n}h.ThemeManager.requireLangPack("advanced");h.create("tinymce.themes.AdvancedTheme",{sizes:[8,10,12,14,18,24,36],controls:{bold:["bold_desc","Bold"],italic:["italic_desc","Italic"],underline:["underline_desc","Underline"],strikethrough:["striketrough_desc","Strikethrough"],justifyleft:["justifyleft_desc","JustifyLeft"],justifycenter:["justifycenter_desc","JustifyCenter"],justifyright:["justifyright_desc","JustifyRight"],justifyfull:["justifyfull_desc","JustifyFull"],bullist:["bullist_desc","InsertUnorderedList"],numlist:["numlist_desc","InsertOrderedList"],outdent:["outdent_desc","Outdent"],indent:["indent_desc","Indent"],cut:["cut_desc","Cut"],copy:["copy_desc","Copy"],paste:["paste_desc","Paste"],undo:["undo_desc","Undo"],redo:["redo_desc","Redo"],link:["link_desc","mceLink"],unlink:["unlink_desc","unlink"],image:["image_desc","mceImage"],cleanup:["cleanup_desc","mceCleanup"],help:["help_desc","mceHelp"],code:["code_desc","mceCodeEditor"],hr:["hr_desc","InsertHorizontalRule"],removeformat:["removeformat_desc","RemoveFormat"],sub:["sub_desc","subscript"],sup:["sup_desc","superscript"],forecolor:["forecolor_desc","ForeColor"],forecolorpicker:["forecolor_desc","mceForeColor"],backcolor:["backcolor_desc","HiliteColor"],backcolorpicker:["backcolor_desc","mceBackColor"],charmap:["charmap_desc","mceCharMap"],visualaid:["visualaid_desc","mceToggleVisualAid"],anchor:["anchor_desc","mceInsertAnchor"],newdocument:["newdocument_desc","mceNewDocument"],blockquote:["blockquote_desc","mceBlockQuote"]},stateControls:["bold","italic","underline","strikethrough","bullist","numlist","justifyleft","justifycenter","justifyright","justifyfull","sub","sup","blockquote"],init:function(k,l){var m=this,n,j,p;m.editor=k;m.url=l;m.onResolveName=new h.util.Dispatcher(this);k.forcedHighContrastMode=k.settings.detect_highcontrast&&m._isHighContrast();k.settings.skin=k.forcedHighContrastMode?"highcontrast":k.settings.skin;m.settings=n=c({theme_advanced_path:true,theme_advanced_toolbar_location:"bottom",theme_advanced_buttons1:"bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect",theme_advanced_buttons2:"bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code",theme_advanced_buttons3:"hr,removeformat,visualaid,|,sub,sup,|,charmap",theme_advanced_blockformats:"p,address,pre,h1,h2,h3,h4,h5,h6",theme_advanced_toolbar_align:"center",theme_advanced_fonts:"Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats",theme_advanced_more_colors:1,theme_advanced_row_height:23,theme_advanced_resize_horizontal:1,theme_advanced_resizing_use_cookie:1,theme_advanced_font_sizes:"1,2,3,4,5,6,7",theme_advanced_font_selector:"span",theme_advanced_show_current_color:0,readonly:k.settings.readonly},k.settings);if(!n.font_size_style_values){n.font_size_style_values="8pt,10pt,12pt,14pt,18pt,24pt,36pt"}if(h.is(n.theme_advanced_font_sizes,"string")){n.font_size_style_values=h.explode(n.font_size_style_values);n.font_size_classes=h.explode(n.font_size_classes||"");p={};k.settings.theme_advanced_font_sizes=n.theme_advanced_font_sizes;f(k.getParam("theme_advanced_font_sizes","","hash"),function(r,q){var o;if(q==r&&r>=1&&r<=7){q=r+" ("+m.sizes[r-1]+"pt)";o=n.font_size_classes[r-1];r=n.font_size_style_values[r-1]||(m.sizes[r-1]+"pt")}if(/^\s*\./.test(r)){o=r.replace(/\./g,"")}p[q]=o?{"class":o}:{fontSize:r}});n.theme_advanced_font_sizes=p}if((j=n.theme_advanced_path_location)&&j!="none"){n.theme_advanced_statusbar_location=n.theme_advanced_path_location}if(n.theme_advanced_statusbar_location=="none"){n.theme_advanced_statusbar_location=0}if(k.settings.content_css!==false){k.contentCSS.push(k.baseURI.toAbsolute(l+"/skins/"+k.settings.skin+"/content.css"))}k.onInit.add(function(){if(!k.settings.readonly){k.onNodeChange.add(m._nodeChanged,m);k.onKeyUp.add(m._updateUndoStatus,m);k.onMouseUp.add(m._updateUndoStatus,m);k.dom.bind(k.dom.getRoot(),"dragend",function(){m._updateUndoStatus(k)})}});k.onSetProgressState.add(function(r,o,s){var t,u=r.id,q;if(o){m.progressTimer=setTimeout(function(){t=r.getContainer();t=t.insertBefore(i.create("DIV",{style:"position:relative"}),t.firstChild);q=i.get(r.id+"_tbl");i.add(t,"div",{id:u+"_blocker","class":"mceBlocker",style:{width:q.clientWidth+2,height:q.clientHeight+2}});i.add(t,"div",{id:u+"_progress","class":"mceProgress",style:{left:q.clientWidth/2,top:q.clientHeight/2}})},s||0)}else{i.remove(u+"_blocker");i.remove(u+"_progress");clearTimeout(m.progressTimer)}});i.loadCSS(n.editor_css?k.documentBaseURI.toAbsolute(n.editor_css):l+"/skins/"+k.settings.skin+"/ui.css");if(n.skin_variant){i.loadCSS(l+"/skins/"+k.settings.skin+"/ui_"+n.skin_variant+".css")}},_isHighContrast:function(){var j,k=i.add(i.getRoot(),"div",{style:"background-color: rgb(171,239,86);"});j=(i.getStyle(k,"background-color",true)+"").toLowerCase().replace(/ /g,"");i.remove(k);return j!="rgb(171,239,86)"&&j!="#abef56"},createControl:function(m,j){var k,l;if(l=j.createControl(m)){return l}switch(m){case"styleselect":return this._createStyleSelect();case"formatselect":return this._createBlockFormats();case"fontselect":return this._createFontSelect();case"fontsizeselect":return this._createFontSizeSelect();case"forecolor":return this._createForeColorMenu();case"backcolor":return this._createBackColorMenu()}if((k=this.controls[m])){return j.createButton(m,{title:"advanced."+k[0],cmd:k[1],ui:k[2],value:k[3]})}},execCommand:function(l,k,m){var j=this["_"+l];if(j){j.call(this,k,m);return true}return false},_importClasses:function(l){var j=this.editor,k=j.controlManager.get("styleselect");if(k.getLength()==0){f(j.dom.getClasses(),function(q,m){var p="style_"+m,n;n={inline:"span",attributes:{"class":q["class"]},selector:"*"};j.formatter.register(p,n);k.add(q["class"],p,{style:function(){return b(j,n)}})})}},_createStyleSelect:function(o){var l=this,j=l.editor,k=j.controlManager,m;m=k.createListBox("styleselect",{title:"advanced.style_select",onselect:function(q){var r,n=[],p;f(m.items,function(s){n.push(s.value)});j.focus();j.undoManager.add();r=j.formatter.matchAll(n);h.each(r,function(s){if(!q||s==q){if(s){j.formatter.remove(s)}p=true}});if(!p){j.formatter.apply(q)}j.undoManager.add();j.nodeChanged();return false}});j.onPreInit.add(function(){var p=0,n=j.getParam("style_formats");if(n){f(n,function(q){var r,s=0;f(q,function(){s++});if(s>1){r=q.name=q.name||"style_"+(p++);j.formatter.register(r,q);m.add(q.title,r,{style:function(){return b(j,q)}})}else{m.add(q.title)}})}else{f(j.getParam("theme_advanced_styles","","hash"),function(t,s){var r,q;if(t){r="style_"+(p++);q={inline:"span",classes:t,selector:"*"};j.formatter.register(r,q);m.add(l.editor.translate(s),r,{style:function(){return b(j,q)}})}})}});if(m.getLength()==0){m.onPostRender.add(function(p,q){if(!m.NativeListBox){g.add(q.id+"_text","focus",l._importClasses,l);g.add(q.id+"_text","mousedown",l._importClasses,l);g.add(q.id+"_open","focus",l._importClasses,l);g.add(q.id+"_open","mousedown",l._importClasses,l)}else{g.add(q.id,"focus",l._importClasses,l)}})}return m},_createFontSelect:function(){var l,k=this,j=k.editor;l=j.controlManager.createListBox("fontselect",{title:"advanced.fontdefault",onselect:function(m){var n=l.items[l.selectedIndex];if(!m&&n){j.execCommand("FontName",false,n.value);return}j.execCommand("FontName",false,m);l.select(function(o){return m==o});if(n&&n.value==m){l.select(null)}return false}});if(l){f(j.getParam("theme_advanced_fonts",k.settings.theme_advanced_fonts,"hash"),function(n,m){l.add(j.translate(m),n,{style:n.indexOf("dings")==-1?"font-family:"+n:""})})}return l},_createFontSizeSelect:function(){var m=this,k=m.editor,n,l=0,j=[];n=k.controlManager.createListBox("fontsizeselect",{title:"advanced.font_size",onselect:function(o){var p=n.items[n.selectedIndex];if(!o&&p){p=p.value;if(p["class"]){k.formatter.toggle("fontsize_class",{value:p["class"]});k.undoManager.add();k.nodeChanged()}else{k.execCommand("FontSize",false,p.fontSize)}return}if(o["class"]){k.focus();k.undoManager.add();k.formatter.toggle("fontsize_class",{value:o["class"]});k.undoManager.add();k.nodeChanged()}else{k.execCommand("FontSize",false,o.fontSize)}n.select(function(q){return o==q});if(p&&(p.value.fontSize==o.fontSize||p.value["class"]&&p.value["class"]==o["class"])){n.select(null)}return false}});if(n){f(m.settings.theme_advanced_font_sizes,function(p,o){var q=p.fontSize;if(q>=1&&q<=7){q=m.sizes[parseInt(q)-1]+"pt"}n.add(o,p,{style:"font-size:"+q,"class":"mceFontSize"+(l++)+(" "+(p["class"]||""))})})}return n},_createBlockFormats:function(){var l,j={p:"advanced.paragraph",address:"advanced.address",pre:"advanced.pre",h1:"advanced.h1",h2:"advanced.h2",h3:"advanced.h3",h4:"advanced.h4",h5:"advanced.h5",h6:"advanced.h6",div:"advanced.div",blockquote:"advanced.blockquote",code:"advanced.code",dt:"advanced.dt",dd:"advanced.dd",samp:"advanced.samp"},k=this;l=k.editor.controlManager.createListBox("formatselect",{title:"advanced.block",onselect:function(m){k.editor.execCommand("FormatBlock",false,m);return false}});if(l){f(k.editor.getParam("theme_advanced_blockformats",k.settings.theme_advanced_blockformats,"hash"),function(n,m){l.add(k.editor.translate(m!=n?m:j[n]),n,{"class":"mce_formatPreview mce_"+n,style:function(){return b(k.editor,{block:n})}})})}return l},_createForeColorMenu:function(){var n,k=this,l=k.settings,m={},j;if(l.theme_advanced_more_colors){m.more_colors_func=function(){k._mceColorPicker(0,{color:n.value,func:function(o){n.setColor(o)}})}}if(j=l.theme_advanced_text_colors){m.colors=j}if(l.theme_advanced_default_foreground_color){m.default_color=l.theme_advanced_default_foreground_color}m.title="advanced.forecolor_desc";m.cmd="ForeColor";m.scope=this;n=k.editor.controlManager.createColorSplitButton("forecolor",m);return n},_createBackColorMenu:function(){var n,k=this,l=k.settings,m={},j;if(l.theme_advanced_more_colors){m.more_colors_func=function(){k._mceColorPicker(0,{color:n.value,func:function(o){n.setColor(o)}})}}if(j=l.theme_advanced_background_colors){m.colors=j}if(l.theme_advanced_default_background_color){m.default_color=l.theme_advanced_default_background_color}m.title="advanced.backcolor_desc";m.cmd="HiliteColor";m.scope=this;n=k.editor.controlManager.createColorSplitButton("backcolor",m);return n},renderUI:function(l){var q,m,r,w=this,u=w.editor,x=w.settings,v,k,j;if(u.settings){u.settings.aria_label=x.aria_label+u.getLang("advanced.help_shortcut")}q=k=i.create("span",{role:"application","aria-labelledby":u.id+"_voice",id:u.id+"_parent","class":"mceEditor "+u.settings.skin+"Skin"+(x.skin_variant?" "+u.settings.skin+"Skin"+w._ufirst(x.skin_variant):"")+(u.settings.directionality=="rtl"?" mceRtl":"")});i.add(q,"span",{"class":"mceVoiceLabel",style:"display:none;",id:u.id+"_voice"},x.aria_label);if(!i.boxModel){q=i.add(q,"div",{"class":"mceOldBoxModel"})}q=v=i.add(q,"table",{role:"presentation",id:u.id+"_tbl","class":"mceLayout",cellSpacing:0,cellPadding:0});q=r=i.add(q,"tbody");switch((x.theme_advanced_layout_manager||"").toLowerCase()){case"rowlayout":m=w._rowLayout(x,r,l);break;case"customlayout":m=u.execCallback("theme_advanced_custom_layout",x,r,l,k);break;default:m=w._simpleLayout(x,r,l,k)}q=l.targetNode;j=v.rows;i.addClass(j[0],"mceFirst");i.addClass(j[j.length-1],"mceLast");f(i.select("tr",r),function(o){i.addClass(o.firstChild,"mceFirst");i.addClass(o.childNodes[o.childNodes.length-1],"mceLast")});if(i.get(x.theme_advanced_toolbar_container)){i.get(x.theme_advanced_toolbar_container).appendChild(k)}else{i.insertAfter(k,q)}g.add(u.id+"_path_row","click",function(n){n=n.target;if(n.nodeName=="A"){w._sel(n.className.replace(/^.*mcePath_([0-9]+).*$/,"$1"));return false}});if(!u.getParam("accessibility_focus")){g.add(i.add(k,"a",{href:"#"},""),"focus",function(){tinyMCE.get(u.id).focus()})}if(x.theme_advanced_toolbar_location=="external"){l.deltaHeight=0}w.deltaHeight=l.deltaHeight;l.targetNode=null;u.onKeyDown.add(function(p,n){var s=121,o=122;if(n.altKey){if(n.keyCode===s){if(h.isWebKit){window.focus()}w.toolbarGroup.focus();return g.cancel(n)}else{if(n.keyCode===o){i.get(p.id+"_path_row").focus();return g.cancel(n)}}}});u.addShortcut("alt+0","","mceShortcuts",w);return{iframeContainer:m,editorContainer:u.id+"_parent",sizeContainer:v,deltaHeight:l.deltaHeight}},getInfo:function(){return{longname:"Advanced theme",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",version:h.majorVersion+"."+h.minorVersion}},resizeBy:function(j,k){var l=i.get(this.editor.id+"_ifr");this.resizeTo(l.clientWidth+j,l.clientHeight+k)},resizeTo:function(j,n,l){var k=this.editor,m=this.settings,o=i.get(k.id+"_tbl"),p=i.get(k.id+"_ifr");j=Math.max(m.theme_advanced_resizing_min_width||100,j);n=Math.max(m.theme_advanced_resizing_min_height||100,n);j=Math.min(m.theme_advanced_resizing_max_width||65535,j);n=Math.min(m.theme_advanced_resizing_max_height||65535,n);i.setStyle(o,"height","");i.setStyle(p,"height",n);if(m.theme_advanced_resize_horizontal){i.setStyle(o,"width","");i.setStyle(p,"width",j);if(j"));i.setHTML(l,r.join(""))},_addStatusBar:function(p,k){var l,w=this,q=w.editor,x=w.settings,j,u,v,m;l=i.add(p,"tr");l=m=i.add(l,"td",{"class":"mceStatusbar"});l=i.add(l,"div",{id:q.id+"_path_row",role:"group","aria-labelledby":q.id+"_path_voice"});if(x.theme_advanced_path){i.add(l,"span",{id:q.id+"_path_voice"},q.translate("advanced.path"));i.add(l,"span",{},": ")}else{i.add(l,"span",{}," ")}if(x.theme_advanced_resizing){i.add(m,"a",{id:q.id+"_resize",href:"javascript:;",onclick:"return false;","class":"mceResize",tabIndex:"-1"});if(x.theme_advanced_resizing_use_cookie){q.onPostRender.add(function(){var n=a.getHash("TinyMCE_"+q.id+"_size"),r=i.get(q.id+"_tbl");if(!n){return}w.resizeTo(n.cw,n.ch)})}q.onPostRender.add(function(){g.add(q.id+"_resize","click",function(n){n.preventDefault()});g.add(q.id+"_resize","mousedown",function(E){var t,r,s,o,D,A,B,G,n,F,y;function z(H){H.preventDefault();n=B+(H.screenX-D);F=G+(H.screenY-A);w.resizeTo(n,F)}function C(H){g.remove(i.doc,"mousemove",t);g.remove(q.getDoc(),"mousemove",r);g.remove(i.doc,"mouseup",s);g.remove(q.getDoc(),"mouseup",o);n=B+(H.screenX-D);F=G+(H.screenY-A);w.resizeTo(n,F,true)}E.preventDefault();D=E.screenX;A=E.screenY;y=i.get(w.editor.id+"_ifr");B=n=y.clientWidth;G=F=y.clientHeight;t=g.add(i.doc,"mousemove",z);r=g.add(q.getDoc(),"mousemove",z);s=g.add(i.doc,"mouseup",C);o=g.add(q.getDoc(),"mouseup",C)})})}k.deltaHeight-=21;l=p=null},_updateUndoStatus:function(k){var j=k.controlManager,l=k.undoManager;j.setDisabled("undo",!l.hasUndo()&&!l.typing);j.setDisabled("redo",!l.hasRedo())},_nodeChanged:function(o,u,E,r,F){var z=this,D,G=0,y,H,A=z.settings,x,l,w,C,m,k,j;h.each(z.stateControls,function(n){u.setActive(n,o.queryCommandState(z.controls[n][1]))});function q(p){var s,n=F.parents,t=p;if(typeof(p)=="string"){t=function(v){return v.nodeName==p}}for(s=0;s0){H.mark(p)}})}if(H=u.get("formatselect")){D=q(o.dom.isBlock);if(D){H.select(D.nodeName.toLowerCase())}}q(function(p){if(p.nodeName==="SPAN"){if(!x&&p.className){x=p.className}}if(o.dom.is(p,A.theme_advanced_font_selector)){if(!l&&p.style.fontSize){l=p.style.fontSize}if(!w&&p.style.fontFamily){w=p.style.fontFamily.replace(/[\"\']+/g,"").replace(/^([^,]+).*/,"$1").toLowerCase()}if(!C&&p.style.color){C=p.style.color}if(!m&&p.style.backgroundColor){m=p.style.backgroundColor}}return false});if(H=u.get("fontselect")){H.select(function(n){return n.replace(/^([^,]+).*/,"$1").toLowerCase()==w})}if(H=u.get("fontsizeselect")){if(A.theme_advanced_runtime_fontsize&&!l&&!x){l=o.dom.getStyle(E,"fontSize",true)}H.select(function(n){if(n.fontSize&&n.fontSize===l){return true}if(n["class"]&&n["class"]===x){return true}})}if(A.theme_advanced_show_current_color){function B(p,n){if(H=u.get(p)){if(!n){n=H.settings.default_color}if(n!==H.value){H.displayColor(n)}}}B("forecolor",C);B("backcolor",m)}if(A.theme_advanced_show_current_color){function B(p,n){if(H=u.get(p)){if(!n){n=H.settings.default_color}if(n!==H.value){H.displayColor(n)}}}B("forecolor",C);B("backcolor",m)}if(A.theme_advanced_path&&A.theme_advanced_statusbar_location){D=i.get(o.id+"_path")||i.add(o.id+"_path_row","span",{id:o.id+"_path"});if(z.statusKeyboardNavigation){z.statusKeyboardNavigation.destroy();z.statusKeyboardNavigation=null}i.setHTML(D,"");q(function(I){var p=I.nodeName.toLowerCase(),s,v,t="";if(I.nodeType!=1||p==="br"||I.getAttribute("data-mce-bogus")||i.hasClass(I,"mceItemHidden")||i.hasClass(I,"mceItemRemoved")){return}if(h.isIE&&I.scopeName!=="HTML"&&I.scopeName){p=I.scopeName+":"+p}p=p.replace(/mce\:/g,"");switch(p){case"b":p="strong";break;case"i":p="em";break;case"img":if(y=i.getAttrib(I,"src")){t+="src: "+y+" "}break;case"a":if(y=i.getAttrib(I,"name")){t+="name: "+y+" ";p+="#"+y}if(y=i.getAttrib(I,"href")){t+="href: "+y+" "}break;case"font":if(y=i.getAttrib(I,"face")){t+="font: "+y+" "}if(y=i.getAttrib(I,"size")){t+="size: "+y+" "}if(y=i.getAttrib(I,"color")){t+="color: "+y+" "}break;case"span":if(y=i.getAttrib(I,"style")){t+="style: "+y+" "}break}if(y=i.getAttrib(I,"id")){t+="id: "+y+" "}if(y=I.className){y=y.replace(/\b\s*(webkit|mce|Apple-)\w+\s*\b/g,"");if(y){t+="class: "+y+" ";if(o.dom.isBlock(I)||p=="img"||p=="span"){p+="."+y}}}p=p.replace(/(html:)/g,"");p={name:p,node:I,title:t};z.onResolveName.dispatch(z,p);t=p.title;p=p.name;v=i.create("a",{href:"javascript:;",role:"button",onmousedown:"return false;",title:t,"class":"mcePath_"+(G++)},p);if(D.hasChildNodes()){D.insertBefore(i.create("span",{"aria-hidden":"true"},"\u00a0\u00bb "),D.firstChild);D.insertBefore(v,D.firstChild)}else{D.appendChild(v)}},o.getBody());if(i.select("a",D).length>0){z.statusKeyboardNavigation=new h.ui.KeyboardNavigation({root:o.id+"_path_row",items:i.select("a",D),excludeFromTabOrder:true,onCancel:function(){o.focus()}},i)}}},_sel:function(j){this.editor.execCommand("mceSelectNodeDepth",false,j)},_mceInsertAnchor:function(l,k){var j=this.editor;j.windowManager.open({url:this.url+"/anchor.htm",width:320+parseInt(j.getLang("advanced.anchor_delta_width",0)),height:90+parseInt(j.getLang("advanced.anchor_delta_height",0)),inline:true},{theme_url:this.url})},_mceCharMap:function(){var j=this.editor;j.windowManager.open({url:this.url+"/charmap.htm",width:550+parseInt(j.getLang("advanced.charmap_delta_width",0)),height:265+parseInt(j.getLang("advanced.charmap_delta_height",0)),inline:true},{theme_url:this.url})},_mceHelp:function(){var j=this.editor;j.windowManager.open({url:this.url+"/about.htm",width:480,height:380,inline:true},{theme_url:this.url})},_mceShortcuts:function(){var j=this.editor;j.windowManager.open({url:this.url+"/shortcuts.htm",width:480,height:380,inline:true},{theme_url:this.url})},_mceColorPicker:function(l,k){var j=this.editor;k=k||{};j.windowManager.open({url:this.url+"/color_picker.htm",width:375+parseInt(j.getLang("advanced.colorpicker_delta_width",0)),height:250+parseInt(j.getLang("advanced.colorpicker_delta_height",0)),close_previous:false,inline:true},{input_color:k.color,func:k.func,theme_url:this.url})},_mceCodeEditor:function(k,l){var j=this.editor;j.windowManager.open({url:this.url+"/source_editor.htm",width:parseInt(j.getParam("theme_advanced_source_editor_width",720)),height:parseInt(j.getParam("theme_advanced_source_editor_height",580)),inline:true,resizable:true,maximizable:true},{theme_url:this.url})},_mceImage:function(k,l){var j=this.editor;if(j.dom.getAttrib(j.selection.getNode(),"class","").indexOf("mceItem")!=-1){return}j.windowManager.open({url:this.url+"/image.htm",width:355+parseInt(j.getLang("advanced.image_delta_width",0)),height:275+parseInt(j.getLang("advanced.image_delta_height",0)),inline:true},{theme_url:this.url})},_mceLink:function(k,l){var j=this.editor;j.windowManager.open({url:this.url+"/link.htm",width:310+parseInt(j.getLang("advanced.link_delta_width",0)),height:200+parseInt(j.getLang("advanced.link_delta_height",0)),inline:true},{theme_url:this.url})},_mceNewDocument:function(){var j=this.editor;j.windowManager.confirm("advanced.newdocument",function(k){if(k){j.execCommand("mceSetContent",false,"")}})},_mceForeColor:function(){var j=this;this._mceColorPicker(0,{color:j.fgColor,func:function(k){j.fgColor=k;j.editor.execCommand("ForeColor",false,k)}})},_mceBackColor:function(){var j=this;this._mceColorPicker(0,{color:j.bgColor,func:function(k){j.bgColor=k;j.editor.execCommand("HiliteColor",false,k)}})},_ufirst:function(j){return j.substring(0,1).toUpperCase()+j.substring(1)}});h.ThemeManager.add("advanced",h.themes.AdvancedTheme)}(tinymce));
\ No newline at end of file
+(function(h){var i=h.DOM,g=h.dom.Event,c=h.extend,f=h.each,a=h.util.Cookie,e,d=h.explode;function b(p,m){var k,l,o=p.dom,j="",n,r;previewStyles=p.settings.preview_styles;if(previewStyles===false){return""}if(!previewStyles){previewStyles="font-family font-size font-weight text-decoration text-transform color background-color"}function q(s){return s.replace(/%(\w+)/g,"")}k=m.block||m.inline||"span";l=o.create(k);f(m.styles,function(t,s){t=q(t);if(t){o.setStyle(l,s,t)}});f(m.attributes,function(t,s){t=q(t);if(t){o.setAttrib(l,s,t)}});f(m.classes,function(s){s=q(s);if(!o.hasClass(l,s)){o.addClass(l,s)}});o.setStyles(l,{position:"absolute",left:-65535});p.getBody().appendChild(l);n=o.getStyle(p.getBody(),"fontSize",true);n=/px$/.test(n)?parseInt(n,10):0;f(previewStyles.split(" "),function(s){var t=o.getStyle(l,s,true);if(s=="background-color"&&/transparent|rgba\s*\([^)]+,\s*0\)/.test(t)){t=o.getStyle(p.getBody(),s,true);if(o.toHex(t).toLowerCase()=="#ffffff"){return}}if(s=="font-size"){if(/em|%$/.test(t)){if(n===0){return}t=parseFloat(t,10)/(/%$/.test(t)?100:1);t=(t*n)+"px"}}j+=s+":"+t+";"});o.remove(l);return j}h.ThemeManager.requireLangPack("advanced");h.create("tinymce.themes.AdvancedTheme",{sizes:[8,10,12,14,18,24,36],controls:{bold:["bold_desc","Bold"],italic:["italic_desc","Italic"],underline:["underline_desc","Underline"],strikethrough:["striketrough_desc","Strikethrough"],justifyleft:["justifyleft_desc","JustifyLeft"],justifycenter:["justifycenter_desc","JustifyCenter"],justifyright:["justifyright_desc","JustifyRight"],justifyfull:["justifyfull_desc","JustifyFull"],bullist:["bullist_desc","InsertUnorderedList"],numlist:["numlist_desc","InsertOrderedList"],outdent:["outdent_desc","Outdent"],indent:["indent_desc","Indent"],cut:["cut_desc","Cut"],copy:["copy_desc","Copy"],paste:["paste_desc","Paste"],undo:["undo_desc","Undo"],redo:["redo_desc","Redo"],link:["link_desc","mceLink"],unlink:["unlink_desc","unlink"],image:["image_desc","mceImage"],cleanup:["cleanup_desc","mceCleanup"],help:["help_desc","mceHelp"],code:["code_desc","mceCodeEditor"],hr:["hr_desc","InsertHorizontalRule"],removeformat:["removeformat_desc","RemoveFormat"],sub:["sub_desc","subscript"],sup:["sup_desc","superscript"],forecolor:["forecolor_desc","ForeColor"],forecolorpicker:["forecolor_desc","mceForeColor"],backcolor:["backcolor_desc","HiliteColor"],backcolorpicker:["backcolor_desc","mceBackColor"],charmap:["charmap_desc","mceCharMap"],visualaid:["visualaid_desc","mceToggleVisualAid"],anchor:["anchor_desc","mceInsertAnchor"],newdocument:["newdocument_desc","mceNewDocument"],blockquote:["blockquote_desc","mceBlockQuote"]},stateControls:["bold","italic","underline","strikethrough","bullist","numlist","justifyleft","justifycenter","justifyright","justifyfull","sub","sup","blockquote"],init:function(k,l){var m=this,n,j,p;m.editor=k;m.url=l;m.onResolveName=new h.util.Dispatcher(this);n=k.settings;k.forcedHighContrastMode=k.settings.detect_highcontrast&&m._isHighContrast();k.settings.skin=k.forcedHighContrastMode?"highcontrast":k.settings.skin;if(!n.theme_advanced_buttons1){n=c({theme_advanced_buttons1:"bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect",theme_advanced_buttons2:"bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code",theme_advanced_buttons3:"hr,removeformat,visualaid,|,sub,sup,|,charmap"},n)}m.settings=n=c({theme_advanced_path:true,theme_advanced_toolbar_location:"top",theme_advanced_blockformats:"p,address,pre,h1,h2,h3,h4,h5,h6",theme_advanced_toolbar_align:"left",theme_advanced_statusbar_location:"bottom",theme_advanced_fonts:"Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats",theme_advanced_more_colors:1,theme_advanced_row_height:23,theme_advanced_resize_horizontal:1,theme_advanced_resizing_use_cookie:1,theme_advanced_font_sizes:"1,2,3,4,5,6,7",theme_advanced_font_selector:"span",theme_advanced_show_current_color:0,readonly:k.settings.readonly},n);if(!n.font_size_style_values){n.font_size_style_values="8pt,10pt,12pt,14pt,18pt,24pt,36pt"}if(h.is(n.theme_advanced_font_sizes,"string")){n.font_size_style_values=h.explode(n.font_size_style_values);n.font_size_classes=h.explode(n.font_size_classes||"");p={};k.settings.theme_advanced_font_sizes=n.theme_advanced_font_sizes;f(k.getParam("theme_advanced_font_sizes","","hash"),function(r,q){var o;if(q==r&&r>=1&&r<=7){q=r+" ("+m.sizes[r-1]+"pt)";o=n.font_size_classes[r-1];r=n.font_size_style_values[r-1]||(m.sizes[r-1]+"pt")}if(/^\s*\./.test(r)){o=r.replace(/\./g,"")}p[q]=o?{"class":o}:{fontSize:r}});n.theme_advanced_font_sizes=p}if((j=n.theme_advanced_path_location)&&j!="none"){n.theme_advanced_statusbar_location=n.theme_advanced_path_location}if(n.theme_advanced_statusbar_location=="none"){n.theme_advanced_statusbar_location=0}if(k.settings.content_css!==false){k.contentCSS.push(k.baseURI.toAbsolute(l+"/skins/"+k.settings.skin+"/content.css"))}k.onInit.add(function(){if(!k.settings.readonly){k.onNodeChange.add(m._nodeChanged,m);k.onKeyUp.add(m._updateUndoStatus,m);k.onMouseUp.add(m._updateUndoStatus,m);k.dom.bind(k.dom.getRoot(),"dragend",function(){m._updateUndoStatus(k)})}});k.onSetProgressState.add(function(r,o,s){var t,u=r.id,q;if(o){m.progressTimer=setTimeout(function(){t=r.getContainer();t=t.insertBefore(i.create("DIV",{style:"position:relative"}),t.firstChild);q=i.get(r.id+"_tbl");i.add(t,"div",{id:u+"_blocker","class":"mceBlocker",style:{width:q.clientWidth+2,height:q.clientHeight+2}});i.add(t,"div",{id:u+"_progress","class":"mceProgress",style:{left:q.clientWidth/2,top:q.clientHeight/2}})},s||0)}else{i.remove(u+"_blocker");i.remove(u+"_progress");clearTimeout(m.progressTimer)}});i.loadCSS(n.editor_css?k.documentBaseURI.toAbsolute(n.editor_css):l+"/skins/"+k.settings.skin+"/ui.css");if(n.skin_variant){i.loadCSS(l+"/skins/"+k.settings.skin+"/ui_"+n.skin_variant+".css")}},_isHighContrast:function(){var j,k=i.add(i.getRoot(),"div",{style:"background-color: rgb(171,239,86);"});j=(i.getStyle(k,"background-color",true)+"").toLowerCase().replace(/ /g,"");i.remove(k);return j!="rgb(171,239,86)"&&j!="#abef56"},createControl:function(m,j){var k,l;if(l=j.createControl(m)){return l}switch(m){case"styleselect":return this._createStyleSelect();case"formatselect":return this._createBlockFormats();case"fontselect":return this._createFontSelect();case"fontsizeselect":return this._createFontSizeSelect();case"forecolor":return this._createForeColorMenu();case"backcolor":return this._createBackColorMenu()}if((k=this.controls[m])){return j.createButton(m,{title:"advanced."+k[0],cmd:k[1],ui:k[2],value:k[3]})}},execCommand:function(l,k,m){var j=this["_"+l];if(j){j.call(this,k,m);return true}return false},_importClasses:function(l){var j=this.editor,k=j.controlManager.get("styleselect");if(k.getLength()==0){f(j.dom.getClasses(),function(q,m){var p="style_"+m,n;n={inline:"span",attributes:{"class":q["class"]},selector:"*"};j.formatter.register(p,n);k.add(q["class"],p,{style:function(){return b(j,n)}})})}},_createStyleSelect:function(o){var l=this,j=l.editor,k=j.controlManager,m;m=k.createListBox("styleselect",{title:"advanced.style_select",onselect:function(q){var r,n=[],p;f(m.items,function(s){n.push(s.value)});j.focus();j.undoManager.add();r=j.formatter.matchAll(n);h.each(r,function(s){if(!q||s==q){if(s){j.formatter.remove(s)}p=true}});if(!p){j.formatter.apply(q)}j.undoManager.add();j.nodeChanged();return false}});j.onPreInit.add(function(){var p=0,n=j.getParam("style_formats");if(n){f(n,function(q){var r,s=0;f(q,function(){s++});if(s>1){r=q.name=q.name||"style_"+(p++);j.formatter.register(r,q);m.add(q.title,r,{style:function(){return b(j,q)}})}else{m.add(q.title)}})}else{f(j.getParam("theme_advanced_styles","","hash"),function(t,s){var r,q;if(t){r="style_"+(p++);q={inline:"span",classes:t,selector:"*"};j.formatter.register(r,q);m.add(l.editor.translate(s),r,{style:function(){return b(j,q)}})}})}});if(m.getLength()==0){m.onPostRender.add(function(p,q){if(!m.NativeListBox){g.add(q.id+"_text","focus",l._importClasses,l);g.add(q.id+"_text","mousedown",l._importClasses,l);g.add(q.id+"_open","focus",l._importClasses,l);g.add(q.id+"_open","mousedown",l._importClasses,l)}else{g.add(q.id,"focus",l._importClasses,l)}})}return m},_createFontSelect:function(){var l,k=this,j=k.editor;l=j.controlManager.createListBox("fontselect",{title:"advanced.fontdefault",onselect:function(m){var n=l.items[l.selectedIndex];if(!m&&n){j.execCommand("FontName",false,n.value);return}j.execCommand("FontName",false,m);l.select(function(o){return m==o});if(n&&n.value==m){l.select(null)}return false}});if(l){f(j.getParam("theme_advanced_fonts",k.settings.theme_advanced_fonts,"hash"),function(n,m){l.add(j.translate(m),n,{style:n.indexOf("dings")==-1?"font-family:"+n:""})})}return l},_createFontSizeSelect:function(){var m=this,k=m.editor,n,l=0,j=[];n=k.controlManager.createListBox("fontsizeselect",{title:"advanced.font_size",onselect:function(o){var p=n.items[n.selectedIndex];if(!o&&p){p=p.value;if(p["class"]){k.formatter.toggle("fontsize_class",{value:p["class"]});k.undoManager.add();k.nodeChanged()}else{k.execCommand("FontSize",false,p.fontSize)}return}if(o["class"]){k.focus();k.undoManager.add();k.formatter.toggle("fontsize_class",{value:o["class"]});k.undoManager.add();k.nodeChanged()}else{k.execCommand("FontSize",false,o.fontSize)}n.select(function(q){return o==q});if(p&&(p.value.fontSize==o.fontSize||p.value["class"]&&p.value["class"]==o["class"])){n.select(null)}return false}});if(n){f(m.settings.theme_advanced_font_sizes,function(p,o){var q=p.fontSize;if(q>=1&&q<=7){q=m.sizes[parseInt(q)-1]+"pt"}n.add(o,p,{style:"font-size:"+q,"class":"mceFontSize"+(l++)+(" "+(p["class"]||""))})})}return n},_createBlockFormats:function(){var l,j={p:"advanced.paragraph",address:"advanced.address",pre:"advanced.pre",h1:"advanced.h1",h2:"advanced.h2",h3:"advanced.h3",h4:"advanced.h4",h5:"advanced.h5",h6:"advanced.h6",div:"advanced.div",blockquote:"advanced.blockquote",code:"advanced.code",dt:"advanced.dt",dd:"advanced.dd",samp:"advanced.samp"},k=this;l=k.editor.controlManager.createListBox("formatselect",{title:"advanced.block",onselect:function(m){k.editor.execCommand("FormatBlock",false,m);return false}});if(l){f(k.editor.getParam("theme_advanced_blockformats",k.settings.theme_advanced_blockformats,"hash"),function(n,m){l.add(k.editor.translate(m!=n?m:j[n]),n,{"class":"mce_formatPreview mce_"+n,style:function(){return b(k.editor,{block:n})}})})}return l},_createForeColorMenu:function(){var n,k=this,l=k.settings,m={},j;if(l.theme_advanced_more_colors){m.more_colors_func=function(){k._mceColorPicker(0,{color:n.value,func:function(o){n.setColor(o)}})}}if(j=l.theme_advanced_text_colors){m.colors=j}if(l.theme_advanced_default_foreground_color){m.default_color=l.theme_advanced_default_foreground_color}m.title="advanced.forecolor_desc";m.cmd="ForeColor";m.scope=this;n=k.editor.controlManager.createColorSplitButton("forecolor",m);return n},_createBackColorMenu:function(){var n,k=this,l=k.settings,m={},j;if(l.theme_advanced_more_colors){m.more_colors_func=function(){k._mceColorPicker(0,{color:n.value,func:function(o){n.setColor(o)}})}}if(j=l.theme_advanced_background_colors){m.colors=j}if(l.theme_advanced_default_background_color){m.default_color=l.theme_advanced_default_background_color}m.title="advanced.backcolor_desc";m.cmd="HiliteColor";m.scope=this;n=k.editor.controlManager.createColorSplitButton("backcolor",m);return n},renderUI:function(l){var q,m,r,w=this,u=w.editor,x=w.settings,v,k,j;if(u.settings){u.settings.aria_label=x.aria_label+u.getLang("advanced.help_shortcut")}q=k=i.create("span",{role:"application","aria-labelledby":u.id+"_voice",id:u.id+"_parent","class":"mceEditor "+u.settings.skin+"Skin"+(x.skin_variant?" "+u.settings.skin+"Skin"+w._ufirst(x.skin_variant):"")+(u.settings.directionality=="rtl"?" mceRtl":"")});i.add(q,"span",{"class":"mceVoiceLabel",style:"display:none;",id:u.id+"_voice"},x.aria_label);if(!i.boxModel){q=i.add(q,"div",{"class":"mceOldBoxModel"})}q=v=i.add(q,"table",{role:"presentation",id:u.id+"_tbl","class":"mceLayout",cellSpacing:0,cellPadding:0});q=r=i.add(q,"tbody");switch((x.theme_advanced_layout_manager||"").toLowerCase()){case"rowlayout":m=w._rowLayout(x,r,l);break;case"customlayout":m=u.execCallback("theme_advanced_custom_layout",x,r,l,k);break;default:m=w._simpleLayout(x,r,l,k)}q=l.targetNode;j=v.rows;i.addClass(j[0],"mceFirst");i.addClass(j[j.length-1],"mceLast");f(i.select("tr",r),function(o){i.addClass(o.firstChild,"mceFirst");i.addClass(o.childNodes[o.childNodes.length-1],"mceLast")});if(i.get(x.theme_advanced_toolbar_container)){i.get(x.theme_advanced_toolbar_container).appendChild(k)}else{i.insertAfter(k,q)}g.add(u.id+"_path_row","click",function(n){n=n.target;if(n.nodeName=="A"){w._sel(n.className.replace(/^.*mcePath_([0-9]+).*$/,"$1"));return false}});if(!u.getParam("accessibility_focus")){g.add(i.add(k,"a",{href:"#"},""),"focus",function(){tinyMCE.get(u.id).focus()})}if(x.theme_advanced_toolbar_location=="external"){l.deltaHeight=0}w.deltaHeight=l.deltaHeight;l.targetNode=null;u.onKeyDown.add(function(p,n){var s=121,o=122;if(n.altKey){if(n.keyCode===s){if(h.isWebKit){window.focus()}w.toolbarGroup.focus();return g.cancel(n)}else{if(n.keyCode===o){i.get(p.id+"_path_row").focus();return g.cancel(n)}}}});u.addShortcut("alt+0","","mceShortcuts",w);return{iframeContainer:m,editorContainer:u.id+"_parent",sizeContainer:v,deltaHeight:l.deltaHeight}},getInfo:function(){return{longname:"Advanced theme",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",version:h.majorVersion+"."+h.minorVersion}},resizeBy:function(j,k){var l=i.get(this.editor.id+"_ifr");this.resizeTo(l.clientWidth+j,l.clientHeight+k)},resizeTo:function(j,n,l){var k=this.editor,m=this.settings,o=i.get(k.id+"_tbl"),p=i.get(k.id+"_ifr");j=Math.max(m.theme_advanced_resizing_min_width||100,j);n=Math.max(m.theme_advanced_resizing_min_height||100,n);j=Math.min(m.theme_advanced_resizing_max_width||65535,j);n=Math.min(m.theme_advanced_resizing_max_height||65535,n);i.setStyle(o,"height","");i.setStyle(p,"height",n);if(m.theme_advanced_resize_horizontal){i.setStyle(o,"width","");i.setStyle(p,"width",j);if(j"));i.setHTML(l,r.join(""))},_addStatusBar:function(p,k){var l,w=this,q=w.editor,x=w.settings,j,u,v,m;l=i.add(p,"tr");l=m=i.add(l,"td",{"class":"mceStatusbar"});l=i.add(l,"div",{id:q.id+"_path_row",role:"group","aria-labelledby":q.id+"_path_voice"});if(x.theme_advanced_path){i.add(l,"span",{id:q.id+"_path_voice"},q.translate("advanced.path"));i.add(l,"span",{},": ")}else{i.add(l,"span",{}," ")}if(x.theme_advanced_resizing){i.add(m,"a",{id:q.id+"_resize",href:"javascript:;",onclick:"return false;","class":"mceResize",tabIndex:"-1"});if(x.theme_advanced_resizing_use_cookie){q.onPostRender.add(function(){var n=a.getHash("TinyMCE_"+q.id+"_size"),r=i.get(q.id+"_tbl");if(!n){return}w.resizeTo(n.cw,n.ch)})}q.onPostRender.add(function(){g.add(q.id+"_resize","click",function(n){n.preventDefault()});g.add(q.id+"_resize","mousedown",function(E){var t,r,s,o,D,A,B,G,n,F,y;function z(H){H.preventDefault();n=B+(H.screenX-D);F=G+(H.screenY-A);w.resizeTo(n,F)}function C(H){g.remove(i.doc,"mousemove",t);g.remove(q.getDoc(),"mousemove",r);g.remove(i.doc,"mouseup",s);g.remove(q.getDoc(),"mouseup",o);n=B+(H.screenX-D);F=G+(H.screenY-A);w.resizeTo(n,F,true);q.nodeChanged()}E.preventDefault();D=E.screenX;A=E.screenY;y=i.get(w.editor.id+"_ifr");B=n=y.clientWidth;G=F=y.clientHeight;t=g.add(i.doc,"mousemove",z);r=g.add(q.getDoc(),"mousemove",z);s=g.add(i.doc,"mouseup",C);o=g.add(q.getDoc(),"mouseup",C)})})}k.deltaHeight-=21;l=p=null},_updateUndoStatus:function(k){var j=k.controlManager,l=k.undoManager;j.setDisabled("undo",!l.hasUndo()&&!l.typing);j.setDisabled("redo",!l.hasRedo())},_nodeChanged:function(o,u,E,r,F){var z=this,D,G=0,y,H,A=z.settings,x,l,w,C,m,k,j;h.each(z.stateControls,function(n){u.setActive(n,o.queryCommandState(z.controls[n][1]))});function q(p){var s,n=F.parents,t=p;if(typeof(p)=="string"){t=function(v){return v.nodeName==p}}for(s=0;s0){H.mark(p)}})}if(H=u.get("formatselect")){D=q(o.dom.isBlock);if(D){H.select(D.nodeName.toLowerCase())}}q(function(p){if(p.nodeName==="SPAN"){if(!x&&p.className){x=p.className}}if(o.dom.is(p,A.theme_advanced_font_selector)){if(!l&&p.style.fontSize){l=p.style.fontSize}if(!w&&p.style.fontFamily){w=p.style.fontFamily.replace(/[\"\']+/g,"").replace(/^([^,]+).*/,"$1").toLowerCase()}if(!C&&p.style.color){C=p.style.color}if(!m&&p.style.backgroundColor){m=p.style.backgroundColor}}return false});if(H=u.get("fontselect")){H.select(function(n){return n.replace(/^([^,]+).*/,"$1").toLowerCase()==w})}if(H=u.get("fontsizeselect")){if(A.theme_advanced_runtime_fontsize&&!l&&!x){l=o.dom.getStyle(E,"fontSize",true)}H.select(function(n){if(n.fontSize&&n.fontSize===l){return true}if(n["class"]&&n["class"]===x){return true}})}if(A.theme_advanced_show_current_color){function B(p,n){if(H=u.get(p)){if(!n){n=H.settings.default_color}if(n!==H.value){H.displayColor(n)}}}B("forecolor",C);B("backcolor",m)}if(A.theme_advanced_show_current_color){function B(p,n){if(H=u.get(p)){if(!n){n=H.settings.default_color}if(n!==H.value){H.displayColor(n)}}}B("forecolor",C);B("backcolor",m)}if(A.theme_advanced_path&&A.theme_advanced_statusbar_location){D=i.get(o.id+"_path")||i.add(o.id+"_path_row","span",{id:o.id+"_path"});if(z.statusKeyboardNavigation){z.statusKeyboardNavigation.destroy();z.statusKeyboardNavigation=null}i.setHTML(D,"");q(function(I){var p=I.nodeName.toLowerCase(),s,v,t="";if(I.nodeType!=1||p==="br"||I.getAttribute("data-mce-bogus")||i.hasClass(I,"mceItemHidden")||i.hasClass(I,"mceItemRemoved")){return}if(h.isIE&&I.scopeName!=="HTML"&&I.scopeName){p=I.scopeName+":"+p}p=p.replace(/mce\:/g,"");switch(p){case"b":p="strong";break;case"i":p="em";break;case"img":if(y=i.getAttrib(I,"src")){t+="src: "+y+" "}break;case"a":if(y=i.getAttrib(I,"name")){t+="name: "+y+" ";p+="#"+y}if(y=i.getAttrib(I,"href")){t+="href: "+y+" "}break;case"font":if(y=i.getAttrib(I,"face")){t+="font: "+y+" "}if(y=i.getAttrib(I,"size")){t+="size: "+y+" "}if(y=i.getAttrib(I,"color")){t+="color: "+y+" "}break;case"span":if(y=i.getAttrib(I,"style")){t+="style: "+y+" "}break}if(y=i.getAttrib(I,"id")){t+="id: "+y+" "}if(y=I.className){y=y.replace(/\b\s*(webkit|mce|Apple-)\w+\s*\b/g,"");if(y){t+="class: "+y+" ";if(o.dom.isBlock(I)||p=="img"||p=="span"){p+="."+y}}}p=p.replace(/(html:)/g,"");p={name:p,node:I,title:t};z.onResolveName.dispatch(z,p);t=p.title;p=p.name;v=i.create("a",{href:"javascript:;",role:"button",onmousedown:"return false;",title:t,"class":"mcePath_"+(G++)},p);if(D.hasChildNodes()){D.insertBefore(i.create("span",{"aria-hidden":"true"},"\u00a0\u00bb "),D.firstChild);D.insertBefore(v,D.firstChild)}else{D.appendChild(v)}},o.getBody());if(i.select("a",D).length>0){z.statusKeyboardNavigation=new h.ui.KeyboardNavigation({root:o.id+"_path_row",items:i.select("a",D),excludeFromTabOrder:true,onCancel:function(){o.focus()}},i)}}},_sel:function(j){this.editor.execCommand("mceSelectNodeDepth",false,j)},_mceInsertAnchor:function(l,k){var j=this.editor;j.windowManager.open({url:this.url+"/anchor.htm",width:320+parseInt(j.getLang("advanced.anchor_delta_width",0)),height:90+parseInt(j.getLang("advanced.anchor_delta_height",0)),inline:true},{theme_url:this.url})},_mceCharMap:function(){var j=this.editor;j.windowManager.open({url:this.url+"/charmap.htm",width:550+parseInt(j.getLang("advanced.charmap_delta_width",0)),height:265+parseInt(j.getLang("advanced.charmap_delta_height",0)),inline:true},{theme_url:this.url})},_mceHelp:function(){var j=this.editor;j.windowManager.open({url:this.url+"/about.htm",width:480,height:380,inline:true},{theme_url:this.url})},_mceShortcuts:function(){var j=this.editor;j.windowManager.open({url:this.url+"/shortcuts.htm",width:480,height:380,inline:true},{theme_url:this.url})},_mceColorPicker:function(l,k){var j=this.editor;k=k||{};j.windowManager.open({url:this.url+"/color_picker.htm",width:375+parseInt(j.getLang("advanced.colorpicker_delta_width",0)),height:250+parseInt(j.getLang("advanced.colorpicker_delta_height",0)),close_previous:false,inline:true},{input_color:k.color,func:k.func,theme_url:this.url})},_mceCodeEditor:function(k,l){var j=this.editor;j.windowManager.open({url:this.url+"/source_editor.htm",width:parseInt(j.getParam("theme_advanced_source_editor_width",720)),height:parseInt(j.getParam("theme_advanced_source_editor_height",580)),inline:true,resizable:true,maximizable:true},{theme_url:this.url})},_mceImage:function(k,l){var j=this.editor;if(j.dom.getAttrib(j.selection.getNode(),"class","").indexOf("mceItem")!=-1){return}j.windowManager.open({url:this.url+"/image.htm",width:355+parseInt(j.getLang("advanced.image_delta_width",0)),height:275+parseInt(j.getLang("advanced.image_delta_height",0)),inline:true},{theme_url:this.url})},_mceLink:function(k,l){var j=this.editor;j.windowManager.open({url:this.url+"/link.htm",width:310+parseInt(j.getLang("advanced.link_delta_width",0)),height:200+parseInt(j.getLang("advanced.link_delta_height",0)),inline:true},{theme_url:this.url})},_mceNewDocument:function(){var j=this.editor;j.windowManager.confirm("advanced.newdocument",function(k){if(k){j.execCommand("mceSetContent",false,"")}})},_mceForeColor:function(){var j=this;this._mceColorPicker(0,{color:j.fgColor,func:function(k){j.fgColor=k;j.editor.execCommand("ForeColor",false,k)}})},_mceBackColor:function(){var j=this;this._mceColorPicker(0,{color:j.bgColor,func:function(k){j.bgColor=k;j.editor.execCommand("HiliteColor",false,k)}})},_ufirst:function(j){return j.substring(0,1).toUpperCase()+j.substring(1)}});h.ThemeManager.add("advanced",h.themes.AdvancedTheme)}(tinymce));
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js
index 61fe5370..82166dcb 100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js
@@ -13,7 +13,7 @@
// Generates a preview for a format
function getPreviewCss(ed, fmt) {
- var previewElm, dom = ed.dom, previewCss = '', parentFontSize, previewStylesName;
+ var name, previewElm, dom = ed.dom, previewCss = '', parentFontSize, previewStylesName;
previewStyles = ed.settings.preview_styles;
@@ -150,23 +150,31 @@
init : function(ed, url) {
var t = this, s, v, o;
-
+
t.editor = ed;
t.url = url;
t.onResolveName = new tinymce.util.Dispatcher(this);
+ s = ed.settings;
ed.forcedHighContrastMode = ed.settings.detect_highcontrast && t._isHighContrast();
ed.settings.skin = ed.forcedHighContrastMode ? 'highcontrast' : ed.settings.skin;
+ // Setup default buttons
+ if (!s.theme_advanced_buttons1) {
+ s = extend({
+ theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect",
+ theme_advanced_buttons2 : "bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code",
+ theme_advanced_buttons3 : "hr,removeformat,visualaid,|,sub,sup,|,charmap"
+ }, s);
+ }
+
// Default settings
t.settings = s = extend({
theme_advanced_path : true,
- theme_advanced_toolbar_location : 'bottom',
- theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect",
- theme_advanced_buttons2 : "bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code",
- theme_advanced_buttons3 : "hr,removeformat,visualaid,|,sub,sup,|,charmap",
+ theme_advanced_toolbar_location : 'top',
theme_advanced_blockformats : "p,address,pre,h1,h2,h3,h4,h5,h6",
- theme_advanced_toolbar_align : "center",
+ theme_advanced_toolbar_align : "left",
+ theme_advanced_statusbar_location : "bottom",
theme_advanced_fonts : "Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats",
theme_advanced_more_colors : 1,
theme_advanced_row_height : 23,
@@ -176,7 +184,7 @@
theme_advanced_font_selector : "span",
theme_advanced_show_current_color: 0,
readonly : ed.settings.readonly
- }, ed.settings);
+ }, s);
// Setup default font_size_style_values
if (!s.font_size_style_values)
@@ -670,7 +678,7 @@
if (DOM.get(ed.id + '_path_row')) {
Event.add(ed.id + '_tbl', 'mouseover', function(e) {
var re;
-
+
e = e.target;
if (e.nodeName == 'SPAN' && DOM.hasClass(e.parentNode, 'mceButton')) {
@@ -823,6 +831,7 @@
var f = Event.add(ed.id + '_external_close', 'click', function() {
DOM.hide(ed.id + '_external');
Event.remove(ed.id + '_external_close', 'click', f);
+ return false;
});
DOM.show(e);
@@ -947,7 +956,7 @@
a = s.theme_advanced_toolbar_align.toLowerCase();
a = 'mce' + t._ufirst(a);
- n = DOM.add(DOM.add(c, 'tr', {role: 'presentation'}), 'td', {'class' : 'mceToolbar ' + a, "role":"presentation"});
+ n = DOM.add(DOM.add(c, 'tr', {role: 'presentation'}), 'td', {'class' : 'mceToolbar ' + a, "role":"toolbar"});
// Create toolbar and add the controls
for (i=1; (v = s['theme_advanced_buttons' + i]); i++) {
@@ -977,7 +986,7 @@
var n, t = this, ed = t.editor, s = t.settings, r, mf, me, td;
n = DOM.add(tb, 'tr');
- n = td = DOM.add(n, 'td', {'class' : 'mceStatusbar'});
+ n = td = DOM.add(n, 'td', {'class' : 'mceStatusbar'});
n = DOM.add(n, 'div', {id : ed.id + '_path_row', 'role': 'group', 'aria-labelledby': ed.id + '_path_voice'});
if (s.theme_advanced_path) {
DOM.add(n, 'span', {id: ed.id + '_path_voice'}, ed.translate('advanced.path'));
@@ -985,7 +994,7 @@
} else {
DOM.add(n, 'span', {}, ' ');
}
-
+
if (s.theme_advanced_resizing) {
DOM.add(td, 'a', {id : ed.id + '_resize', href : 'javascript:;', onclick : "return false;", 'class' : 'mceResize', tabIndex:"-1"});
@@ -1030,6 +1039,8 @@
width = startWidth + (e.screenX - startX);
height = startHeight + (e.screenY - startY);
t.resizeTo(width, height, true);
+
+ ed.nodeChanged();
};
e.preventDefault();
@@ -1089,19 +1100,17 @@
p = getParent('A');
if (c = cm.get('link')) {
- if (!p || !p.name) {
- c.setDisabled(!p && co);
- c.setActive(!!p);
- }
+ c.setDisabled((!p && co) || (p && !p.href));
+ c.setActive(!!p && (!p.name && !p.id));
}
if (c = cm.get('unlink')) {
c.setDisabled(!p && co);
- c.setActive(!!p && !p.name);
+ c.setActive(!!p && !p.name && !p.id);
}
if (c = cm.get('anchor')) {
- c.setActive(!co && !!p && p.name);
+ c.setActive(!co && !!p && (p.name || (p.id && !p.href)));
}
p = getParent('IMG');
@@ -1145,7 +1154,7 @@
if (!fn && n.style.fontFamily)
fn = n.style.fontFamily.replace(/[\"\']+/g, '').replace(/^([^,]+).*/, '$1').toLowerCase();
-
+
if (!fc && n.style.color)
fc = n.style.color;
@@ -1176,7 +1185,7 @@
return true;
});
}
-
+
if (s.theme_advanced_show_current_color) {
function updateColor(controlId, color) {
if (c = cm.get(controlId)) {
@@ -1280,7 +1289,7 @@
ti += 'id: ' + v + ' ';
if (v = n.className) {
- v = v.replace(/\b\s*(webkit|mce|Apple-)\w+\s*\b/g, '')
+ v = v.replace(/\b\s*(webkit|mce|Apple-)\w+\s*\b/g, '');
if (v) {
ti += 'class: ' + v + ' ';
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/img/icons.gif b/library/tinymce/jscripts/tiny_mce/themes/advanced/img/icons.gif
index efb356c4..ca222490 100644
Binary files a/library/tinymce/jscripts/tiny_mce/themes/advanced/img/icons.gif and b/library/tinymce/jscripts/tiny_mce/themes/advanced/img/icons.gif differ
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js
index 2940db35..2909a3a4 100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js
@@ -6,7 +6,7 @@ var AnchorDialog = {
this.editor = ed;
elm = ed.dom.getParent(ed.selection.getNode(), 'A');
- v = ed.dom.getAttrib(elm, 'name');
+ v = ed.dom.getAttrib(elm, 'name') || ed.dom.getAttrib(elm, 'id');
if (v) {
this.action = 'update';
@@ -17,7 +17,7 @@ var AnchorDialog = {
},
update : function() {
- var ed = this.editor, elm, name = document.forms[0].anchorName.value;
+ var ed = this.editor, elm, name = document.forms[0].anchorName.value, attribName;
if (!name || !/^[a-z][a-z0-9\-\_:\.]*$/i.test(name)) {
tinyMCEPopup.alert('advanced_dlg.anchor_invalid');
@@ -29,13 +29,25 @@ var AnchorDialog = {
if (this.action != 'update')
ed.selection.collapse(1);
+ var aRule = ed.schema.getElementRule('a');
+ if (!aRule || aRule.attributes.name) {
+ attribName = 'name';
+ } else {
+ attribName = 'id';
+ }
+
elm = ed.dom.getParent(ed.selection.getNode(), 'A');
if (elm) {
- elm.setAttribute('name', name);
- elm.name = name;
- } else
+ elm.setAttribute(attribName, name);
+ elm[attribName] = name;
+ ed.undoManager.add();
+ } else {
// create with zero-sized nbsp so that in Webkit where anchor is on last line by itself caret cannot be placed after it
- ed.execCommand('mceInsertContent', 0, ed.dom.createHTML('a', {name : name, 'class' : 'mceItemAnchor'}, '\uFEFF'));
+ var attrs = {'class' : 'mceItemAnchor'};
+ attrs[attribName] = name;
+ ed.execCommand('mceInsertContent', 0, ed.dom.createHTML('a', attrs, '\uFEFF'));
+ ed.nodeChanged();
+ }
tinyMCEPopup.close();
}
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js
index 53ff409e..8c1d73c5 100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js
@@ -68,10 +68,16 @@ var LinkDialog = {
} else {
ed.dom.setAttribs(e, {
href : href,
- title : f.linktitle.value,
- target : f.target_list ? getSelectValue(f, "target_list") : null,
- 'class' : f.class_list ? getSelectValue(f, "class_list") : null
+ title : f.linktitle.value
});
+
+ if (f.target_list) {
+ ed.dom.setAttrib(e, 'target', getSelectValue(f, "target_list"));
+ }
+
+ if (f.class_list) {
+ ed.dom.setAttrib(e, 'class', getSelectValue(f, "class_list"));
+ }
}
// Don't move caret if selection was image
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css
index 52a1d67e..2fd94a1f 100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css
@@ -48,4 +48,3 @@ font[face=mceinline] {font-family:inherit !important}
.mceItemEmbeddedAudio {background-image:url(../../img/video.gif)}
.mceItemIframe {background-image:url(../../img/iframe.gif)}
.mcePageBreak {display:block;border:0;width:100%;height:12px;border-top:1px dotted #ccc;margin-top:15px;background:#fff url(../../img/pagebreak.gif) no-repeat center top;}
-.mceHideBrInPre pre br {display: none}
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css
index f0122265..879786fc 100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css
@@ -105,11 +105,12 @@ h3 {font-size:14px;}
#plugintable, #about #plugintable td {border:1px solid #919B9C;}
#plugintable {width:96%; margin-top:10px;}
#pluginscontainer {height:290px; overflow:auto;}
-#colorpicker #preview {float:right; width:50px; height:14px;line-height:1px; border:1px solid black; margin-left:5px;}
+#colorpicker #preview {display:inline-block; padding-left:40px; height:14px; border:1px solid black; margin-left:5px; margin-right: 5px}
+#colorpicker #previewblock {position: relative; top: -3px; padding-left:5px; padding-top: 0px; display:inline}
+#colorpicker #preview_wrapper { text-align:center; padding-top:4px; white-space: nowrap}
#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;}
#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;}
#colorpicker #light div {overflow:hidden;}
-#colorpicker #previewblock {float:right; padding-left:10px; height:20px;}
#colorpicker .panel_wrapper div.current {height:175px;}
#colorpicker #namedcolors {width:150px;}
#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;}
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css
index 5f1f9644..77083f31 100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css
@@ -4,14 +4,14 @@
.defaultSkin table td {vertical-align:middle}
/* Containers */
-.defaultSkin table {direction:ltr; background:#FFF}
-.defaultSkin iframe {display:block; background:#FFF}
+.defaultSkin table {direction:ltr;background:transparent}
+.defaultSkin iframe {display:block;}
.defaultSkin .mceToolbar {height:26px}
.defaultSkin .mceLeft {text-align:left}
.defaultSkin .mceRight {text-align:right}
/* External */
-.defaultSkin .mceExternalToolbar {position:absolute; border:2px solid #CCC; border-bottom:0; display:none;}
+.defaultSkin .mceExternalToolbar {position:absolute; border:1px solid #CCC; border-bottom:0; display:none;}
.defaultSkin .mceExternalToolbar td.mceToolbar {padding-right:13px;}
.defaultSkin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px; background:url(../../img/icons.gif) -820px 0}
@@ -20,9 +20,9 @@
.defaultSkin table.mceLayout tr.mceFirst td {border-top:1px solid #CCC}
.defaultSkin table.mceLayout tr.mceLast td {border-bottom:1px solid #CCC}
.defaultSkin table.mceToolbar, .defaultSkin tr.mceFirst .mceToolbar tr td, .defaultSkin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0;}
-.defaultSkin td.mceToolbar {padding-top:1px; vertical-align:top}
-.defaultSkin .mceIframeContainer { /*border-top:1px solid #CCC; border-bottom:1px solid #CCC */ border: none;}
-.defaultSkin .mceStatusbar {font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; display:block; height:20px}
+.defaultSkin td.mceToolbar {background:#F0F0EE; padding-top:1px; vertical-align:top}
+.defaultSkin .mceIframeContainer {border-top:1px solid #CCC; border-bottom:1px solid #CCC}
+.defaultSkin .mceStatusbar {background:#F0F0EE; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; display:block; height:20px}
.defaultSkin .mceStatusbar div {float:left; margin:2px}
.defaultSkin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize; outline:0}
.defaultSkin .mceStatusbar a:hover {text-decoration:underline}
@@ -34,7 +34,7 @@
.defaultSkin td.mceRight table {margin:0 0 0 auto;}
/* Button */
-.defaultSkin .mceButton {display:block; border:1px solid #F0F0EE; width:20px; height:20px; margin-right:10px}
+.defaultSkin .mceButton {display:block; border:1px solid #F0F0EE; width:20px; height:20px; margin-right:1px}
.defaultSkin a.mceButtonEnabled:hover {border:1px solid #0A246A; background-color:#B2BBD0}
.defaultSkin a.mceButtonActive, .defaultSkin a.mceButtonSelected {border:1px solid #0A246A; background-color:#C2CBE0}
.defaultSkin .mceButtonDisabled .mceIcon {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}
@@ -83,7 +83,7 @@
.defaultSkin .mce_forecolor span.mceAction, .defaultSkin .mce_backcolor span.mceAction {overflow:hidden; height:16px}
/* Menu */
-.defaultSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid #D4D0C8}
+.defaultSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid #D4D0C8; direction:ltr}
.defaultSkin .mceNoIcons span.mceIcon {width:0;}
.defaultSkin .mceNoIcons a .mceText {padding-left:10px}
.defaultSkin .mceMenu table {background:#FFF}
@@ -103,11 +103,16 @@
.defaultSkin .mceNoIcons .mceMenuItemSelected a {background:url(img/menu_arrow.gif) no-repeat -6px center}
.defaultSkin .mceMenu span.mceMenuLine {display:none}
.defaultSkin .mceMenuItemSub a {background:url(img/menu_arrow.gif) no-repeat top right;}
+.defaultSkin .mceMenuItem td, .defaultSkin .mceMenuItem th {line-height: normal}
/* Progress,Resize */
.defaultSkin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=50)'; filter:alpha(opacity=50); background:#FFF}
.defaultSkin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px}
+/* Rtl */
+.mceRtl .mceListBox .mceText {text-align: right; padding: 0 4px 0 0}
+.mceRtl .mceMenuItem .mceText {text-align: right}
+
/* Formats */
.defaultSkin .mce_formatPreview a {font-size:10px}
.defaultSkin .mce_p span.mceText {}
@@ -211,3 +216,4 @@
.defaultSkin span.mce_pagebreak {background-position:0 -40px}
.defaultSkin span.mce_restoredraft {background-position:-20px -40px}
.defaultSkin span.mce_spellchecker {background-position:-540px -20px}
+.defaultSkin span.mce_visualblocks {background-position: -40px -40px}
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/content.css b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/content.css
index fe09e214..cbce6c6a 100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/content.css
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/content.css
@@ -22,4 +22,3 @@ abbr {border-bottom:1px dashed #CCC; cursor:help}
img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px}
font[face=mceinline] {font-family:inherit !important}
*[contentEditable]:focus {outline:0}
-.mceHideBrInPre pre br {display: none}
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css
index 3537c8bc..a1a8f9bd 100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css
@@ -46,4 +46,3 @@ font[face=mceinline] {font-family:inherit !important}
.mceItemAudio {background-image:url(../../img/video.gif)}
.mceItemIframe {background-image:url(../../img/iframe.gif)}
.mcePageBreak {display:block;border:0;width:100%;height:12px;border-top:1px dotted #ccc;margin-top:15px;background:#fff url(../../img/pagebreak.gif) no-repeat center top;}
-.mceHideBrInPre pre br {display: none}
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm b/library/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm
index 3c6d6580..dd973fcc 100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm
@@ -4,7 +4,7 @@
-
+
diff --git a/view/theme/decaf-mobile/cropend.tpl b/view/theme/decaf-mobile/cropend.tpl
new file mode 100644
index 00000000..a27de0e2
--- /dev/null
+++ b/view/theme/decaf-mobile/cropend.tpl
@@ -0,0 +1,4 @@
+{##}
diff --git a/view/theme/decaf-mobile/crophead.tpl b/view/theme/decaf-mobile/crophead.tpl
new file mode 100644
index 00000000..56e941e3
--- /dev/null
+++ b/view/theme/decaf-mobile/crophead.tpl
@@ -0,0 +1 @@
+
diff --git a/view/theme/decaf-mobile/default.php b/view/theme/decaf-mobile/default.php
new file mode 100644
index 00000000..ad464760
--- /dev/null
+++ b/view/theme/decaf-mobile/default.php
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>
+
+
+ module === 'home' ) { ?>
+
+
+
+
+ module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {
+ ?>
+
+
+
+
+
+
+
+
+
+ module === 'settings' || $a->module === 'message' || $a->module === 'profile') && x($page,'aside')) echo $page['aside']; ?>
+
+
+
+ module === 'contacts') && x($page,'aside')) echo $page['aside']; ?>
+
+
+
+
+
+
+
+
diff --git a/view/theme/decaf-mobile/display-head.tpl b/view/theme/decaf-mobile/display-head.tpl
new file mode 100644
index 00000000..1c990657
--- /dev/null
+++ b/view/theme/decaf-mobile/display-head.tpl
@@ -0,0 +1,4 @@
+{##}
diff --git a/view/theme/decaf-mobile/editicons.png b/view/theme/decaf-mobile/editicons.png
new file mode 100644
index 00000000..171a4087
Binary files /dev/null and b/view/theme/decaf-mobile/editicons.png differ
diff --git a/view/theme/decaf-mobile/end.tpl b/view/theme/decaf-mobile/end.tpl
new file mode 100644
index 00000000..cb3824d9
--- /dev/null
+++ b/view/theme/decaf-mobile/end.tpl
@@ -0,0 +1,24 @@
+
+{##}
+{##}
+{##}
+{##}
+{##}
+
+
+
+
diff --git a/view/theme/decaf-mobile/event_end.tpl b/view/theme/decaf-mobile/event_end.tpl
new file mode 100644
index 00000000..3e4be6ec
--- /dev/null
+++ b/view/theme/decaf-mobile/event_end.tpl
@@ -0,0 +1,4 @@
+{##}
diff --git a/view/theme/decaf-mobile/event_head.tpl b/view/theme/decaf-mobile/event_head.tpl
new file mode 100644
index 00000000..63a1135a
--- /dev/null
+++ b/view/theme/decaf-mobile/event_head.tpl
@@ -0,0 +1,6 @@
+
+{##}
diff --git a/view/theme/decaf-mobile/experimental b/view/theme/decaf-mobile/experimental
new file mode 100644
index 00000000..e69de29b
diff --git a/view/theme/decaf-mobile/field_checkbox.tpl b/view/theme/decaf-mobile/field_checkbox.tpl
new file mode 100644
index 00000000..9fbf84ea
--- /dev/null
+++ b/view/theme/decaf-mobile/field_checkbox.tpl
@@ -0,0 +1,6 @@
+
+
+ $field.1
+
+ $field.3
+
diff --git a/view/theme/decaf-mobile/field_input.tpl b/view/theme/decaf-mobile/field_input.tpl
new file mode 100644
index 00000000..58e17406
--- /dev/null
+++ b/view/theme/decaf-mobile/field_input.tpl
@@ -0,0 +1,6 @@
+
+
+ $field.1
+
+ $field.3
+
diff --git a/view/theme/decaf-mobile/field_openid.tpl b/view/theme/decaf-mobile/field_openid.tpl
new file mode 100644
index 00000000..8d330a30
--- /dev/null
+++ b/view/theme/decaf-mobile/field_openid.tpl
@@ -0,0 +1,6 @@
+
+
+ $field.1
+
+ $field.3
+
diff --git a/view/theme/decaf-mobile/field_password.tpl b/view/theme/decaf-mobile/field_password.tpl
new file mode 100644
index 00000000..7a0d3fe9
--- /dev/null
+++ b/view/theme/decaf-mobile/field_password.tpl
@@ -0,0 +1,6 @@
+
+
+ $field.1
+
+ $field.3
+
diff --git a/view/theme/decaf-mobile/field_themeselect.tpl b/view/theme/decaf-mobile/field_themeselect.tpl
new file mode 100644
index 00000000..5ac310f8
--- /dev/null
+++ b/view/theme/decaf-mobile/field_themeselect.tpl
@@ -0,0 +1,9 @@
+
+
+
$field.1
+
+ {{ for $field.4 as $opt=>$val }}$val {{ endfor }}
+
+
$field.3
+
+
diff --git a/view/theme/decaf-mobile/field_yesno.tpl b/view/theme/decaf-mobile/field_yesno.tpl
new file mode 100644
index 00000000..c399579b
--- /dev/null
+++ b/view/theme/decaf-mobile/field_yesno.tpl
@@ -0,0 +1,14 @@
+{##}
+{{ inc field_checkbox.tpl }}{{ endinc }}
diff --git a/view/theme/decaf-mobile/file.gif b/view/theme/decaf-mobile/file.gif
new file mode 100644
index 00000000..7885b998
Binary files /dev/null and b/view/theme/decaf-mobile/file.gif differ
diff --git a/view/theme/decaf-mobile/friendica-16.png b/view/theme/decaf-mobile/friendica-16.png
new file mode 100644
index 00000000..1a742ecd
Binary files /dev/null and b/view/theme/decaf-mobile/friendica-16.png differ
diff --git a/view/theme/decaf-mobile/generic_links_widget.tpl b/view/theme/decaf-mobile/generic_links_widget.tpl
new file mode 100644
index 00000000..a976d457
--- /dev/null
+++ b/view/theme/decaf-mobile/generic_links_widget.tpl
@@ -0,0 +1,12 @@
+
diff --git a/view/theme/decaf-mobile/group_drop.tpl b/view/theme/decaf-mobile/group_drop.tpl
new file mode 100644
index 00000000..959b77bb
--- /dev/null
+++ b/view/theme/decaf-mobile/group_drop.tpl
@@ -0,0 +1,9 @@
+
+
diff --git a/view/theme/decaf-mobile/group_side.tpl b/view/theme/decaf-mobile/group_side.tpl
new file mode 100644
index 00000000..0b456407
--- /dev/null
+++ b/view/theme/decaf-mobile/group_side.tpl
@@ -0,0 +1,33 @@
+
+
+
diff --git a/view/theme/decaf-mobile/head.jpg b/view/theme/decaf-mobile/head.jpg
new file mode 100644
index 00000000..6210b76b
Binary files /dev/null and b/view/theme/decaf-mobile/head.jpg differ
diff --git a/view/theme/decaf-mobile/head.tpl b/view/theme/decaf-mobile/head.tpl
new file mode 100644
index 00000000..5ad82b4c
--- /dev/null
+++ b/view/theme/decaf-mobile/head.tpl
@@ -0,0 +1,29 @@
+
+{##}
+
+{##}
+
+
+
+{##}
+
+
+
+
+
+
+
diff --git a/view/theme/decaf-mobile/images/approve-blue.png b/view/theme/decaf-mobile/images/approve-blue.png
new file mode 100644
index 00000000..a13668a5
Binary files /dev/null and b/view/theme/decaf-mobile/images/approve-blue.png differ
diff --git a/view/theme/decaf-mobile/images/approve.png b/view/theme/decaf-mobile/images/approve.png
new file mode 100644
index 00000000..473c646e
Binary files /dev/null and b/view/theme/decaf-mobile/images/approve.png differ
diff --git a/view/theme/decaf-mobile/images/arrow-left.png b/view/theme/decaf-mobile/images/arrow-left.png
new file mode 100644
index 00000000..a312cfa7
Binary files /dev/null and b/view/theme/decaf-mobile/images/arrow-left.png differ
diff --git a/view/theme/decaf-mobile/images/arrow-right.png b/view/theme/decaf-mobile/images/arrow-right.png
new file mode 100644
index 00000000..2be9bd74
Binary files /dev/null and b/view/theme/decaf-mobile/images/arrow-right.png differ
diff --git a/view/theme/decaf-mobile/images/boldB-serif.png b/view/theme/decaf-mobile/images/boldB-serif.png
new file mode 100644
index 00000000..78ce59a5
Binary files /dev/null and b/view/theme/decaf-mobile/images/boldB-serif.png differ
diff --git a/view/theme/decaf-mobile/images/camera.png b/view/theme/decaf-mobile/images/camera.png
new file mode 100644
index 00000000..aa5935b7
Binary files /dev/null and b/view/theme/decaf-mobile/images/camera.png differ
diff --git a/view/theme/decaf-mobile/images/code.png b/view/theme/decaf-mobile/images/code.png
new file mode 100644
index 00000000..d490cea9
Binary files /dev/null and b/view/theme/decaf-mobile/images/code.png differ
diff --git a/view/theme/decaf-mobile/images/contacts.png b/view/theme/decaf-mobile/images/contacts.png
new file mode 100644
index 00000000..e870470d
Binary files /dev/null and b/view/theme/decaf-mobile/images/contacts.png differ
diff --git a/view/theme/decaf-mobile/images/disapprove-blue.png b/view/theme/decaf-mobile/images/disapprove-blue.png
new file mode 100644
index 00000000..ebbc7e4e
Binary files /dev/null and b/view/theme/decaf-mobile/images/disapprove-blue.png differ
diff --git a/view/theme/decaf-mobile/images/disapprove.png b/view/theme/decaf-mobile/images/disapprove.png
new file mode 100644
index 00000000..fa58d020
Binary files /dev/null and b/view/theme/decaf-mobile/images/disapprove.png differ
diff --git a/view/theme/decaf-mobile/images/drop-blue.png b/view/theme/decaf-mobile/images/drop-blue.png
new file mode 100644
index 00000000..a8b6c53c
Binary files /dev/null and b/view/theme/decaf-mobile/images/drop-blue.png differ
diff --git a/view/theme/decaf-mobile/images/drop-darkred.png b/view/theme/decaf-mobile/images/drop-darkred.png
new file mode 100644
index 00000000..9657d113
Binary files /dev/null and b/view/theme/decaf-mobile/images/drop-darkred.png differ
diff --git a/view/theme/decaf-mobile/images/drop-red.png b/view/theme/decaf-mobile/images/drop-red.png
new file mode 100644
index 00000000..91b0260c
Binary files /dev/null and b/view/theme/decaf-mobile/images/drop-red.png differ
diff --git a/view/theme/decaf-mobile/images/drop.png b/view/theme/decaf-mobile/images/drop.png
new file mode 100644
index 00000000..af38adf5
Binary files /dev/null and b/view/theme/decaf-mobile/images/drop.png differ
diff --git a/view/theme/decaf-mobile/images/folder-blue.png b/view/theme/decaf-mobile/images/folder-blue.png
new file mode 100644
index 00000000..6af9bbec
Binary files /dev/null and b/view/theme/decaf-mobile/images/folder-blue.png differ
diff --git a/view/theme/decaf-mobile/images/folder.png b/view/theme/decaf-mobile/images/folder.png
new file mode 100644
index 00000000..86dd2102
Binary files /dev/null and b/view/theme/decaf-mobile/images/folder.png differ
diff --git a/view/theme/decaf-mobile/images/globe.png b/view/theme/decaf-mobile/images/globe.png
new file mode 100644
index 00000000..f84632bf
Binary files /dev/null and b/view/theme/decaf-mobile/images/globe.png differ
diff --git a/view/theme/decaf-mobile/images/italicI-serif.png b/view/theme/decaf-mobile/images/italicI-serif.png
new file mode 100644
index 00000000..86fa40f9
Binary files /dev/null and b/view/theme/decaf-mobile/images/italicI-serif.png differ
diff --git a/view/theme/decaf-mobile/images/lock.png b/view/theme/decaf-mobile/images/lock.png
new file mode 100644
index 00000000..b8b8cd20
Binary files /dev/null and b/view/theme/decaf-mobile/images/lock.png differ
diff --git a/view/theme/decaf-mobile/images/menu.png b/view/theme/decaf-mobile/images/menu.png
new file mode 100644
index 00000000..44d5285f
Binary files /dev/null and b/view/theme/decaf-mobile/images/menu.png differ
diff --git a/view/theme/decaf-mobile/images/message.png b/view/theme/decaf-mobile/images/message.png
new file mode 100644
index 00000000..8f735aed
Binary files /dev/null and b/view/theme/decaf-mobile/images/message.png differ
diff --git a/view/theme/decaf-mobile/images/network.png b/view/theme/decaf-mobile/images/network.png
new file mode 100644
index 00000000..943e3252
Binary files /dev/null and b/view/theme/decaf-mobile/images/network.png differ
diff --git a/view/theme/decaf-mobile/images/noglobe.png b/view/theme/decaf-mobile/images/noglobe.png
new file mode 100644
index 00000000..b5aceb6d
Binary files /dev/null and b/view/theme/decaf-mobile/images/noglobe.png differ
diff --git a/view/theme/decaf-mobile/images/notifications.png b/view/theme/decaf-mobile/images/notifications.png
new file mode 100644
index 00000000..27bacc67
Binary files /dev/null and b/view/theme/decaf-mobile/images/notifications.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/LICENSE b/view/theme/decaf-mobile/images/oxygen/LICENSE
new file mode 100644
index 00000000..65c5ca88
--- /dev/null
+++ b/view/theme/decaf-mobile/images/oxygen/LICENSE
@@ -0,0 +1,165 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+ This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+ 0. Additional Definitions.
+
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+ 1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+ 2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
+
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
+
+ 3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
+
+ 4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
+
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
+
+ d) Do one of the following:
+
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
+
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
+
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
+
+ 5. Combined Libraries.
+
+ You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
+
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
+
+ 6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+ If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/view/theme/decaf-mobile/images/oxygen/application-msword.png b/view/theme/decaf-mobile/images/oxygen/application-msword.png
new file mode 100644
index 00000000..aa5aaf31
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-msword.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-pdf.png b/view/theme/decaf-mobile/images/oxygen/application-pdf.png
new file mode 100644
index 00000000..bc954ff6
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-pdf.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-vnd.ms-excel.png b/view/theme/decaf-mobile/images/oxygen/application-vnd.ms-excel.png
new file mode 100644
index 00000000..aa0d9959
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-vnd.ms-excel.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-vnd.ms-powerpoint.png b/view/theme/decaf-mobile/images/oxygen/application-vnd.ms-powerpoint.png
new file mode 100644
index 00000000..022b5152
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-vnd.ms-powerpoint.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-vnd.oasis.opendocument.presentation.png b/view/theme/decaf-mobile/images/oxygen/application-vnd.oasis.opendocument.presentation.png
new file mode 100644
index 00000000..cb573b5c
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-vnd.oasis.opendocument.presentation.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-vnd.oasis.opendocument.spreadsheet.png b/view/theme/decaf-mobile/images/oxygen/application-vnd.oasis.opendocument.spreadsheet.png
new file mode 100644
index 00000000..6b8030ed
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-vnd.oasis.opendocument.spreadsheet.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-vnd.oasis.opendocument.text.png b/view/theme/decaf-mobile/images/oxygen/application-vnd.oasis.opendocument.text.png
new file mode 100644
index 00000000..1adb56e2
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-vnd.oasis.opendocument.text.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-bzip-compressed-tar.png b/view/theme/decaf-mobile/images/oxygen/application-x-bzip-compressed-tar.png
new file mode 100644
index 00000000..d7dd1d1f
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-bzip-compressed-tar.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-compressed-tar.png b/view/theme/decaf-mobile/images/oxygen/application-x-compressed-tar.png
new file mode 100644
index 00000000..adda6850
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-compressed-tar.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-deb.png b/view/theme/decaf-mobile/images/oxygen/application-x-deb.png
new file mode 100644
index 00000000..1832d3b7
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-deb.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-font-otf.png b/view/theme/decaf-mobile/images/oxygen/application-x-font-otf.png
new file mode 100644
index 00000000..68fb5dd0
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-font-otf.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-font-ttf.png b/view/theme/decaf-mobile/images/oxygen/application-x-font-ttf.png
new file mode 100644
index 00000000..93b92fb2
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-font-ttf.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-java-archive.png b/view/theme/decaf-mobile/images/oxygen/application-x-java-archive.png
new file mode 100644
index 00000000..4883b2d7
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-java-archive.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-lzma-compressed-tar.png b/view/theme/decaf-mobile/images/oxygen/application-x-lzma-compressed-tar.png
new file mode 100644
index 00000000..6092aedd
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-lzma-compressed-tar.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-php.png b/view/theme/decaf-mobile/images/oxygen/application-x-php.png
new file mode 100644
index 00000000..f133c87a
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-php.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-rar.png b/view/theme/decaf-mobile/images/oxygen/application-x-rar.png
new file mode 100644
index 00000000..a9b1b12a
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-rar.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-rpm.png b/view/theme/decaf-mobile/images/oxygen/application-x-rpm.png
new file mode 100644
index 00000000..43149f17
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-rpm.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-ruby.png b/view/theme/decaf-mobile/images/oxygen/application-x-ruby.png
new file mode 100644
index 00000000..e640ead7
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-ruby.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-shellscript.png b/view/theme/decaf-mobile/images/oxygen/application-x-shellscript.png
new file mode 100644
index 00000000..11e27543
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-shellscript.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-shockwave-flash.png b/view/theme/decaf-mobile/images/oxygen/application-x-shockwave-flash.png
new file mode 100644
index 00000000..ea9ca59e
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-shockwave-flash.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-tar.png b/view/theme/decaf-mobile/images/oxygen/application-x-tar.png
new file mode 100644
index 00000000..4b7d023f
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-tar.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-xml.png b/view/theme/decaf-mobile/images/oxygen/application-xml.png
new file mode 100644
index 00000000..58d32e43
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-xml.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-zip.png b/view/theme/decaf-mobile/images/oxygen/application-zip.png
new file mode 100644
index 00000000..9d349a89
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-zip.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/audio-aac.png b/view/theme/decaf-mobile/images/oxygen/audio-aac.png
new file mode 100644
index 00000000..a2d5177d
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/audio-aac.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/audio-mp4.png b/view/theme/decaf-mobile/images/oxygen/audio-mp4.png
new file mode 100644
index 00000000..ae5fd740
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/audio-mp4.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/audio-mpeg.png b/view/theme/decaf-mobile/images/oxygen/audio-mpeg.png
new file mode 100644
index 00000000..5fe3a235
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/audio-mpeg.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/audio-x-flac.png b/view/theme/decaf-mobile/images/oxygen/audio-x-flac.png
new file mode 100644
index 00000000..f2f11e86
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/audio-x-flac.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/audio-x-generic.png b/view/theme/decaf-mobile/images/oxygen/audio-x-generic.png
new file mode 100644
index 00000000..fe7b0527
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/audio-x-generic.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/audio-x-mp2.png b/view/theme/decaf-mobile/images/oxygen/audio-x-mp2.png
new file mode 100644
index 00000000..5ac79099
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/audio-x-mp2.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/audio-x-ms-wma.png b/view/theme/decaf-mobile/images/oxygen/audio-x-ms-wma.png
new file mode 100644
index 00000000..86cb3e51
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/audio-x-ms-wma.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/audio-x-vorbis+ogg.png b/view/theme/decaf-mobile/images/oxygen/audio-x-vorbis+ogg.png
new file mode 100644
index 00000000..5ac79099
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/audio-x-vorbis+ogg.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/audio-x-wav.png b/view/theme/decaf-mobile/images/oxygen/audio-x-wav.png
new file mode 100644
index 00000000..101f8fe5
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/audio-x-wav.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/image-x-generic.png b/view/theme/decaf-mobile/images/oxygen/image-x-generic.png
new file mode 100644
index 00000000..d1d4e256
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/image-x-generic.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/text-css.png b/view/theme/decaf-mobile/images/oxygen/text-css.png
new file mode 100644
index 00000000..119aec52
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/text-css.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/text-html.png b/view/theme/decaf-mobile/images/oxygen/text-html.png
new file mode 100644
index 00000000..34768bfb
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/text-html.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/text-x-generic-2.png b/view/theme/decaf-mobile/images/oxygen/text-x-generic-2.png
new file mode 100644
index 00000000..70be9bfc
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/text-x-generic-2.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/text-x-tex.png b/view/theme/decaf-mobile/images/oxygen/text-x-tex.png
new file mode 100644
index 00000000..23d8bf7c
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/text-x-tex.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/unknown.png b/view/theme/decaf-mobile/images/oxygen/unknown.png
new file mode 100644
index 00000000..eb1758ae
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/unknown.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/video-x-generic.png b/view/theme/decaf-mobile/images/oxygen/video-x-generic.png
new file mode 100644
index 00000000..81fe23e7
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/video-x-generic.png differ
diff --git a/view/theme/decaf-mobile/images/paperclip.png b/view/theme/decaf-mobile/images/paperclip.png
new file mode 100644
index 00000000..3a2ee269
Binary files /dev/null and b/view/theme/decaf-mobile/images/paperclip.png differ
diff --git a/view/theme/decaf-mobile/images/pencil-blue.png b/view/theme/decaf-mobile/images/pencil-blue.png
new file mode 100644
index 00000000..f51ddd4f
Binary files /dev/null and b/view/theme/decaf-mobile/images/pencil-blue.png differ
diff --git a/view/theme/decaf-mobile/images/pencil.png b/view/theme/decaf-mobile/images/pencil.png
new file mode 100644
index 00000000..8078d308
Binary files /dev/null and b/view/theme/decaf-mobile/images/pencil.png differ
diff --git a/view/theme/decaf-mobile/images/quote.png b/view/theme/decaf-mobile/images/quote.png
new file mode 100644
index 00000000..93127c5e
Binary files /dev/null and b/view/theme/decaf-mobile/images/quote.png differ
diff --git a/view/theme/decaf-mobile/images/recycle-blue.png b/view/theme/decaf-mobile/images/recycle-blue.png
new file mode 100644
index 00000000..4129f05c
Binary files /dev/null and b/view/theme/decaf-mobile/images/recycle-blue.png differ
diff --git a/view/theme/decaf-mobile/images/recycle.png b/view/theme/decaf-mobile/images/recycle.png
new file mode 100644
index 00000000..e5d8e118
Binary files /dev/null and b/view/theme/decaf-mobile/images/recycle.png differ
diff --git a/view/theme/decaf-mobile/images/remote-link-blue.png b/view/theme/decaf-mobile/images/remote-link-blue.png
new file mode 100644
index 00000000..de8d21db
Binary files /dev/null and b/view/theme/decaf-mobile/images/remote-link-blue.png differ
diff --git a/view/theme/decaf-mobile/images/remote-link.png b/view/theme/decaf-mobile/images/remote-link.png
new file mode 100644
index 00000000..1f657411
Binary files /dev/null and b/view/theme/decaf-mobile/images/remote-link.png differ
diff --git a/view/theme/decaf-mobile/images/star-blue.png b/view/theme/decaf-mobile/images/star-blue.png
new file mode 100644
index 00000000..f8783fcd
Binary files /dev/null and b/view/theme/decaf-mobile/images/star-blue.png differ
diff --git a/view/theme/decaf-mobile/images/star-yellow.png b/view/theme/decaf-mobile/images/star-yellow.png
new file mode 100644
index 00000000..cc2b884b
Binary files /dev/null and b/view/theme/decaf-mobile/images/star-yellow.png differ
diff --git a/view/theme/decaf-mobile/images/star.png b/view/theme/decaf-mobile/images/star.png
new file mode 100644
index 00000000..f8a61a49
Binary files /dev/null and b/view/theme/decaf-mobile/images/star.png differ
diff --git a/view/theme/decaf-mobile/images/tag-blue.png b/view/theme/decaf-mobile/images/tag-blue.png
new file mode 100644
index 00000000..6e5cec80
Binary files /dev/null and b/view/theme/decaf-mobile/images/tag-blue.png differ
diff --git a/view/theme/decaf-mobile/images/tag.png b/view/theme/decaf-mobile/images/tag.png
new file mode 100644
index 00000000..9c644b82
Binary files /dev/null and b/view/theme/decaf-mobile/images/tag.png differ
diff --git a/view/theme/decaf-mobile/images/underlineU-serif.png b/view/theme/decaf-mobile/images/underlineU-serif.png
new file mode 100644
index 00000000..745ca2cd
Binary files /dev/null and b/view/theme/decaf-mobile/images/underlineU-serif.png differ
diff --git a/view/theme/decaf-mobile/images/unlock.png b/view/theme/decaf-mobile/images/unlock.png
new file mode 100644
index 00000000..81d9740e
Binary files /dev/null and b/view/theme/decaf-mobile/images/unlock.png differ
diff --git a/view/theme/decaf-mobile/jot-end.tpl b/view/theme/decaf-mobile/jot-end.tpl
new file mode 100644
index 00000000..59585d01
--- /dev/null
+++ b/view/theme/decaf-mobile/jot-end.tpl
@@ -0,0 +1,5 @@
+
+
+{##}
diff --git a/view/theme/decaf-mobile/jot-header.tpl b/view/theme/decaf-mobile/jot-header.tpl
new file mode 100644
index 00000000..c239aeec
--- /dev/null
+++ b/view/theme/decaf-mobile/jot-header.tpl
@@ -0,0 +1,17 @@
+
+
+
diff --git a/view/theme/decaf-mobile/jot.tpl b/view/theme/decaf-mobile/jot.tpl
new file mode 100644
index 00000000..697a7c80
--- /dev/null
+++ b/view/theme/decaf-mobile/jot.tpl
@@ -0,0 +1,99 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ if $placeholdercategory }}
+
+ {{ endif }}
+
+ {##}
+ {{ if $content }}$content{{ endif }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {##}
+ {##}
+
+ {##}
+
+
+
+
+
+ $jotplugins
+
+
+
+
+ {##}
+
+ {##}
+ {{ if $acl_data }}
+ {{ inc acl_html_selector.tpl }}{{ endinc }}
+ {{ endif }}
+ $jotnets
+
+ {##}
+
+
+
+
+
+
+
+ {##}
+
diff --git a/view/theme/decaf-mobile/jot_geotag.tpl b/view/theme/decaf-mobile/jot_geotag.tpl
new file mode 100644
index 00000000..3f8bee91
--- /dev/null
+++ b/view/theme/decaf-mobile/jot_geotag.tpl
@@ -0,0 +1,11 @@
+
+ if(navigator.geolocation) {
+ navigator.geolocation.getCurrentPosition(function(position) {
+ var lat = position.coords.latitude.toFixed(4);
+ var lon = position.coords.longitude.toFixed(4);
+
+ $j('#jot-coord').val(lat + ', ' + lon);
+ $j('#profile-nolocation-wrapper').show();
+ });
+ }
+
diff --git a/view/theme/decaf-mobile/js/theme.js b/view/theme/decaf-mobile/js/theme.js
new file mode 100644
index 00000000..cd9a17f0
--- /dev/null
+++ b/view/theme/decaf-mobile/js/theme.js
@@ -0,0 +1,77 @@
+// For Firefox < 3.6, which doesn't support document.readyState
+// verify that document.readyState is undefined
+// verify that document.addEventListener is there
+// these two conditions are basically telling us
+// we are using Firefox < 3.6
+/*if(document.readyState == null && document.addEventListener){
+ // on DOMContentLoaded event, supported since ages
+ document.addEventListener("DOMContentLoaded", function DOMContentLoaded(){
+ // remove the listener itself
+ document.removeEventListener("DOMContentLoaded", DOMContentLoaded, false);
+ // assign readyState as complete
+ document.readyState = "complete";
+ }, false);
+ // set readyState = loading or interactive
+ // it does not really matter for this purpose
+ document.readyState = "loading";
+}*/
+
+document.addEventListener('DOMContentLoaded', function(){
+
+ if(typeof window.AjaxUpload != "undefined") {
+ var uploader = new window.AjaxUpload(
+ window.imageUploadButton,
+ { action: 'wall_upload/'+window.nickname,
+ name: 'userfile',
+ onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
+ onComplete: function(file,response) {
+ var currentText = $j(window.jotId).val();
+ $j(window.jotId).val(currentText + response);
+ $j('#profile-rotator').hide();
+ }
+ }
+ );
+
+ if(document.getElementById('wall-file-upload') != null) {
+ var file_uploader = new window.AjaxUpload(
+ 'wall-file-upload',
+ { action: 'wall_attach/'+window.nickname,
+ name: 'userfile',
+ onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
+ onComplete: function(file,response) {
+ var currentText = $j(window.jotId).val();
+ $j(window.jotId).val(currentText + response);
+ $j('#profile-rotator').hide();
+ }
+ }
+ );
+ }
+ }
+
+});
+
+function confirmDelete(f) {
+ response = confirm(window.delItem);
+ if(response && typeof f == 'function') {
+ f();
+ }
+ return response;
+}
+
+function changeHref(elemId, url) {
+ elem = document.getElementById(elemId);
+ elem.href = url;
+}
+
+function remove(elemId) {
+ elem = document.getElementById(elemId);
+ elem.parentNode.removeChild(elem);
+}
+
+function openClose(el) {}
+
+// It's better to separate Javascript from the HTML, but the wall_thread
+// items require more work to find since they contain the item ID in the id field
+//document.getElementById('photo-album-edit-drop').onclick = function(){return confirmDelete(function(){remove('photo-album-edit-form-confirm');});}
+//document.getElementById('photo-edit-delete-button').onclick = function(){return confirmDelete(function(){remove('photo-edit-form-confirm');});}
+
diff --git a/view/theme/decaf-mobile/lang_selector.tpl b/view/theme/decaf-mobile/lang_selector.tpl
new file mode 100644
index 00000000..e777a0a8
--- /dev/null
+++ b/view/theme/decaf-mobile/lang_selector.tpl
@@ -0,0 +1,10 @@
+
+
+
+
+ {{ for $langs.0 as $v=>$l }}
+ $l
+ {{ endfor }}
+
+
+
diff --git a/view/theme/decaf-mobile/like_noshare.tpl b/view/theme/decaf-mobile/like_noshare.tpl
new file mode 100644
index 00000000..5e74850a
--- /dev/null
+++ b/view/theme/decaf-mobile/like_noshare.tpl
@@ -0,0 +1,7 @@
+
diff --git a/view/theme/decaf-mobile/lock.cur b/view/theme/decaf-mobile/lock.cur
new file mode 100644
index 00000000..892c5e85
Binary files /dev/null and b/view/theme/decaf-mobile/lock.cur differ
diff --git a/view/theme/decaf-mobile/login-bg.gif b/view/theme/decaf-mobile/login-bg.gif
new file mode 100644
index 00000000..cde836c8
Binary files /dev/null and b/view/theme/decaf-mobile/login-bg.gif differ
diff --git a/view/theme/decaf-mobile/login-style.css b/view/theme/decaf-mobile/login-style.css
new file mode 100644
index 00000000..bbb60eba
--- /dev/null
+++ b/view/theme/decaf-mobile/login-style.css
@@ -0,0 +1,180 @@
+html {
+ width: 100%;
+}
+
+body {
+ font-family: helvetica,arial,freesans,clean,sans-serif;
+ font-size: 16px;
+ background-color: #ffffff;
+ color: #505050;/* ZP Change*/
+ margin: 0px;
+}
+
+a, a:visited, a:link { color: #3465a4; text-decoration: none; }
+a:hover {text-decoration: underline; }
+
+img { border :0px; }
+
+nav {
+ display: none;
+}
+
+/* popup notifications */
+div.jGrowl div.notice {
+ background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+ color: #ffffff;
+ padding-left: 58px;
+ margin: 0px;
+}
+div.jGrowl div.info {
+ background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+ color: #ffffff;
+ padding-left: 58px;
+ margin: 0px;
+}
+#jGrowl.top-right {
+ top: 15px;
+ right: 10px;
+}
+div.jGrowl-notification {
+ border-radius: 7px;
+}
+
+.login-button {
+ margin-top: 90px;
+ margin-left: auto;
+ margin-right: auto;
+
+}
+
+img.login-button-image {
+ max-width: 300px;
+}
+
+div.section-wrapper {
+ position: relative;
+ width: 300px;
+ margin-left: auto;
+ margin-right: auto;
+}
+
+.login-form {
+ margin-top: 40px;
+}
+
+.field {
+ position: relative;
+ margin-bottom: 15px;
+}
+
+.field label {
+ margin-left: 25px;
+ font-weight: 700;
+ float: none;
+ width: auto;
+}
+
+.field input {
+ font-size: 18px;
+ width: 200px;
+ margin-left: 50px;
+}
+
+.field.checkbox label {
+ margin-left: auto;
+ float: auto;
+ /*margin-left: 100px;*/
+}
+.field.checkbox input {
+ width: auto;
+ margin-left: 30px;
+}
+
+#div_id_remember {
+ margin-top: 10px;
+ margin-bottom: 10px;
+}
+
+#login_openid {
+ margin-top: 50px;
+}
+
+#login_openid input {
+ background: url(login-bg.gif) no-repeat;
+ background-position: 0 50%;
+ width: 182px;
+ padding-left: 18px;
+ margin-left: 50px;
+}
+
+#login-footer {
+ margin-top: 10px;
+ text-align: center;
+}
+
+.login-extra-links, .agreement {
+ font-size: 14px;
+}
+
+#login-submit-button, #register-submit-button, #lostpass-submit-button {
+ font-size: 20px;
+ padding: 0.5em 1em;
+}
+
+#register-link {
+ margin-right: 100px;
+}
+
+.register-form {
+ margin-top: 15px;
+}
+
+.register-form h2, .lostpass-form h2 {
+ text-align: center;
+}
+
+.error-message {
+ width: 270px;
+ color: #FF0000;
+ font-size: 1.1em;
+ text-align: justify;
+ border: 1px solid #FF8888;
+ background-color: #FFEEEE;
+ padding: 10px;
+ margin-left: auto;
+ margin-right: auto;
+}
+
+.register-explain-wrapper {
+ width: 290px;
+ text-align: justify;
+ font-size: 14px;
+ margin-left: 5px;
+}
+
+#register-footer {
+ margin-top: 60px;
+ text-align: center;
+}
+
+.lostpass-form {
+ margin-top: 100px;
+}
+
+#lostpass-desc {
+ width: 290px;
+ margin-left: 5px;
+ margin-bottom: 30px;
+ text-align: justify;
+ font-size: 14px;
+}
+
+#login-submit-wrapper {
+ text-align: center;
+}
+
+footer {
+ text-align: center;
+ padding-top: 3em;
+ padding-bottom: 1em;
+}
diff --git a/view/theme/decaf-mobile/login.tpl b/view/theme/decaf-mobile/login.tpl
new file mode 100644
index 00000000..926ab769
--- /dev/null
+++ b/view/theme/decaf-mobile/login.tpl
@@ -0,0 +1,45 @@
+
+
+
+{##}
diff --git a/view/theme/decaf-mobile/login_head.tpl b/view/theme/decaf-mobile/login_head.tpl
new file mode 100644
index 00000000..14734821
--- /dev/null
+++ b/view/theme/decaf-mobile/login_head.tpl
@@ -0,0 +1,2 @@
+{##}
+
diff --git a/view/theme/decaf-mobile/lostpass.tpl b/view/theme/decaf-mobile/lostpass.tpl
new file mode 100644
index 00000000..583e3dba
--- /dev/null
+++ b/view/theme/decaf-mobile/lostpass.tpl
@@ -0,0 +1,21 @@
+
diff --git a/view/theme/decaf-mobile/mail_conv.tpl b/view/theme/decaf-mobile/mail_conv.tpl
new file mode 100644
index 00000000..7aac8370
--- /dev/null
+++ b/view/theme/decaf-mobile/mail_conv.tpl
@@ -0,0 +1,18 @@
+
+
+
+
+
+
$mail.from_name
+
$mail.date
+
$mail.subject
+
+
$mail.body
+
+
+
+
+
+
+
+
diff --git a/view/theme/decaf-mobile/mail_list.tpl b/view/theme/decaf-mobile/mail_list.tpl
new file mode 100644
index 00000000..74274a24
--- /dev/null
+++ b/view/theme/decaf-mobile/mail_list.tpl
@@ -0,0 +1,16 @@
+
+
+
+
+
+
$from_name
+
$date
+
+
+
+
+
+
+
diff --git a/view/theme/decaf-mobile/manage.tpl b/view/theme/decaf-mobile/manage.tpl
new file mode 100644
index 00000000..fec30db9
--- /dev/null
+++ b/view/theme/decaf-mobile/manage.tpl
@@ -0,0 +1,18 @@
+$title
+$desc
+$choose
+
+
diff --git a/view/theme/decaf-mobile/message-end.tpl b/view/theme/decaf-mobile/message-end.tpl
new file mode 100644
index 00000000..fea59636
--- /dev/null
+++ b/view/theme/decaf-mobile/message-end.tpl
@@ -0,0 +1,4 @@
+{##}
diff --git a/view/theme/decaf-mobile/message-head.tpl b/view/theme/decaf-mobile/message-head.tpl
new file mode 100644
index 00000000..e69de29b
diff --git a/view/theme/decaf-mobile/mobile b/view/theme/decaf-mobile/mobile
new file mode 100644
index 00000000..e69de29b
diff --git a/view/theme/decaf-mobile/msg-end.tpl b/view/theme/decaf-mobile/msg-end.tpl
new file mode 100644
index 00000000..60741337
--- /dev/null
+++ b/view/theme/decaf-mobile/msg-end.tpl
@@ -0,0 +1,2 @@
+
+
diff --git a/view/theme/decaf-mobile/msg-header.tpl b/view/theme/decaf-mobile/msg-header.tpl
new file mode 100644
index 00000000..9ccf5d6f
--- /dev/null
+++ b/view/theme/decaf-mobile/msg-header.tpl
@@ -0,0 +1,10 @@
+
+
+
diff --git a/view/theme/decaf-mobile/nav.tpl b/view/theme/decaf-mobile/nav.tpl
new file mode 100644
index 00000000..45b7beee
--- /dev/null
+++ b/view/theme/decaf-mobile/nav.tpl
@@ -0,0 +1,155 @@
+
+{##}
+
+{##}
+
+
+
+{##}
+
+
+ {{ if $nav.notifications }}
+{##}
+
+ {{ endif }}
+
+{##}
+ {{ if $nav.contacts }}
+
+ {{ endif }}
+
+ {{ if $nav.messages }}
+{##}
+
+ {{ endif }}
+
+{##}
+ {{ if $nav.network }}
+
+ {{ endif }}
+
+
+
+ {##}
+ $banner
+
+
+{##}
diff --git a/view/theme/decaf-mobile/photo_drop.tpl b/view/theme/decaf-mobile/photo_drop.tpl
new file mode 100644
index 00000000..296b8290
--- /dev/null
+++ b/view/theme/decaf-mobile/photo_drop.tpl
@@ -0,0 +1,4 @@
+
+
diff --git a/view/theme/decaf-mobile/photo_edit.tpl b/view/theme/decaf-mobile/photo_edit.tpl
new file mode 100644
index 00000000..5bfa37c3
--- /dev/null
+++ b/view/theme/decaf-mobile/photo_edit.tpl
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+ $newalbum
+
+
+
+
+
+
+ $capt_label
+
+
+
+
+
+
+ $tag_label
+
+
+
+
+
+
+ $rotatecw
+
+
+
+
+ $rotateccw
+
+
+
+
+
+ {##}
+
+ {##}
+ {{ inc acl_html_selector.tpl }}{{ endinc }}
+
+ {##}
+
+
+
+
+
+
+
+
+
+
diff --git a/view/theme/decaf-mobile/photo_edit_head.tpl b/view/theme/decaf-mobile/photo_edit_head.tpl
new file mode 100644
index 00000000..c819e24c
--- /dev/null
+++ b/view/theme/decaf-mobile/photo_edit_head.tpl
@@ -0,0 +1,7 @@
+{##}
diff --git a/view/theme/decaf-mobile/photo_view.tpl b/view/theme/decaf-mobile/photo_view.tpl
new file mode 100644
index 00000000..329e0a4e
--- /dev/null
+++ b/view/theme/decaf-mobile/photo_view.tpl
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+ {{ if $prevlink }}
{{ endif }}
+ {{ if $nextlink }}
{{ endif }}
+
+
+
+$desc
+{{ if $tags }}
+$tags.0
+$tags.1
+{{ endif }}
+{{ if $tags.2 }}{{ endif }}
+
+{{ if $edit }}
+$edit
+{{ else }}
+
+{{ if $likebuttons }}
+
+ $likebuttons
+ $like
+ $dislike
+
+{{ endif }}
+
+$comments
+
+$paginate
+{{ endif }}
+
diff --git a/view/theme/decaf-mobile/photos_head.tpl b/view/theme/decaf-mobile/photos_head.tpl
new file mode 100644
index 00000000..5c13a0ae
--- /dev/null
+++ b/view/theme/decaf-mobile/photos_head.tpl
@@ -0,0 +1,5 @@
+{##}
diff --git a/view/theme/decaf-mobile/photos_upload.tpl b/view/theme/decaf-mobile/photos_upload.tpl
new file mode 100644
index 00000000..31ad4680
--- /dev/null
+++ b/view/theme/decaf-mobile/photos_upload.tpl
@@ -0,0 +1,51 @@
+$pagename
+
+$usage
+
+
+
+
+
+
$existalbumtext
+
+ $albumselect
+
+
+
+
+ $default_upload_box
+
+
+
+ $nosharetext
+
+
+
+ {##}
+
+ {##}
+ {{ inc acl_html_selector.tpl }}{{ endinc }}
+
+ {##}
+
+
+
+ $alt_uploader
+
+ $default_upload_submit
+
+
+
+
diff --git a/view/theme/decaf-mobile/profed_end.tpl b/view/theme/decaf-mobile/profed_end.tpl
new file mode 100644
index 00000000..ff56fda4
--- /dev/null
+++ b/view/theme/decaf-mobile/profed_end.tpl
@@ -0,0 +1,8 @@
+{##}
diff --git a/view/theme/decaf-mobile/profed_head.tpl b/view/theme/decaf-mobile/profed_head.tpl
new file mode 100644
index 00000000..02fd46aa
--- /dev/null
+++ b/view/theme/decaf-mobile/profed_head.tpl
@@ -0,0 +1,5 @@
+{##}
diff --git a/view/theme/decaf-mobile/profile_edit.tpl b/view/theme/decaf-mobile/profile_edit.tpl
new file mode 100644
index 00000000..bed1de35
--- /dev/null
+++ b/view/theme/decaf-mobile/profile_edit.tpl
@@ -0,0 +1,324 @@
+$default
+
+$banner
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+$lbl_fullname
+
+
+
+
+
+$lbl_title
+
+
+
+
+
+
+$lbl_gender
+$gender
+
+
+
+
+
$lbl_bd
+
+$dob $age
+
+
+
+
+$hide_friends
+
+
+
+
+
+
+
+
+$lbl_address
+
+
+
+
+
+$lbl_city
+
+
+
+
+
+
+$lbl_zip
+
+
+
+
+
+$lbl_country
+
+{##}
+
+
+
+
+$lbl_region
+
+{##}
+
+
+
+
+$lbl_hometown
+
+
+
+
+
+
+
+
+
+
+$lbl_marital
+$marital
+
+ $lbl_with
+
+ $lbl_howlong
+
+
+
+
+
+$lbl_sexual
+$sexual
+
+
+
+
+
+
+$lbl_homepage
+
+
+
+
+
+$lbl_politic
+
+
+
+
+
+$lbl_religion
+
+
+
+
+
+$lbl_pubkey
+
+
$lbl_pubdsc
+
+
+
+$lbl_prvkey
+
+
$lbl_prvdsc
+
+
+
+
+
+
+
+
+
+
+$lbl_about
+
+
+
$about
+
+
+
+
+
+
+
+$lbl_hobbies
+
+
+
$interest
+
+
+
+
+
+
+
+$lbl_likes
+
+
+
$likes
+
+
+
+
+
+
+
+$lbl_dislikes
+
+
+
$dislikes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+$lbl_music
+
+
+
$music
+
+
+
+
+
+
+$lbl_book
+
+
+
$book
+
+
+
+
+
+
+
+
+
+
+
+
+
+$lbl_film
+
+
+
$film
+
+
+
+
+
+
+
+
+
+
+
+
+
+$lbl_love
+
+
+
$romance
+
+
+
+
+
+
+
+
+$lbl_work
+
+
+
$work
+
+
+
+
+
+
+
+
+$lbl_school
+
+
+
$education
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/view/theme/decaf-mobile/profile_photo.tpl b/view/theme/decaf-mobile/profile_photo.tpl
new file mode 100644
index 00000000..42fc139f
--- /dev/null
+++ b/view/theme/decaf-mobile/profile_photo.tpl
@@ -0,0 +1,19 @@
+$title
+
+
+
+
+
+$lbl_upfile
+
+
+
+
+
+
+
+
+
+
+$select
+
diff --git a/view/theme/decaf-mobile/profile_vcard.tpl b/view/theme/decaf-mobile/profile_vcard.tpl
new file mode 100644
index 00000000..e91e6125
--- /dev/null
+++ b/view/theme/decaf-mobile/profile_vcard.tpl
@@ -0,0 +1,51 @@
+
+
+
$profile.name
+
+
+
+ {{ if $pdesc }}
$profile.pdesc
{{ endif }}
+
+
+
+
+ {{ if $location }}
+
$location
+
+ {{ if $profile.address }}$profile.address
{{ endif }}
+
+ $profile.locality {{ if $profile.locality }}, {{ endif }}
+ $profile.region
+ $profile.postal_code
+
+ {{ if $profile.country_name }}$profile.country_name {{ endif }}
+
+
+ {{ endif }}
+
+ {{ if $gender }}
$gender $profile.gender {{ endif }}
+
+ {{ if $profile.pubkey }}
$profile.pubkey
{{ endif }}
+
+ {{ if $marital }}
♥ $marital$profile.marital {{ endif }}
+
+ {{ if $homepage }}
$homepage $profile.homepage {{ endif }}
+
+ {{ inc diaspora_vcard.tpl }}{{ endinc }}
+
+
+
+
+
+$contact_block
+
+
diff --git a/view/theme/decaf-mobile/prv_message.tpl b/view/theme/decaf-mobile/prv_message.tpl
new file mode 100644
index 00000000..5d992529
--- /dev/null
+++ b/view/theme/decaf-mobile/prv_message.tpl
@@ -0,0 +1,43 @@
+
+$header
+
+
+
+
+$parent
+
+$to
+
+{{ if $showinputs }}
+
+
+{{ else }}
+$select
+{{ endif }}
+
+$subject
+
+
+$yourmessage
+$text
+
+
+
+
+
+ {##}
+
+
+
+
+
+
+
+
+
diff --git a/view/theme/decaf-mobile/register.tpl b/view/theme/decaf-mobile/register.tpl
new file mode 100644
index 00000000..b1f39048
--- /dev/null
+++ b/view/theme/decaf-mobile/register.tpl
@@ -0,0 +1,80 @@
+
diff --git a/view/theme/decaf-mobile/screenshot.jpg b/view/theme/decaf-mobile/screenshot.jpg
new file mode 100644
index 00000000..1b18c3a4
Binary files /dev/null and b/view/theme/decaf-mobile/screenshot.jpg differ
diff --git a/view/theme/decaf-mobile/search_item.tpl b/view/theme/decaf-mobile/search_item.tpl
new file mode 100644
index 00000000..3e14b644
--- /dev/null
+++ b/view/theme/decaf-mobile/search_item.tpl
@@ -0,0 +1,64 @@
+
+{##}
+
+
+ {##}
+
+
+ {##}
+
+
+ {{ if $item.lock }}{##}
{##}
+ {{ else }}
{{ endif }}
+
$item.location
+
+
+ {##}
+
$item.name
+
$item.ago
+
+ {##}
+
+
$item.title
+ {##}
+
$item.body
+ {{ if $item.has_cats }}
+
+ {{ endif }}
+
+ {{ if $item.has_folders }}
+
+ {{ endif }}
+
+
+
+ {##}
+
+
+
+
+{##}
+
+{##}
+
+
diff --git a/view/theme/decaf-mobile/settings-head.tpl b/view/theme/decaf-mobile/settings-head.tpl
new file mode 100644
index 00000000..5c13a0ae
--- /dev/null
+++ b/view/theme/decaf-mobile/settings-head.tpl
@@ -0,0 +1,5 @@
+{##}
diff --git a/view/theme/decaf-mobile/settings.tpl b/view/theme/decaf-mobile/settings.tpl
new file mode 100644
index 00000000..3ab464b2
--- /dev/null
+++ b/view/theme/decaf-mobile/settings.tpl
@@ -0,0 +1,148 @@
+$ptitle
+
+$nickname_block
+
+
+
+
+$h_pass
+
+{{inc field_password.tpl with $field=$password1 }}{{endinc}}
+{{inc field_password.tpl with $field=$password2 }}{{endinc}}
+
+{{ if $oid_enable }}
+{{inc field_input.tpl with $field=$openid }}{{endinc}}
+{{ endif }}
+
+
+
+
+
+
+$h_basic
+
+{{inc field_input.tpl with $field=$username }}{{endinc}}
+{{inc field_input.tpl with $field=$email }}{{endinc}}
+{{inc field_custom.tpl with $field=$timezone }}{{endinc}}
+{{inc field_input.tpl with $field=$defloc }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
+
+
+
+
+
+
+
+$h_prv
+
+
+
+
+{{inc field_input.tpl with $field=$maxreq }}{{endinc}}
+
+$profile_in_dir
+
+$profile_in_net_dir
+
+$hide_friends
+
+$hide_wall
+
+$blockwall
+
+$blocktags
+
+$suggestme
+
+$unkmail
+
+
+{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
+
+{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
+
+
+
+
+
+
+
$settings_perms
+
+{##}
+
+ {##}
+ {{ inc acl_html_selector.tpl }}{{ endinc }}
+
+{##}
+
+
+
+
+
+$group_select
+
+
+
+
+
+
+
+
+$h_not
+
+
+
$activity_options
+
+{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
+
+
+
$lbl_not
+
+
+{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
+
+
+
+
+
+
+
+
+
+$h_advn
+$h_descadvn
+
+$pagetype
+
+
+
+
+
+
diff --git a/view/theme/decaf-mobile/settings_display_end.tpl b/view/theme/decaf-mobile/settings_display_end.tpl
new file mode 100644
index 00000000..739c43b3
--- /dev/null
+++ b/view/theme/decaf-mobile/settings_display_end.tpl
@@ -0,0 +1,2 @@
+
+
diff --git a/view/theme/decaf-mobile/smarty3/acl_html_selector.tpl b/view/theme/decaf-mobile/smarty3/acl_html_selector.tpl
new file mode 100644
index 00000000..05e82f2d
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/acl_html_selector.tpl
@@ -0,0 +1,34 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+
+
+
+
+ {{$group_perms}}
+
+ {{foreach $acl_data.groups as $group}}
+ {{$group.name}}
+ {{/foreach}}
+
+
+
+ {{$contact_perms}}
+
+ {{foreach $acl_data.contacts as $contact}}
+ {{$contact.name}} ({{$contact.networkName}})
+ {{/foreach}}
+
+
+
+
+
+
+
diff --git a/view/theme/decaf-mobile/smarty3/acl_selector.tpl b/view/theme/decaf-mobile/smarty3/acl_selector.tpl
new file mode 100644
index 00000000..b5e83072
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/acl_selector.tpl
@@ -0,0 +1,28 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+
+
+{{**}}
diff --git a/view/theme/decaf-mobile/smarty3/admin_aside.tpl b/view/theme/decaf-mobile/smarty3/admin_aside.tpl
new file mode 100644
index 00000000..024d6195
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/admin_aside.tpl
@@ -0,0 +1,36 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+
+
+{{if $admin.update}}
+
+{{/if}}
+
+
+{{if $admin.plugins_admin}}{{$plugadmtxt}} {{/if}}
+
+ {{foreach $admin.plugins_admin as $l}}
+ {{$l.1}}
+ {{/foreach}}
+
+
+
+{{$logtxt}}
+
+
diff --git a/view/theme/decaf-mobile/smarty3/admin_site.tpl b/view/theme/decaf-mobile/smarty3/admin_site.tpl
new file mode 100644
index 00000000..27773da2
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/admin_site.tpl
@@ -0,0 +1,66 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
diff --git a/view/theme/decaf-mobile/smarty3/admin_users.tpl b/view/theme/decaf-mobile/smarty3/admin_users.tpl
new file mode 100644
index 00000000..886b67dc
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/admin_users.tpl
@@ -0,0 +1,103 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
diff --git a/view/theme/decaf-mobile/smarty3/album_edit.tpl b/view/theme/decaf-mobile/smarty3/album_edit.tpl
new file mode 100644
index 00000000..094da70a
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/album_edit.tpl
@@ -0,0 +1,20 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
diff --git a/view/theme/decaf-mobile/smarty3/categories_widget.tpl b/view/theme/decaf-mobile/smarty3/categories_widget.tpl
new file mode 100644
index 00000000..1749fced
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/categories_widget.tpl
@@ -0,0 +1,17 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{**}}
diff --git a/view/theme/decaf-mobile/smarty3/comment_item.tpl b/view/theme/decaf-mobile/smarty3/comment_item.tpl
new file mode 100644
index 00000000..63c70aa5
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/comment_item.tpl
@@ -0,0 +1,84 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{**}}
+
+
diff --git a/view/theme/decaf-mobile/smarty3/common_tabs.tpl b/view/theme/decaf-mobile/smarty3/common_tabs.tpl
new file mode 100644
index 00000000..9fa4ed41
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/common_tabs.tpl
@@ -0,0 +1,11 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
diff --git a/view/theme/decaf-mobile/smarty3/contact_block.tpl b/view/theme/decaf-mobile/smarty3/contact_block.tpl
new file mode 100644
index 00000000..5a0a26b8
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/contact_block.tpl
@@ -0,0 +1,17 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{**}}
diff --git a/view/theme/decaf-mobile/smarty3/contact_edit.tpl b/view/theme/decaf-mobile/smarty3/contact_edit.tpl
new file mode 100644
index 00000000..bced55ac
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/contact_edit.tpl
@@ -0,0 +1,98 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+{{$header}}
+
+
diff --git a/view/theme/decaf-mobile/smarty3/contact_head.tpl b/view/theme/decaf-mobile/smarty3/contact_head.tpl
new file mode 100644
index 00000000..a7fb9610
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/contact_head.tpl
@@ -0,0 +1,5 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/theme/decaf-mobile/smarty3/contact_template.tpl b/view/theme/decaf-mobile/smarty3/contact_template.tpl
new file mode 100644
index 00000000..f017744f
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/contact_template.tpl
@@ -0,0 +1,43 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+
+
+
+{{**}}
+ {{**}}
+
+
+
+ {{**}}
+
+{{**}}
+
+
+
+
+
{{$contact.name}}
+{{if $contact.alt_text}}
{{$contact.alt_text}}
{{/if}}
+
{{$contact.network}}
+
+
+
diff --git a/view/theme/decaf-mobile/smarty3/contacts-end.tpl b/view/theme/decaf-mobile/smarty3/contacts-end.tpl
new file mode 100644
index 00000000..adeea280
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/contacts-end.tpl
@@ -0,0 +1,9 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{**}}
diff --git a/view/theme/decaf-mobile/smarty3/contacts-head.tpl b/view/theme/decaf-mobile/smarty3/contacts-head.tpl
new file mode 100644
index 00000000..7fa14116
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/contacts-head.tpl
@@ -0,0 +1,10 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{**}}
diff --git a/view/theme/decaf-mobile/smarty3/contacts-template.tpl b/view/theme/decaf-mobile/smarty3/contacts-template.tpl
new file mode 100644
index 00000000..b9162c2e
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/contacts-template.tpl
@@ -0,0 +1,33 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$header}}{{if $total}} ({{$total}}){{/if}}
+
+{{if $finding}}{{$finding}} {{/if}}
+
+
+
+{{$desc}}
+
+
+
+
+
+
+{{$tabs}}
+
+
+
+{{foreach $contacts as $contact}}
+ {{include file="contact_template.tpl"}}
+{{/foreach}}
+
+
+
+{{$paginate}}
+
+
+
+
diff --git a/view/theme/decaf-mobile/smarty3/contacts-widget-sidebar.tpl b/view/theme/decaf-mobile/smarty3/contacts-widget-sidebar.tpl
new file mode 100644
index 00000000..bda32189
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/contacts-widget-sidebar.tpl
@@ -0,0 +1,7 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$follow_widget}}
+
diff --git a/view/theme/decaf-mobile/smarty3/conversation.tpl b/view/theme/decaf-mobile/smarty3/conversation.tpl
new file mode 100644
index 00000000..f6810bb1
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/conversation.tpl
@@ -0,0 +1,34 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+
+ {{foreach $thread.items as $item}}
+ {{if $item.comment_firstcollapsed}}
+
+ {{/if}}
+
+ {{include file="{{$item.template}}"}}
+
+
+ {{/foreach}}
+
+{{/foreach}}
+
+
+
+{{**}}
diff --git a/view/theme/decaf-mobile/smarty3/cropbody.tpl b/view/theme/decaf-mobile/smarty3/cropbody.tpl
new file mode 100644
index 00000000..5ace9a1a
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/cropbody.tpl
@@ -0,0 +1,32 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$title}}
+
+{{$desc}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/view/theme/decaf-mobile/smarty3/cropend.tpl b/view/theme/decaf-mobile/smarty3/cropend.tpl
new file mode 100644
index 00000000..e75083f5
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/cropend.tpl
@@ -0,0 +1,9 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{**}}
diff --git a/view/theme/decaf-mobile/smarty3/crophead.tpl b/view/theme/decaf-mobile/smarty3/crophead.tpl
new file mode 100644
index 00000000..6438cfb3
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/crophead.tpl
@@ -0,0 +1,6 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
diff --git a/view/theme/decaf-mobile/smarty3/display-head.tpl b/view/theme/decaf-mobile/smarty3/display-head.tpl
new file mode 100644
index 00000000..29432019
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/display-head.tpl
@@ -0,0 +1,9 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{**}}
diff --git a/view/theme/decaf-mobile/smarty3/end.tpl b/view/theme/decaf-mobile/smarty3/end.tpl
new file mode 100644
index 00000000..e75845ba
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/end.tpl
@@ -0,0 +1,29 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+{{**}}
+{{**}}
+{{**}}
+{{**}}
+{{**}}
+
+
+
+
diff --git a/view/theme/decaf-mobile/smarty3/event_end.tpl b/view/theme/decaf-mobile/smarty3/event_end.tpl
new file mode 100644
index 00000000..63dbec44
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/event_end.tpl
@@ -0,0 +1,9 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{**}}
diff --git a/view/theme/decaf-mobile/smarty3/event_head.tpl b/view/theme/decaf-mobile/smarty3/event_head.tpl
new file mode 100644
index 00000000..bd72758e
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/event_head.tpl
@@ -0,0 +1,11 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+{{**}}
diff --git a/view/theme/decaf-mobile/smarty3/field_checkbox.tpl b/view/theme/decaf-mobile/smarty3/field_checkbox.tpl
new file mode 100644
index 00000000..f7f857f5
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/field_checkbox.tpl
@@ -0,0 +1,11 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+ {{$field.1}}
+
+ {{$field.3}}
+
diff --git a/view/theme/decaf-mobile/smarty3/field_input.tpl b/view/theme/decaf-mobile/smarty3/field_input.tpl
new file mode 100644
index 00000000..240bed24
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/field_input.tpl
@@ -0,0 +1,11 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+ {{$field.1}}
+
+ {{$field.3}}
+
diff --git a/view/theme/decaf-mobile/smarty3/field_openid.tpl b/view/theme/decaf-mobile/smarty3/field_openid.tpl
new file mode 100644
index 00000000..d5ebd9a3
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/field_openid.tpl
@@ -0,0 +1,11 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+ {{$field.1}}
+
+ {{$field.3}}
+
diff --git a/view/theme/decaf-mobile/smarty3/field_password.tpl b/view/theme/decaf-mobile/smarty3/field_password.tpl
new file mode 100644
index 00000000..f1352f27
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/field_password.tpl
@@ -0,0 +1,11 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+ {{$field.1}}
+
+ {{$field.3}}
+
diff --git a/view/theme/decaf-mobile/smarty3/field_themeselect.tpl b/view/theme/decaf-mobile/smarty3/field_themeselect.tpl
new file mode 100644
index 00000000..95cfd6bc
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/field_themeselect.tpl
@@ -0,0 +1,14 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+
{{$field.1}}
+
+ {{foreach $field.4 as $opt=>$val}}{{$val}} {{/foreach}}
+
+
{{$field.3}}
+
+
diff --git a/view/theme/decaf-mobile/smarty3/field_yesno.tpl b/view/theme/decaf-mobile/smarty3/field_yesno.tpl
new file mode 100644
index 00000000..9cdb95e0
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/field_yesno.tpl
@@ -0,0 +1,19 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{**}}
+{{include file="field_checkbox.tpl"}}
diff --git a/view/theme/decaf-mobile/smarty3/generic_links_widget.tpl b/view/theme/decaf-mobile/smarty3/generic_links_widget.tpl
new file mode 100644
index 00000000..705ddb57
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/generic_links_widget.tpl
@@ -0,0 +1,17 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
diff --git a/view/theme/decaf-mobile/smarty3/group_drop.tpl b/view/theme/decaf-mobile/smarty3/group_drop.tpl
new file mode 100644
index 00000000..26932281
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/group_drop.tpl
@@ -0,0 +1,14 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
diff --git a/view/theme/decaf-mobile/smarty3/group_side.tpl b/view/theme/decaf-mobile/smarty3/group_side.tpl
new file mode 100644
index 00000000..7d9d23eb
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/group_side.tpl
@@ -0,0 +1,38 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+
diff --git a/view/theme/decaf-mobile/smarty3/head.tpl b/view/theme/decaf-mobile/smarty3/head.tpl
new file mode 100644
index 00000000..ad9e1ad2
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/head.tpl
@@ -0,0 +1,34 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+{{**}}
+
+{{**}}
+
+
+
+{{**}}
+
+
+
+
+
+
+
diff --git a/view/theme/decaf-mobile/smarty3/jot-end.tpl b/view/theme/decaf-mobile/smarty3/jot-end.tpl
new file mode 100644
index 00000000..88c8e59c
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/jot-end.tpl
@@ -0,0 +1,10 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+{{**}}
diff --git a/view/theme/decaf-mobile/smarty3/jot-header.tpl b/view/theme/decaf-mobile/smarty3/jot-header.tpl
new file mode 100644
index 00000000..b0bf7891
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/jot-header.tpl
@@ -0,0 +1,22 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+
diff --git a/view/theme/decaf-mobile/smarty3/jot.tpl b/view/theme/decaf-mobile/smarty3/jot.tpl
new file mode 100644
index 00000000..61a72154
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/jot.tpl
@@ -0,0 +1,104 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{if $placeholdercategory}}
+
+ {{/if}}
+
+ {{**}}
+ {{if $content}}{{$content}}{{/if}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{**}}
+ {{**}}
+
+ {{**}}
+
+
+
+
+
+ {{$jotplugins}}
+
+
+
+
+ {{**}}
+
+ {{**}}
+ {{if $acl_data}}
+ {{include file="acl_html_selector.tpl"}}
+ {{/if}}
+ {{$jotnets}}
+
+ {{**}}
+
+
+
+
+
+
+
+ {{**}}
+
diff --git a/view/theme/decaf-mobile/smarty3/jot_geotag.tpl b/view/theme/decaf-mobile/smarty3/jot_geotag.tpl
new file mode 100644
index 00000000..d828980e
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/jot_geotag.tpl
@@ -0,0 +1,16 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+ if(navigator.geolocation) {
+ navigator.geolocation.getCurrentPosition(function(position) {
+ var lat = position.coords.latitude.toFixed(4);
+ var lon = position.coords.longitude.toFixed(4);
+
+ $j('#jot-coord').val(lat + ', ' + lon);
+ $j('#profile-nolocation-wrapper').show();
+ });
+ }
+
diff --git a/view/theme/decaf-mobile/smarty3/lang_selector.tpl b/view/theme/decaf-mobile/smarty3/lang_selector.tpl
new file mode 100644
index 00000000..a1aee827
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/lang_selector.tpl
@@ -0,0 +1,15 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+
+
+ {{foreach $langs.0 as $v=>$l}}
+ {{$l}}
+ {{/foreach}}
+
+
+
diff --git a/view/theme/decaf-mobile/smarty3/like_noshare.tpl b/view/theme/decaf-mobile/smarty3/like_noshare.tpl
new file mode 100644
index 00000000..9d6a58ea
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/like_noshare.tpl
@@ -0,0 +1,12 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
diff --git a/view/theme/decaf-mobile/smarty3/login.tpl b/view/theme/decaf-mobile/smarty3/login.tpl
new file mode 100644
index 00000000..69d05318
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/login.tpl
@@ -0,0 +1,50 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+
+{{**}}
diff --git a/view/theme/decaf-mobile/smarty3/login_head.tpl b/view/theme/decaf-mobile/smarty3/login_head.tpl
new file mode 100644
index 00000000..c2d9504a
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/login_head.tpl
@@ -0,0 +1,7 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{**}}
+
diff --git a/view/theme/decaf-mobile/smarty3/lostpass.tpl b/view/theme/decaf-mobile/smarty3/lostpass.tpl
new file mode 100644
index 00000000..5a22c245
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/lostpass.tpl
@@ -0,0 +1,26 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
diff --git a/view/theme/decaf-mobile/smarty3/mail_conv.tpl b/view/theme/decaf-mobile/smarty3/mail_conv.tpl
new file mode 100644
index 00000000..c2b43c53
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/mail_conv.tpl
@@ -0,0 +1,23 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+
+
+
+
{{$mail.from_name}}
+
{{$mail.date}}
+
{{$mail.subject}}
+
+
{{$mail.body}}
+
+
+
+
+
+
+
+
diff --git a/view/theme/decaf-mobile/smarty3/mail_list.tpl b/view/theme/decaf-mobile/smarty3/mail_list.tpl
new file mode 100644
index 00000000..538f6aff
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/mail_list.tpl
@@ -0,0 +1,21 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+
+
+
+
{{$from_name}}
+
{{$date}}
+
+
+
+
+
+
+
diff --git a/view/theme/decaf-mobile/smarty3/manage.tpl b/view/theme/decaf-mobile/smarty3/manage.tpl
new file mode 100644
index 00000000..f7d72f65
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/manage.tpl
@@ -0,0 +1,23 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$title}}
+{{$desc}}
+{{$choose}}
+
+
diff --git a/view/theme/decaf-mobile/smarty3/message-end.tpl b/view/theme/decaf-mobile/smarty3/message-end.tpl
new file mode 100644
index 00000000..adeea280
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/message-end.tpl
@@ -0,0 +1,9 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{**}}
diff --git a/view/theme/decaf-mobile/smarty3/message-head.tpl b/view/theme/decaf-mobile/smarty3/message-head.tpl
new file mode 100644
index 00000000..a7fb9610
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/message-head.tpl
@@ -0,0 +1,5 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/theme/decaf-mobile/smarty3/moderated_comment.tpl b/view/theme/decaf-mobile/smarty3/moderated_comment.tpl
new file mode 100644
index 00000000..b2401ca4
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/moderated_comment.tpl
@@ -0,0 +1,66 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
diff --git a/view/theme/decaf-mobile/smarty3/msg-end.tpl b/view/theme/decaf-mobile/smarty3/msg-end.tpl
new file mode 100644
index 00000000..594f3f79
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/msg-end.tpl
@@ -0,0 +1,7 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
diff --git a/view/theme/decaf-mobile/smarty3/msg-header.tpl b/view/theme/decaf-mobile/smarty3/msg-header.tpl
new file mode 100644
index 00000000..8447bb30
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/msg-header.tpl
@@ -0,0 +1,15 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+
diff --git a/view/theme/decaf-mobile/smarty3/nav.tpl b/view/theme/decaf-mobile/smarty3/nav.tpl
new file mode 100644
index 00000000..87d0bdec
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/nav.tpl
@@ -0,0 +1,160 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+{{**}}
+
+{{**}}
+
+
+
+{{**}}
+
+
+ {{if $nav.notifications}}
+{{**}}
+
+ {{/if}}
+
+{{**}}
+ {{if $nav.contacts}}
+
+ {{/if}}
+
+ {{if $nav.messages}}
+{{**}}
+
+ {{/if}}
+
+{{**}}
+ {{if $nav.network}}
+
+ {{/if}}
+
+
+
+ {{**}}
+ {{$banner}}
+
+
+{{**}}
diff --git a/view/theme/decaf-mobile/smarty3/photo_drop.tpl b/view/theme/decaf-mobile/smarty3/photo_drop.tpl
new file mode 100644
index 00000000..57f26cf5
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/photo_drop.tpl
@@ -0,0 +1,9 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
diff --git a/view/theme/decaf-mobile/smarty3/photo_edit.tpl b/view/theme/decaf-mobile/smarty3/photo_edit.tpl
new file mode 100644
index 00000000..1cff8f04
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/photo_edit.tpl
@@ -0,0 +1,65 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+
+
+
+
+
+ {{$newalbum}}
+
+
+
+
+
+
+ {{$capt_label}}
+
+
+
+
+
+
+ {{$tag_label}}
+
+
+
+
+
+
+ {{$rotatecw}}
+
+
+
+
+ {{$rotateccw}}
+
+
+
+
+
+ {{**}}
+
+ {{**}}
+ {{include file="acl_html_selector.tpl"}}
+
+ {{**}}
+
+
+
+
+
+
+
+
+
+
diff --git a/view/theme/decaf-mobile/smarty3/photo_edit_head.tpl b/view/theme/decaf-mobile/smarty3/photo_edit_head.tpl
new file mode 100644
index 00000000..740c3b42
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/photo_edit_head.tpl
@@ -0,0 +1,12 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{**}}
diff --git a/view/theme/decaf-mobile/smarty3/photo_view.tpl b/view/theme/decaf-mobile/smarty3/photo_view.tpl
new file mode 100644
index 00000000..5ccb5fb1
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/photo_view.tpl
@@ -0,0 +1,47 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+
+
+
+
+ {{if $prevlink}}
{{/if}}
+ {{if $nextlink}}
{{/if}}
+
+
+
+{{$desc}}
+{{if $tags}}
+{{$tags.0}}
+{{$tags.1}}
+{{/if}}
+{{if $tags.2}}{{/if}}
+
+{{if $edit}}
+{{$edit}}
+{{else}}
+
+{{if $likebuttons}}
+
+ {{$likebuttons}}
+ {{$like}}
+ {{$dislike}}
+
+{{/if}}
+
+{{$comments}}
+
+{{$paginate}}
+{{/if}}
+
diff --git a/view/theme/decaf-mobile/smarty3/photos_head.tpl b/view/theme/decaf-mobile/smarty3/photos_head.tpl
new file mode 100644
index 00000000..c8bfa62c
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/photos_head.tpl
@@ -0,0 +1,10 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{**}}
diff --git a/view/theme/decaf-mobile/smarty3/photos_upload.tpl b/view/theme/decaf-mobile/smarty3/photos_upload.tpl
new file mode 100644
index 00000000..9c22448d
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/photos_upload.tpl
@@ -0,0 +1,56 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$pagename}}
+
+{{$usage}}
+
+
+
+
+
+
{{$existalbumtext}}
+
+ {{$albumselect}}
+
+
+
+
+ {{$default_upload_box}}
+
+
+
+ {{$nosharetext}}
+
+
+
+ {{**}}
+
+ {{**}}
+ {{include file="acl_html_selector.tpl"}}
+
+ {{**}}
+
+
+
+ {{$alt_uploader}}
+
+ {{$default_upload_submit}}
+
+
+
+
diff --git a/view/theme/decaf-mobile/smarty3/profed_end.tpl b/view/theme/decaf-mobile/smarty3/profed_end.tpl
new file mode 100644
index 00000000..e9c03543
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/profed_end.tpl
@@ -0,0 +1,13 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{**}}
diff --git a/view/theme/decaf-mobile/smarty3/profed_head.tpl b/view/theme/decaf-mobile/smarty3/profed_head.tpl
new file mode 100644
index 00000000..c8ce27bb
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/profed_head.tpl
@@ -0,0 +1,10 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{**}}
diff --git a/view/theme/decaf-mobile/smarty3/profile_edit.tpl b/view/theme/decaf-mobile/smarty3/profile_edit.tpl
new file mode 100644
index 00000000..7583784f
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/profile_edit.tpl
@@ -0,0 +1,329 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$default}}
+
+{{$banner}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{{$lbl_fullname}}
+
+
+
+
+
+{{$lbl_title}}
+
+
+
+
+
+
+{{$lbl_gender}}
+{{$gender}}
+
+
+
+
+
{{$lbl_bd}}
+
+{{$dob}} {{$age}}
+
+
+
+
+{{$hide_friends}}
+
+
+
+
+
+
+
+
+{{$lbl_address}}
+
+
+
+
+
+{{$lbl_city}}
+
+
+
+
+
+
+{{$lbl_zip}}
+
+
+
+
+
+{{$lbl_country}}
+
+{{**}}
+
+
+
+
+{{$lbl_region}}
+
+{{**}}
+
+
+
+
+{{$lbl_hometown}}
+
+
+
+
+
+
+
+
+
+
+{{$lbl_marital}}
+{{$marital}}
+
+ {{$lbl_with}}
+
+ {{$lbl_howlong}}
+
+
+
+
+
+{{$lbl_sexual}}
+{{$sexual}}
+
+
+
+
+
+
+{{$lbl_homepage}}
+
+
+
+
+
+{{$lbl_politic}}
+
+
+
+
+
+{{$lbl_religion}}
+
+
+
+
+
+{{$lbl_pubkey}}
+
+
{{$lbl_pubdsc}}
+
+
+
+{{$lbl_prvkey}}
+
+
{{$lbl_prvdsc}}
+
+
+
+
+
+
+
+
+
+
+{{$lbl_about}}
+
+
+
{{$about}}
+
+
+
+
+
+
+
+{{$lbl_hobbies}}
+
+
+
{{$interest}}
+
+
+
+
+
+
+
+{{$lbl_likes}}
+
+
+
{{$likes}}
+
+
+
+
+
+
+
+{{$lbl_dislikes}}
+
+
+
{{$dislikes}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{{$lbl_music}}
+
+
+
{{$music}}
+
+
+
+
+
+
+{{$lbl_book}}
+
+
+
{{$book}}
+
+
+
+
+
+
+
+
+{{$lbl_tv}}
+
+
+
{{$tv}}
+
+
+
+
+
+
+
+
+{{$lbl_film}}
+
+
+
{{$film}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{{$lbl_love}}
+
+
+
{{$romance}}
+
+
+
+
+
+
+
+
+{{$lbl_work}}
+
+
+
{{$work}}
+
+
+
+
+
+
+
+
+{{$lbl_school}}
+
+
+
{{$education}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/view/theme/decaf-mobile/smarty3/profile_photo.tpl b/view/theme/decaf-mobile/smarty3/profile_photo.tpl
new file mode 100644
index 00000000..6bcb3cf8
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/profile_photo.tpl
@@ -0,0 +1,24 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$title}}
+
+
+
+
+
+{{$lbl_upfile}}
+
+
+
+
+
+
+
+
+
+
+{{$select}}
+
diff --git a/view/theme/decaf-mobile/smarty3/profile_vcard.tpl b/view/theme/decaf-mobile/smarty3/profile_vcard.tpl
new file mode 100644
index 00000000..85c6345d
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/profile_vcard.tpl
@@ -0,0 +1,56 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+
{{$profile.name}}
+
+
+
+ {{if $pdesc}}
{{$profile.pdesc}}
{{/if}}
+
+
+
+
+ {{if $location}}
+
{{$location}}
+
+ {{if $profile.address}}{{$profile.address}}
{{/if}}
+
+ {{$profile.locality}} {{if $profile.locality}}, {{/if}}
+ {{$profile.region}}
+ {{$profile.postal_code}}
+
+ {{if $profile.country_name}}{{$profile.country_name}} {{/if}}
+
+
+ {{/if}}
+
+ {{if $gender}}
{{$gender}} {{$profile.gender}} {{/if}}
+
+ {{if $profile.pubkey}}
{{$profile.pubkey}}
{{/if}}
+
+ {{if $marital}}
♥ {{$marital}}{{$profile.marital}} {{/if}}
+
+ {{if $homepage}}
{{$homepage}} {{$profile.homepage}} {{/if}}
+
+ {{include file="diaspora_vcard.tpl"}}
+
+
+
+
+
+{{$contact_block}}
+
+
diff --git a/view/theme/decaf-mobile/smarty3/prv_message.tpl b/view/theme/decaf-mobile/smarty3/prv_message.tpl
new file mode 100644
index 00000000..6372d306
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/prv_message.tpl
@@ -0,0 +1,48 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+{{$header}}
+
+
+
+
+{{$parent}}
+
+{{$to}}
+
+{{if $showinputs}}
+
+
+{{else}}
+{{$select}}
+{{/if}}
+
+{{$subject}}
+
+
+{{$yourmessage}}
+{{$text}}
+
+
+
+
+
+ {{**}}
+
+
+
+
+
+
+
+
+
diff --git a/view/theme/decaf-mobile/smarty3/register.tpl b/view/theme/decaf-mobile/smarty3/register.tpl
new file mode 100644
index 00000000..3f64bb67
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/register.tpl
@@ -0,0 +1,85 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
diff --git a/view/theme/decaf-mobile/smarty3/search_item.tpl b/view/theme/decaf-mobile/smarty3/search_item.tpl
new file mode 100644
index 00000000..a6da44d3
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/search_item.tpl
@@ -0,0 +1,69 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+{{**}}
+
+
+ {{**}}
+
+
+ {{**}}
+
+
+ {{if $item.lock}}{{**}}
{{**}}
+ {{else}}
{{/if}}
+
{{$item.location}}
+
+
+ {{**}}
+
{{$item.name}}
+
{{$item.ago}}
+
+ {{**}}
+
+
{{$item.title}}
+ {{**}}
+
{{$item.body}}
+ {{if $item.has_cats}}
+
+ {{/if}}
+
+ {{if $item.has_folders}}
+
+ {{/if}}
+
+
+
+ {{**}}
+
+
+
+
+{{**}}
+
+{{**}}
+
+
diff --git a/view/theme/decaf-mobile/smarty3/settings-head.tpl b/view/theme/decaf-mobile/smarty3/settings-head.tpl
new file mode 100644
index 00000000..c8bfa62c
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/settings-head.tpl
@@ -0,0 +1,10 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{**}}
diff --git a/view/theme/decaf-mobile/smarty3/settings.tpl b/view/theme/decaf-mobile/smarty3/settings.tpl
new file mode 100644
index 00000000..d702cd7d
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/settings.tpl
@@ -0,0 +1,153 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$ptitle}}
+
+{{$nickname_block}}
+
+
+
+
+{{$h_pass}}
+
+{{include file="field_password.tpl" field=$password1}}
+{{include file="field_password.tpl" field=$password2}}
+
+{{if $oid_enable}}
+{{include file="field_input.tpl" field=$openid}}
+{{/if}}
+
+
+
+
+
+
+{{$h_basic}}
+
+{{include file="field_input.tpl" field=$username}}
+{{include file="field_input.tpl" field=$email}}
+{{include file="field_custom.tpl" field=$timezone}}
+{{include file="field_input.tpl" field=$defloc}}
+{{include file="field_checkbox.tpl" field=$allowloc}}
+
+
+
+
+
+
+
+{{$h_prv}}
+
+
+
+
+{{include file="field_input.tpl" field=$maxreq}}
+
+{{$profile_in_dir}}
+
+{{$profile_in_net_dir}}
+
+{{$hide_friends}}
+
+{{$hide_wall}}
+
+{{$blockwall}}
+
+{{$blocktags}}
+
+{{$suggestme}}
+
+{{$unkmail}}
+
+
+{{include file="field_input.tpl" field=$cntunkmail}}
+
+{{include file="field_input.tpl" field=$expire.days}}
+
+
+
+
+
+
+
{{$settings_perms}}
+
+{{**}}
+
+ {{**}}
+ {{include file="acl_html_selector.tpl"}}
+
+{{**}}
+
+
+
+
+
+{{$group_select}}
+
+
+
+
+
+
+
+
+{{$h_not}}
+
+
+
{{$activity_options}}
+
+{{include file="field_checkbox.tpl" field=$post_newfriend}}
+{{include file="field_checkbox.tpl" field=$post_joingroup}}
+{{include file="field_checkbox.tpl" field=$post_profilechange}}
+
+
+
{{$lbl_not}}
+
+
+{{include file="field_intcheckbox.tpl" field=$notify1}}
+{{include file="field_intcheckbox.tpl" field=$notify2}}
+{{include file="field_intcheckbox.tpl" field=$notify3}}
+{{include file="field_intcheckbox.tpl" field=$notify4}}
+{{include file="field_intcheckbox.tpl" field=$notify5}}
+{{include file="field_intcheckbox.tpl" field=$notify6}}
+{{include file="field_intcheckbox.tpl" field=$notify7}}
+
+
+
+
+
+
+
+
+
+{{$h_advn}}
+{{$h_descadvn}}
+
+{{$pagetype}}
+
+
+
+
+
+
diff --git a/view/theme/decaf-mobile/smarty3/settings_display_end.tpl b/view/theme/decaf-mobile/smarty3/settings_display_end.tpl
new file mode 100644
index 00000000..4b3db00f
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/settings_display_end.tpl
@@ -0,0 +1,7 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
diff --git a/view/theme/decaf-mobile/smarty3/suggest_friends.tpl b/view/theme/decaf-mobile/smarty3/suggest_friends.tpl
new file mode 100644
index 00000000..7221dc68
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/suggest_friends.tpl
@@ -0,0 +1,21 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+
+
+
+ {{if $connlnk}}
+
+ {{/if}}
+
+
diff --git a/view/theme/decaf-mobile/smarty3/threaded_conversation.tpl b/view/theme/decaf-mobile/smarty3/threaded_conversation.tpl
new file mode 100644
index 00000000..e90caf5a
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/threaded_conversation.tpl
@@ -0,0 +1,17 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+{{if $mode == display}}
+{{include file="{{$thread.template}}" item=$thread}}
+{{else}}
+{{include file="wall_thread_toponly.tpl" item=$thread}}
+{{/if}}
+{{/foreach}}
+
+
+
diff --git a/view/theme/decaf-mobile/smarty3/voting_fakelink.tpl b/view/theme/decaf-mobile/smarty3/voting_fakelink.tpl
new file mode 100644
index 00000000..1e073916
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/voting_fakelink.tpl
@@ -0,0 +1,6 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$phrase}}
diff --git a/view/theme/decaf-mobile/smarty3/wall_thread.tpl b/view/theme/decaf-mobile/smarty3/wall_thread.tpl
new file mode 100644
index 00000000..058ae43c
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/wall_thread.tpl
@@ -0,0 +1,124 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+{{**}}
+
+
+ {{if $item.owner_url}}
+
+
+ {{/if}}
+ {{**}}
+ {{**}}
+
+
+
+ {{**}}
+
+ {{**}}
+ {{**}}
+
+ {{if $item.lock}}{{**}}
{{**}}
+ {{else}}
{{/if}}
+
{{$item.location}}
+
+
+ {{**}}
+
{{$item.name}} {{if $item.owner_url}} {{$item.to}}
{{$item.owner_name}} {{$item.vwall}}{{/if}}
+
{{$item.ago}}
+ {{**}}
+
+
{{$item.title}}
+ {{**}}
+
{{$item.body}}
+ {{**}}
+ {{foreach $item.tags as $tag}}
+
{{$tag}}
+ {{/foreach}}
+ {{**}}
+ {{if $item.has_cats}}
+
+ {{/if}}
+
+ {{if $item.has_folders}}
+
+ {{/if}}
+
+
+
+
+ {{**}}
+
{{$item.like}}
+
{{$item.dislike}}
+
+ {{if $item.threaded}}
+ {{if $item.comment}}
+ {{**}}
+ {{$item.comment}}
+ {{**}}
+ {{/if}}
+ {{/if}}
+
+{{**}}
+{{**}}
+{{foreach $item.children as $child}}
+ {{include file="{{$child.template}}" item=$child}}
+{{/foreach}}
+
+{{if $item.flatten}}
+{{**}}
+ {{$item.comment}}
+{{**}}
+{{/if}}
+
+
diff --git a/view/theme/decaf-mobile/smarty3/wall_thread_toponly.tpl b/view/theme/decaf-mobile/smarty3/wall_thread_toponly.tpl
new file mode 100644
index 00000000..af8626a8
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/wall_thread_toponly.tpl
@@ -0,0 +1,106 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+
+
+
+ {{if $item.owner_url}}
+
+
+ {{/if}}
+
+
+
+
+
+ {{if $item.lock}}
+ {{else}}
{{/if}}
+
{{$item.location}}
+
+
+
{{$item.name}} {{if $item.owner_url}} {{$item.to}}
{{$item.owner_name}} {{$item.vwall}}{{/if}}
+
{{$item.ago}}
+
+
{{$item.title}}
+
{{$item.body}}
+ {{foreach $item.tags as $tag}}
+
{{$tag}}
+ {{/foreach}}
+ {{if $item.has_cats}}
+
+ {{/if}}
+
+ {{if $item.has_folders}}
+
+ {{/if}}
+
+
+
+
+
{{$item.like}}
+
{{$item.dislike}}
+
+
+
+
+
+
diff --git a/view/theme/decaf-mobile/smarty3/wallmessage.tpl b/view/theme/decaf-mobile/smarty3/wallmessage.tpl
new file mode 100644
index 00000000..4cba9009
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/wallmessage.tpl
@@ -0,0 +1,37 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+{{$header}}
+
+{{$subheader}}
+
+
+
+
+{{$parent}}
+
+{{$to}}
+{{$recipname}}
+
+{{$subject}}
+
+
+{{$yourmessage}}
+{{$text}}
+
+
+
+
+ {{**}}
+
+
+
+
+
+
+
diff --git a/view/theme/decaf-mobile/smarty3/wallmsg-end.tpl b/view/theme/decaf-mobile/smarty3/wallmsg-end.tpl
new file mode 100644
index 00000000..594f3f79
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/wallmsg-end.tpl
@@ -0,0 +1,7 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
diff --git a/view/theme/decaf-mobile/smarty3/wallmsg-header.tpl b/view/theme/decaf-mobile/smarty3/wallmsg-header.tpl
new file mode 100644
index 00000000..e6f1c673
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/wallmsg-header.tpl
@@ -0,0 +1,12 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+
diff --git a/view/theme/decaf-mobile/style.css b/view/theme/decaf-mobile/style.css
new file mode 100644
index 00000000..4cfdd805
--- /dev/null
+++ b/view/theme/decaf-mobile/style.css
@@ -0,0 +1,4317 @@
+/**
+ * duepuntozero Frindika style
+ * Fabio Comuni
+ *
+ * Heavily modified for Frost Mobile
+ * Zach P
+ */
+
+
+/* generals */
+html {
+/* width: 320px;*/
+ margin-left: auto;
+ margin-right: auto;
+/* overflow-x:hidden;*/
+}
+
+body {
+ font-family: helvetica,arial,freesans,clean,sans-serif;
+ font-size: 16px;
+/* line-height: 24px;*/
+ background-color: #ffffff;
+ background-image: url(head.jpg);
+ background-repeat: repeat-x;
+ color: #505050;
+ margin: 0px;
+ overflow-x:hidden;
+}
+
+div.container {
+ display: block;
+/* width: 100%;*/
+ margin-top: 0px;
+ margin-bottom: 0px;
+ margin-left: auto;
+ margin-right: auto;
+ overflow-x:hidden;
+}
+
+a, a:visited, a:link { color: #3465a4; text-decoration: none; }
+a:hover {text-decoration: underline; }
+
+input {
+ border: 1px solid #666666;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
+ padding: 3px;
+}
+
+img { border :0px; }
+
+#id_openid_url, .openid input {
+ background: url(login-bg.gif) no-repeat;
+ background-position: 0 50%;
+ padding-left: 18px;
+ width: 212px;
+ margin-left: 20px;
+}
+.openid:hover {
+
+}
+
+/*#id_openid_url {
+ width: 384px;
+}*/
+
+/*code {
+ font-family: Courier, monospace;
+ white-space: pre;
+ display: block;
+ overflow: auto;
+ border: 1px solid #444;
+ background: #EEE;
+ color: #444;
+ padding: 10px;
+ margin-top: 20px;
+}
+
+blockquote {
+ background-color: #f4f8f9;
+ border-left: 4px solid #dae4ee;
+ padding: 0.4em;
+ margin-left: 20px;
+ margin-right: 0px;
+ width: 260px;
+ overflow: hidden;
+}*/
+
+code {
+ font-family: Courier, monospace;
+ white-space: pre;
+ display: block;
+ overflow: auto;
+ border: 1px solid #444;
+ background: #EEE;
+ color: #444;
+ padding: 10px;
+ margin-top: 20px;
+}
+
+blockquote {
+ background-color: #f4f8f9;
+ border-left: 4px solid #dae4ee;
+ padding: 0.4em;
+}
+
+.icollapse-wrapper, .ccollapse-wrapper {
+ border: 1px solid #CCC;
+ padding: 5px;
+}
+
+.hide-comments-outer {
+ margin-left: 0px;
+ font-weight: 700;
+ opacity: 0.6;
+}
+.hide-comments {
+ margin-left: 5px;
+}
+
+#panel {
+ background-color: ivory;
+ position: absolute;
+/* z-index: 2;*/
+ width: 30%;
+ padding: 25px;
+ border: 1px solid #444;
+}
+
+.heart {
+ color: #FF0000;
+ font-size: 100%;
+ margin-right: 5px;
+}
+
+
+
+/* nav */
+nav {
+ height: 94px;
+/* width: 100%;*/
+ width: 320px;
+ display: block;
+ margin-top: 0px;
+ margin-bottom: 0px;
+ margin-left: auto;
+ margin-right: auto;
+}
+nav #site-location {
+ color: #888a85;
+ font-size: 0.8em;
+ position: absolute;
+}
+
+.error-message {
+ color: #FF0000;
+ font-size: 1.1em;
+ border: 1px solid #FF8888;
+ background-color: #FFEEEE;
+ padding: 10px;
+}
+
+.info-message {
+ color: #204a87;
+ font-size: 1.1em;
+ border: 1px solid #3465a4;
+ background-color: #d7e3f1;
+ padding: 10px;
+}
+
+
+nav #banner {
+/* display: block;*/
+ display: none;
+ margin-top: 14px;
+ position: absolute;
+}
+nav #banner #logo-text a {
+ display: none;
+ font-size: 40px;
+ font-weight: bold;
+ margin-left: 3px;
+ color: #000000;
+
+}
+nav #banner #logo-text a:hover { text-decoration: none; }
+
+
+/* ZP REMOVE? nav-commlink */
+.nav-commlink, .nav-login-link {
+ display: block;
+ height: 15px;
+ margin-top: 67px;
+ margin-right: 2px;
+ /*padding: 6px 10px;*/
+ padding: 6px 3px;
+ float: left;
+ bottom: 140px;
+ border: 1px solid #babdb6;
+ border-bottom: 0px;
+ background-color: #aec0d3;
+ color: #565854;
+ -moz-border-radius: 3px 3px 0px 0px;
+ -webkit-border-radius: 3px 3px 0px 0px;
+ border-radius: 3px 3px 0px 0px;
+}
+
+.nav-commlink.selected {
+ background-color: #ffffff;
+ border-bottom: 1px solid #ffffff;
+ color: #000000 !important;
+ margin-top: 64px;
+ padding-top: 6px;
+ padding-bottom: 8px;
+}
+
+.nav-ajax-left.show {
+ position: absolute;
+ font-size: 0.8em;
+ top: 22px;
+ right: 2px;
+ padding: 1px 2px;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ background-color: gold !important;
+}
+
+
+
+nav #nav-link-wrapper .nav-link {
+ /*border-right: 1px solid #babdb6;*/
+}
+
+nav .nav-link {
+ margin-top: 24px;
+ margin-bottom: 0.2em;
+ margin-right: 1em;
+ margin-left: 1em;
+ background-color: transparent !important;
+}
+
+.nav-button-container {
+ float: right;
+ position: relative;
+}
+
+.nav-button-container .nav-ajax-left {
+}
+
+.nav-button-container a {
+ padding-top: 1.4em;
+}
+
+.nav-menu-list {
+ text-align: center;
+ text-size: 18px;
+ line-height: 24px;
+
+ border-left: 1px solid #aaa;/*#444444;*/
+ border-right: 1px solid #aaa;
+ border-top: 1px solid #aaa;
+ border-bottom: 1px solid #aaa;
+
+ background: #FFFFFF;
+
+ display: none;
+ list-style: none;
+
+ width: 8em;
+ position: absolute;
+ margin: 0px;
+/* right: -33px;*/
+ padding: 1em 0px;
+
+ -moz-box-shadow: 3px 3px 5px #555;
+ -webkit-box-shadow: 3px 3px 5px #555;
+ box-shadow: 3px 3px 5px #555;
+
+ z-index: 100;
+}
+
+#network-menu-list {
+ width: 9em;
+ left: 3px;
+}
+
+#contacts-menu-list {
+ right: -30px;
+}
+
+#system-menu-list {
+ right: 3px;
+}
+
+
+div.main-container {
+/* width: 100%;*/
+ margin: 0px auto;
+ display: block;
+ position: relative;
+}
+
+/*div.main-content-loading {
+ position: absolute;
+ top: 200px;
+ left: 50%;
+ display: none;
+}*/
+
+
+/* aside */
+/*aside {
+ display: block;
+ min-height: 112px;
+
+ width: 250px;
+
+ padding: 1em;
+ margin: 1em 0px 0px 0px;
+
+ position: absolute;
+}*/
+
+#dfrn-request-link {
+ display: block;
+ color: #FFFFFF;
+ -webkit-border-radius: 5px ;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+ padding: 5px;
+ font-weight: bold;
+ background: #3465a4 url('friendica-16.png') no-repeat 95% center;
+}
+#wallmessage-link {
+ display: block;
+ color: #FFFFFF;
+ -webkit-border-radius: 5px ;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+ padding: 5px;
+ font-weight: bold;
+ background-color: #3465a4;
+}
+
+/* section */
+div.section-wrapper {
+/* width: 100%;*/
+/* width: 320px;
+
+ margin-left: auto;
+ margin-right: auto;*/
+ margin-left: 0px;
+
+ /*padding-right:2em;*/
+
+ display: block;
+
+ background-color: #ffffff;
+ background-image: url(border.jpg);
+ background-position: top right;
+ background-repeat: no-repeat;
+}
+
+section {
+ margin: 0px 0px 0px 0px;
+
+ padding-left: 5px;
+ padding-right: 5px;
+ padding-top: 1em;
+ padding-bottom: 3em;
+
+ background-image: url(border.jpg);
+ background-position: top left;
+ background-repeat: no-repeat;
+
+ min-height: 112px;
+ border-top: 1px solid #babdb6;
+ overflow-x:hidden;
+}
+
+/* footer */
+footer {
+ text-align: center;
+ padding-bottom: 1em;
+}
+
+.tabs {
+ /*background-image: url(head.jpg);
+ background-repeat: repeat-x;
+ background-position: 0px -20px;*/
+ border-bottom: 1px solid #babdb6;
+ padding:0px;
+}
+.tabs.links-widget {
+ border: none;
+}
+.tabs li { margin: 0px 0px 20px 0px; padding-left: 1em; list-style: none; }
+.tabs a {
+ padding: 0.4em 2em;
+ border: 1px solid #aaa;
+ border-radius: 8px;
+ -moz-border-radius: 8px;
+ -webkit-border-radius: 8px;
+}
+.tab {
+ /*display:block;*/
+ float:left;
+ padding-left: 1em;
+ padding-right: 0.4em;
+ padding-top: 0.4em;
+ padding-bottom: 0.4em;
+ margin-right: 0.5em;
+ margin-bottom: 0.4em;
+}
+.tab.active {
+ font-weight: bold;
+
+}
+#events-tab {
+ display: none;
+}
+#tabs-end {
+ padding-top: 0.3em;
+ clear: both;
+}
+
+
+/* Navigation page */
+.navigation-link {
+/* display: block;
+ clear: both;
+ text-align: center;*/
+ font-size: 24px;
+}
+#navigation-login-wrapper,
+#navigation-network-wrapper,
+navigation-messages-wrapper,
+#navigation-contacts-wrapper,
+#navigation-notifications-wrapper,
+#navigation-misc-wrapper {
+ margin-bottom: 1em;
+}
+
+
+.birthday-today, .event-today {
+ font-weight: bold;
+}
+
+.preview {
+ background: #FFFFC8;
+}
+
+#theme-preview {
+ margin: 15px 0 15px 15px;
+}
+#theme-version {
+ display: block;
+ font-weight: bold;
+}
+#theme-credits {
+ margin-top: 15px;
+ margin-bottom: 15px;
+}
+
+/* from default */
+#jot-perms-icon,
+#profile-location,
+#profile-nolocation,
+#profile-youtube,
+#profile-video,
+#profile-audio,
+#profile-link,
+#profile-title,
+#wall-image-upload,
+#wall-file-upload,
+#profile-upload-wrapper,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+ cursor: pointer;
+}
+
+#jot-perms-icon {
+ float: left;
+}
+
+#jot-title, #jot-category {
+ border: 0px;
+ margin: 0px;
+ height: 20px;
+ width: 270px;
+ margin-bottom: 5px;
+ font-weight: bold;
+ border: 1px solid #ffffff;
+}
+
+/*#jot-title::-webkit-input-placeholder{font-weight: normal;}
+#jot-title:-moz-placeholder{font-weight: normal;}
+#jot-category::-webkit-input-placeholder{font-weight: normal;}
+#jot-category:-moz-placeholder{font-weight: normal;}*/
+#profile-jot-text::-webkit-input-placeholder{font-weight: bold;}
+#profile-jot-text:-moz-placeholder{font-weight: bold; font-size:18px; color: graytext}
+
+#jot-title:hover,
+#jot-title:focus,
+#jot-category:hover,
+#jot-category:focus {
+ border: 1px solid #cccccc;
+}
+
+/*.jothidden { display:none; }*/
+
+
+/*.fakelink, .fakelink:visited, .fakelink:link {
+ color: #3465a4;
+ text-decoration: none;
+ cursor: pointer;
+ margin-top: 15px;
+ margin-bottom: 15px;
+}*/
+.lockview {
+ cursor: pointer;
+}
+
+#group-sidebar {
+ margin-bottom: 10px;
+}
+
+.group-selected, .nets-selected, .fileas-selected, .categories-selected {
+ padding: 3px;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
+ border: 1px solid #CCCCCC;
+ background: #F8F8F8;
+ font-weight: bold;
+}
+
+.settings-widget .selected {
+/* padding: 3px;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
+ border: 1px solid #CCCCCC;*/
+ background: #F8F8F8;
+ font-weight: bold;
+}
+
+/*.fakelink:hover {
+ color: #3465a4;
+ text-decoration: underline;
+ cursor: pointer;
+}*/
+.smalltext {
+ font-size: 0.7em;
+}
+#sysmsg {
+ /*width: 600px;*/
+ margin-bottom: 10px;
+}
+
+#register-fill-ext {
+ margin-bottom: 25px;
+}
+
+#label-register-name, #label-register-email, #label-register-nickname, #label-register-openid {
+ float: left;
+ width: 350px;
+ margin-top: 10px;
+}
+
+#register-name, #register-email, #register-nickname {
+ float: left;
+ margin-top: 10px;
+ width: 150px;
+}
+
+#register-openid {
+ float: left;
+ margin-top: 10px;
+ width: 130px;
+}
+
+#register-name-end, #register-email-end, #register-nickname-end, #register-submit-end, #register-openid-end {
+ clear: both;
+}
+
+#register-nickname-desc {
+ margin-top: 30px;
+ width: 650px;
+}
+#register-sitename {
+ float: left;
+ margin-top: 10px;
+}
+
+#register-submit-button {
+ margin-top: 10px;
+}
+
+/*
+#login_standard {
+ width: 210px;
+ float: left;
+}
+#login_openid {
+ width: 210px;
+ margin-left: 250px;
+}
+
+#login_standard input,
+#login_openid input {
+ width: 180px;
+}
+
+#login-extra-links {
+ clear: both;
+}
+
+#register-link, #lost-password-link {
+ float: left;
+ font-size: 80%;
+ margin-right: 15px;
+}
+
+#login-name-end, #login-password-end, #login-extra-end, #login-submit-end {
+ height: 50px;
+}
+
+#login-submit-button {
+ margin-top: 10px;
+ margin-left: 200px;
+}*/
+
+
+input#dfrn-url {
+ float: left;
+ background: url(friendica-16.png) no-repeat;
+ background-position: 2px center;
+ font-size: 17px;
+ padding-left: 21px;
+ height: 21px;
+ background-color: #FFFFFF;
+ color: #000000;
+ margin-bottom: 20px;
+ max-width: 90%;
+}
+
+#dfrn-url-label {
+ float: left;
+ width: 250px;
+}
+
+#dfrn-request-url-end {
+ clear: both;
+}
+
+#knowyouyes, #knowyouno {
+ float: left;
+}
+
+#dfrn-request-knowyou-yes-wrapper, #dfrn-request-knowyou-no-wrapper {
+
+ float: none;
+}
+#dfrn-request-knowyou-yes-label, #dfrn-request-knowyou-no-label {
+ float: left;
+ width: 75px;
+ margin-left: 50px;
+ margin-bottom: 7px;
+}
+#dfrn-request-knowyou-break, #dfrn-request-knowyou-end {
+ clear: both;
+}
+
+#dfrn-request-message-wrapper {
+ margin-bottom: 50px;
+}
+#dfrn-request-message-wrapper textarea {
+ max-width: 90%;
+}
+#dfrn-request-submit-wrapper {
+ clear: both;
+ /*margin-left: 50px;*/
+}
+#dfrn-request-submit-wrapper input {
+ font-size: 18px;
+ padding: 5px 10px;
+}
+
+#dfrn-request-info-wrapper {
+ margin-left: 50px;
+}
+
+
+
+#cropimage-wrapper, #cropimage-preview-wrapper {
+ float: left;
+ padding: 10px;
+}
+.imgCrop {
+ max-width: 280px;
+}
+#crop-image-form {
+ margin-top: 30px;
+ clear: both;
+}
+
+.intro-wrapper {
+ margin-top: 20px;
+}
+
+.intro-fullname {
+ font-size: 1.1em;
+ font-weight: bold;
+
+}
+.intro-desc {
+ margin-bottom: 20px;
+ font-weight: bold;
+}
+
+.intro-note {
+ padding: 10px;
+}
+
+.intro-end {
+ padding: 30px;
+}
+
+.intro-form {
+ float: left;
+}
+.intro-approve-form {
+ clear: both;
+}
+.intro-approve-as-friend-end {
+ clear: both;
+}
+.intro-submit-approve, .intro-submit-ignore {
+ margin-right: 20px;
+}
+.intro-submit-approve {
+ margin-top: 15px;
+}
+
+.intro-approve-as-friend-label, .intro-approve-as-fan-label {
+ float: left;
+ width: 100px;
+ margin-left: 20px;
+}
+.intro-approve-as-friend, .intro-approve-as-fan {
+ float: left;
+}
+.intro-form-end {
+ clear: both;
+}
+.intro-approve-as-friend-desc {
+ margin-top: 15px;
+}
+.intro-approve-as-end {
+ clear: both;
+ margin-bottom: 10px;
+}
+
+.intro-end {
+ clear: both;
+ margin-bottom: 30px;
+}
+.aprofile dt {
+ font-weight: bold;
+}
+#page-profile .title {
+ font-weight: bold;
+}
+#profile-vcard-break {
+ clear: both;
+}
+#profile-extra-links {
+ clear: both;
+ margin-top: 10px;
+}
+
+#profile-extra-links ul {
+ list-style-type: none;
+ padding: 0px;
+}
+
+
+#profile-extra-links li {
+ margin-top: 5px;
+ max-width: 300px;
+ margin-left: auto;
+ margin-right: auto;
+}
+
+#profile-edit-links ul {
+ list-style-type: none;
+}
+
+#profile-edit-links li {
+ margin-top: 10px;
+}
+.profile-edit-side-div {
+ float: right;
+}
+.profile-edit-side-link {
+ opacity: 0.3;
+ filter:alpha(opacity=30);
+}
+.profile-edit-side-link:hover {
+ opacity: 1.0;
+ filter:alpha(opacity=100);
+}
+
+.view-contact-wrapper {
+ margin-top: 20px;
+ float: left;
+ margin-left: 20px;
+ width: 180px;
+}
+
+.contact-wrapper {
+ float: left;
+ width: 150px;
+ height: 150px;
+ overflow: auto;
+}
+
+#view-contact-end {
+ clear: both;
+}
+
+
+#viewcontacts {
+ margin-top: 15px;
+}
+#profile-edit-default-desc {
+ color: #FF0000;
+ border: 1px solid #FF8888;
+ background-color: #FFEEEE;
+ padding: 7px;
+}
+
+#profile-edit-clone-link-wrapper {
+ float: left;
+ margin-left: 50px;
+ margin-bottom: 20px;
+ width: 300px;
+}
+
+
+#profile-edit-links-end {
+ clear: both;
+ margin-bottom: 15px;
+}
+
+.profile-listing-photo {
+ border: none;
+}
+
+.profile-edit-submit-wrapper {
+ margin-top: 20px;
+ margin-bottom: 20px;
+}
+
+#profile-photo-link-select-wrapper {
+ margin-top: 2em;
+}
+
+#profile-photo-submit-wrapper {
+ margin-top: 10px;
+}
+
+#profile-photo-wrapper {
+ text-align: center;
+}
+#profile-photo-wrapper img {
+ width:175px;
+ height:175px;
+ padding: 12px;
+}
+
+#profile-edit-profile-name-label,
+#profile-edit-name-label,
+#profile-edit-pdesc-label,
+#profile-edit-gender-label,
+#profile-edit-dob-label,
+#profile-edit-address-label,
+#profile-edit-locality-label,
+#profile-edit-region-label,
+#profile-edit-postal-code-label,
+#profile-edit-country-name-label,
+#profile-edit-marital-label,
+#profile-edit-sexual-label,
+#profile-edit-politic-label,
+#profile-edit-religion-label,
+#profile-edit-pubkeywords-label,
+#profile-edit-prvkeywords-label,
+#profile-edit-homepage-label,
+#profile-edit-hometown-label {
+ font-weight: 700;
+ float: left;
+ width: 175px;
+}
+
+#profile-edit-profile-name,
+#profile-edit-name,
+#profile-edit-pdesc,
+#gender-select,
+#profile-edit-dob,
+#profile-edit-address,
+#profile-edit-locality,
+#profile-edit-region,
+#profile-edit-postal-code,
+#profile-edit-country-name,
+#marital-select,
+#sexual-select,
+#profile-edit-politic,
+#profile-edit-religion,
+#profile-edit-pubkeywords,
+#profile-edit-prvkeywords,
+#profile-in-dir-yes,
+#profile-in-dir-no,
+#profile-in-netdir-yes,
+#profile-in-netdir-no,
+#hide-wall-yes,
+#hide-wall-no,
+#hide-friends-yes,
+#hide-friends-no {
+ float: left;
+ margin-bottom: 20px;
+ margin-left: 20px;
+}
+#profile-edit-country-name {
+ max-width: 260px;
+}
+#profile-edit-pubkeywords,
+#profile-edit-prvkeywords {
+ margin-bottom: 5px;
+}
+#settings-normal,
+#settings-soapbox,
+#settings-freelove,
+#settings-community {
+ float: left;
+}
+#settings-notifications label {
+ margin-left: 20px;
+}
+#settings-notify-desc, #settings-activity-desc {
+ font-weight: bold;
+ margin-bottom: 15px;
+}
+#settings-pagetype-desc {
+ color: #666666;
+ margin-bottom: 15px;
+}
+
+#profile-in-dir-yes-label,
+#profile-in-dir-no-label,
+#profile-in-netdir-yes-label,
+#profile-in-netdir-no-label,
+#hide-wall-yes-label,
+#hide-wall-no-label,
+#hide-friends-yes-label,
+#hide-friends-no-label {
+ margin-left: 125px;
+ float: left;
+ width: 50px;
+}
+
+
+#profile-edit-howlong-label,
+#profile-edit-with-label {
+ display: block;
+ font-style: italic;
+ width: 175px;
+ margin-left: 0px;
+}
+#profile-edit-howlong,
+#profile-edit-with {
+ margin-left: 20px;
+ margin-bottom: 20px;
+}
+
+#profile-publish-yes-reg,
+#profile-publish-no-reg {
+ float: left;
+ margin-bottom: 10px;
+}
+
+#profile-publish-yes-label-reg,
+#profile-publish-no-label-reg {
+ margin-left: 350px;
+ float: left;
+ width: 50px;
+}
+
+#profile-publish-break-reg,
+#profile-publish-end-reg {
+ clear: both;
+}
+
+
+#profile-edit-pdesc-desc,
+#profile-edit-pubkeywords-desc,
+#profile-edit-prvkeywords-desc {
+ float: left;
+ color: #777;
+ margin-left: 20px;
+ margin-bottom: 20px;
+}
+#profile-edit-prvkeywords-desc {
+ margin-bottom: 0px;
+}
+
+#profile-edit-homepage, #profile-edit-hometown {
+ float: left;
+ margin-bottom: 25px;
+ margin-left: 20px;
+}
+#profile-edit-hometown {
+ margin-bottom: 5px;
+}
+#settings-normal-label,
+#settings-soapbox-label,
+#settings-community-label,
+#settings-freelove-label {
+ float: left;
+ width: 200px;
+}
+#settings-normal-desc,
+#settings-soapbox-desc,
+#settings-community-desc,
+#settings-freelove-desc {
+ /*float: left;
+ margin-left: 75px;*/
+ clear: left;
+ color: #666666;
+ display: block;
+ margin-bottom: 20px
+}
+
+#profile-edit-profile-name-end,
+#profile-edit-name-end,
+#profile-edit-pdesc-end,
+#profile-edit-gender-end,
+#profile-edit-dob-end,
+#profile-edit-address-end,
+#profile-edit-locality-end,
+#profile-edit-region-end,
+#profile-edit-postal-code-end,
+#profile-edit-country-name-end,
+#profile-edit-marital-end,
+#profile-edit-sexual-end,
+#profile-edit-politic-end,
+#profile-edit-religion-end,
+#profile-edit-pubkeywords-end,
+#profile-edit-prvkeywords-end,
+#profile-edit-homepage-end,
+#profile-edit-hometown-end,
+#profile-in-dir-break,
+#profile-in-dir-end,
+#profile-in-netdir-break,
+#profile-in-netdir-end,
+#hide-wall-break,
+#hide-wall-end,
+#hide-friends-break,
+#hide-friends-end,
+#settings-normal-break,
+#settings-soapbox-break,
+#settings-community-break,
+#settings-freelove-break {
+ clear: both;
+}
+#profile-edit-marital-wrapper, #profile-edit-address-wrapper {
+ margin-top: 50px;
+}
+#profile-edit-marital-end {
+ margin-bottom: 20px;
+}
+
+#id_theme,
+#id_mobile_theme {
+ width: 280px;
+}
+/*.settings-widget ul {
+ list-style-type: none;
+ padding: 0px;
+}
+
+.settings-widget li {
+ margin-left: 24px;
+ margin-bottom: 8px;
+}*/
+
+
+#gender-select, #marital-select, #sexual-select {
+ width: 220px;
+}
+
+#profile-edit-profile-name-wrapper .required {
+ color: #FF0000;
+ float: left;
+}
+
+#contacts-search-submit {
+ font-size: 18px;
+ padding: 5px 10px;
+}
+
+#contacts-display-wrapper {
+ padding-left: 35px;
+}
+
+#contacts-main {
+ margin-top: 20px;
+ margin-bottom: 20px;
+}
+
+.contact-entry-wrapper {
+ float: left;
+/* width: 120px;
+ height: 120px;*/
+ padding-left: 15px;
+ padding-right: 15px;
+ width: 95px;
+ height: 200px;
+}
+#contacts-search-end {
+ margin-bottom: 10px;
+}
+
+.contact-entry-direction-icon {
+ margin-top: 24px;
+ margin-right: 2px;
+}
+
+.contact-entry-photo img {
+ border: none;
+}
+.contact-entry-photo-end {
+ clear: both;
+}
+.contact-entry-name {
+ float: left;
+ margin-left: 0px;
+ margin-right: 10px;
+ padding-bottom: 5px;
+ width: 120px;
+ font-weight: 600;
+ overflow: hidden;
+}
+.contact-entry-details {
+ font-style: italic;
+ font-size: 10px;
+ font-weight: 500;
+}
+.contact-entry-network {
+ font-size: 10px;
+ font-weight: 500;
+}
+.contact-entry-edit-links {
+ margin-top: 6px;
+ margin-left: 10px;
+ width: 16px;
+}
+.contact-entry-nav-wrapper {
+ float: left;
+ margin-left: 10px;
+}
+
+.contact-entry-edit-links img {
+ border: none;
+ margin-right: 15px;
+}
+.contact-entry-photo {
+ float: left;
+ position: relative;
+}
+.contact-entry-end {
+ clear: both;
+}
+
+#fsuggest-desc, #fsuggest-submit-wrapper {
+ margin-top: 15px;
+ margin-bottom: 15px;
+}
+
+#network-star-link{
+ margin-top: 10px;
+}
+.network-star {
+ float: left;
+ margin-right: 5px;
+}
+#network-bmark-link {
+ margin-top: 10px;
+}
+
+.toplevel_item {
+ margin-bottom: 60px;
+}
+
+.wall-item-content-wrapper {
+ padding-top: 1em;
+/* padding-left: 0.25em;
+ padding-right: 0.25em;*/
+
+ border-top: 2px solid #AAAAAA;
+ position: relative;
+}
+
+.wall-item-content-wrapper.comment {
+ margin-top: 15px;
+ margin-left: 5px;
+ margin-right: 5px;
+
+ padding-top: 0px;
+/* padding-left: 0.5em
+ padding-right: 0.5em;*/
+
+ border: 2px solid #AAAAAA;
+ border-radius: 10px;
+ -webkit-border-radius: 10px;
+ -moz-border-radius: 10px;
+/* background: #EEEEEE;*/
+}
+
+.wall-item-like, .wall-item-dislike {
+ font-style: italic;
+ margin-left: 0px;
+ opacity: 0.6;
+}
+
+.wall-item-like.comment, .wall-item-dislike.comment {
+ margin-left: 5px;
+}
+
+.wall-item-like-full .fakelink-wrapper,
+.wall-item-dislike-full .fakelink-wrapper {
+ display: none;
+}
+.wall-item-like-full .wall-item-like-expanded,
+.wall-item-dislike-full .wall-item-dislike-expanded {
+ display: inherit !important;
+}
+
+.wall-item-info {
+ display: block;
+ float: left;
+ width:110px;
+ margin-right:10px;
+ margin-bottom:10px;
+}
+.comment .wall-item-info {
+ width: 70px;
+}
+
+.wall-item-photo-menu-button {
+ display: block;
+ position: absolute;
+ background-image: url("photo-menu.jpg");
+ background-position: top left;
+ background-repeat: no-repeat;
+ margin: 0px; padding: 0px;
+ width: 16px;
+ height: 16px;
+ top: 94px; left:0px;
+ overflow: hidden;
+ text-indent: 40px;
+ display: none;
+
+}
+.wall-item-photo-menu {
+ width: auto;
+ border: 2px solid #444444;
+ background: #FFFFFF;
+ position: absolute;
+ left: 0px; top:110px;
+ display: none;
+/* z-index: 10000;*/
+}
+.wall-item-photo-menu { margin:0px; padding: 0px; list-style: none }
+.wall-item-photo-menu li a { display: block; padding: 2px; }
+.wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
+
+
+.comment .wall-item-photo-menu-button { top: 64px;}
+.comment .wall-item-photo-menu { top: 80px; }
+
+.wallwall .wwto {
+ left: 50px;
+ margin: 0;
+ position: absolute;
+ top: 67px;
+ width: 30px
+}
+.wallwall .wwto img {
+ width: 30px !important;
+ height: 30px !important;
+}
+
+.wallwall /*.wall-item-photo-end*/ {
+ clear: both;
+}
+
+.wall-item-arrowphoto-wrapper {
+ position: absolute;
+ left: 75px;
+ top: 67px;
+/* z-index: 100;*/
+}
+.wall-item-lock {
+ margin-top: 1em;
+ left: 105px;
+ position: absolute;
+ top: 1px;
+}
+.comment .wall-item-lock {
+ margin-top: 0px;
+ left: 65px;
+}
+
+.wall-item-ago {
+ color: #888888;
+ font-size: 0.8em;
+}
+
+.wall-item-location {
+ overflow: hidden;
+ /* add ellipsis on text overflow */
+ /* this work on safari, opera, ie, chrome. */
+ /* firefox users have to wait support or we */
+ /* can use a jquery plugin http://bit.ly/zJskg */
+ text-overflow: ellipsis;
+ -o-text-overflow: ellipsis;
+ width: 100%;
+}
+
+.wall-item-like-buttons {
+ float: left;
+ margin-right: 3px;
+}
+
+.like-rotator {
+ margin-left: 5px;
+}
+
+.wall-item-like-buttons > a,
+.wall-item-like-buttons > img {
+ float: left;
+}
+
+.wall-item-like-buttons img {
+ cursor: pointer;
+}
+
+.wall-item-share-buttons {
+ margin-left: 10px;
+ margin-right: 10px;
+}
+
+.editpost {
+ margin-left: 10px;
+ float: left;
+}
+.star-item {
+ margin-left: 10px;
+ float: left;
+}
+.tag-item {
+ margin-left: 10px;
+ float: left;
+}
+
+.filer-item {
+ margin-left: 10px;
+ float: left;
+}
+
+.wall-item-links-wrapper {
+ float: left;
+}
+
+.wall-item-delete-wrapper {
+ float: right;
+}
+
+/*.wall-item-delete-end {
+ clear: both;
+}*/
+
+.wall-item-delete-icon {
+ border: none;
+}
+
+
+/*.wall-item-wrapper-end {
+ clear: both;
+}*/
+.wall-item-name-link {
+ font-weight: bold;
+ text-decoration: none;
+ color: #3172BD;
+}
+.wall-item-photo {
+ border: none;
+ border-radius: 7px;
+}
+.comment .wall-item-photo {
+ width: 50px !important;
+ height: 50px !important;
+}
+.wall-item-content {
+/* float: left;
+ max-width: 100%*/
+/* padding-right: 1em;
+ max-height: 500px;
+ overflow: auto;*/
+ padding-left:0.25em;
+ padding-right:0.25em;
+ clear: left; /* I hate this, but it's the only way to keep the text from bunching to the right on the Android browser */
+}
+.comment .wall-item-content {
+ padding-left:0.5em;
+ padding-right:0.5em;
+}
+
+.wall-item-title {
+ /*float: left;*/
+ font-weight: bold;
+ font-size: 1.6em;
+ /*width: 450px;*/
+}
+
+/*.wall-item-title-end {
+ clear: both;
+}*/
+
+.wall-item-body {
+ text-align: justify;
+ float: left;
+ max-width: 100%;
+ overflow: hidden;
+ margin-top: 10px;
+ line-height: 23px;
+}
+
+.wall-item-body img {
+ display: block;
+ margin-top: 2px;
+ margin-right: auto;
+ margin-left: auto;
+ /*max-width: 290px;*/
+ max-width: 100%;
+ border-radius: 7px;
+ -moz-border-radius: 7px;
+ -webkit-border-radius: 7px;
+}
+
+/*.comment .wall-item-body img {
+ max-width: 100%;
+}*/
+
+.wall-item-body img.smiley {
+ display: inline;
+ margin: auto;
+ border-radius: 0;
+ -webkit-border-radius: 0;
+}
+
+.wall-item-body blockquote {
+ margin-left: 0px;
+ margin-right: 0px;
+}
+
+.comment .wall-item-body ul {
+ padding-left: 1.5em;
+}
+
+.wall-item-body iframe {
+ display: block;
+ clear: both;
+ margin-top: 1.5em;
+ margin-bottom: 1.5em;
+}
+
+.wall-item-body code {
+ overflow: hidden;
+}
+
+.divgrow-showmore {
+ display: block;
+ clear: both;
+ text-align: center;
+ outline: 0;
+ border-top: 1px dotted #888;
+}
+
+.wall-item-tools {
+ clear: both;
+/* background-image: url("head.jpg");
+ background-position: 0 -20px;
+ background-repeat: repeat-x;*/
+ padding: 5px 5px 0px;
+ height: 32px;
+
+}
+.wall-item-author {
+/* margin-top: 10px;*/
+ margin-top: 0px;
+}
+
+.comment .wall-item-tools {
+/* background:none;*/
+/* background-image: url("head.jpg");
+ background-position: 0 -20px;
+ background-repeat: repeat-x;*/
+ border-bottom-left-radius: 10px;
+ border-bottom-right-radius: 10px;
+}
+
+
+.comment-edit-wrapper {
+ margin-top: 15px;
+ background: #f3f3f3;
+ margin-left: 50px;
+}
+
+.comment-wwedit-wrapper {
+ display: block;
+ margin-top: 15px;
+ background: #f3f3f3;
+ margin-left: 10px;
+ margin-right: 10px;
+
+ max-width: 90%;
+}
+
+.comment-wwedit-wrapper.comment {
+ margin-left: 40px;
+ margin-right: 40px;
+ border-radius: 10px;
+}
+
+.comment-edit-form {
+ padding-left: 1em;
+ padding-right: 1.5em;
+}
+
+.comment-edit-photo {
+ margin-top: 15px;
+ /*margin-left: 10px;*/
+ /*margin-bottom: 10px;*/
+ width: 25px;
+ float: left;
+}
+.comment-edit-photo img {
+ width: 25px;
+}
+.comment-edit-text-empty, .comment-edit-text-full {
+/* float: left;*/
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
+ border: 1px solid #cccccc;
+ padding: 3px 1px 1px 3px;
+}
+
+.comment-edit-text-empty {
+ color: gray;
+ height: 30px;
+ width: 175px;
+/* overflow: auto;*/
+ margin-top: 40px;
+ margin-bottom: 10px;
+ margin-left: 20px;
+}
+
+.comment-edit-text-full {
+ color: black;
+ height: 150px;
+/* width: 350px;
+ overflow: auto;*/
+/* width: 250px;*/
+ width: 100%;
+ margin-top: 1.5em;
+/* margin-left: 20px;*/
+}
+
+.comment .comment-edit-text-empty {
+ width: 120px;
+}
+.comment .comment-edit-text-full {
+ margin-left: 10px;
+ width: 210px;
+}
+
+
+.comment-edit-text-end {
+ clear: both;
+}
+
+.comment-edit-submit {
+ font-size: 18px;
+ padding: 5px 10px;
+ margin: 10px 0px 10px 0px;
+}
+
+#profile-jot-wrapper {
+ padding-left: 10px;
+ padding-right: 10px;
+}
+
+.shared_header {
+ border-top: 1px solid #aaa;
+ color: #999;
+
+ height: 42px; /* 32 px for the image plus 10 px for the margin around the image */
+ padding-top: 0.5em;
+ margin-top: 1em;
+ margin-bottom: 1em;
+
+}
+.shared_header img {
+ float: left;
+
+ margin: auto 1em auto auto;
+ padding: 0;
+
+ box-shadow: none;
+ -moz-box-shadow: none;
+ -webkit-box-shadow: none;
+}
+
+#profile-jot-plugin-wrapper,
+#profile-jot-submit-wrapper {
+ margin-top: 15px;
+}
+
+#profile-jot-submit {
+ float: left;
+ font-size: 18px;
+ padding: 5px 8px;
+}
+#profile-upload-wrapper {
+ float: left;
+ margin-left: 30px;
+}
+#profile-attach-wrapper {
+ float: left;
+ margin-left: 15px;
+}
+#profile-rotator {
+ float: left;
+ margin-left: 30px;
+}
+#profile-link-wrapper {
+ float: left;
+ margin-left: 15px;
+}
+#profile-youtube-wrapper {
+ float: left;
+ margin-left: 15px;
+}
+#profile-video-wrapper {
+ float: left;
+ margin-left: 15px;
+}
+#profile-audio-wrapper {
+ float: left;
+ margin-left: 15px;
+}
+#profile-location-wrapper {
+ float: left;
+ margin-left: 15px;
+}
+#jot-preview-link {
+ display: none;
+ float: left;
+ margin-left: 45px;
+ margin-top: 0px !important;
+}
+
+
+#profile-nolocation-wrapper {
+ float: left;
+ margin-left: 15px;
+}
+#profile-title-wrapper {
+ float: left;
+ margin-left: 15px;
+}
+
+#profile-jot-perms {
+ float: left;
+ margin-left: 40px;
+ font-weight: bold;
+ font-size: 1.2em;
+}
+
+
+#profile-jot-perms-end {
+ /*clear: left;*/
+ height: 30px;
+}
+
+#profile-jot-plugin-end{
+ clear: both;
+}
+input#profile-jot-email {
+ display: block;
+}
+.profile-jot-net {
+ float: left;
+ margin-right: 10px;
+ margin-top: 5px;
+ margin-bottom: 5px;
+}
+
+#profile-jot-networks-end {
+ clear: both;
+}
+
+.profile-jot-box {
+ margin-top: 50px;
+}
+.profile-edit-textarea {
+ margin-left: 20px;
+}
+
+#profile-jot-end {
+ clear: both;
+ margin-bottom: 30px;
+}
+#about-jot-submit-wrapper {
+ margin-top: 15px;
+}
+#about-jot-end {
+ margin-bottom: 30px;
+}
+#contacts-main {
+ margin-bottom: 30px;
+}
+
+#profile-listing-desc {
+ margin-left: 30px;
+}
+
+#profile-listing-new-link-wrapper {
+ margin-left: 30px;
+ margin-bottom: 30px;
+}
+.profile-listing-photo-wrapper {
+ float: left;
+}
+
+.profile-listing-edit-buttons-wrapper {
+ clear: both;
+}
+.profile-listing-photo-edit-link {
+ float: left;
+ width: 125px;
+}
+.profile-listing-end {
+ clear: both;
+}
+.profile-listing-edit-buttons-wrapper img{
+ border: none;
+ margin-right: 20px;
+}
+.profile-listing {
+ float: left;
+ margin-left: 30px;
+ margin-top: 25px;
+}
+.profile-listing-visible {
+ margin-left: 100px;
+}
+.profile-listing-name {
+ float: left;
+ margin-left: 12px;
+ margin-top: 10px;
+ color: #3172BD;
+ font-weight: bold;
+ width: 200px;
+
+}
+.fortune {
+ margin-top: 50px;
+ color: #4444FF;
+ font-weight: bold;
+ margin-bottom: 20px;
+}
+
+
+.directory-end {
+ clear: both;
+}
+.directory-name {
+ text-align: center;
+}
+.directory-photo {
+ margin-left: 15px;
+}
+.directory-details {
+ font-size: 0.7em;
+ text-align: center;
+ margin-left: 5px;
+ margin-right: 5px;
+}
+.directory-item {
+ float: left;
+/* width: 225px;
+ height: 260px;*/
+ padding-left: 15px;
+ width: 130px;
+ height: 235px;
+ overflow: auto;
+}
+
+#directory-search-wrapper {
+ margin-top: 20px;
+ margin-right: 20px;
+ margin-bottom: 50px;
+}
+
+#directory-search-end {
+}
+
+.directory-photo-img {
+ width: 125px;
+ border: none;
+}
+
+
+.pager {
+ margin-top: 30px;
+ margin-right: auto;
+ margin-left: auto;
+
+ padding-top: 10px;
+ padding-bottom: 10px;
+ padding-left: 10px;
+ text-align: center;
+/* line-height: 2.75em;*/
+}
+
+.pager a {
+ font-size: 1.5em;
+ padding: 0.2em 1em;
+ border: 1px solid #aaa;
+ border-radius: 10px;
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
+}
+
+
+.pager_first,
+.pager_last,
+.pager_prev,
+.pager_next,
+.pager_n {
+/* float: left;
+ border: 1px solid black;
+ border-radius: 7px;
+ background: #EEE;
+ text-align: center;
+ width: 50px;
+ margin-right: 5px;
+ margin-bottom: 10px;*/
+/* float: left;*/
+/* margin-right: 15px;
+ margin-left: 15px;*/
+}
+
+.pager_first,
+.pager_last,
+.pager_n {
+ display: none;
+}
+
+/*.pager_first a,
+.pager_last a,
+.pager_prev a,
+.pager_next a {
+ padding-top: 5px;
+ padding-bottom: 5px;
+ padding-left: 25px;
+ padding-right: 30px;
+
+ border: 2px solid #AAAAAA;
+ border-radius: 10px;
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
+ font-size: 1.25em;
+ text-align: center;
+ text-decoration: none;
+}
+.pager_n a {
+ padding-top: 2px;
+ padding-bottom: 2px;
+ padding-left: 9px;
+ padding-right: 18px;
+ text-decoration: none;
+
+
+
+
+
+
+
+}*/
+
+.pager_prev a,
+
+.pager_next a {
+ font-size: 1.5em;
+ padding: 0.2em 1em;
+ border: 1px solid #aaa;
+ border-radius: 10px;
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
+}
+
+.pager_current {
+ display: none;
+ float: left;
+ border: 1px solid black;
+ border-radius: 7px;
+ -moz-border-radius: 7px;
+ -webkit-border-radius: 7px;
+ background: #FFCCCC;
+ font-size: 1.25em;
+ text-align: center;
+ width: 50px;
+ margin-right: 5px;
+ margin-bottom: 10px;
+}
+
+
+#advanced-profile-name-wrapper,
+#advanced-profile-gender-wrapper,
+#advanced-profile-dob-wrapper,
+#advanced-profile-age-wrapper,
+#advanced-profile-marital-wrapper,
+#advanced-profile-sexual-wrapper,
+#advanced-profile-homepage-wrapper,
+#advanced-profile-politic-wrapper,
+#advanced-profile-religion-wrapper,
+#advanced-profile-about-wrapper,
+#advanced-profile-interest-wrapper,
+#advanced-profile-contact-wrapper,
+#advanced-profile-music-wrapper,
+#advanced-profile-book-wrapper,
+#advanced-profile-tv-wrapper,
+#advanced-profile-film-wrapper,
+#advanced-profile-romance-wrapper,
+#advanced-profile-work-wrapper,
+#advanced-profile-education-wrapper {
+ margin-top: 20px;
+}
+
+#advanced-profile-name-text,
+#advanced-profile-gender-text,
+#advanced-profile-dob-text,
+#advanced-profile-age-text,
+#advanced-profile-marital-text,
+#advanced-profile-sexual-text,
+#advanced-profile-homepage-text,
+#advanced-profile-politic-text,
+#advanced-profile-religion-text,
+#advanced-profile-about-text,
+#advanced-profile-interest-text,
+#advanced-profile-contact-text,
+#advanced-profile-music-text,
+#advanced-profile-book-text,
+#advanced-profile-tv-text,
+#advanced-profile-film-text,
+#advanced-profile-romance-text,
+#advanced-profile-work-text,
+#advanced-profile-education-text {
+ width: 300px;
+ float: left;
+}
+
+#advanced-profile-name-end,
+#advanced-profile-gender-end,
+#advanced-profile-dob-end,
+#advanced-profile-age-end,
+#advanced-profile-marital-end,
+#advanced-profile-sexual-end,
+#advanced-profile-homepage-end,
+#advanced-profile-politic-end,
+#advanced-profile-religion-end {
+ height: 10px;
+}
+
+#advanced-profile-about-end,
+#advanced-profile-interest-end,
+#advanced-profile-contact-end,
+#advanced-profile-music-end,
+#advanced-profile-book-end,
+#advanced-profile-tv-end,
+#advanced-profile-film-end,
+#advanced-profile-romance-end,
+#advanced-profile-work-end,
+#advanced-profile-education-end {
+
+
+}
+
+#advanced-profile-name,
+#advanced-profile-gender,
+#advanced-profile-dob,
+#advanced-profile-age,
+#advanced-profile-marital,
+#advanced-profile-sexual,
+#advanced-profile-homepage,
+#advanced-profile-politic,
+#advanced-profile-religion {
+ float: left;
+
+}
+
+
+#advanced-profile-about,
+#advanced-profile-interest,
+#advanced-profile-contact,
+#advanced-profile-music,
+#advanced-profile-book,
+#advanced-profile-tv,
+#advanced-profile-film,
+#advanced-profile-romance,
+#advanced-profile-work,
+#advanced-profile-education {
+ margin-top: 10px;
+ margin-left: 50px;
+ margin-right: 20px;
+ padding: 10px;
+ border: 1px solid #CCCCCC;
+}
+
+#advanced-profile-with {
+ float: left;
+ margin-left: 15px;
+}
+
+#contact-edit-wrapper {
+ margin-top: 10px;
+}
+
+#contact-edit-banner-name {
+ font-size: 1.4em;
+ font-weight: bold;
+}
+
+#contact-edit-poll-wrapper {
+ margin-top: 15px;
+}
+
+#contact-edit-last-update-text {
+ float: left;
+ clear: left;
+ margin-top: 30px;
+}
+
+#contact-edit-poll-text {
+ float: left;
+ clear: left;
+ margin-top: 15px;
+ margin-bottom: 0px;
+}
+
+#contact-edit-update-now {
+ margin-top: 15px;
+}
+
+#contact-edit-links{
+ clear: both;
+}
+
+#contact-edit-links ul {
+ list-style: none;
+ list-style-type: none;
+ margin-left: 0px;
+ padding-left: 0px;
+}
+
+#contact-edit-links li {
+ margin-top: 5px;
+}
+
+#contact-edit-drop-link {
+ float: right;
+ margin-right: 10px;
+}
+
+#contact-edit-nav-end {
+ clear: both;
+}
+
+#contact-edit-wrapper {
+ width: 100%;
+}
+
+#update_now_link {
+ float: left;
+ clear: left;
+ margin-bottom: 20px;
+}
+
+#label_id_hidden, #id_hidden {
+ margin-top: 30px;
+}
+#help_id_hidden {
+ margin-top: 30px;
+}
+
+#contact-edit-info-wrapper, #contact-edit-info {
+ width: 90%;
+}
+
+#contact-edit-end {
+ clear: both;
+ margin-top: 15px;
+}
+
+#contact-profile-selector {
+ width: 175px;
+ margin-left: 0px;
+}
+
+.contact-edit-submit {
+ clear: left;
+ display: block;
+
+ margin-top: 10px;
+ margin-bottom: 45px;
+ padding: 0.2em 0.5em;
+ font-size: 18px;
+}
+
+
+.contact-photo-menu-button {
+/* position: absolute;
+ background-image: url("photo-menu.jpg");
+ background-position: top left;
+ background-repeat: no-repeat;
+ margin: 0px; padding: 0px;
+ width: 16px;
+ height: 16px;
+ top: 64px; left:0px;
+ overflow: hidden;
+ text-indent: 40px;
+ display: none;*/
+
+}
+.contact-photo-menu {
+ width: 130px;
+ border: 1px solid #AAA;
+ background: #FFFFFF;
+ position: absolute;
+ left: -30px; top: 80px;
+ display: none;
+ z-index: 101;
+ -moz-box-shadow: 3px 3px 5px #555;
+ -webkit-box-shadow: 3px 3px 5px #555;
+ box-shadow: 3px 3px 5px #555;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a { display: block; padding: 2px; }
+.contact-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
+
+
+#block-message, #ignore-message, #archive-message, #lost-contact-message {
+ color: #FF0000;
+}
+
+#profile-edit-insecure {
+ margin-top: 20px;
+ color: #FF0000;
+ font-size: 1.1em;
+ border: 1px solid #FF8888;
+ background-color: #FFEEEE;
+ padding-left: 5px;
+ /*: 3px 3px 3px 5px; */
+ width: 587px;
+}
+
+#profile-jot-desc {
+ /*float: left;*/
+ width: 100%;
+ color: #FF0000;
+ margin-top: 10px;
+ margin-bottom: 10px;
+}
+
+#profile-jot-text {
+ width: 100%;
+ height: 200px;
+ color:#000;
+ border: 1px solid #cccccc;
+ padding: 3px 0px 0px 5px;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
+}
+
+
+/** acl **/
+#photo-edit-perms-select,
+#photos-upload-permissions-wrapper,
+#profile-jot-acl-wrapper{
+ /*display:block!important;*/
+}
+
+#photos-usage-message {
+ margin-bottom: 15px;
+}
+
+#profile-jot-acl-wrapper{
+ /*width:270px;
+ padding-left:10px;
+ padding-right:10px;*/
+ height:auto;
+ overflow:visible;
+ text-align: center;
+}
+
+#acl-wrapper {
+ /*display: inline-block;*/
+ padding-right: 1em;
+ padding-left: 1em;
+
+ border: 1px solid #444;
+ border-radius: 10px;
+}
+
+#acl-public-switch {
+ margin-top: 40px;
+ text-align: center;
+/* margin-right: auto;
+ margin-left: auto;
+
+ padding-top: 10px;
+ padding-bottom: 10px;
+ padding-left: 10px;
+ text-align: center;*/
+}
+
+#acl-public-switch a {
+ font-size: 1.5em;
+ padding: 0.2em 1em;
+ border: 1px solid #aaa;
+ border-radius: 10px;
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
+ display: inline-block;
+ margin-right: 0.4em;
+ margin-bottom: 0.4em;
+}
+
+.acl-public-switch-selected {
+ font-weight: 700;
+}
+
+#acl-search {
+ display: none;
+ float:right;
+ background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+ padding-right:20px;
+}
+#acl-showall {
+ float: left;
+ display: block;
+ width: auto;
+ height: 18px;
+ background-color: #cccccc;
+ background-image: url("../../../images/show_all_off.png");
+ background-position: 7px 7px;
+ background-repeat: no-repeat;
+ padding: 7px 5px 0px 30px;
+ -webkit-border-radius: 5px ;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+ color: #999999;
+}
+#acl-showall.selected {
+ color: #000000;
+ background-color: #ff9900;
+ background-image: url("../../../images/show_all_on.png");
+}
+
+#acl-list {
+/* height: 210px;*/
+/* border: 1px solid #cccccc;*/
+ clear: both;
+ margin-top: 0.7em;
+ overflow: visible;
+}
+#acl-list-content {
+ text-align: center;
+}
+.acl-html-select-wrapper {
+ display: inline-block;
+ margin-right: 1em;
+ margin-bottom: 2em;
+ font-weight: 700;
+ max-width: 100%;
+}
+.acl-html-select {
+ margin-top: 0.4em;
+ max-width: 100%;
+}
+.acl-list-item {
+ display: block;
+ width: 120px;
+ height: 30px;
+ border: 1px solid #cccccc;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ border-radius: 4px;
+ margin-top: 5px;
+
+ margin-bottom: 5px;
+ margin-right: 2px;
+ margin-left: 2px;
+ padding-left: 5px;
+ float: left;
+}
+.acl-list-item img{
+
+ display: none;
+ width:22px;
+ height: 22px;
+ float: left;
+ margin: 4px;
+}
+.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
+.acl-list-item a {
+ font-size: 8px;
+ display: block;
+ width: 40px;
+ height: 10px;
+ float: left;
+ color: #999999;
+ background-color: #cccccc;
+ background-position: 3px 3px;
+ background-repeat: no-repeat;
+ margin-right: 5px;
+ -webkit-border-radius: 2px ;
+ -moz-border-radius: 2px;
+ border-radius: 2px;
+ padding-left: 15px;
+}
+#acl-wrapper a:hover {
+ text-decoration: none;
+ color:#000000;
+}
+.acl-button-show { background-image: url("../../../images/show_off.png"); }
+.acl-button-hide { background-image: url("../../../images/hide_off.png"); }
+
+.acl-button-show.selected {
+ color: #000000;
+ background-color: #9ade00;
+ background-image: url("../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+ color: #000000;
+ background-color: #ff4141;
+ background-image: url("../../../images/hide_on.png");
+}
+.acl-list-item.groupshow { border-color: #9ade00; }
+.acl-list-item.grouphide { border-color: #ff4141; }
+/** /acl **/
+
+
+#group-new-submit-wrapper {
+ margin-top: 30px;
+}
+
+
+#group-edit-name-label {
+ float: left;
+ width: 175px;
+ margin-top: 20px;
+ margin-bottom: 20px;
+}
+
+#group-edit-name {
+ float: left;
+ width: 225px;
+ margin-top: 20px;
+ margin-bottom: 20px;
+}
+
+#group-edit-name-wrapper {
+
+
+}
+
+
+#group_members_select_label {
+ display: block;
+ float: left;
+ width: 175px;
+}
+
+.group_members_select {
+ float: left;
+ width: 230px;
+ overflow: auto;
+}
+
+#group_members_select_end {
+ clear: both;
+}
+#group-edit-name-end {
+ clear: both;
+}
+
+#message-new {
+ font-size: 24px;
+}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+ margin-bottom: 10px;
+ margin-top: 20px;
+}
+
+#prvmail-submit {
+ float: left;
+ font-size: 18px;
+ padding: 0.25em 0.5em;
+ margin-top: 10px;
+ margin-right: 30px;
+}
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+ float: left;
+ margin-top: 10px;
+ margin-right: 10px;
+ width: 24px;
+}
+
+#prvmail-end {
+ clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+ float: left;
+}
+.mail-list-detail {
+ margin-left: 20px;
+}
+
+.mail-list-subject {
+ font-size: 1.1em;
+ margin-top: 10px;
+}
+a.mail-list-link {
+ display: block;
+ font-size: 1.3em;
+ padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+* background-color: #15607B;
+* color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+ clear: both;
+
+}
+
+.mail-list-outside-wrapper {
+ margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+ float: right;
+ margin-right: 30px;
+ margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+ border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+ float: left;
+}
+.mail-conv-detail {
+ margin-left: 20px;
+ margin-bottom: 10px;
+ /*width: 270px;*/
+}
+
+.mail-conv-subject {
+ font-size: 1.4em;
+ margin: 10px 0;
+}
+
+.mail-conv-body {
+ padding-top: 20px;
+ clear: both;
+}
+
+.mail-conv-outside-wrapper-end {
+ clear: both;
+}
+
+.mail-conv-outside-wrapper {
+ margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+ float: right;
+ padding-bottom: 0.5em;
+ margin-right: 5px;
+ margin-top: 15px;
+}
+.mail-conv-break {
+ clear: both;
+}
+
+.mail-conv-delete-icon {
+ border: none;
+}
+
+.message-links ul {
+ list-style-type: none;
+ padding: 0px;
+}
+
+.message-links li {
+ margin-top: 10px;
+ float: left;
+}
+.message-links a {
+ padding: 3px 5px;
+}
+
+.message-links-end {
+ clear: both;
+}
+
+#sidebar-group-list ul {
+ list-style-type: none;
+}
+
+#sidebar-group-list .icon, #sidebar-group-list .iconspacer {
+ display: inline-block;
+ height: 12px;
+ width: 12px;
+}
+
+#sidebar-group-list li {
+ margin-top: 10px;
+}
+
+.nets-ul, .fileas-ul, .categories-ul {
+ list-style-type: none;
+}
+
+.nets-ul li, .fileas-ul li, .categories-ul li {
+ margin-top: 10px;
+}
+
+.nets-link {
+ margin-left: 24px;
+}
+.nets-all {
+ margin-left: 42px;
+}
+
+.fileas-link, .categories-link {
+ margin-left: 24px;
+}
+
+.fileas-all, .categories-all {
+ margin-left: 0px;
+}
+
+#search-save {
+ font-size: 18px;
+ padding: 5px 10px;
+ margin-left: 5px;
+}
+.groupsideedit {
+ margin-right: 10px;
+}
+#saved-search-ul {
+ list-style-type: none;
+}
+.savedsearchdrop, .savedsearchterm {
+ float: left;
+ margin-top: 10px;
+}
+.savedsearchterm {
+ margin-left: 10px;
+}
+
+
+#side-follow-wrapper {
+ margin-top: 20px;
+}
+#side-follow-url, #side-peoplefind-url {
+ margin-top: 5px;
+}
+#side-follow-submit, #side-peoplefind-submit {
+ font-size: 18px;
+ padding: 5px 10px;
+ margin: 10px 0px 10px 10px;
+}
+
+#side-match-link {
+ margin-top: 10px;
+}
+
+aside input[type='text'] {
+ width: 174px;
+}
+
+.widget {
+ border: 1px solid #DDDDDD;
+ padding: 18px;
+ margin-top: 5px;
+ -moz-border-radius:5px;
+ -webkit-border-radius:5px;
+ border-radius:5px;
+}
+.widget.settings-widget {
+ padding: 0;
+}
+
+
+/*.photos {
+ height: auto;
+ overflow: auto;
+}*/
+
+.photos-end {
+ clear: both;
+ margin-bottom: 25px;
+}
+
+.photo-album-image-wrapper {
+ float: left;
+ margin-top: 15px;
+ margin-right: 15px;
+ margin-left: 15px;
+/* width: 200px; height: 200px;
+ overflow: hidden;
+ position: relative; */
+}
+.photo-album-image-wrapper .caption {
+ display: none;
+ width: 100%;
+/* position: absolute; */
+ bottom: 0px;
+ padding: 0.5em 0.5em 0px 0.5em;
+ background-color: rgba(245, 245, 255, 0.8);
+ border-bottom: 2px solid #CCC;
+ margin: 0px;
+}
+.photo-album-image-wrapper a:hover .caption {
+ display:block;
+}
+
+#photo-album-end {
+ clear: both;
+ margin-bottom: 25px;
+}
+
+.photo-top-image-wrapper {
+/* position: relative;
+ float: left;*/
+ display: inline-block;
+ vertical-align: top;
+ margin-top: 15px;
+ margin-right: 15px;
+ margin-left: 15px;
+ margin-bottom: 15px;
+/* width: 200px; height: 200px;
+ overflow: hidden; */
+}
+.photo-top-image-wrapper img {
+ max-width: 290px;
+ border-radius: 10px;
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
+}
+.photo-top-album-name {
+ width: 100%;
+ min-height: 2em;
+/* position: absolute; */
+ bottom: 0px;
+ padding: 0px 3px;
+ padding-top: 0.5em;
+ background-color: rgb(255, 255, 255);
+}
+#photo-top-end {
+ clear: both;
+}
+
+#photo-top-links {
+ margin-bottom: 30px;
+ margin-left: 30px;
+}
+
+#photos-upload-form {
+ text-align: center;
+}
+
+#photos-upload-newalbum-div, #photos-upload-existing-album-text {
+ /*float: left;*/
+ display: inline-block;
+ width: 175px;
+ text-align: left;
+}
+
+#photos-upload-noshare {
+ margin-bottom: 10px;
+}
+#photos-upload-noshare-div {
+ margin-top: 2em;
+ margin-bottom: 15px;
+}
+
+#photos-upload-noshare-label {
+ margin-left: 25px;
+}
+
+#photos-upload-newalbum {
+ width: 15em;
+}
+#photos-upload-album-select {
+ width: 15.7em;
+}
+
+#photos-upload-spacer {
+ margin-top: 25px;
+}
+#photos-upload-new-end, #photos-upload-exist-end {
+ clear: both;
+}
+#photos-upload-exist-end {
+ margin-bottom: 15px;
+}
+
+#photos_upload_applet_wrapper {
+ margin-bottom: 15px;
+}
+
+#photos-upload-no-java-message {
+ margin-bottom: 15px;
+}
+
+#character-counter {
+ float: right;
+ font-size: 120%;
+}
+
+#character-counter.grey {
+ color: #888888;
+}
+
+#character-counter.orange {
+ color: orange;
+}
+#character-counter.red {
+ color: red;
+}
+
+#profile-jot-banner-end {
+ /* clear: both; */
+}
+
+#photos-upload-select-files-text {
+ margin-top: 15px;
+ margin-bottom: 15px;
+}
+
+#photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link {
+ color: #8888FF;
+ text-decoration: none;
+ cursor: pointer;
+}
+
+#photos-upload-perms-menu {
+ margin-left: 15px;
+}
+
+#photos-upload-perms-menu:hover {
+ color: #0000FF;
+ text-decoration: underline;
+ cursor: pointer;
+}
+#settings-default-perms-menu {
+ margin-top: 15px;
+ margin-bottom: 15px;
+}
+
+.photo-edit-input-text {
+ display: inline-block;
+ text-align: left;
+}
+
+#photo_edit_form {
+ text-align: center;
+}
+
+#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label, .photo-edit-rotate-label {
+ /*float: left;*/
+ display: inline-block;
+ width: 150px;
+}
+
+#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label {
+ font-weight: 700;
+}
+
+.photo-perms-icon {
+ float: left;
+}
+
+#photo-edit-perms-menu, #photos-upload-perms-menu, #settings-default-perms-menu {
+ text-decoration: none;
+}
+
+.photo-jot-perms-text {
+ padding-top: 5px;
+ padding-left: 40px;
+}
+
+#photo-edit-perms, #photos-upload-perms, #settings-default-perms {
+ margin-top: 30px;
+}
+#photos-upload-perms {
+ margin-top: 15px;
+ margin-left: 5px;
+}
+
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #settings-jot-acl-wrapper {
+ margin-top: 30px;
+/* margin-left: 20px;*/
+}
+
+#advanced-expire-popup {
+ padding-left: 1em;
+ margin-top: 15px;
+ border: 1px solid #aaa;
+ border-radius: 10px;
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
+}
+
+#photo-edit-perms-end {
+ margin-bottom: 15px;
+}
+
+#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname {
+ /*float: left;*/
+ margin-bottom: 25px;
+}
+
+.photo-edit-rotate-choice {
+ display: inline-block;
+}
+
+.photo-edit-rotate {
+ float: left;
+ margin-left: 20px;
+}
+#photo-edit-link-wrap {
+ margin-bottom: 15px;
+}
+#photo-like-div {
+ margin-left: 15px;
+ margin-bottom: 65px;
+}
+
+#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end {
+ clear: both;
+}
+
+#photo-edit-rotate-end {
+ margin-bottom: 15px;
+}
+
+#photo-edit-submit-button, #photo-edit-delete-button, #photos-upload-submit {
+ margin-top: 30px;
+ padding: 0.25em 0.5em;
+ font-size: 18px;
+}
+#photo-edit-submit-button {
+ margin-left: 10px;
+}
+#photo-edit-delete-button {
+ margin-left: 45px;
+}
+#photos-upload-choose {
+/* position: absolute;
+ top: 460px;
+ left: 5px;*/
+ margin-top: 1em;
+}
+#photos-upload-submit {
+ margin-top: 0px;
+}
+.settings-submit, .profile-edit-submit-button, .settings-features-submit {
+ padding: 0.25em 0.5em;
+ margin-bottom: 10px;
+ font-size: 18px;
+}
+#photo-edit-end {
+ margin-bottom: 35px;
+}
+#photo-caption {
+ font-size: 110%;
+ font-weight: bold;
+ margin-top: 15px;
+ margin-bottom: 15px;
+}
+
+#in-this-photo-text {
+ color: #0000FF;
+ margin-left: 30px;
+}
+
+#in-this-photo {
+ margin-left: 60px;
+ margin-top: 10px;
+ margin-bottom: 20px;
+}
+
+#photo-album-edit-form {
+ max-width: 100%;
+ padding-left: 0.5em;
+ padding-right: 0.5em;
+}
+#photo-album-edit-form input {
+ max-width: 100%;
+}
+#photo-album-edit-name-label {
+ display: block;
+}
+
+#photo-album-edit-submit, #photo-album-edit-drop {
+ margin-top: 15px;
+ margin-bottom: 15px;
+
+ padding: 0.25em 0.5em;
+ font-size: 18px;
+}
+
+#photo-album-edit-drop {
+ margin-left: 2em;
+}
+
+.group-delete-wrapper {
+ float: right;
+ margin-right: 50px;
+}
+
+#confirm-message {
+ display: block;
+ font-size: 24px;
+}
+.confirm-button {
+ margin-top: 30px;
+ margin-right: 0.4em;
+ padding: 0.25em 0.5em;
+ font-size: 18px;
+}
+
+#install-dbhost-label,
+#install-dbuser-label,
+#install-dbpass-label,
+#install-dbdata-label,
+#install-tz-desc {
+ float: left;
+ width: 250px;
+ margin-top: 10px;
+ margin-bottom: 10px;
+
+}
+
+#install-dbhost,
+#install-dbuser,
+#install-dbpass,
+#install-dbdata {
+ float: left;
+ width: 200px;
+ margin-left: 20px;
+}
+
+#install-dbhost-end,
+#install-dbuser-end,
+#install-dbpass-end,
+#install-dbdata-end,
+#install-tz-end {
+ clear: both;
+}
+
+#install-form select#timezone_select {
+ float: left;
+ margin-top: 18px;
+ margin-left: 20px;
+}
+
+#dfrn-request-networks {
+ margin-bottom: 30px;
+}
+
+#pause {
+ position: fixed;
+ bottom: 5px;
+ right: 5px;
+}
+
+.sparkle {
+ cursor: url('lock.cur'), pointer;
+/* cursor: pointer !important; */
+}
+
+.contact-block-div {
+ float: left;
+ width: 52px;
+ height: 52px;
+}
+.contact-block-textdiv {
+ float: left;
+ width: 150px;
+ height: 34px;
+}
+
+#contact-block-end {
+ clear: both;
+}
+.contact-block-link {
+ float: left;
+}
+.contact-block-img {
+ width:48px;
+ height:48px;
+}
+
+#tag-remove {
+ margin-bottom: 15px;
+}
+
+#tagrm li {
+ margin-bottom: 10px;
+}
+
+#tagrm-submit, #tagrm-cancel {
+ margin-top: 25px;
+}
+
+#tagrm-cancel {
+ margin-left: 15px;
+}
+
+.wall-item-conv {
+ margin-top: 5px;
+ margin-bottom: 25px;
+}
+
+#search-submit {
+ font-size: 18px;
+ padding: 5px 10px;
+ margin-left: 15px;
+}
+
+#search-box {
+ margin-bottom: 25px;
+}
+
+.location-label, .gender-label, .marital-label, .homepage-label {
+ float: left;
+ text-align: right;
+ display: block;
+ width: 65px;
+}
+
+.adr, .x-gender, .marital-text, .homepage-url {
+ float: left;
+ display: block;
+ margin-left: 8px;
+}
+
+.profile-clear {
+ clear: both;
+}
+
+
+.clear {
+ clear: both;
+}
+
+.cc-license {
+ margin-top: 50px;
+ font-size: 70%;
+}
+
+
+#plugin-settings-link, #account-settings-link {
+ margin-bottom: 10px;
+}
+
+#uexport-link {
+ margin-bottom: 20px;
+}
+
+/* end from default */
+
+
+.fn {
+ padding: 1em 0px 5px 12px;
+ font-size: 120%;
+ font-weight: bold;
+}
+
+.vcard .title {
+ margin-bottom: 5px;
+ margin-left: 12px;
+}
+
+.vcard dl {
+ clear: both;
+}
+
+#birthday-title {
+ float: left;
+ font-weight: bold;
+}
+
+#birthday-adjust {
+ float: left;
+ font-size: 75%;
+ margin-left: 10px;
+}
+
+#birthday-title-end {
+ clear: both;
+}
+
+.birthday-list {
+ margin-left: 15px;
+}
+
+#birthday-wrapper {
+ margin-bottom: 20px;
+}
+
+#network-new-link {
+ margin-top: 15px;
+ margin-bottom: 15px;
+}
+
+
+.tool-wrapper {
+ float: left;
+ margin-left: 15px;
+}
+
+.tool-link {
+ cursor: pointer;
+}
+
+.eventcal {
+ float: left;
+ font-size: 20px;
+}
+
+#event-summary-text {
+ margin-top: 15px;
+}
+
+#event-share-checkbox {
+ float: left;
+ margin-top: 10px;
+}
+
+#event-share-text {
+ float: left;
+ margin-top: 10px;
+ margin-left: 5px;
+}
+
+#event-share-break {
+ clear: both;
+ margin-bottom: 10px;
+}
+
+#event-summary {
+ width: 280px;
+}
+
+.vevent {
+ border: 1px solid #CCCCCC;
+}
+
+.vevent .event-summary {
+ margin-left: 10px;
+ margin-right: 10px;
+ font-weight: bold;
+}
+
+.vevent .event-description, .vevent .event-location {
+ margin-left: 10px;
+ margin-right: 10px;
+}
+.vevent .event-start {
+ margin-left: 10px;
+ margin-right: 10px;
+}
+
+#new-event-link {
+ margin-bottom: 10px;
+}
+
+.edit-event-link, .plink-event-link {
+ float: left;
+ margin-top: 4px;
+ margin-right: 4px;
+ margin-bottom: 15px;
+}
+
+.event-description:before {
+ content: url('../../../images/calendar.png');
+ margin-right: 15px;
+}
+
+.event-start, .event-end {
+ font-size: 14px;
+ margin-left: 10px;
+ width: 280px;
+ clear: both;
+ padding-bottom: 1.5em;
+}
+
+.event-start .dtstart, .event-end .dtend {
+ clear: both;
+ float: left;
+}
+
+.event-list-date {
+ margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+ float: left;
+ margin-left: 32px;
+ margin-right: 32px;
+ margin-top: 64px;
+}
+.event-calendar-end {
+ clear: both;
+}
+
+
+.calendar {
+ font-family: Courier, monospace;
+}
+.today {
+ font-weight: bold;
+ color: #FF0000;
+}
+
+.settings-block {
+ border: 1px solid #AAA;
+ margin: 10px;
+ padding: 10px;
+}
+
+.app-title {
+ margin: 10px;
+}
+
+#identity-manage-desc {
+ margin-top:15px;
+ margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+ margin-bottom: 15px;
+}
+
+#identity-submit {
+ margin-top: 20px;
+}
+
+#photo-nav {
+ position: relative;
+ height: 55px;
+}
+
+#photo-prev-link {
+ position: absolute;
+ left: 5px;
+}
+#photo-next-link {
+ position: absolute;
+ right: 5px;
+}
+#photo-prev-link, #photo-next-link {
+ padding: 10px;
+/* float: left;*/
+}
+
+/*#photo-photo {
+ float: left;
+}*/
+
+#photo-photo {
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+ text-align: center;
+}
+
+#photo-photo img {
+ max-width: 100%;
+}
+
+#photo-photo-end {
+ clear: both;
+}
+
+.profile-match-photo {
+ float: left;
+ text-align: center;
+ width: 120px;
+}
+
+.profile-match-name {
+ float: left;
+ text-align: center;
+ width: 120px;
+ overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+ clear: both;
+}
+
+.profile-match-connect {
+ text-align: center;
+ font-weight: bold;
+}
+
+.profile-match-wrapper {
+ display: inline-block;
+ padding: 10px;
+ /*width: 120px;
+ height: 120px;*/
+ scroll: auto;
+ margin-bottom: 2em;
+ vertical-align: top;
+}
+.profile-match-wrapper .icon.drophide {
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: 1em;
+}
+#profile-match-wrapper-end {
+ clear: both;
+}
+.side-link {
+ margin-bottom: 15px;
+}
+
+#language-selector {
+ position: absolute;
+ top: 0px;
+ left: 16px;
+}
+
+#group-members {
+ margin-top: 20px;
+ padding: 10px;
+ height: 250px;
+ overflow: auto;
+ border: 1px solid #ddd;
+}
+
+#group-members-end {
+ clear: both;
+}
+
+#group-separator {
+ margin-top: 10px;
+ margin-bottom: 10px;
+}
+
+#group-all-contacts {
+ padding: 10px;
+ height: 450px;
+ overflow: auto;
+ border: 1px solid #ddd;
+}
+
+#group-all-contacts-end {
+ clear: both;
+ margin-bottom: 10px;
+}
+
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+
+#prof-members {
+ margin-top: 20px;
+ padding: 10px;
+ height: 250px;
+ overflow: auto;
+ border: 1px solid #ddd;
+}
+
+#prof-members-end {
+ clear: both;
+}
+
+#prof-separator {
+ margin-top: 10px;
+ margin-bottom: 10px;
+}
+
+#prof-all-contacts {
+ padding: 10px;
+ height: 450px;
+ overflow: auto;
+ border: 1px solid #ddd;
+}
+
+#prof-all-contacts-end {
+ clear: both;
+ margin-bottom: 10px;
+}
+
+#prof-edit-desc {
+ margin-top: 15px;
+}
+
+#crepair-name-label,
+#crepair-nick-label,
+#crepair-attag-label,
+#crepair-url-label,
+#crepair-request-label,
+#crepair-confirm-label,
+#crepair-notify-label,
+#crepair-photo-label,
+#crepair-poll-label {
+ float: left;
+ width: 200px;
+ margin-bottom: 15px;
+}
+
+#crepair-name,
+#crepair-nick,
+#crepair-attag,
+#crepair-url,
+#crepair-request,
+#crepair-confirm,
+#crepair-notify,
+#crepair-photo,
+#crepair-poll {
+ float: left;
+ width: 300px;
+}
+
+
+#netsearch-box {
+ margin-top: 20px;
+}
+
+#netsearch-box #search-submit {
+ margin: 5px 0px 0px 0px;
+}
+
+.required {
+ color: #FF0000;
+}
+
+#event-start-text, #event-finish-text {
+ margin-top: 10px;
+ margin-bottom: 5px;
+}
+
+#event-nofinish-checkbox, #event-nofinish-text, #event-adjust-checkbox, #event-adjust-text {
+ float: left;
+}
+#event-datetime-break {
+ margin-bottom: 10px;
+}
+
+#event-nofinish-break, #event-adjust-break {
+ clear: both;
+}
+
+#event-desc-text, #event-location-text {
+ margin-top: 10px;
+ margin-bottom: 5px;
+}
+
+#event-submit {
+ margin-top: 10px;
+}
+
+.filesavetags, .categorytags {
+ display: block;
+ clear: left;
+}
+
+.body-tag, .filesavetags, .categorytags {
+ opacity: 0.5;
+ filter:alpha(opacity=50);
+}
+
+.body-tag:hover, .filesavetags:hover, .categorytags:hover {
+ opacity: 1.0 !important;
+ filter:alpha(opacity=100) !important;
+}
+
+.item-select {
+ display: none;
+ opacity: 0.1;
+ filter:alpha(opacity=10);
+ float: right;
+ margin-right: 10px;
+
+}
+.item-select:hover, .checkeditem {
+ opacity: 1;
+ filter:alpha(opacity=100);
+}
+
+
+#item-delete-selected {
+ margin-top: 30px;
+}
+
+#item-delete-selected-end {
+ clear: both;
+}
+#item-delete-selected-icon, #item-delete-selected-desc {
+ float: left;
+ margin-right: 5px;
+}
+#item-delete-selected-desc:hover {
+ text-decoration: underline;
+}
+
+#lang-select-icon {
+ cursor: pointer;
+ position: fixed;
+ left: 0px;
+ top: 0px;
+ opacity: 0.2;
+ filter:alpha(opacity=20);
+}
+
+#lang-select-icon:hover {
+ opacity: 1;
+ filter:alpha(opacity=100);
+}
+
+.notif-image {
+ height: 80px;
+ width: 80px;
+ margin-right: 15px;
+}
+.notification-listing-end {
+ clear: both;
+ margin-bottom: 15px;
+}
+
+
+
+/**
+ * Plugins settings
+ */
+
+.settings-block > h3,
+.settings-heading {
+ border-bottom: 1px solid #babdb6;
+}
+
+
+
+/**
+ * Form fields
+ */
+.field {
+ margin-bottom: 10px;
+ padding-bottom: 10px;
+ overflow: auto;
+/* width: 100%*/
+}
+
+.field label {
+ font-weight: 700;
+ float: left;
+ width: 200px;
+}
+
+.field input,
+.field textarea {
+ width: 230px;
+ margin-left: 20px;
+}
+.field input[type=checkbox],
+.field input[type=radio] {
+ width: auto;
+}
+.field textarea { height: 100px; }
+.field_help {
+ display: block;
+ margin-left: 20px;
+ color: #666666;
+ clear: left;
+}
+
+
+
+.field .onoff {
+ float: left;
+ width: 80px;
+}
+.field .onoff a {
+ display: block;
+ border:1px solid #666666;
+ background-image:url("../../../images/onoff.jpg");
+ background-repeat: no-repeat;
+ padding: 4px 2px 2px 2px;
+ height: 16px;
+ text-decoration: none;
+}
+.field .onoff .off {
+
+ border-color:#666666;
+ padding-left: 40px;
+ background-position: left center;
+ background-color: #cccccc;
+ color: #666666;
+ text-align: right;
+}
+.field .onoff .on {
+ border-color:#204A87;
+ padding-right: 40px;
+ background-position: right center;
+ background-color: #D7E3F1;
+ color: #204A87;
+ text-align: left;
+}
+.hidden { display: none!important; }
+
+.field.radio .field_help { margin-left: 20px; }
+
+/**
+ * ADMIN
+ */
+#pending-update {
+ float:right;
+ color: #ffffff;
+ font-weight: bold;
+ background-color: #FF0000;
+ padding: 0em 0.3em;
+
+}
+#adminpage dl {
+ clear: left;
+ min-height: 40px;
+ margin-bottom: 2px;
+ padding-bottom: 2px;
+ border-bottom: 1px solid black;
+}
+#adminpage dt {
+ width: 180px;
+ float: left;
+ font-weight: bold;
+}
+#adminpage dd {
+ margin-left: 180px;
+}
+
+#adminpage h3 {
+ border-bottom: 1px solid #cccccc;
+}
+#adminpage .field label {
+ font-weight: bold;
+}
+#adminpage .submit {
+ clear:left;
+ text-align: right;
+}
+
+#adminpage #pluginslist {
+ margin: 0px; padding: 0px;
+}
+#adminpage .plugin {
+ list-style: none;
+ display: block;
+ border: 1px solid #888888;
+ padding: 1em;
+ margin-bottom: 5px;
+ clear: left;
+}
+#adminpage .plugin .desc { margin-left: 2.5em;}
+#adminpage .toggleplugin {
+ float:left;
+ margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1px solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #bbc7d7; }
+#adminpage .selectall { text-align: right; }
+
+#cnftheme {
+ display: none;
+}
+
+/*
+ * UPDATE
+ */
+.popup {
+ width: 100%; height: 100%;
+ top:0px; left:0px;
+ position: absolute;
+ display: none;
+}
+
+.popup .background {
+ background-color: rgba(0,0,0,128);
+ opacity: 0.5;
+ width: 100%; height: 100%;
+ position: absolute;
+ top:0px; left:0px;
+}
+.popup .panel {
+ top:25%;left:25%;width:50%;height:50%;
+ padding: 1em;
+ position: absolute;
+ border: 4px solid #000000;
+ background-color: #FFFFFF;
+}
+.popup .panel .panel_text { display: block; overflow: auto; height: 80%; }
+.popup .panel .panel_in { width: 100%; height: 100%; position: relative; }
+.popup .panel .panel_actions { width: 100%; bottom: 4px; left: 0px; position: absolute; }
+.panel_text .progress { width: 50%; overflow: hidden; height: auto; border: 1px solid #cccccc; margin-bottom: 5px}
+.panel_text .progress span {float: right; display: block; width: 25%; background-color: #eeeeee; text-align: right;}
+
+/**
+ * OAuth
+ */
+.oauthapp {
+ height: auto; overflow: auto;
+ border-bottom: 2px solid #cccccc;
+ padding-bottom: 1em;
+ margin-bottom: 1em;
+}
+.oauthapp img {
+ float: left;
+ width: 48px; height: 48px;
+ margin: 10px;
+}
+.oauthapp img.noicon {
+ background-image: url("../../../images/icons/48/plugin.png");
+ background-position: center center;
+ background-repeat: no-repeat;
+}
+.oauthapp a {
+ float: left;
+}
+
+/**
+ * ICONS
+ */
+.iconspacer {
+ display: block; width: 16px; height: 16px;
+}
+
+.icon {
+ display: block; width: 16px; height: 16px;
+ background-image: url('../../../images/icons.png');
+}
+.article { background-position: 0px 0px;}
+.icon.audio { display: none; background-position: -16px 0px;}
+.block { background-position: -32px 0px;}
+/*.drop { background-position: -48px 0px;}
+.drophide { background-position: -64px 0px;}*/
+.icon.drop {
+ display: block; width: 28px; height: 28px;
+ background-size: 100% 100%;
+ background-image: url('images/drop-darkred.png');
+ background-repeat: no-repeat;
+}
+.icon.drophide {
+ display: block; width: 28px; height: 28px;
+ background-size: 100% 100%;
+ background-image: url('images/drop-darkred.png');
+ background-repeat: no-repeat;
+}
+.edit { background-position: -80px 0px;}
+/*.camera { background-position: -96px 0px;}*/
+.icon.camera {
+ display: block; width: 28px; height: 21px;
+ margin-top: 4px;
+ background-size: 100% 100%;
+ background-image: url('images/camera.png');
+ background-repeat: no-repeat;
+}
+/*.dislike { background-position: -112px 0px;}*/
+.icon.dislike {
+ display: block;
+ width: 26px; height: 28px;/*31 33*/
+ background-size: 100% 100%;
+ background-image: url('images/disapprove.png');
+ background-repeat: no-repeat;
+ opacity: 0.5;
+}
+/*.like { background-position: -128px 0px;}*/
+.icon.like {
+ display: block; width: 26px; height: 28px;/*31 33*/
+ margin-right: 7px;
+ background-size: 100% 100%;
+ background-image: url('images/approve.png');
+ background-repeat: no-repeat;
+ opacity: 0.5;
+}
+.icon.link { display: none; background-position: -144px 0px;}
+
+/*.globe { background-position: 0px -16px;}*/
+.icon.globe {
+ display: block; width: 28px; height: 28px;
+ background-size: 100% 100%;
+ background-image: url('images/globe.png');
+ background-repeat: no-repeat;
+}
+/*.noglobe { background-position: -16px -16px;}*/
+.icon.noglobe {
+ display: block; width: 24px; height: 24px;
+ background-size: 100% 100%;
+ background-image: url('images/noglobe.png');
+ background-repeat: no-repeat;
+}
+.no { background-position: -32px -16px;}
+.pause { background-position: -48px -16px;}
+.play { background-position: -64px -16px;}
+/*.pencil { background-position: -80px -16px;}
+.small-pencil { background-position: -96px -16px;}*/
+.icon.pencil {
+ display: block; width: 28px; height: 28px;
+ background-size: 100% 100%;
+ background-image: url('images/pencil.png');
+ background-repeat: no-repeat;
+ opacity: 0.5;
+}
+.icon.small-pencil {
+ display: block; width: 28px; height: 28px;
+ background-size: 100% 100%;
+ background-image: url('images/pencil.png');
+ background-repeat: no-repeat;
+ opacity: 0.5;
+}
+/*.recycle { background-position: -112px -16px;}*/
+.icon.recycle {
+ display: block;
+ width: 28px; height: 27px;/*33 32*/
+ background-size: 100% 100%;
+ background-image: url('images/recycle.png');
+ background-repeat: no-repeat;
+ opacity: 0.5;
+}
+/*.remote-link { background-position: -128px -16px;}*/
+.icon.remote-link {
+/* display: block;*/
+ display: none;
+ width: 28px; height: 28px;
+ background-size: 100% 100%;
+ background-image: url('images/remote-link.png');
+ background-repeat: no-repeat;
+ opacity: 0.5;
+}
+.share { background-position: -144px -16px;}
+
+.tools { background-position: 0px -32px;}
+/*.lock { background-position: -16px -32px;}*/
+.icon.lock {
+ display: block; width: 17px; height: 25px;
+ margin-top: 1px;
+ background-size: 100% 100%;
+ background-image: url('images/lock.png');
+ background-repeat: no-repeat;
+}
+/*.unlock { background-position: -32px -32px;}*/
+.icon.unlock {
+ display: block; width: 17px; height: 28px;
+ margin-top: -2px;
+ background-size: 100% 100%;
+ background-image: url('images/unlock.png');
+ background-repeat: no-repeat;
+}
+.icon.video { display: none; background-position: -48px -32px;}
+.oembed.video a { display: block; }
+.youtube { background-position: -64px -32px;}
+/*.attach { background-position: -80px -32px; }*/
+.icon.attach {
+ display: block; width: 28px; height: 28px;
+ background-size: 100% 100%;
+ background-image: url('images/paperclip.png');
+ background-repeat: no-repeat;
+}
+.language { background-position: -96px -32px; }
+.prev { background-position: -112px -32px; }
+.next { background-position: -128px -32px; }
+.on { background-position: -144px -32px; }
+
+.off { background-position: 0px -48px; }
+/*.starred { background-position: -16px -48px; }*/
+.icon.starred {
+ display: block; width: 28px; height: 28px;
+ background-size: 100% 100%;
+ background-image: url('images/star-yellow.png');
+ background-repeat: no-repeat;
+}
+/*.unstarred { background-position: -32px -48px; }*/
+.icon.unstarred {
+ display: block; width: 28px; height: 28px;
+ background-size: 100% 100%;
+ background-image: url('images/star.png');
+ background-repeat: no-repeat;
+
+ opacity: 0.5;
+}
+/*.tagged { background-position: -48px -48px; }*/
+.icon.tagged {
+ display: block; width: 28px; height: 28px;
+ background-size: 100% 100%;
+ background-image: url('images/tag.png');
+ background-repeat: no-repeat;
+ opacity: 0.5;
+}
+.yellow { background-position: -64px -48px; }
+
+
+.filer-icon {
+ display: block; width: 24px; height: 24px;
+ background-size: 100% 100%;
+ background-image: url('images/folder.png');
+ background-repeat: no-repeat;
+ opacity: 0.5;
+}
+
+.icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
+
+[class^="comment-edit-bb"] {
+ list-style: none;
+ display: none;
+ margin: 0px 0 -5px 20px;
+ width: 75%;
+}
+[class^="comment-edit-bb"] > li {
+ display: inline-block;
+ margin: 20px 10px 0 0;
+ visibility: none;
+}
+/*[class^="comment-edit-bb-end"] {
+ clear: both;
+}*/
+.editicon {
+ display: inline-block;
+ background-size: 100% 100%;
+ background-repeat: no-repeat;
+ background-color: #f3f3f3;
+ text-decoration: none;
+}
+/*.editicon:hover {
+ background-color: #ccc;
+}*/
+.boldbb {
+/* background-position: 0px 0px;*/
+ width: 26px; height: 28px;
+ background-image: url('images/boldB-serif.png');
+}
+/*.boldbb:hover {
+ background-position: 0px -16px;
+}*/
+.italicbb {
+/* background-position: -16px 0px;*/
+ width: 16px; height: 28px;
+ background-image: url('images/italicI-serif.png');
+}
+/*.italicbb:hover {
+ background-position: -16px -16px;
+}*/
+.underlinebb {
+/* background-position: -32px 0px;*/
+ width: 25px; height: 28px;
+ background-image: url('images/underlineU-serif.png');
+}
+/*.underlinebb:hover {
+ background-position: -32px -16px;
+}*/
+.quotebb {
+/* background-position: -48px 0px;*/
+ width: 28px; height: 28px;
+ background-image: url('images/quote.png');
+}
+/*.quotebb:hover {
+ background-position: -48px -16px;
+}*/
+.codebb {
+/* background-position: -64px 0px;*/
+ width: 28px; height: 28px;
+ background-image: url('images/code.png');
+}
+/*.codebb:hover {
+ background-position: -64px -16px;
+}*/
+.imagebb {
+ background-position: -80px 0px;
+}
+.imagebb:hover {
+ background-position: -80px -16px;
+}
+.urlbb {
+ background-position: -96px 0px;
+}
+.urlbb:hover {
+ background-position: -96px -16px;
+}
+.videobb {
+ background-position: -112px 0px;
+}
+.videobb:hover {
+ background-position: -112px -16px;
+}
+
+.attachtype {
+ display: block;
+ float: left;
+ background-size: 100% 100%;
+ width: 48px;
+ height: 48px;
+ background-image: url('images/oxygen/unknown.png');
+}
+
+.body-attach {
+ margin-top: 10px;
+}
+
+/*.type-video { background-position: 0px 0px; }
+.type-image { background-position: -20px 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text { background-position: -60px 0px; }
+.type-unkn { background-position: -80px 0px; }*/
+.type-video {
+ background-image: url('images/oxygen/video-x-generic.png');
+ background-size: 100% 100%;
+ width: 48px;
+ height: 48px;
+}
+.type-image {
+ background-image: url('images/oxygen/image-x-generic.png');
+ background-size: 100% 100%;
+ width: 48px;
+ height: 48px;
+}
+.type-audio { background-image: url('images/oxygen/audio-x-generic.png');
+ background-size: 100% 100%;
+ width: 48px;
+ height: 48px;
+}
+
+.type-text {
+ background-image: url('images/oxygen/text-x-generic-2.png');
+ background-size: 100% 100%;
+ width: 48px;
+ height: 48px;
+}
+.subtype-msword, .subtype-vnd-openxmlformats-officedocument-wordprocessingml-document {
+ background-image: url('images/oxygen/application-msword.png');
+ background-size: 100% 100%;
+ width: 48px;
+ height: 48px;
+}
+.subtype-pdf {
+ background-image: url('images/oxygen/application-pdf.png');
+ background-size: 100% 100%;
+ width: 48px;
+ height: 48px;
+}
+/*.type-unkn {
+ background-image: url('images/oxygen/unknown.png');
+ background-size: 100% 100%;
+
+ width: 48px;
+ height: 48px;
+}*/
+
+
+
+/* autocomplete popup */
+.acpopup {
+ max-height:150px;
+ background-color:#ffffff;
+ overflow:auto;
+ z-index:102;
+ border:1px solid #cccccc;
+}
+.acpopupitem {
+ background-color:#ffffff; padding: 4px;
+ clear:left;
+}
+.acpopupitem img {
+ float: left;
+ margin-right: 4px;
+
+}
+
+.acpopupitem.selected {
+ color: #FFFFFF; background: #3465A4;
+}
+
+/* popup notifications */
+div.jGrowl div.notice {
+ background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+ color: #ffffff;
+ padding-left: 58px;
+ margin: 0px;
+}
+div.jGrowl div.info {
+ background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+ color: #ffffff;
+ padding-left: 58px;
+ margin: 0px;
+}
+#jGrowl.top-right {
+ top: 15px;
+ right: 10px;
+}
+div.jGrowl-notification {
+ border-radius: 7px;
+}
+.qcomment {
+ border: 1px solid #EEE;
+ padding: 3px;
+ margin-top: 15px;
+ margin-left: 25px;
+ width: 125px;
+ overflow-y: auto;
+}
+
+
+.qcomment option {
+ width: 125px;
+ overflow-x: hidden;
+}
+
+.qcomment {
+ opacity: 0.3;
+ filter:alpha(opacity=30);
+}
+.qcomment:hover {
+ opacity: 1.0;
+ filter:alpha(opacity=100);
+}
+
+/* notifications popup menu */
+.nav-notify {
+ display: none;
+ position: absolute;
+ font-size: 10px;
+ padding: 1px 3px;
+ top: 0px;
+ right: -10px;
+ min-width: 15px;
+ text-align: right;
+}
+.nav-notify.show {
+ display: block;
+}
+ul.notifications-menu-popup {
+ position: absolute;
+ display: none;
+ width: 10em;
+ margin: 0px;
+ padding: 0px 0.3em;
+ list-style: none;
+ right: -60px;
+}
+#nav-notifications-menu {
+ width: 300px;
+/* max-height: 400px;*/
+ height: auto;
+/* overflow-y: scroll;overflow-style:scrollbar;*/
+ background-color:#FFFFFF;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ border-radius:5px;
+ border: 1px solid #AAA;
+ -moz-box-shadow: 3px 3px 5px #555;
+ -webkit-box-shadow: 3px 3px 5px #555;
+ box-shadow: 3px 3px 5px #555;
+/* z-index: 103;*/
+}
+#nav-notifications-menu .contactname { font-weight: bold; font-size: 0.9em; }
+#nav-notifications-menu img { float: left; margin-right: 5px; }
+#nav-notifications-menu .notif-when { font-size: 0.8em; display: block; }
+#nav-notifications-menu li {
+ padding: 7px 0px 7px 10px;
+ word-wrap:normal;
+ border-bottom: 1px solid #000;
+}
+
+#nav-notifications-menu li:hover {
+
+}
+
+#nav-notifications-menu a:hover {
+ text-decoration: underline;
+}
+
+.notif-item a {
+ color: #000000;
+}
+
+.notif-item a:hover {
+ text-decoration: underline;
+}
+
+.notif-image {
+ width: 32px;
+ height: 32px;
+ padding: 7px 7px 0px 0px;
+
+}
+
+.notify-seen {
+ background: #DDDDDD;
+}
+
+#id_term_label {
+ width:75px;
+}
+#id_term {
+ width:100px;
+}
+
+#recip {
+
+}
+.autocomplete-w1 { background: #ffffff; no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; }
+.autocomplete { color:#000; border:1px solid #999; background:#FFF; cursor:default; text-align:left; max-height:350px; overflow:auto; margin:-6px 6px 6px -6px; /* IE6 specific: */ _height:350px; _margin:0; _overflow-x:hidden; }
+.autocomplete .selected { background:#F0F0F0; }
+.autocomplete div { padding:2px 5px; white-space:nowrap; overflow:hidden; }
+
+#datebrowse-sidebar select {
+ margin-left: 40px;
+ width: 130px;
+}
+
+/*@media only screen and (min-device-width: 768px)
+and (max-device-width: 1024px)*/
+/*@media only screen and (min-device-width: 768px)
+{
+html {
+width:700px
+}
+div.section-wrapper {
+width:700px;
+margin-left:0px;
+}
+.wall-item-body {
+width:700px;
+}
+.comment .wall-item-body {
+width:650px;
+}
+}*/
+
+/*@media only screen and (min-device-width: 768px)
+{
+ .wall-item-body code {
+ width: 700px;
+ }
+
+ .comment .wall-item-body blockquote {
+ margin-left: 20px;
+ width: 680px;
+ }
+ blockquote {
+ width: 700px;
+ }
+
+}*/
+
diff --git a/view/theme/decaf-mobile/suggest_friends.tpl b/view/theme/decaf-mobile/suggest_friends.tpl
new file mode 100644
index 00000000..d5051e33
--- /dev/null
+++ b/view/theme/decaf-mobile/suggest_friends.tpl
@@ -0,0 +1,16 @@
+
+
+
+
+
+ {{ if $connlnk }}
+
+ {{ endif }}
+
+
diff --git a/view/theme/decaf-mobile/theme.php b/view/theme/decaf-mobile/theme.php
new file mode 100644
index 00000000..a525c4b7
--- /dev/null
+++ b/view/theme/decaf-mobile/theme.php
@@ -0,0 +1,33 @@
+
+ * Maintainer: Zach P
+ */
+
+function decaf_mobile_init(&$a) {
+ $a->theme_info = array();
+ $a->sourcename = 'Friendica mobile web';
+ $a->videowidth = 250;
+ $a->videoheight = 200;
+ $a->theme_thread_allow = false;
+// $a->force_max_items = 10;
+ set_template_engine($a, 'smarty3');
+}
+
+function decaf_mobile_content_loaded(&$a) {
+
+ // I could do this in style.php, but by having the CSS in a file the browser will cache it,
+ // making pages load faster
+ if( $a->module === 'home' || $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {
+// $a->page['htmlhead'] = str_replace('$stylesheet', $a->get_baseurl() . '/view/theme/decaf-mobile/login-style.css', $a->page['htmlhead']);
+ $a->theme['stylesheet'] = $a->get_baseurl() . '/view/theme/decaf-mobile/login-style.css';
+ }
+ if( $a->module === 'login' )
+ $a->page['end'] .= '';
+
+}
diff --git a/view/theme/decaf-mobile/threaded_conversation.tpl b/view/theme/decaf-mobile/threaded_conversation.tpl
new file mode 100644
index 00000000..5310b323
--- /dev/null
+++ b/view/theme/decaf-mobile/threaded_conversation.tpl
@@ -0,0 +1,12 @@
+$live_update
+
+{{ for $threads as $thread }}
+{{ if $mode == display }}
+{{ inc $thread.template with $item=$thread }}{{ endinc }}
+{{ else }}
+{{ inc wall_thread_toponly.tpl with $item=$thread }}{{ endinc }}
+{{ endif }}
+{{ endfor }}
+
+
+
diff --git a/view/theme/decaf-mobile/voting_fakelink.tpl b/view/theme/decaf-mobile/voting_fakelink.tpl
new file mode 100644
index 00000000..b66302cc
--- /dev/null
+++ b/view/theme/decaf-mobile/voting_fakelink.tpl
@@ -0,0 +1 @@
+$phrase
diff --git a/view/theme/decaf-mobile/wall_thread.tpl b/view/theme/decaf-mobile/wall_thread.tpl
new file mode 100644
index 00000000..a5bcbda7
--- /dev/null
+++ b/view/theme/decaf-mobile/wall_thread.tpl
@@ -0,0 +1,119 @@
+
+
+{##}
+
+
+ {{ if $item.owner_url }}
+
+
+ {{ endif }}
+ {##}
+ {##}
+
+
+
+ {##}
+
+ {##}
+ {##}
+
+ {{ if $item.lock }}{##}
{##}
+ {{ else }}
{{ endif }}
+
$item.location
+
+
+ {##}
+
$item.name {{ if $item.owner_url }} $item.to
$item.owner_name $item.vwall{{ endif }}
+
$item.ago
+ {##}
+
+
$item.title
+ {##}
+
$item.body
+ {##}
+ {{ for $item.tags as $tag }}
+
$tag
+ {{ endfor }}
+ {##}
+ {{ if $item.has_cats }}
+
+ {{ endif }}
+
+ {{ if $item.has_folders }}
+
+ {{ endif }}
+
+
+
+
+ {##}
+
$item.like
+
$item.dislike
+
+ {{ if $item.threaded }}
+ {{ if $item.comment }}
+ {##}
+ $item.comment
+ {##}
+ {{ endif }}
+ {{ endif }}
+
+{##}
+{##}
+{{ for $item.children as $child }}
+ {{ inc $child.template with $item=$child }}{{ endinc }}
+{{ endfor }}
+
+{{ if $item.flatten }}
+{##}
+ $item.comment
+{##}
+{{ endif }}
+
+
diff --git a/view/theme/decaf-mobile/wall_thread_toponly.tpl b/view/theme/decaf-mobile/wall_thread_toponly.tpl
new file mode 100644
index 00000000..817432da
--- /dev/null
+++ b/view/theme/decaf-mobile/wall_thread_toponly.tpl
@@ -0,0 +1,101 @@
+
+
+
+
+
+ {{ if $item.owner_url }}
+
+
+ {{ endif }}
+
+
+
+
+
+ {{ if $item.lock }}
+ {{ else }}
{{ endif }}
+
$item.location
+
+
+
$item.name {{ if $item.owner_url }} $item.to
$item.owner_name $item.vwall{{ endif }}
+
$item.ago
+
+
$item.title
+
$item.body
+ {{ for $item.tags as $tag }}
+
$tag
+ {{ endfor }}
+ {{ if $item.has_cats }}
+
+ {{ endif }}
+
+ {{ if $item.has_folders }}
+
+ {{ endif }}
+
+
+
+
+
$item.like
+
$item.dislike
+
+
+
+
+
+
diff --git a/view/theme/decaf-mobile/wallmessage.tpl b/view/theme/decaf-mobile/wallmessage.tpl
new file mode 100644
index 00000000..e7fa0ec0
--- /dev/null
+++ b/view/theme/decaf-mobile/wallmessage.tpl
@@ -0,0 +1,32 @@
+
+$header
+
+$subheader
+
+
+
+
+$parent
+
+$to
+$recipname
+
+$subject
+
+
+$yourmessage
+$text
+
+
+
+
+ {##}
+
+
+
+
+
+
+
diff --git a/view/theme/decaf-mobile/wallmsg-end.tpl b/view/theme/decaf-mobile/wallmsg-end.tpl
new file mode 100644
index 00000000..60741337
--- /dev/null
+++ b/view/theme/decaf-mobile/wallmsg-end.tpl
@@ -0,0 +1,2 @@
+
+
diff --git a/view/theme/decaf-mobile/wallmsg-header.tpl b/view/theme/decaf-mobile/wallmsg-header.tpl
new file mode 100644
index 00000000..dc6cb821
--- /dev/null
+++ b/view/theme/decaf-mobile/wallmsg-header.tpl
@@ -0,0 +1,7 @@
+
+
+
diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl
index fc3594fd..6f263b3d 100644
--- a/view/theme/diabook/comment_item.tpl
+++ b/view/theme/diabook/comment_item.tpl
@@ -3,7 +3,7 @@
-
+ {##}
diff --git a/view/theme/diabook/contact_template.tpl b/view/theme/diabook/contact_template.tpl
index 48930b48..f7ed1075 100644
--- a/view/theme/diabook/contact_template.tpl
+++ b/view/theme/diabook/contact_template.tpl
@@ -11,7 +11,13 @@
{{ endif }}
diff --git a/view/theme/diabook/smarty3/comment_item.tpl b/view/theme/diabook/smarty3/comment_item.tpl
index c38991f5..a03d0f2a 100644
--- a/view/theme/diabook/smarty3/comment_item.tpl
+++ b/view/theme/diabook/smarty3/comment_item.tpl
@@ -8,7 +8,7 @@
-
+ {{**}}
diff --git a/view/theme/diabook/smarty3/contact_template.tpl b/view/theme/diabook/smarty3/contact_template.tpl
index 8143a828..8e0e1acc 100644
--- a/view/theme/diabook/smarty3/contact_template.tpl
+++ b/view/theme/diabook/smarty3/contact_template.tpl
@@ -16,7 +16,13 @@
{{/if}}
diff --git a/view/theme/dispy/comment_item.tpl b/view/theme/dispy/comment_item.tpl
index 765b4143..e9408003 100644
--- a/view/theme/dispy/comment_item.tpl
+++ b/view/theme/dispy/comment_item.tpl
@@ -3,7 +3,7 @@
-
+ {##}
diff --git a/view/theme/dispy/contact_template.tpl b/view/theme/dispy/contact_template.tpl
index 04968bd0..e656ea55 100644
--- a/view/theme/dispy/contact_template.tpl
+++ b/view/theme/dispy/contact_template.tpl
@@ -11,7 +11,13 @@
{{ endif }}
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 0be480df..3974c11c 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -36,9 +36,9 @@ function initEditor(cb) {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
- force_p_newlines : false,
- force_br_newlines : true,
- forced_root_block : '',
+ //force_p_newlines : false,
+ //force_br_newlines : true,
+ forced_root_block : 'div',
convert_urls: false,
content_css: "$baseurl/view/custom_tinymce.css",
theme_advanced_path : false,
diff --git a/view/theme/dispy/smarty3/comment_item.tpl b/view/theme/dispy/smarty3/comment_item.tpl
index 136ed2d3..b30aede3 100644
--- a/view/theme/dispy/smarty3/comment_item.tpl
+++ b/view/theme/dispy/smarty3/comment_item.tpl
@@ -8,7 +8,7 @@
-
+ {{**}}
diff --git a/view/theme/dispy/smarty3/contact_template.tpl b/view/theme/dispy/smarty3/contact_template.tpl
index 800e19b1..d22acd5a 100644
--- a/view/theme/dispy/smarty3/contact_template.tpl
+++ b/view/theme/dispy/smarty3/contact_template.tpl
@@ -16,7 +16,13 @@
{{/if}}
diff --git a/view/theme/dispy/smarty3/jot-header.tpl b/view/theme/dispy/smarty3/jot-header.tpl
index 247d11cd..00bf4dcb 100644
--- a/view/theme/dispy/smarty3/jot-header.tpl
+++ b/view/theme/dispy/smarty3/jot-header.tpl
@@ -41,9 +41,9 @@ function initEditor(cb) {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
- force_p_newlines : false,
- force_br_newlines : true,
- forced_root_block : '',
+ //force_p_newlines : false,
+ //force_br_newlines : true,
+ forced_root_block : 'div',
convert_urls: false,
content_css: "{{$baseurl}}/view/custom_tinymce.css",
theme_advanced_path : false,
diff --git a/view/theme/duepuntozero/comment_item.tpl b/view/theme/duepuntozero/comment_item.tpl
index 0f655ba4..24164a03 100755
--- a/view/theme/duepuntozero/comment_item.tpl
+++ b/view/theme/duepuntozero/comment_item.tpl
@@ -7,7 +7,7 @@
-
+ {##}
diff --git a/view/theme/duepuntozero/smarty3/comment_item.tpl b/view/theme/duepuntozero/smarty3/comment_item.tpl
index edf19395..f4655078 100644
--- a/view/theme/duepuntozero/smarty3/comment_item.tpl
+++ b/view/theme/duepuntozero/smarty3/comment_item.tpl
@@ -12,7 +12,7 @@
-
+ {{**}}
diff --git a/view/theme/facepark/comment_item.tpl b/view/theme/facepark/comment_item.tpl
index 7e71aa38..bb1d4fa7 100644
--- a/view/theme/facepark/comment_item.tpl
+++ b/view/theme/facepark/comment_item.tpl
@@ -3,7 +3,7 @@
-
+ {##}
diff --git a/view/theme/facepark/smarty3/comment_item.tpl b/view/theme/facepark/smarty3/comment_item.tpl
index 9a0efdc2..50bbd89e 100644
--- a/view/theme/facepark/smarty3/comment_item.tpl
+++ b/view/theme/facepark/smarty3/comment_item.tpl
@@ -8,7 +8,7 @@
-
+ {{**}}
diff --git a/view/theme/frost-mobile/comment_item.tpl b/view/theme/frost-mobile/comment_item.tpl
index adcd5d75..5410cd4c 100755
--- a/view/theme/frost-mobile/comment_item.tpl
+++ b/view/theme/frost-mobile/comment_item.tpl
@@ -1,4 +1,4 @@
-
+ -->#}
diff --git a/view/theme/frost-mobile/contact_template.tpl b/view/theme/frost-mobile/contact_template.tpl
index c27060bb..7c19b327 100644
--- a/view/theme/frost-mobile/contact_template.tpl
+++ b/view/theme/frost-mobile/contact_template.tpl
@@ -5,16 +5,22 @@
onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id);"
onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
+{##}
{{ if $contact.photo_menu }}
-
+{##}
{{ endif }}
diff --git a/view/theme/frost-mobile/js/main.js b/view/theme/frost-mobile/js/main.js
index 0773dcc0..d73c0263 100644
--- a/view/theme/frost-mobile/js/main.js
+++ b/view/theme/frost-mobile/js/main.js
@@ -690,9 +690,9 @@ function setupFieldRichtext(){
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
- force_p_newlines : false,
- force_br_newlines : true,
- forced_root_block : '',
+ //force_p_newlines : false,
+ //force_br_newlines : true,
+ forced_root_block : 'div',
convert_urls: false,
content_css: baseurl+"/view/custom_tinymce.css",
theme_advanced_path : false,
diff --git a/view/theme/frost-mobile/js/main.min.js b/view/theme/frost-mobile/js/main.min.js
index fad629ce..aa4ce442 100644
--- a/view/theme/frost-mobile/js/main.min.js
+++ b/view/theme/frost-mobile/js/main.min.js
@@ -1 +1 @@
-function openClose(listID){listID="#"+listID.replace(/:/g,"\\:");listID=listID.replace(/\./g,"\\.");listID=listID.replace(/@/g,"\\@");if($j(listID).is(":visible")){$j(listID).hide();$j(listID+"-wrapper").show();alert($j(listID+"-wrapper").attr("id"))}else{$j(listID).show();$j(listID+"-wrapper").hide()}}function openMenu(theID){document.getElementById(theID).style.display="block"}function closeMenu(theID){document.getElementById(theID).style.display="none"}var src=null;var prev=null;var livetime=null;var msie=false;var stopped=false;var totStopped=false;var timer=null;var pr=0;var liking=0;var in_progress=false;var langSelect=false;var commentBusy=false;var last_popup_menu=null;var last_popup_button=null;$j(function(){$j.ajaxSetup({cache:false});msie=$j.browser.msie;collapseHeight();$j(".onoff input").each(function(){val=$j(this).val();id=$j(this).attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")});$j(".onoff > a").click(function(event){event.preventDefault();var input=$j(this).siblings("input");var val=1-input.val();var id=input.attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$j("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});function close_last_popup_menu(e){if(last_popup_menu){if("#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")){last_popup_menu.hide();if(last_popup_menu.attr("id")=="nav-notifications-menu")$j(".main-container").show();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}}$j("img[rel^=#]").click(function(e){close_last_popup_menu(e);menu=$j($j(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;if(menu.css("display")=="none"){$j(this).parent().addClass("selected");menu.show();if(menu.attr("id")=="nav-notifications-menu")$j(".main-container").hide();last_popup_menu=menu;last_popup_button=$j(this).parent()}else{$j(this).parent().removeClass("selected");menu.hide();if(menu.attr("id")=="nav-notifications-menu")$j(".main-container").show();last_popup_menu=null;last_popup_button=null}return false});$j("html").click(function(e){close_last_popup_menu(e)});var notifications_tpl=unescape($j("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($j("").append($j("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($j("
").append($j("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,data){var invalid=$j(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$j(data).find("net").text();if(net==0){net="";$j("#net-update").removeClass("show")}else{$j("#net-update").addClass("show")}$j("#net-update").html(net);var home=$j(data).find("home").text();if(home==0){home="";$j("#home-update").removeClass("show")}else{$j("#home-update").addClass("show")}$j("#home-update").html(home);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update").removeClass("show")}else{$j("#intro-update").addClass("show")}$j("#intro-update").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update").removeClass("show")}else{$j("#mail-update").addClass("show")}$j("#mail-update").html(mail);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update-li").removeClass("show")}else{$j("#intro-update-li").addClass("show")}$j("#intro-update-li").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update-li").removeClass("show")}else{$j("#mail-update-li").addClass("show")}$j("#mail-update-li").html(mail);var eNotif=$j(data).find("notif");if(eNotif.children("note").length==0){$j("#nav-notifications-menu").html(notifications_empty)}else{nnm=$j("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$j(this);text=e.text().format(""+e.attr("name")+" ");html=notifications_tpl.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen"));nnm.append(html)});$j("img[data-src]",nnm).each(function(i,el){$j(el).attr("src",$j(el).data("src"))})}notif=eNotif.attr("count");if(notif>0){$j("#nav-notifications-linkmenu").addClass("on")}else{$j("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$j("#notify-update").removeClass("show")}else{$j("#notify-update").addClass("show")}$j("#notify-update").html(notif);var eSysmsg=$j(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"notice",life:1e3})});eSysmsg.children("info").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"info",life:1e3})})});NavUpdate()});function NavUpdate(){if(!stopped){var pingCmd="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(pingCmd,function(data){$j(data).find("result").each(function(){$j("nav").trigger("nav-update",this);if($j("#live-network").length){src="network";liveUpdate()}if($j("#live-profile").length){src="profile";liveUpdate()}if($j("#live-community").length){src="community";liveUpdate()}if($j("#live-notes").length){src="notes";liveUpdate()}if($j("#live-display").length){src="display";liveUpdate()}if($j("#live-photos").length){if(liking){liking=0;window.location.href=window.location.href}}})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){if(livetime){clearTimeout(livetime)}livetime=setTimeout(liveUpdate,1e4);return}if(livetime!=null)livetime=null;prev="live-"+src;in_progress=true;var udargs=netargs.length?"/"+netargs:"";var update_url="update_"+src+udargs+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(update_url,function(data){in_progress=false;$j(".toplevel_item",data).each(function(){var ident=$j(this).attr("id");if($j("#"+ident).length==0&&profile_page==1){$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("#"+prev).after($j(this))}else{var id=$j(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$j("#collapsed-comments-"+id).is(":visible")}$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("html").height($j("html").height());$j("#"+ident).replaceWith($j(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$j("html").height("auto")}prev=ident});collapseHeight();$j(".like-rotator").hide();if(commentBusy){commentBusy=false;$j("body").css("cursor","auto")}$j(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl")})}function collapseHeight(elems){var elemName=".wall-item-body:not(.divmore)";if(typeof elems!="undefined"){elemName=elems+" "+elemName}$j(elemName).each(function(){if($j(this).height()>350){$j("html").height($j("html").height());$j(this).divgrow({initialHeight:300,showBrackets:false,speed:0});$j(this).addClass("divmore");$j("html").height("auto")}})}function imgbright(node){$j(node).removeClass("drophide").addClass("drop")}function imgdull(node){$j(node).removeClass("drop").addClass("drophide")}function dolike(ident,verb){unpause();$j("#like-rotator-"+ident.toString()).show();$j.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$j.get("starred/"+ident,function(data){if(data.match(/1/)){$j("#starred-"+ident).addClass("starred");$j("#starred-"+ident).removeClass("unstarred");$j("#star-"+ident).addClass("hidden");$j("#unstar-"+ident).removeClass("hidden")}else{$j("#starred-"+ident).addClass("unstarred");$j("#starred-"+ident).removeClass("starred");$j("#star-"+ident).removeClass("hidden");$j("#unstar-"+ident).addClass("hidden")}})}function getPosition(e){var cursor={x:0,y:0};if(e.touches[0].pageX||e.touches[0].pageY){cursor.x=e.touches[0].pageX;cursor.y=e.touches[0].pageY}else{if(e.touches[0].clientX||e.touches[0].clientY){cursor.x=e.touches[0].clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft;cursor.y=e.touches[0].clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop}else{if(e.touches[0].x||e.touches[0].y){cursor.touches[0].x=e.touches[0].x;cursor.touches[0].y=e.touches[0].y}}}return cursor}var lockvisible=false;function lockview(event,id){event=event||window.event;cursor=getPosition(event);if(lockvisible){lockviewhide()}else{lockvisible=true;$j.get("lockview/"+id,function(data){$j("#panel").html(data);$j("#panel").css({left:cursor.x+5,top:cursor.y+5});$j("#panel").show()})}}function lockviewhide(){lockvisible=false;$j("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$j("body").css("cursor","wait");$j("#comment-preview-inp-"+id).val("0");$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$j("#comment-edit-wrapper-"+id).hide();$j("#comment-edit-text-"+id).val("");var tarea=document.getElementById("comment-edit-text-"+id);if(tarea)commentClose(tarea,id);if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,10)}if(data.reload){window.location.href=data.reload}},"json");return false}function preview_comment(id){$j("#comment-preview-inp-"+id).val("1");$j("#comment-edit-preview-"+id).show();$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$j("#comment-edit-preview-"+id).html(data.preview);$j("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($j("#collapsed-comments-"+id).is(":visible")){$j("#collapsed-comments-"+id).hide();$j("#hide-comments-"+id).html(window.showMore)}else{$j("#collapsed-comments-"+id).show();$j("#hide-comments-"+id).html(window.showFewer);collapseHeight("#collapsed-comments-"+id)}}function preview_post(){$j("#jot-preview").val("1");$j("#jot-preview-content").show();tinyMCE.triggerSave();$j.post("item",$j("#profile-jot-form").serialize(),function(data){if(data.preview){$j("#jot-preview-content").html(data.preview);$j("#jot-preview-content"+" a").click(function(){return false})}},"json");$j("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$j("#pause").html("")}function bin2hex(s){var v,i,f=0,a=[];s+="";f=s.length;for(i=0;i'+data.desc+'
'+data.version+'
'+data.credits+"
")})}
\ No newline at end of file
+function openClose(listID){listID="#"+listID.replace(/:/g,"\\:");listID=listID.replace(/\./g,"\\.");listID=listID.replace(/@/g,"\\@");if($j(listID).is(":visible")){$j(listID).hide();$j(listID+"-wrapper").show();alert($j(listID+"-wrapper").attr("id"))}else{$j(listID).show();$j(listID+"-wrapper").hide()}}function openMenu(theID){document.getElementById(theID).style.display="block"}function closeMenu(theID){document.getElementById(theID).style.display="none"}var src=null;var prev=null;var livetime=null;var msie=false;var stopped=false;var totStopped=false;var timer=null;var pr=0;var liking=0;var in_progress=false;var langSelect=false;var commentBusy=false;var last_popup_menu=null;var last_popup_button=null;$j(function(){$j.ajaxSetup({cache:false});msie=$j.browser.msie;collapseHeight();$j(".onoff input").each(function(){val=$j(this).val();id=$j(this).attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")});$j(".onoff > a").click(function(event){event.preventDefault();var input=$j(this).siblings("input");var val=1-input.val();var id=input.attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$j("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});function close_last_popup_menu(e){if(last_popup_menu){if("#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")){last_popup_menu.hide();if(last_popup_menu.attr("id")=="nav-notifications-menu")$j(".main-container").show();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}}$j("img[rel^=#]").click(function(e){close_last_popup_menu(e);menu=$j($j(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;if(menu.css("display")=="none"){$j(this).parent().addClass("selected");menu.show();if(menu.attr("id")=="nav-notifications-menu")$j(".main-container").hide();last_popup_menu=menu;last_popup_button=$j(this).parent()}else{$j(this).parent().removeClass("selected");menu.hide();if(menu.attr("id")=="nav-notifications-menu")$j(".main-container").show();last_popup_menu=null;last_popup_button=null}return false});$j("html").click(function(e){close_last_popup_menu(e)});var notifications_tpl=unescape($j("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($j("
").append($j("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($j("
").append($j("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,data){var invalid=$j(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$j(data).find("net").text();if(net==0){net="";$j("#net-update").removeClass("show")}else{$j("#net-update").addClass("show")}$j("#net-update").html(net);var home=$j(data).find("home").text();if(home==0){home="";$j("#home-update").removeClass("show")}else{$j("#home-update").addClass("show")}$j("#home-update").html(home);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update").removeClass("show")}else{$j("#intro-update").addClass("show")}$j("#intro-update").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update").removeClass("show")}else{$j("#mail-update").addClass("show")}$j("#mail-update").html(mail);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update-li").removeClass("show")}else{$j("#intro-update-li").addClass("show")}$j("#intro-update-li").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update-li").removeClass("show")}else{$j("#mail-update-li").addClass("show")}$j("#mail-update-li").html(mail);var eNotif=$j(data).find("notif");if(eNotif.children("note").length==0){$j("#nav-notifications-menu").html(notifications_empty)}else{nnm=$j("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$j(this);text=e.text().format(""+e.attr("name")+" ");html=notifications_tpl.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen"));nnm.append(html)});$j("img[data-src]",nnm).each(function(i,el){$j(el).attr("src",$j(el).data("src"))})}notif=eNotif.attr("count");if(notif>0){$j("#nav-notifications-linkmenu").addClass("on")}else{$j("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$j("#notify-update").removeClass("show")}else{$j("#notify-update").addClass("show")}$j("#notify-update").html(notif);var eSysmsg=$j(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"notice",life:1e3})});eSysmsg.children("info").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"info",life:1e3})})});NavUpdate()});function NavUpdate(){if(!stopped){var pingCmd="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(pingCmd,function(data){$j(data).find("result").each(function(){$j("nav").trigger("nav-update",this);if($j("#live-network").length){src="network";liveUpdate()}if($j("#live-profile").length){src="profile";liveUpdate()}if($j("#live-community").length){src="community";liveUpdate()}if($j("#live-notes").length){src="notes";liveUpdate()}if($j("#live-display").length){src="display";liveUpdate()}if($j("#live-photos").length){if(liking){liking=0;window.location.href=window.location.href}}})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){if(livetime){clearTimeout(livetime)}livetime=setTimeout(liveUpdate,1e4);return}if(livetime!=null)livetime=null;prev="live-"+src;in_progress=true;var udargs=netargs.length?"/"+netargs:"";var update_url="update_"+src+udargs+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(update_url,function(data){in_progress=false;$j(".toplevel_item",data).each(function(){var ident=$j(this).attr("id");if($j("#"+ident).length==0&&profile_page==1){$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("#"+prev).after($j(this))}else{var id=$j(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$j("#collapsed-comments-"+id).is(":visible")}$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("html").height($j("html").height());$j("#"+ident).replaceWith($j(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$j("html").height("auto")}prev=ident});collapseHeight();$j(".like-rotator").hide();if(commentBusy){commentBusy=false;$j("body").css("cursor","auto")}$j(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl")})}function collapseHeight(elems){var elemName=".wall-item-body:not(.divmore)";if(typeof elems!="undefined"){elemName=elems+" "+elemName}$j(elemName).each(function(){if($j(this).height()>350){$j("html").height($j("html").height());$j(this).divgrow({initialHeight:300,showBrackets:false,speed:0});$j(this).addClass("divmore");$j("html").height("auto")}})}function imgbright(node){$j(node).removeClass("drophide").addClass("drop")}function imgdull(node){$j(node).removeClass("drop").addClass("drophide")}function dolike(ident,verb){unpause();$j("#like-rotator-"+ident.toString()).show();$j.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$j.get("starred/"+ident,function(data){if(data.match(/1/)){$j("#starred-"+ident).addClass("starred");$j("#starred-"+ident).removeClass("unstarred");$j("#star-"+ident).addClass("hidden");$j("#unstar-"+ident).removeClass("hidden")}else{$j("#starred-"+ident).addClass("unstarred");$j("#starred-"+ident).removeClass("starred");$j("#star-"+ident).removeClass("hidden");$j("#unstar-"+ident).addClass("hidden")}})}function getPosition(e){var cursor={x:0,y:0};if(e.touches[0].pageX||e.touches[0].pageY){cursor.x=e.touches[0].pageX;cursor.y=e.touches[0].pageY}else{if(e.touches[0].clientX||e.touches[0].clientY){cursor.x=e.touches[0].clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft;cursor.y=e.touches[0].clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop}else{if(e.touches[0].x||e.touches[0].y){cursor.touches[0].x=e.touches[0].x;cursor.touches[0].y=e.touches[0].y}}}return cursor}var lockvisible=false;function lockview(event,id){event=event||window.event;cursor=getPosition(event);if(lockvisible){lockviewhide()}else{lockvisible=true;$j.get("lockview/"+id,function(data){$j("#panel").html(data);$j("#panel").css({left:cursor.x+5,top:cursor.y+5});$j("#panel").show()})}}function lockviewhide(){lockvisible=false;$j("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$j("body").css("cursor","wait");$j("#comment-preview-inp-"+id).val("0");$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$j("#comment-edit-wrapper-"+id).hide();$j("#comment-edit-text-"+id).val("");var tarea=document.getElementById("comment-edit-text-"+id);if(tarea)commentClose(tarea,id);if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,10)}if(data.reload){window.location.href=data.reload}},"json");return false}function preview_comment(id){$j("#comment-preview-inp-"+id).val("1");$j("#comment-edit-preview-"+id).show();$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$j("#comment-edit-preview-"+id).html(data.preview);$j("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($j("#collapsed-comments-"+id).is(":visible")){$j("#collapsed-comments-"+id).hide();$j("#hide-comments-"+id).html(window.showMore)}else{$j("#collapsed-comments-"+id).show();$j("#hide-comments-"+id).html(window.showFewer);collapseHeight("#collapsed-comments-"+id)}}function preview_post(){$j("#jot-preview").val("1");$j("#jot-preview-content").show();tinyMCE.triggerSave();$j.post("item",$j("#profile-jot-form").serialize(),function(data){if(data.preview){$j("#jot-preview-content").html(data.preview);$j("#jot-preview-content"+" a").click(function(){return false})}},"json");$j("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$j("#pause").html("")}function bin2hex(s){var v,i,f=0,a=[];s+="";f=s.length;for(i=0;i'+data.desc+'
'+data.version+'
'+data.credits+"
")})}
\ No newline at end of file
diff --git a/view/theme/frost-mobile/js/theme.js b/view/theme/frost-mobile/js/theme.js
index 14e4915c..e0ff5e7d 100644
--- a/view/theme/frost-mobile/js/theme.js
+++ b/view/theme/frost-mobile/js/theme.js
@@ -330,9 +330,9 @@ function initEditor(cb){
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
- force_p_newlines : false,
- force_br_newlines : true,
- forced_root_block : '',
+ //force_p_newlines : false,
+ //force_br_newlines : true,
+ forced_root_block : 'div',
convert_urls: false,
content_css: "$baseurl/view/custom_tinymce.css",
theme_advanced_path : false,
@@ -432,9 +432,9 @@ function wallInitEditor() {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
- force_p_newlines : false,
- force_br_newlines : true,
- forced_root_block : '',
+ //force_p_newlines : false,
+ //force_br_newlines : true,
+ forced_root_block : 'div',
convert_urls: false,
content_css: baseurl + "/view/custom_tinymce.css",
//Character count
diff --git a/view/theme/frost-mobile/js/theme.min.js b/view/theme/frost-mobile/js/theme.min.js
index 44b842c6..a7562d5e 100644
--- a/view/theme/frost-mobile/js/theme.min.js
+++ b/view/theme/frost-mobile/js/theme.min.js
@@ -1 +1 @@
-$j(document).ready(function(){$j("#profile-jot-text").focus(enableOnUser);$j("#profile-jot-text").click(enableOnUser);if(typeof window.AjaxUpload!="undefined"){switch(window.ajaxType){case"jot-header":var uploader=new window.AjaxUpload("wall-image-upload",{action:"wall_upload/"+window.nickname+"?nomce=1",name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){addeditortext(response);$j("#profile-rotator").hide()}});var file_uploader=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname+"?nomce=1",name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){addeditortext(response);$j("#profile-rotator").hide()}});break;case"msg-header":var uploader=new window.AjaxUpload("prvmail-upload",{action:"wall_upload/"+window.nickname+"?nomce=1",name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){tinyMCE.execCommand("mceInsertRawHTML",false,response);$j("#profile-rotator").hide()}});break;default:break}}if(typeof window.aclInit!="undefined"&&typeof acl=="undefined"){acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID])}if(window.autoCompleteType=="display-head"){$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl")}if(window.aclType=="event_head"){$j("#events-calendar").fullCalendar({events:baseurl+"/events/json/",header:{left:"prev,next today",center:"title",right:"month,agendaWeek,agendaDay"},timeFormat:"H(:mm)",eventClick:function(calEvent,jsEvent,view){showEvent(calEvent.id)},eventRender:function(event,element,view){if(event.item["author-name"]==null)return;switch(view.name){case"month":element.find(".fc-event-title").html("
{1} : {2}".format(event.item["author-avatar"],event.item["author-name"],event.title));break;case"agendaWeek":element.find(".fc-event-title").html("
{1}
{2}
{3}
".format(event.item["author-avatar"],event.item["author-name"],event.item.desc,event.item.location));break;case"agendaDay":element.find(".fc-event-title").html("
{1}
{2}
{3}
".format(event.item["author-avatar"],event.item["author-name"],event.item.desc,event.item.location));break}}});var args=location.href.replace(baseurl,"").split("/");if(args.length>=4){$j("#events-calendar").fullCalendar("gotoDate",args[2],args[3]-1)}var hash=location.hash.split("-");if(hash.length==2&&hash[0]=="#link")showEvent(hash[1])}if(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head"){$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var selstr;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){selstr=$j(this).text();$j("#jot-perms-icon").removeClass("unlock").addClass("lock");$j("#jot-public").hide()});if(selstr==null){$j("#jot-perms-icon").removeClass("lock").addClass("unlock");$j("#jot-public").show()}}).trigger("change")}switch(window.autocompleteType){case"msg-header":var a=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(value,data){$j("#recip-complete").val(data)}});break;case"contacts-head":var a=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});a.setOptions({params:{type:"a"}});break;default:break}$j("#event-share-checkbox").change(function(){if($j("#event-share-checkbox").is(":checked")){$j("#acl-wrapper").show()}else{$j("#acl-wrapper").hide()}}).trigger("change");$j(".popupbox").click(function(){var parent=$j($j(this).attr("href")).parent();if(parent.css("display")=="none"){parent.show()}else{parent.hide()}return false})});$j(function(){$j("nav").bind("nav-update",function(e,data){var elm=$j("#pending-update");var register=$j(data).find("register").text();if(register=="0"){register="";elm.hide()}else{elm.show()}elm.html(register)})});function homeRedirect(){$j("html").fadeOut("slow",function(){window.location=baseurl+"/login"})}function insertFormatting(comment,BBcode,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==comment){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id);$j("#comment-edit-text-"+id).val(tmpStr)}textarea=document.getElementById("comment-edit-text-"+id);if(document.selection){textarea.focus();selected=document.selection.createRange();if(BBcode=="url"){selected.text="["+BBcode+"=http://]"+selected.text+"[/"+BBcode+"]"}else selected.text="["+BBcode+"]"+selected.text+"[/"+BBcode+"]"}else if(textarea.selectionStart||textarea.selectionStart=="0"){var start=textarea.selectionStart;var end=textarea.selectionEnd;if(BBcode=="url"){textarea.value=textarea.value.substring(0,start)+"["+BBcode+"=http://]"+textarea.value.substring(start,end)+"[/"+BBcode+"]"+textarea.value.substring(end,textarea.value.length)}else textarea.value=textarea.value.substring(0,start)+"["+BBcode+"]"+textarea.value.substring(start,end)+"[/"+BBcode+"]"+textarea.value.substring(end,textarea.value.length)}return true}function cmtBbOpen(id){$j(".comment-edit-bb-"+id).show()}function cmtBbClose(id){$j(".comment-edit-bb-"+id).hide()}var editor=false;var textlen=0;var plaintext="none";var ispublic=window.isPublic;function initEditor(cb){if(editor==false){if(plaintext=="none"){$j("#profile-jot-text").css({height:200,color:"#000"});$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl");editor=true;$j("a#jot-perms-icon, a#settings-default-perms-menu").click(function(){var parent=$j("#profile-jot-acl-wrapper").parent();if(parent.css("display")=="none"){parent.show()}else{parent.hide()}return false});$j(".jothidden").show();if(typeof cb!="undefined")cb();return}}else{if(typeof cb!="undefined")cb()}}function enableOnUser(){if(editor)return;$j(this).val("");initEditor()}function wallInitEditor(){var plaintext=window.editSelect;if(plaintext!="none"){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:/(profile-jot-text|prvmail-text)/,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:true,paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,force_p_newlines:false,force_br_newlines:true,forced_root_block:"",convert_urls:false,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,setup:function(ed){ed.onInit.add(function(ed){ed.pasteAsPlainText=true;var editorId=ed.editorId;var textarea=$j("#"+editorId);if(typeof textarea.attr("tabindex")!="undefined"){$j("#"+editorId+"_ifr").attr("tabindex",textarea.attr("tabindex"));textarea.attr("tabindex",null)}})}})}else $j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function initCrop(){function onEndCrop(coords,dimensions){$("x1").value=coords.x1;$("y1").value=coords.y1;$("x2").value=coords.x2;$("y2").value=coords.y2;$("width").value=dimensions.width;$("height").value=dimensions.height}Event.observe(window,"load",function(){new Cropper.ImgWithPreview("croppa",{previewWrap:"previewWrap",minWidth:175,minHeight:175,maxWidth:640,maxHeight:640,ratioDim:{x:100,y:100},displayOnInit:true,onEndCrop:onEndCrop})})}function confirmDelete(){return confirm(window.delItem)}function commentOpen(obj,id){if(obj.value==window.commentEmptyText){obj.value="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");$j("#mod-cmnt-wrap-"+id).show();openMenu("comment-edit-submit-wrapper-"+id)}}function commentClose(obj,id){if(obj.value==""){obj.value=window.commentEmptyText;$j("#comment-edit-text-"+id).removeClass("comment-edit-text-full");$j("#comment-edit-text-"+id).addClass("comment-edit-text-empty");$j("#mod-cmnt-wrap-"+id).hide();closeMenu("comment-edit-submit-wrapper-"+id)}}function commentInsert(obj,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==window.commentEmptyText){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id)}var ins=$j(obj).html();ins=ins.replace("<","<");ins=ins.replace(">",">");ins=ins.replace("&","&");ins=ins.replace(""",'"');$j("#comment-edit-text-"+id).val(tmpStr+ins)}function qCommentInsert(obj,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==window.commentEmptyText){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id)}var ins=$j(obj).val();ins=ins.replace("<","<");ins=ins.replace(">",">");ins=ins.replace("&","&");ins=ins.replace(""",'"');$j("#comment-edit-text-"+id).val(tmpStr+ins);$j(obj).val("")}function jotVideoURL(){reply=prompt(window.vidURL);if(reply&&reply.length){addeditortext("[video]"+reply+"[/video]")}}function jotAudioURL(){reply=prompt(window.audURL);if(reply&&reply.length){addeditortext("[audio]"+reply+"[/audio]")}}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val());if(reply&&reply.length){$j("#jot-location").val(reply)}}function jotShare(id){if($j("#jot-popup").length!=0)$j("#jot-popup").show();$j("#like-rotator-"+id).show();$j.get("share/"+id,function(data){if(!editor)$j("#profile-jot-text").val("");initEditor(function(){addeditortext(data);$j("#like-rotator-"+id).hide();$j(window).scrollTop(0)})})}function linkdropper(event){var linkFound=event.dataTransfer.types.contains("text/uri-list");if(linkFound)event.preventDefault()}switch(window.ajaxType){case"jot-header":function jotGetLink(){reply=prompt(window.linkURL);if(reply&&reply.length){reply=bin2hex(reply);$j("#profile-rotator").show();$j.get("parse_url?binurl="+reply,function(data){addeditortext(data);$j("#profile-rotator").hide()})}}function linkdrop(event){var reply=event.dataTransfer.getData("text/uri-list");event.target.textContent=reply;event.preventDefault();if(reply&&reply.length){reply=bin2hex(reply);$j("#profile-rotator").show();$j.get("parse_url?binurl="+reply,function(data){if(!editor)$j("#profile-jot-text").val("");initEditor(function(){addeditortext(data);$j("#profile-rotator").hide()})})}}break;case"msg-header":case"wallmsg-header":function jotGetLink(){reply=prompt(window.linkURL);if(reply&&reply.length){$j("#profile-rotator").show();$j.get("parse_url?url="+reply,function(data){tinyMCE.execCommand("mceInsertRawHTML",false,data);$j("#profile-rotator").hide()})}}function linkdrop(event){var reply=event.dataTransfer.getData("text/uri-list");event.target.textContent=reply;event.preventDefault();if(reply&&reply.length){$j("#profile-rotator").show();$j.get("parse_url?url="+reply,function(data){tinyMCE.execCommand("mceInsertRawHTML",false,data);$j("#profile-rotator").hide()})}}break;default:break}function showEvent(eventid){}function itemTag(id){reply=prompt(window.term);if(reply&&reply.length){reply=reply.replace("#","");if(reply.length){commentBusy=true;$j("body").css("cursor","wait");$j.get("tagger/"+id+"?term="+reply,NavUpdate);liking=1}}}function itemFiler(id){$j.get("filer/",function(data){var promptText=$j("#id_term_label",data).text();reply=prompt(promptText);if(reply&&reply.length){commentBusy=true;$j("body").css("cursor","wait");$j.get("filer/"+id+"?term="+reply,NavUpdate);liking=1}})}function jotClearLocation(){$j("#jot-coord").val("");$j("#profile-nolocation-wrapper").hide()}function addeditortext(data){if(plaintext=="none"){var currentText=$j("#profile-jot-text").val();$j("#profile-jot-text").val(currentText+data)}}if(typeof window.geoTag==="function")window.geoTag();
\ No newline at end of file
+$j(document).ready(function(){$j("#profile-jot-text").focus(enableOnUser);$j("#profile-jot-text").click(enableOnUser);if(typeof window.AjaxUpload!="undefined"){switch(window.ajaxType){case"jot-header":var uploader=new window.AjaxUpload("wall-image-upload",{action:"wall_upload/"+window.nickname+"?nomce=1",name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){addeditortext(response);$j("#profile-rotator").hide()}});var file_uploader=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname+"?nomce=1",name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){addeditortext(response);$j("#profile-rotator").hide()}});break;case"msg-header":var uploader=new window.AjaxUpload("prvmail-upload",{action:"wall_upload/"+window.nickname+"?nomce=1",name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){tinyMCE.execCommand("mceInsertRawHTML",false,response);$j("#profile-rotator").hide()}});break;default:break}}if(typeof window.aclInit!="undefined"&&typeof acl=="undefined"){acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID])}if(window.autoCompleteType=="display-head"){$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl")}if(window.aclType=="event_head"){$j("#events-calendar").fullCalendar({events:baseurl+"/events/json/",header:{left:"prev,next today",center:"title",right:"month,agendaWeek,agendaDay"},timeFormat:"H(:mm)",eventClick:function(calEvent,jsEvent,view){showEvent(calEvent.id)},eventRender:function(event,element,view){if(event.item["author-name"]==null)return;switch(view.name){case"month":element.find(".fc-event-title").html("
{1} : {2}".format(event.item["author-avatar"],event.item["author-name"],event.title));break;case"agendaWeek":element.find(".fc-event-title").html("
{1}
{2}
{3}
".format(event.item["author-avatar"],event.item["author-name"],event.item.desc,event.item.location));break;case"agendaDay":element.find(".fc-event-title").html("
{1}
{2}
{3}
".format(event.item["author-avatar"],event.item["author-name"],event.item.desc,event.item.location));break}}});var args=location.href.replace(baseurl,"").split("/");if(args.length>=4){$j("#events-calendar").fullCalendar("gotoDate",args[2],args[3]-1)}var hash=location.hash.split("-");if(hash.length==2&&hash[0]=="#link")showEvent(hash[1])}if(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head"){$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var selstr;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){selstr=$j(this).text();$j("#jot-perms-icon").removeClass("unlock").addClass("lock");$j("#jot-public").hide()});if(selstr==null){$j("#jot-perms-icon").removeClass("lock").addClass("unlock");$j("#jot-public").show()}}).trigger("change")}switch(window.autocompleteType){case"msg-header":var a=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(value,data){$j("#recip-complete").val(data)}});break;case"contacts-head":var a=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});a.setOptions({params:{type:"a"}});break;default:break}$j("#event-share-checkbox").change(function(){if($j("#event-share-checkbox").is(":checked")){$j("#acl-wrapper").show()}else{$j("#acl-wrapper").hide()}}).trigger("change");$j(".popupbox").click(function(){var parent=$j($j(this).attr("href")).parent();if(parent.css("display")=="none"){parent.show()}else{parent.hide()}return false})});$j(function(){$j("nav").bind("nav-update",function(e,data){var elm=$j("#pending-update");var register=$j(data).find("register").text();if(register=="0"){register="";elm.hide()}else{elm.show()}elm.html(register)})});function homeRedirect(){$j("html").fadeOut("slow",function(){window.location=baseurl+"/login"})}function insertFormatting(comment,BBcode,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==comment){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id);$j("#comment-edit-text-"+id).val(tmpStr)}textarea=document.getElementById("comment-edit-text-"+id);if(document.selection){textarea.focus();selected=document.selection.createRange();if(BBcode=="url"){selected.text="["+BBcode+"=http://]"+selected.text+"[/"+BBcode+"]"}else selected.text="["+BBcode+"]"+selected.text+"[/"+BBcode+"]"}else if(textarea.selectionStart||textarea.selectionStart=="0"){var start=textarea.selectionStart;var end=textarea.selectionEnd;if(BBcode=="url"){textarea.value=textarea.value.substring(0,start)+"["+BBcode+"=http://]"+textarea.value.substring(start,end)+"[/"+BBcode+"]"+textarea.value.substring(end,textarea.value.length)}else textarea.value=textarea.value.substring(0,start)+"["+BBcode+"]"+textarea.value.substring(start,end)+"[/"+BBcode+"]"+textarea.value.substring(end,textarea.value.length)}return true}function cmtBbOpen(id){$j(".comment-edit-bb-"+id).show()}function cmtBbClose(id){$j(".comment-edit-bb-"+id).hide()}var editor=false;var textlen=0;var plaintext="none";var ispublic=window.isPublic;function initEditor(cb){if(editor==false){if(plaintext=="none"){$j("#profile-jot-text").css({height:200,color:"#000"});$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl");editor=true;$j("a#jot-perms-icon, a#settings-default-perms-menu").click(function(){var parent=$j("#profile-jot-acl-wrapper").parent();if(parent.css("display")=="none"){parent.show()}else{parent.hide()}return false});$j(".jothidden").show();if(typeof cb!="undefined")cb();return}}else{if(typeof cb!="undefined")cb()}}function enableOnUser(){if(editor)return;$j(this).val("");initEditor()}function wallInitEditor(){var plaintext=window.editSelect;if(plaintext!="none"){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:/(profile-jot-text|prvmail-text)/,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:true,paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,forced_root_block:"div",convert_urls:false,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,setup:function(ed){ed.onInit.add(function(ed){ed.pasteAsPlainText=true;var editorId=ed.editorId;var textarea=$j("#"+editorId);if(typeof textarea.attr("tabindex")!="undefined"){$j("#"+editorId+"_ifr").attr("tabindex",textarea.attr("tabindex"));textarea.attr("tabindex",null)}})}})}else $j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function initCrop(){function onEndCrop(coords,dimensions){$("x1").value=coords.x1;$("y1").value=coords.y1;$("x2").value=coords.x2;$("y2").value=coords.y2;$("width").value=dimensions.width;$("height").value=dimensions.height}Event.observe(window,"load",function(){new Cropper.ImgWithPreview("croppa",{previewWrap:"previewWrap",minWidth:175,minHeight:175,maxWidth:640,maxHeight:640,ratioDim:{x:100,y:100},displayOnInit:true,onEndCrop:onEndCrop})})}function confirmDelete(){return confirm(window.delItem)}function commentOpen(obj,id){if(obj.value==window.commentEmptyText){obj.value="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");$j("#mod-cmnt-wrap-"+id).show();openMenu("comment-edit-submit-wrapper-"+id)}}function commentClose(obj,id){if(obj.value==""){obj.value=window.commentEmptyText;$j("#comment-edit-text-"+id).removeClass("comment-edit-text-full");$j("#comment-edit-text-"+id).addClass("comment-edit-text-empty");$j("#mod-cmnt-wrap-"+id).hide();closeMenu("comment-edit-submit-wrapper-"+id)}}function commentInsert(obj,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==window.commentEmptyText){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id)}var ins=$j(obj).html();ins=ins.replace("<","<");ins=ins.replace(">",">");ins=ins.replace("&","&");ins=ins.replace(""",'"');$j("#comment-edit-text-"+id).val(tmpStr+ins)}function qCommentInsert(obj,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==window.commentEmptyText){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id)}var ins=$j(obj).val();ins=ins.replace("<","<");ins=ins.replace(">",">");ins=ins.replace("&","&");ins=ins.replace(""",'"');$j("#comment-edit-text-"+id).val(tmpStr+ins);$j(obj).val("")}function jotVideoURL(){reply=prompt(window.vidURL);if(reply&&reply.length){addeditortext("[video]"+reply+"[/video]")}}function jotAudioURL(){reply=prompt(window.audURL);if(reply&&reply.length){addeditortext("[audio]"+reply+"[/audio]")}}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val());if(reply&&reply.length){$j("#jot-location").val(reply)}}function jotShare(id){if($j("#jot-popup").length!=0)$j("#jot-popup").show();$j("#like-rotator-"+id).show();$j.get("share/"+id,function(data){if(!editor)$j("#profile-jot-text").val("");initEditor(function(){addeditortext(data);$j("#like-rotator-"+id).hide();$j(window).scrollTop(0)})})}function linkdropper(event){var linkFound=event.dataTransfer.types.contains("text/uri-list");if(linkFound)event.preventDefault()}switch(window.ajaxType){case"jot-header":function jotGetLink(){reply=prompt(window.linkURL);if(reply&&reply.length){reply=bin2hex(reply);$j("#profile-rotator").show();$j.get("parse_url?binurl="+reply,function(data){addeditortext(data);$j("#profile-rotator").hide()})}}function linkdrop(event){var reply=event.dataTransfer.getData("text/uri-list");event.target.textContent=reply;event.preventDefault();if(reply&&reply.length){reply=bin2hex(reply);$j("#profile-rotator").show();$j.get("parse_url?binurl="+reply,function(data){if(!editor)$j("#profile-jot-text").val("");initEditor(function(){addeditortext(data);$j("#profile-rotator").hide()})})}}break;case"msg-header":case"wallmsg-header":function jotGetLink(){reply=prompt(window.linkURL);if(reply&&reply.length){$j("#profile-rotator").show();$j.get("parse_url?url="+reply,function(data){tinyMCE.execCommand("mceInsertRawHTML",false,data);$j("#profile-rotator").hide()})}}function linkdrop(event){var reply=event.dataTransfer.getData("text/uri-list");event.target.textContent=reply;event.preventDefault();if(reply&&reply.length){$j("#profile-rotator").show();$j.get("parse_url?url="+reply,function(data){tinyMCE.execCommand("mceInsertRawHTML",false,data);$j("#profile-rotator").hide()})}}break;default:break}function showEvent(eventid){}function itemTag(id){reply=prompt(window.term);if(reply&&reply.length){reply=reply.replace("#","");if(reply.length){commentBusy=true;$j("body").css("cursor","wait");$j.get("tagger/"+id+"?term="+reply,NavUpdate);liking=1}}}function itemFiler(id){$j.get("filer/",function(data){var promptText=$j("#id_term_label",data).text();reply=prompt(promptText);if(reply&&reply.length){commentBusy=true;$j("body").css("cursor","wait");$j.get("filer/"+id+"?term="+reply,NavUpdate);liking=1}})}function jotClearLocation(){$j("#jot-coord").val("");$j("#profile-nolocation-wrapper").hide()}function addeditortext(data){if(plaintext=="none"){var currentText=$j("#profile-jot-text").val();$j("#profile-jot-text").val(currentText+data)}}if(typeof window.geoTag==="function")window.geoTag();
\ No newline at end of file
diff --git a/view/theme/frost-mobile/photos_upload.tpl b/view/theme/frost-mobile/photos_upload.tpl
index d354bc58..43dbcaad 100644
--- a/view/theme/frost-mobile/photos_upload.tpl
+++ b/view/theme/frost-mobile/photos_upload.tpl
@@ -18,6 +18,8 @@
+ $default_upload_box
+
$nosharetext
@@ -39,9 +41,9 @@
- $uploader
+ $alt_uploader
- $default
+ $default_upload_submit
diff --git a/view/theme/frost-mobile/smarty3/comment_item.tpl b/view/theme/frost-mobile/smarty3/comment_item.tpl
index a5baa14a..1b22ea9c 100644
--- a/view/theme/frost-mobile/smarty3/comment_item.tpl
+++ b/view/theme/frost-mobile/smarty3/comment_item.tpl
@@ -3,7 +3,7 @@
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
-
+ -->*}}
diff --git a/view/theme/frost-mobile/smarty3/contact_template.tpl b/view/theme/frost-mobile/smarty3/contact_template.tpl
index 2f903f49..7d257dab 100644
--- a/view/theme/frost-mobile/smarty3/contact_template.tpl
+++ b/view/theme/frost-mobile/smarty3/contact_template.tpl
@@ -10,16 +10,22 @@
onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}});"
onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)" >
-
+{{**}}
{{if $contact.photo_menu}}
-
+{{**}}
{{/if}}
diff --git a/view/theme/frost-mobile/smarty3/photos_upload.tpl b/view/theme/frost-mobile/smarty3/photos_upload.tpl
index 0c4a2607..d0b5135c 100644
--- a/view/theme/frost-mobile/smarty3/photos_upload.tpl
+++ b/view/theme/frost-mobile/smarty3/photos_upload.tpl
@@ -23,6 +23,8 @@
+ {{$default_upload_box}}
+
{{$nosharetext}}
@@ -44,9 +46,9 @@
- {{$uploader}}
+ {{$alt_uploader}}
- {{$default}}
+ {{$default_upload_submit}}
diff --git a/view/theme/frost/comment_item.tpl b/view/theme/frost/comment_item.tpl
index 38080380..5e0919c3 100755
--- a/view/theme/frost/comment_item.tpl
+++ b/view/theme/frost/comment_item.tpl
@@ -1,4 +1,4 @@
-
+ -->#}
-
+ {##}
diff --git a/view/theme/frost/contact_template.tpl b/view/theme/frost/contact_template.tpl
index 4f66684e..dd3dbf79 100644
--- a/view/theme/frost/contact_template.tpl
+++ b/view/theme/frost/contact_template.tpl
@@ -11,7 +11,13 @@
{{ endif }}
diff --git a/view/theme/frost/js/main.js b/view/theme/frost/js/main.js
index 3f2f1356..1c865ac3 100644
--- a/view/theme/frost/js/main.js
+++ b/view/theme/frost/js/main.js
@@ -682,9 +682,9 @@ function setupFieldRichtext(){
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
- force_p_newlines : false,
- force_br_newlines : true,
- forced_root_block : '',
+ //force_p_newlines : false,
+ //force_br_newlines : true,
+ forced_root_block : 'div',
convert_urls: false,
content_css: baseurl+"/view/custom_tinymce.css",
theme_advanced_path : false,
diff --git a/view/theme/frost/js/main.min.js b/view/theme/frost/js/main.min.js
index 8e521424..6a500aae 100644
--- a/view/theme/frost/js/main.min.js
+++ b/view/theme/frost/js/main.min.js
@@ -1 +1 @@
-function openClose(listID){listID="#"+listID.replace(/:/g,"\\:");listID=listID.replace(/\./g,"\\.");listID=listID.replace(/@/g,"\\@");if($j(listID).is(":visible")){$j(listID).hide();$j(listID+"-wrapper").show()}else{$j(listID).show();$j(listID+"-wrapper").hide()}}function openMenu(theID){document.getElementById(theID).style.display="block"}function closeMenu(theID){document.getElementById(theID).style.display="none"}var src=null;var prev=null;var livetime=null;var msie=false;var stopped=false;var totStopped=false;var timer=null;var pr=0;var liking=0;var in_progress=false;var langSelect=false;var commentBusy=false;var last_popup_menu=null;var last_popup_button=null;$j(function(){$j.ajaxSetup({cache:false});msie=$j.browser.msie;collapseHeight();$j(".onoff input").each(function(){val=$j(this).val();id=$j(this).attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")});$j(".onoff > a").click(function(event){event.preventDefault();var input=$j(this).siblings("input");var val=1-input.val();var id=input.attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$j("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});setupFieldRichtext();function close_last_popup_menu(e){if(last_popup_menu){if("#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")){last_popup_menu.hide();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}}$j("a[rel^=#]").click(function(e){close_last_popup_menu(e);menu=$j($j(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;$j(this).parent().toggleClass("selected");menu.slideToggle("fast");if(menu.css("display")=="none"){last_popup_menu=null;last_popup_button=null}else{last_popup_menu=menu;last_popup_button=$j(this).parent()}return false});$j("html").click(function(e){close_last_popup_menu(e)});$j("a.popupbox").fancybox({transitionIn:"none",transitionOut:"none"});var notifications_tpl=unescape($j("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($j("
").append($j("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($j("
").append($j("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,data){var invalid=$j(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$j(data).find("net").text();if(net==0){net="";$j("#net-update").removeClass("show")}else{$j("#net-update").addClass("show")}$j("#net-update").html(net);var home=$j(data).find("home").text();if(home==0){home="";$j("#home-update").removeClass("show")}else{$j("#home-update").addClass("show")}$j("#home-update").html(home);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update").removeClass("show")}else{$j("#intro-update").addClass("show")}$j("#intro-update").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update").removeClass("show")}else{$j("#mail-update").addClass("show")}$j("#mail-update").html(mail);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update-li").removeClass("show")}else{$j("#intro-update-li").addClass("show")}$j("#intro-update-li").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update-li").removeClass("show")}else{$j("#mail-update-li").addClass("show")}$j("#mail-update-li").html(mail);var eNotif=$j(data).find("notif");if(eNotif.children("note").length==0){$j("#nav-notifications-menu").html(notifications_empty)}else{nnm=$j("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$j(this);text=e.text().format("
"+e.attr("name")+" ");html=notifications_tpl.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen"));nnm.append(html)});$j("img[data-src]",nnm).each(function(i,el){$j(el).attr("src",$j(el).data("src"))})}notif=eNotif.attr("count");if(notif>0){$j("#nav-notifications-linkmenu").addClass("on")}else{$j("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$j("#notify-update").removeClass("show")}else{$j("#notify-update").addClass("show")}$j("#notify-update").html(notif);var eSysmsg=$j(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"notice",life:3e3})});eSysmsg.children("info").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"info",life:1e3})})});NavUpdate();$j(document).keydown(function(event){if(event.keyCode=="8"){var target=event.target||event.srcElement;if(!/input|textarea/i.test(target.nodeName)){return false}}if(event.keyCode=="19"||event.ctrlKey&&event.which=="32"){event.preventDefault();if(stopped==false){stopped=true;if(event.ctrlKey){totStopped=true}$j("#pause").html('
')}else{unpause()}}else{if(!totStopped){unpause()}}})});function NavUpdate(){if(!stopped){var pingCmd="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(pingCmd,function(data){$j(data).find("result").each(function(){$j("nav").trigger("nav-update",this);if($j("#live-network").length){src="network";liveUpdate()}if($j("#live-profile").length){src="profile";liveUpdate()}if($j("#live-community").length){src="community";liveUpdate()}if($j("#live-notes").length){src="notes";liveUpdate()}if($j("#live-display").length){src="display";liveUpdate()}if($j("#live-photos").length){if(liking){liking=0;window.location.href=window.location.href}}})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){if(livetime){clearTimeout(livetime)}livetime=setTimeout(liveUpdate,1e4);return}if(livetime!=null)livetime=null;prev="live-"+src;in_progress=true;var udargs=netargs.length?"/"+netargs:"";var update_url="update_"+src+udargs+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(update_url,function(data){in_progress=false;$j(".toplevel_item",data).each(function(){var ident=$j(this).attr("id");if($j("#"+ident).length==0&&profile_page==1){$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("#"+prev).after($j(this))}else{var id=$j(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$j("#collapsed-comments-"+id).is(":visible")}$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("html").height($j("html").height());$j("#"+ident).replaceWith($j(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$j("html").height("auto")}prev=ident});$j(".like-rotator").hide();if(commentBusy){commentBusy=false;$j("body").css("cursor","auto")}$j(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl");collapseHeight()})}function collapseHeight(elems){var elemName=".wall-item-body:not(.divmore)";if(typeof elems!="undefined"){elemName=elems+" "+elemName}$j(elemName).each(function(){if($j(this).height()>450){$j("html").height($j("html").height());$j(this).divgrow({initialHeight:400,showBrackets:false,speed:0});$j(this).addClass("divmore");$j("html").height("auto")}})}function imgbright(node){$j(node).removeClass("drophide").addClass("drop")}function imgdull(node){$j(node).removeClass("drop").addClass("drophide")}function dolike(ident,verb){unpause();$j("#like-rotator-"+ident.toString()).show();$j.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$j.get("starred/"+ident,function(data){if(data.match(/1/)){$j("#starred-"+ident).addClass("starred");$j("#starred-"+ident).removeClass("unstarred");$j("#star-"+ident).addClass("hidden");$j("#unstar-"+ident).removeClass("hidden")}else{$j("#starred-"+ident).addClass("unstarred");$j("#starred-"+ident).removeClass("starred");$j("#star-"+ident).removeClass("hidden");$j("#unstar-"+ident).addClass("hidden")}})}function getPosition(e){var cursor={x:0,y:0};if(e.pageX||e.pageY){cursor.x=e.pageX;cursor.y=e.pageY}else{if(e.clientX||e.clientY){cursor.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft;cursor.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop}else{if(e.x||e.y){cursor.x=e.x;cursor.y=e.y}}}return cursor}var lockvisible=false;function lockview(event,id){event=event||window.event;cursor=getPosition(event);if(lockvisible){lockviewhide()}else{lockvisible=true;$j.get("lockview/"+id,function(data){$j("#panel").html(data);$j("#panel").css({left:cursor.x+5,top:cursor.y+5});$j("#panel").show()})}}function lockviewhide(){lockvisible=false;$j("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$j("body").css("cursor","wait");$j("#comment-preview-inp-"+id).val("0");$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$j("#comment-edit-wrapper-"+id).hide();$j("#comment-edit-text-"+id).val("");var tarea=document.getElementById("comment-edit-text-"+id);if(tarea)commentClose(tarea,id);if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,10)}if(data.reload){window.location.href=data.reload}},"json");return false}function preview_comment(id){$j("#comment-preview-inp-"+id).val("1");$j("#comment-edit-preview-"+id).show();$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$j("#comment-edit-preview-"+id).html(data.preview);$j("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($j("#collapsed-comments-"+id).is(":visible")){$j("#collapsed-comments-"+id).hide();$j("#hide-comments-"+id).html(window.showMore)}else{$j("#collapsed-comments-"+id).show();$j("#hide-comments-"+id).html(window.showFewer);collapseHeight("#collapsed-comments-"+id)}}function preview_post(){$j("#jot-preview").val("1");$j("#jot-preview-content").show();tinyMCE.triggerSave();$j.post("item",$j("#profile-jot-form").serialize(),function(data){if(data.preview){$j("#jot-preview-content").html(data.preview);$j("#jot-preview-content"+" a").click(function(){return false})}},"json");$j("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$j("#pause").html("")}function bin2hex(s){var v,i,f=0,a=[];s+="";f=s.length;for(i=0;i
'+data.desc+' '+data.version+'
'+data.credits+'
')})}
\ No newline at end of file
+function openClose(listID){listID="#"+listID.replace(/:/g,"\\:");listID=listID.replace(/\./g,"\\.");listID=listID.replace(/@/g,"\\@");if($j(listID).is(":visible")){$j(listID).hide();$j(listID+"-wrapper").show()}else{$j(listID).show();$j(listID+"-wrapper").hide()}}function openMenu(theID){document.getElementById(theID).style.display="block"}function closeMenu(theID){document.getElementById(theID).style.display="none"}var src=null;var prev=null;var livetime=null;var msie=false;var stopped=false;var totStopped=false;var timer=null;var pr=0;var liking=0;var in_progress=false;var langSelect=false;var commentBusy=false;var last_popup_menu=null;var last_popup_button=null;$j(function(){$j.ajaxSetup({cache:false});msie=$j.browser.msie;collapseHeight();$j(".onoff input").each(function(){val=$j(this).val();id=$j(this).attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")});$j(".onoff > a").click(function(event){event.preventDefault();var input=$j(this).siblings("input");var val=1-input.val();var id=input.attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$j("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});setupFieldRichtext();function close_last_popup_menu(e){if(last_popup_menu){if("#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")){last_popup_menu.hide();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}}$j("a[rel^=#]").click(function(e){close_last_popup_menu(e);menu=$j($j(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;$j(this).parent().toggleClass("selected");menu.slideToggle("fast");if(menu.css("display")=="none"){last_popup_menu=null;last_popup_button=null}else{last_popup_menu=menu;last_popup_button=$j(this).parent()}return false});$j("html").click(function(e){close_last_popup_menu(e)});$j("a.popupbox").fancybox({transitionIn:"none",transitionOut:"none"});var notifications_tpl=unescape($j("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($j("
").append($j("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($j("
").append($j("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,data){var invalid=$j(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$j(data).find("net").text();if(net==0){net="";$j("#net-update").removeClass("show")}else{$j("#net-update").addClass("show")}$j("#net-update").html(net);var home=$j(data).find("home").text();if(home==0){home="";$j("#home-update").removeClass("show")}else{$j("#home-update").addClass("show")}$j("#home-update").html(home);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update").removeClass("show")}else{$j("#intro-update").addClass("show")}$j("#intro-update").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update").removeClass("show")}else{$j("#mail-update").addClass("show")}$j("#mail-update").html(mail);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update-li").removeClass("show")}else{$j("#intro-update-li").addClass("show")}$j("#intro-update-li").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update-li").removeClass("show")}else{$j("#mail-update-li").addClass("show")}$j("#mail-update-li").html(mail);var eNotif=$j(data).find("notif");if(eNotif.children("note").length==0){$j("#nav-notifications-menu").html(notifications_empty)}else{nnm=$j("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$j(this);text=e.text().format("
"+e.attr("name")+" ");html=notifications_tpl.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen"));nnm.append(html)});$j("img[data-src]",nnm).each(function(i,el){$j(el).attr("src",$j(el).data("src"))})}notif=eNotif.attr("count");if(notif>0){$j("#nav-notifications-linkmenu").addClass("on")}else{$j("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$j("#notify-update").removeClass("show")}else{$j("#notify-update").addClass("show")}$j("#notify-update").html(notif);var eSysmsg=$j(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"notice",life:3e3})});eSysmsg.children("info").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"info",life:1e3})})});NavUpdate();$j(document).keydown(function(event){if(event.keyCode=="8"){var target=event.target||event.srcElement;if(!/input|textarea/i.test(target.nodeName)){return false}}if(event.keyCode=="19"||event.ctrlKey&&event.which=="32"){event.preventDefault();if(stopped==false){stopped=true;if(event.ctrlKey){totStopped=true}$j("#pause").html('
')}else{unpause()}}else{if(!totStopped){unpause()}}})});function NavUpdate(){if(!stopped){var pingCmd="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(pingCmd,function(data){$j(data).find("result").each(function(){$j("nav").trigger("nav-update",this);if($j("#live-network").length){src="network";liveUpdate()}if($j("#live-profile").length){src="profile";liveUpdate()}if($j("#live-community").length){src="community";liveUpdate()}if($j("#live-notes").length){src="notes";liveUpdate()}if($j("#live-display").length){src="display";liveUpdate()}if($j("#live-photos").length){if(liking){liking=0;window.location.href=window.location.href}}})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){if(livetime){clearTimeout(livetime)}livetime=setTimeout(liveUpdate,1e4);return}if(livetime!=null)livetime=null;prev="live-"+src;in_progress=true;var udargs=netargs.length?"/"+netargs:"";var update_url="update_"+src+udargs+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(update_url,function(data){in_progress=false;$j(".toplevel_item",data).each(function(){var ident=$j(this).attr("id");if($j("#"+ident).length==0&&profile_page==1){$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("#"+prev).after($j(this))}else{var id=$j(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$j("#collapsed-comments-"+id).is(":visible")}$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("html").height($j("html").height());$j("#"+ident).replaceWith($j(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$j("html").height("auto")}prev=ident});$j(".like-rotator").hide();if(commentBusy){commentBusy=false;$j("body").css("cursor","auto")}$j(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl");collapseHeight()})}function collapseHeight(elems){var elemName=".wall-item-body:not(.divmore)";if(typeof elems!="undefined"){elemName=elems+" "+elemName}$j(elemName).each(function(){if($j(this).height()>450){$j("html").height($j("html").height());$j(this).divgrow({initialHeight:400,showBrackets:false,speed:0});$j(this).addClass("divmore");$j("html").height("auto")}})}function imgbright(node){$j(node).removeClass("drophide").addClass("drop")}function imgdull(node){$j(node).removeClass("drop").addClass("drophide")}function dolike(ident,verb){unpause();$j("#like-rotator-"+ident.toString()).show();$j.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$j.get("starred/"+ident,function(data){if(data.match(/1/)){$j("#starred-"+ident).addClass("starred");$j("#starred-"+ident).removeClass("unstarred");$j("#star-"+ident).addClass("hidden");$j("#unstar-"+ident).removeClass("hidden")}else{$j("#starred-"+ident).addClass("unstarred");$j("#starred-"+ident).removeClass("starred");$j("#star-"+ident).removeClass("hidden");$j("#unstar-"+ident).addClass("hidden")}})}function getPosition(e){var cursor={x:0,y:0};if(e.pageX||e.pageY){cursor.x=e.pageX;cursor.y=e.pageY}else{if(e.clientX||e.clientY){cursor.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft;cursor.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop}else{if(e.x||e.y){cursor.x=e.x;cursor.y=e.y}}}return cursor}var lockvisible=false;function lockview(event,id){event=event||window.event;cursor=getPosition(event);if(lockvisible){lockviewhide()}else{lockvisible=true;$j.get("lockview/"+id,function(data){$j("#panel").html(data);$j("#panel").css({left:cursor.x+5,top:cursor.y+5});$j("#panel").show()})}}function lockviewhide(){lockvisible=false;$j("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$j("body").css("cursor","wait");$j("#comment-preview-inp-"+id).val("0");$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$j("#comment-edit-wrapper-"+id).hide();$j("#comment-edit-text-"+id).val("");var tarea=document.getElementById("comment-edit-text-"+id);if(tarea)commentClose(tarea,id);if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,10)}if(data.reload){window.location.href=data.reload}},"json");return false}function preview_comment(id){$j("#comment-preview-inp-"+id).val("1");$j("#comment-edit-preview-"+id).show();$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$j("#comment-edit-preview-"+id).html(data.preview);$j("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($j("#collapsed-comments-"+id).is(":visible")){$j("#collapsed-comments-"+id).hide();$j("#hide-comments-"+id).html(window.showMore)}else{$j("#collapsed-comments-"+id).show();$j("#hide-comments-"+id).html(window.showFewer);collapseHeight("#collapsed-comments-"+id)}}function preview_post(){$j("#jot-preview").val("1");$j("#jot-preview-content").show();tinyMCE.triggerSave();$j.post("item",$j("#profile-jot-form").serialize(),function(data){if(data.preview){$j("#jot-preview-content").html(data.preview);$j("#jot-preview-content"+" a").click(function(){return false})}},"json");$j("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$j("#pause").html("")}function bin2hex(s){var v,i,f=0,a=[];s+="";f=s.length;for(i=0;i
'+data.desc+' '+data.version+'
'+data.credits+'
')})}
\ No newline at end of file
diff --git a/view/theme/frost/js/theme.js b/view/theme/frost/js/theme.js
index 34288420..b0d6f493 100644
--- a/view/theme/frost/js/theme.js
+++ b/view/theme/frost/js/theme.js
@@ -647,9 +647,9 @@ function initEditor(cb){
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
- force_p_newlines : false,
- force_br_newlines : true,
- forced_root_block : '',
+ //force_p_newlines : false,
+ //force_br_newlines : true,
+ forced_root_block : 'div',
convert_urls: false,
content_css: window.baseURL + "/view/custom_tinymce.css",
theme_advanced_path : false,
@@ -742,9 +742,9 @@ function msgInitEditor() {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
- force_p_newlines : false,
- force_br_newlines : true,
- forced_root_block : '',
+ //force_p_newlines : false,
+ //force_br_newlines : true,
+ forced_root_block : 'div',
convert_urls: false,
content_css: baseurl + "/view/custom_tinymce.css",
//Character count
@@ -783,9 +783,9 @@ function profInitEditor() {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
- force_p_newlines : false,
- force_br_newlines : true,
- forced_root_block : '',
+ //force_p_newlines : false,
+ //force_br_newlines : true,
+ forced_root_block : 'div',
content_css: baseurl + "/view/custom_tinymce.css",
theme_advanced_path : false,
setup : function(ed) {
@@ -813,9 +813,9 @@ function eventInitEditor() {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
- force_p_newlines : false,
- force_br_newlines : true,
- forced_root_block : '',
+ //force_p_newlines : false,
+ //force_br_newlines : true,
+ forced_root_block : 'div',
content_css: baseurl + "/view/custom_tinymce.css",
theme_advanced_path : false,
setup : function(ed) {
@@ -843,9 +843,9 @@ function contactInitEditor () {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
- force_p_newlines : false,
- force_br_newlines : true,
- forced_root_block : '',
+ //force_p_newlines : false,
+ //force_br_newlines : true,
+ forced_root_block : 'div',
content_css: baseurl + "/view/custom_tinymce.css"
@@ -872,9 +872,9 @@ function wallInitEditor() {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
- force_p_newlines : false,
- force_br_newlines : true,
- forced_root_block : '',
+ //force_p_newlines : false,
+ //force_br_newlines : true,
+ forced_root_block : 'div',
convert_urls: false,
content_css: baseurl + "/view/custom_tinymce.css",
//Character count
diff --git a/view/theme/frost/js/theme.min.js b/view/theme/frost/js/theme.min.js
index 49be57f2..2184b780 100644
--- a/view/theme/frost/js/theme.min.js
+++ b/view/theme/frost/js/theme.min.js
@@ -1 +1 @@
-$j(document).ready(function(){window.navMenuTimeout={"#network-menu-list-timeout":null,"#contacts-menu-list-timeout":null,"#system-menu-list-timeout":null,"#network-menu-list-opening":false,"#contacts-menu-list-opening":false,"#system-menu-list-opening":false,"#network-menu-list-closing":false,"#contacts-menu-list-closing":false,"#system-menu-list-closing":false};if(typeof window.aclInit!="undefined"&&typeof acl=="undefined"){acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID])}$j("#profile-jot-text").focus(enableOnUser);$j("#profile-jot-text").click(enableOnUser);$j(".nav-menu-list, .nav-menu-icon").hover(function(){showNavMenu($j(this).attr("point"))},function(){hideNavMenu($j(this).attr("point"))});$j(".group-edit-icon").hover(function(){$j(this).addClass("icon");$j(this).removeClass("iconspacer")},function(){$j(this).removeClass("icon");$j(this).addClass("iconspacer")});$j(".sidebar-group-element").hover(function(){id=$j(this).attr("id");$j("#edit-"+id).addClass("icon");$j("#edit-"+id).removeClass("iconspacer")},function(){id=$j(this).attr("id");$j("#edit-"+id).removeClass("icon");$j("#edit-"+id).addClass("iconspacer")});$j(".savedsearchdrop").hover(function(){$j(this).addClass("drop");$j(this).addClass("icon");$j(this).removeClass("iconspacer")},function(){$j(this).removeClass("drop");$j(this).removeClass("icon");$j(this).addClass("iconspacer")});$j(".savedsearchterm").hover(function(){id=$j(this).attr("id");$j("#drop-"+id).addClass("icon");$j("#drop-"+id).addClass("drophide");$j("#drop-"+id).removeClass("iconspacer")},function(){id=$j(this).attr("id");$j("#drop-"+id).removeClass("icon");$j("#drop-"+id).removeClass("drophide");$j("#drop-"+id).addClass("iconspacer")});if(window.autoCompleteType=="display-head"){$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl")}if(window.aclType=="event_head"){$j("#events-calendar").fullCalendar({events:baseurl+"/events/json/",header:{left:"prev,next today",center:"title",right:"month,agendaWeek,agendaDay"},timeFormat:"H(:mm)",eventClick:function(calEvent,jsEvent,view){showEvent(calEvent.id)},eventRender:function(event,element,view){if(event.item["author-name"]==null)return;switch(view.name){case"month":element.find(".fc-event-title").html("
{1} : {2}".format(event.item["author-avatar"],event.item["author-name"],event.title));break;case"agendaWeek":element.find(".fc-event-title").html("
{1}
{2}
{3}
".format(event.item["author-avatar"],event.item["author-name"],event.item.desc,event.item.location));break;case"agendaDay":element.find(".fc-event-title").html("
{1}
{2}
{3}
".format(event.item["author-avatar"],event.item["author-name"],event.item.desc,event.item.location));break}}});var args=location.href.replace(baseurl,"").split("/");if(args.length>=4){$j("#events-calendar").fullCalendar("gotoDate",args[2],args[3]-1)}var hash=location.hash.split("-");if(hash.length==2&&hash[0]=="#link")showEvent(hash[1])}$j("#event-share-checkbox").change(function(){if($j("#event-share-checkbox").is(":checked")){$j("#acl-wrapper").show()}else{$j("#acl-wrapper").hide()}}).trigger("change");if(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head"){$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var selstr;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){selstr=$j(this).text();$j("#jot-perms-icon").removeClass("unlock").addClass("lock");$j("#jot-public").hide()});if(selstr==null){$j("#jot-perms-icon").removeClass("lock").addClass("unlock");$j("#jot-public").show()}}).trigger("change")}switch(window.autocompleteType){case"msg-header":var a=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(value,data){$j("#recip-complete").val(data)}});break;case"contacts-head":var a=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});a.setOptions({params:{type:"a"}});break;default:break}if(typeof window.AjaxUpload!="undefined"){switch(window.ajaxType){case"jot-header":var uploader=new window.AjaxUpload("wall-image-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){addeditortext(response);$j("#profile-rotator").hide()}});var file_uploader=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname,name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){addeditortext(response);$j("#profile-rotator").hide()}});break;case"msg-header":var uploader=new window.AjaxUpload("prvmail-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){tinyMCE.execCommand("mceInsertRawHTML",false,response);$j("#profile-rotator").hide()}});break;default:break}}});$j(function(){$j("nav").bind("nav-update",function(e,data){var elm=$j("#pending-update");var register=$j(data).find("register").text();if(register=="0"){register="";elm.hide()}else{elm.show()}elm.html(register)})});$j(function(){$j("#cnftheme").fancybox({width:800,autoDimensions:false,onStart:function(){var theme=$j("#id_theme :selected").val();var theme_mobile=$j("#id_theme_mobile :selected").val();$j("#cnftheme").attr("href",baseurl+"/admin/themes/"+theme)},onComplete:function(){$j("div#fancybox-content form").submit(function(e){var url=$j(this).attr("action");var data={};$j(this).find("input").each(function(){data[$j(this).attr("name")]=$j(this).val()});$j(this).find("select").each(function(){data[$j(this).attr("name")]=$j(this).children(":selected").val()});console.log(":)",url,data);$j.post(url,data,function(data){if(timer)clearTimeout(timer);NavUpdate();$j.fancybox.close()});return false})}})});function homeRedirect(){$j("html").fadeOut("slow",function(){window.location=baseurl+"/login"})}if(typeof window.photoEdit!="undefined"){$j(document).keydown(function(event){if(window.prevLink!=""){if(event.ctrlKey&&event.keyCode==37){event.preventDefault();window.location.href=window.prevLink}}if(window.nextLink!=""){if(event.ctrlKey&&event.keyCode==39){event.preventDefault();window.location.href=window.nextLink}}})}switch(window.ajaxType){case"jot-header":function jotGetLink(){reply=prompt(window.linkURL);if(reply&&reply.length){reply=bin2hex(reply);$j("#profile-rotator").show();$j.get("parse_url?binurl="+reply,function(data){addeditortext(data);$j("#profile-rotator").hide()})}}function linkdrop(event){var reply=event.dataTransfer.getData("text/uri-list");event.target.textContent=reply;event.preventDefault();if(reply&&reply.length){reply=bin2hex(reply);$j("#profile-rotator").show();$j.get("parse_url?binurl="+reply,function(data){if(!editor)$j("#profile-jot-text").val("");initEditor(function(){addeditortext(data);$j("#profile-rotator").hide()})})}}break;case"msg-header":case"wallmsg-header":function jotGetLink(){reply=prompt(window.linkURL);if(reply&&reply.length){$j("#profile-rotator").show();$j.get("parse_url?url="+reply,function(data){tinyMCE.execCommand("mceInsertRawHTML",false,data);$j("#profile-rotator").hide()})}}function linkdrop(event){var reply=event.dataTransfer.getData("text/uri-list");event.target.textContent=reply;event.preventDefault();if(reply&&reply.length){$j("#profile-rotator").show();$j.get("parse_url?url="+reply,function(data){tinyMCE.execCommand("mceInsertRawHTML",false,data);$j("#profile-rotator").hide()})}}break;default:break}function showEvent(eventid){$j.get(baseurl+"/events/?id="+eventid,function(data){$j.fancybox(data)})}function initCrop(){function onEndCrop(coords,dimensions){$("x1").value=coords.x1;$("y1").value=coords.y1;$("x2").value=coords.x2;$("y2").value=coords.y2;$("width").value=dimensions.width;$("height").value=dimensions.height}Event.observe(window,"load",function(){new Cropper.ImgWithPreview("croppa",{previewWrap:"previewWrap",minWidth:175,minHeight:175,maxWidth:640,maxHeight:640,ratioDim:{x:100,y:100},displayOnInit:true,onEndCrop:onEndCrop})})}function showNavMenu(menuID){if(window.navMenuTimeout[menuID+"-closing"]){window.navMenuTimeout[menuID+"-closing"]=false;clearTimeout(window.navMenuTimeout[menuID+"-timeout"])}else{window.navMenuTimeout[menuID+"-opening"]=true;window.navMenuTimeout[menuID+"-timeout"]=setTimeout(function(){$j(menuID).slideDown("fast").show();window.navMenuTimeout[menuID+"-opening"]=false},200)}}function hideNavMenu(menuID){if(window.navMenuTimeout[menuID+"-opening"]){window.navMenuTimeout[menuID+"-opening"]=false;clearTimeout(window.navMenuTimeout[menuID+"-timeout"])}else{window.navMenuTimeout[menuID+"-closing"]=true;window.navMenuTimeout[menuID+"-timeout"]=setTimeout(function(){$j(menuID).slideUp("fast");window.navMenuTimeout[menuID+"-closing"]=false},500)}}function insertFormatting(comment,BBcode,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==comment){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id);$j("#comment-edit-text-"+id).val(tmpStr)}textarea=document.getElementById("comment-edit-text-"+id);if(document.selection){textarea.focus();selected=document.selection.createRange();if(BBcode=="url"){selected.text="["+BBcode+"=http://]"+selected.text+"[/"+BBcode+"]"}else selected.text="["+BBcode+"]"+selected.text+"[/"+BBcode+"]"}else if(textarea.selectionStart||textarea.selectionStart=="0"){var start=textarea.selectionStart;var end=textarea.selectionEnd;if(BBcode=="url"){textarea.value=textarea.value.substring(0,start)+"["+BBcode+"=http://]"+textarea.value.substring(start,end)+"[/"+BBcode+"]"+textarea.value.substring(end,textarea.value.length)}else textarea.value=textarea.value.substring(0,start)+"["+BBcode+"]"+textarea.value.substring(start,end)+"[/"+BBcode+"]"+textarea.value.substring(end,textarea.value.length)}return true}function cmtBbOpen(id){$j("#comment-edit-bb-"+id).show()}function cmtBbClose(id){$j("#comment-edit-bb-"+id).hide()}function confirmDelete(){return confirm(window.delItem)}function commentOpen(obj,id){if(obj.value==window.commentEmptyText){obj.value="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");$j("#mod-cmnt-wrap-"+id).show();openMenu("comment-edit-submit-wrapper-"+id)}}function commentClose(obj,id){if(obj.value==""){obj.value=window.commentEmptyText;$j("#comment-edit-text-"+id).removeClass("comment-edit-text-full");$j("#comment-edit-text-"+id).addClass("comment-edit-text-empty");$j("#mod-cmnt-wrap-"+id).hide();closeMenu("comment-edit-submit-wrapper-"+id)}}function commentInsert(obj,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==window.commentEmptyText){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id)}var ins=$j(obj).html();ins=ins.replace("<","<");ins=ins.replace(">",">");ins=ins.replace("&","&");ins=ins.replace(""",'"');$j("#comment-edit-text-"+id).val(tmpStr+ins)}function qCommentInsert(obj,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==window.commentEmptyText){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id)}var ins=$j(obj).val();ins=ins.replace("<","<");ins=ins.replace(">",">");ins=ins.replace("&","&");ins=ins.replace(""",'"');$j("#comment-edit-text-"+id).val(tmpStr+ins);$j(obj).val("")}function enableOnUser(){if(editor)return;$j(this).val("");initEditor()}var editor=false;var textlen=0;var plaintext=window.editSelect;var ispublic=window.isPublic;function initEditor(cb){if(editor==false){$j("#profile-jot-text-loading").show();if(plaintext=="none"){$j("#profile-jot-text-loading").hide();$j("#profile-jot-text").css({height:200,color:"#000"});$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl");editor=true;$j("a#jot-perms-icon").fancybox({transitionIn:"none",transitionOut:"none"});$j(".jothidden").show();if(typeof cb!="undefined")cb();return}tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:window.editSelect,auto_focus:"profile-jot-text",plugins:"bbcode,paste,autoresize, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:true,paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,force_p_newlines:false,force_br_newlines:true,forced_root_block:"",convert_urls:false,content_css:window.baseURL+"/view/custom_tinymce.css",theme_advanced_path:false,file_browser_callback:"fcFileBrowser",setup:function(ed){cPopup=null;ed.onKeyDown.add(function(ed,e){if(cPopup!==null)cPopup.onkey(e)});ed.onKeyUp.add(function(ed,e){var txt=tinyMCE.activeEditor.getContent();match=txt.match(/@([^ \n]+)$/);if(match!==null){if(cPopup===null){cPopup=new ACPopup(this,baseurl+"/acl")}if(cPopup.ready&&match[1]!==cPopup.searchText)cPopup.search(match[1]);if(!cPopup.ready)cPopup=null}else{if(cPopup!==null){cPopup.close();cPopup=null}}textlen=txt.length;if(textlen!=0&&$j("#jot-perms-icon").is(".unlock")){$j("#profile-jot-desc").html(ispublic)}else{$j("#profile-jot-desc").html(" ")}if(textlen<=140){$j("#character-counter").removeClass("red");$j("#character-counter").removeClass("orange");$j("#character-counter").addClass("grey")}if(textlen>140&&textlen<=420){$j("#character-counter").removeClass("grey");$j("#character-counter").removeClass("red");$j("#character-counter").addClass("orange")}if(textlen>420){$j("#character-counter").removeClass("grey");$j("#character-counter").removeClass("orange");$j("#character-counter").addClass("red")}$j("#character-counter").text(textlen)});ed.onInit.add(function(ed){ed.pasteAsPlainText=true;$j("#profile-jot-text-loading").hide();$j(".jothidden").show();if(typeof cb!="undefined")cb()})}});editor=true;$j("a#jot-perms-icon").fancybox({transitionIn:"none",transitionOut:"none"})}else{if(typeof cb!="undefined")cb()}}function msgInitEditor(){if(plaintext!="none"){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:/(profile-jot-text|prvmail-text)/,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:true,paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,force_p_newlines:false,force_br_newlines:true,forced_root_block:"",convert_urls:false,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,setup:function(ed){ed.onInit.add(function(ed){ed.pasteAsPlainText=true;var editorId=ed.editorId;var textarea=$j("#"+editorId);if(typeof textarea.attr("tabindex")!="undefined"){$j("#"+editorId+"_ifr").attr("tabindex",textarea.attr("tabindex"));textarea.attr("tabindex",null)}})}})}else $j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function profInitEditor(){tinyMCE.init({theme:"advanced",mode:window.editSelect,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:true,paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,force_p_newlines:false,force_br_newlines:true,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,setup:function(ed){ed.onInit.add(function(ed){ed.pasteAsPlainText=true})}})}function eventInitEditor(){tinyMCE.init({theme:"advanced",mode:"textareas",plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:true,paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,force_p_newlines:false,force_br_newlines:true,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,setup:function(ed){ed.onInit.add(function(ed){ed.pasteAsPlainText=true})}})}function contactInitEditor(){tinyMCE.init({theme:"advanced",mode:window.editSelect,elements:"contact-edit-info",plugins:"bbcode",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_styles:"blockquote,code",gecko_spellcheck:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,force_p_newlines:false,force_br_newlines:true,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css"})}function wallInitEditor(){var plaintext=window.editSelect;if(plaintext!="none"){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:/(profile-jot-text|prvmail-text)/,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:true,paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,force_p_newlines:false,force_br_newlines:true,forced_root_block:"",convert_urls:false,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,setup:function(ed){ed.onInit.add(function(ed){ed.pasteAsPlainText=true;var editorId=ed.editorId;var textarea=$j("#"+editorId);if(typeof textarea.attr("tabindex")!="undefined"){$j("#"+editorId+"_ifr").attr("tabindex",textarea.attr("tabindex"));textarea.attr("tabindex",null)}})}})}else $j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function deleteCheckedItems(delID){if(confirm(window.delItems)){var checkedstr="";$j(delID).hide();$j(delID+"-rotator").show();$j(".item-select").each(function(){if($j(this).is(":checked")){if(checkedstr.length!=0){checkedstr=checkedstr+","+$j(this).val()}else{checkedstr=$j(this).val()}}});$j.post("item",{dropitems:checkedstr},function(data){window.location.reload()})}}function jotVideoURL(){reply=prompt(window.vidURL);if(reply&&reply.length){addeditortext("[video]"+reply+"[/video]")}}function jotAudioURL(){reply=prompt(window.audURL);if(reply&&reply.length){addeditortext("[audio]"+reply+"[/audio]")}}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val());if(reply&&reply.length){$j("#jot-location").val(reply)}}function jotShare(id){if($j("#jot-popup").length!=0)$j("#jot-popup").show();$j("#like-rotator-"+id).show();$j.get("share/"+id,function(data){if(!editor)$j("#profile-jot-text").val("");initEditor(function(){addeditortext(data);$j("#like-rotator-"+id).hide();$j(window).scrollTop(0)})})}function linkdropper(event){var linkFound=event.dataTransfer.types.contains("text/uri-list");if(linkFound)event.preventDefault()}function itemTag(id){reply=prompt(window.term);if(reply&&reply.length){reply=reply.replace("#","");if(reply.length){commentBusy=true;$j("body").css("cursor","wait");$j.get("tagger/"+id+"?term="+reply,NavUpdate);liking=1}}}function itemFiler(id){var bordercolor=$j("input").css("border-color");$j.get("filer/",function(data){$j.fancybox(data);$j("#id_term").keypress(function(){$j(this).css("border-color",bordercolor)});$j("#select_term").change(function(){$j("#id_term").css("border-color",bordercolor)});$j("#filer_save").click(function(e){e.preventDefault();reply=$j("#id_term").val();if(reply&&reply.length){commentBusy=true;$j("body").css("cursor","wait");$j.get("filer/"+id+"?term="+reply,NavUpdate);liking=1;$j.fancybox.close()}else{$j("#id_term").css("border-color","#FF0000")}return false})})}function jotClearLocation(){$j("#jot-coord").val("");$j("#profile-nolocation-wrapper").hide()}function addeditortext(data){if(plaintext=="none"){var currentText=$j("#profile-jot-text").val();$j("#profile-jot-text").val(currentText+data)}else tinyMCE.execCommand("mceInsertRawHTML",false,data)}if(typeof window.geoTag==="function")window.geoTag();
\ No newline at end of file
+$j(document).ready(function(){window.navMenuTimeout={"#network-menu-list-timeout":null,"#contacts-menu-list-timeout":null,"#system-menu-list-timeout":null,"#network-menu-list-opening":false,"#contacts-menu-list-opening":false,"#system-menu-list-opening":false,"#network-menu-list-closing":false,"#contacts-menu-list-closing":false,"#system-menu-list-closing":false};if(typeof window.aclInit!="undefined"&&typeof acl=="undefined"){acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID])}$j("#profile-jot-text").focus(enableOnUser);$j("#profile-jot-text").click(enableOnUser);$j(".nav-menu-list, .nav-menu-icon").hover(function(){showNavMenu($j(this).attr("point"))},function(){hideNavMenu($j(this).attr("point"))});$j(".group-edit-icon").hover(function(){$j(this).addClass("icon");$j(this).removeClass("iconspacer")},function(){$j(this).removeClass("icon");$j(this).addClass("iconspacer")});$j(".sidebar-group-element").hover(function(){id=$j(this).attr("id");$j("#edit-"+id).addClass("icon");$j("#edit-"+id).removeClass("iconspacer")},function(){id=$j(this).attr("id");$j("#edit-"+id).removeClass("icon");$j("#edit-"+id).addClass("iconspacer")});$j(".savedsearchdrop").hover(function(){$j(this).addClass("drop");$j(this).addClass("icon");$j(this).removeClass("iconspacer")},function(){$j(this).removeClass("drop");$j(this).removeClass("icon");$j(this).addClass("iconspacer")});$j(".savedsearchterm").hover(function(){id=$j(this).attr("id");$j("#drop-"+id).addClass("icon");$j("#drop-"+id).addClass("drophide");$j("#drop-"+id).removeClass("iconspacer")},function(){id=$j(this).attr("id");$j("#drop-"+id).removeClass("icon");$j("#drop-"+id).removeClass("drophide");$j("#drop-"+id).addClass("iconspacer")});if(window.autoCompleteType=="display-head"){$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl")}if(window.aclType=="event_head"){$j("#events-calendar").fullCalendar({events:baseurl+"/events/json/",header:{left:"prev,next today",center:"title",right:"month,agendaWeek,agendaDay"},timeFormat:"H(:mm)",eventClick:function(calEvent,jsEvent,view){showEvent(calEvent.id)},eventRender:function(event,element,view){if(event.item["author-name"]==null)return;switch(view.name){case"month":element.find(".fc-event-title").html("
{1} : {2}".format(event.item["author-avatar"],event.item["author-name"],event.title));break;case"agendaWeek":element.find(".fc-event-title").html("
{1}
{2}
{3}
".format(event.item["author-avatar"],event.item["author-name"],event.item.desc,event.item.location));break;case"agendaDay":element.find(".fc-event-title").html("
{1}
{2}
{3}
".format(event.item["author-avatar"],event.item["author-name"],event.item.desc,event.item.location));break}}});var args=location.href.replace(baseurl,"").split("/");if(args.length>=4){$j("#events-calendar").fullCalendar("gotoDate",args[2],args[3]-1)}var hash=location.hash.split("-");if(hash.length==2&&hash[0]=="#link")showEvent(hash[1])}$j("#event-share-checkbox").change(function(){if($j("#event-share-checkbox").is(":checked")){$j("#acl-wrapper").show()}else{$j("#acl-wrapper").hide()}}).trigger("change");if(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head"){$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var selstr;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){selstr=$j(this).text();$j("#jot-perms-icon").removeClass("unlock").addClass("lock");$j("#jot-public").hide()});if(selstr==null){$j("#jot-perms-icon").removeClass("lock").addClass("unlock");$j("#jot-public").show()}}).trigger("change")}switch(window.autocompleteType){case"msg-header":var a=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(value,data){$j("#recip-complete").val(data)}});break;case"contacts-head":var a=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});a.setOptions({params:{type:"a"}});break;default:break}if(typeof window.AjaxUpload!="undefined"){switch(window.ajaxType){case"jot-header":var uploader=new window.AjaxUpload("wall-image-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){addeditortext(response);$j("#profile-rotator").hide()}});var file_uploader=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname,name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){addeditortext(response);$j("#profile-rotator").hide()}});break;case"msg-header":var uploader=new window.AjaxUpload("prvmail-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){tinyMCE.execCommand("mceInsertRawHTML",false,response);$j("#profile-rotator").hide()}});break;default:break}}});$j(function(){$j("nav").bind("nav-update",function(e,data){var elm=$j("#pending-update");var register=$j(data).find("register").text();if(register=="0"){register="";elm.hide()}else{elm.show()}elm.html(register)})});$j(function(){$j("#cnftheme").fancybox({width:800,autoDimensions:false,onStart:function(){var theme=$j("#id_theme :selected").val();var theme_mobile=$j("#id_theme_mobile :selected").val();$j("#cnftheme").attr("href",baseurl+"/admin/themes/"+theme)},onComplete:function(){$j("div#fancybox-content form").submit(function(e){var url=$j(this).attr("action");var data={};$j(this).find("input").each(function(){data[$j(this).attr("name")]=$j(this).val()});$j(this).find("select").each(function(){data[$j(this).attr("name")]=$j(this).children(":selected").val()});console.log(":)",url,data);$j.post(url,data,function(data){if(timer)clearTimeout(timer);NavUpdate();$j.fancybox.close()});return false})}})});function homeRedirect(){$j("html").fadeOut("slow",function(){window.location=baseurl+"/login"})}if(typeof window.photoEdit!="undefined"){$j(document).keydown(function(event){if(window.prevLink!=""){if(event.ctrlKey&&event.keyCode==37){event.preventDefault();window.location.href=window.prevLink}}if(window.nextLink!=""){if(event.ctrlKey&&event.keyCode==39){event.preventDefault();window.location.href=window.nextLink}}})}switch(window.ajaxType){case"jot-header":function jotGetLink(){reply=prompt(window.linkURL);if(reply&&reply.length){reply=bin2hex(reply);$j("#profile-rotator").show();$j.get("parse_url?binurl="+reply,function(data){addeditortext(data);$j("#profile-rotator").hide()})}}function linkdrop(event){var reply=event.dataTransfer.getData("text/uri-list");event.target.textContent=reply;event.preventDefault();if(reply&&reply.length){reply=bin2hex(reply);$j("#profile-rotator").show();$j.get("parse_url?binurl="+reply,function(data){if(!editor)$j("#profile-jot-text").val("");initEditor(function(){addeditortext(data);$j("#profile-rotator").hide()})})}}break;case"msg-header":case"wallmsg-header":function jotGetLink(){reply=prompt(window.linkURL);if(reply&&reply.length){$j("#profile-rotator").show();$j.get("parse_url?url="+reply,function(data){tinyMCE.execCommand("mceInsertRawHTML",false,data);$j("#profile-rotator").hide()})}}function linkdrop(event){var reply=event.dataTransfer.getData("text/uri-list");event.target.textContent=reply;event.preventDefault();if(reply&&reply.length){$j("#profile-rotator").show();$j.get("parse_url?url="+reply,function(data){tinyMCE.execCommand("mceInsertRawHTML",false,data);$j("#profile-rotator").hide()})}}break;default:break}function showEvent(eventid){$j.get(baseurl+"/events/?id="+eventid,function(data){$j.fancybox(data)})}function initCrop(){function onEndCrop(coords,dimensions){$("x1").value=coords.x1;$("y1").value=coords.y1;$("x2").value=coords.x2;$("y2").value=coords.y2;$("width").value=dimensions.width;$("height").value=dimensions.height}Event.observe(window,"load",function(){new Cropper.ImgWithPreview("croppa",{previewWrap:"previewWrap",minWidth:175,minHeight:175,maxWidth:640,maxHeight:640,ratioDim:{x:100,y:100},displayOnInit:true,onEndCrop:onEndCrop})})}function showNavMenu(menuID){if(window.navMenuTimeout[menuID+"-closing"]){window.navMenuTimeout[menuID+"-closing"]=false;clearTimeout(window.navMenuTimeout[menuID+"-timeout"])}else{window.navMenuTimeout[menuID+"-opening"]=true;window.navMenuTimeout[menuID+"-timeout"]=setTimeout(function(){$j(menuID).slideDown("fast").show();window.navMenuTimeout[menuID+"-opening"]=false},200)}}function hideNavMenu(menuID){if(window.navMenuTimeout[menuID+"-opening"]){window.navMenuTimeout[menuID+"-opening"]=false;clearTimeout(window.navMenuTimeout[menuID+"-timeout"])}else{window.navMenuTimeout[menuID+"-closing"]=true;window.navMenuTimeout[menuID+"-timeout"]=setTimeout(function(){$j(menuID).slideUp("fast");window.navMenuTimeout[menuID+"-closing"]=false},500)}}function insertFormatting(comment,BBcode,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==comment){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id);$j("#comment-edit-text-"+id).val(tmpStr)}textarea=document.getElementById("comment-edit-text-"+id);if(document.selection){textarea.focus();selected=document.selection.createRange();if(BBcode=="url"){selected.text="["+BBcode+"=http://]"+selected.text+"[/"+BBcode+"]"}else selected.text="["+BBcode+"]"+selected.text+"[/"+BBcode+"]"}else if(textarea.selectionStart||textarea.selectionStart=="0"){var start=textarea.selectionStart;var end=textarea.selectionEnd;if(BBcode=="url"){textarea.value=textarea.value.substring(0,start)+"["+BBcode+"=http://]"+textarea.value.substring(start,end)+"[/"+BBcode+"]"+textarea.value.substring(end,textarea.value.length)}else textarea.value=textarea.value.substring(0,start)+"["+BBcode+"]"+textarea.value.substring(start,end)+"[/"+BBcode+"]"+textarea.value.substring(end,textarea.value.length)}return true}function cmtBbOpen(id){$j("#comment-edit-bb-"+id).show()}function cmtBbClose(id){$j("#comment-edit-bb-"+id).hide()}function confirmDelete(){return confirm(window.delItem)}function commentOpen(obj,id){if(obj.value==window.commentEmptyText){obj.value="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");$j("#mod-cmnt-wrap-"+id).show();openMenu("comment-edit-submit-wrapper-"+id)}}function commentClose(obj,id){if(obj.value==""){obj.value=window.commentEmptyText;$j("#comment-edit-text-"+id).removeClass("comment-edit-text-full");$j("#comment-edit-text-"+id).addClass("comment-edit-text-empty");$j("#mod-cmnt-wrap-"+id).hide();closeMenu("comment-edit-submit-wrapper-"+id)}}function commentInsert(obj,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==window.commentEmptyText){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id)}var ins=$j(obj).html();ins=ins.replace("<","<");ins=ins.replace(">",">");ins=ins.replace("&","&");ins=ins.replace(""",'"');$j("#comment-edit-text-"+id).val(tmpStr+ins)}function qCommentInsert(obj,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==window.commentEmptyText){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id)}var ins=$j(obj).val();ins=ins.replace("<","<");ins=ins.replace(">",">");ins=ins.replace("&","&");ins=ins.replace(""",'"');$j("#comment-edit-text-"+id).val(tmpStr+ins);$j(obj).val("")}function enableOnUser(){if(editor)return;$j(this).val("");initEditor()}var editor=false;var textlen=0;var plaintext=window.editSelect;var ispublic=window.isPublic;function initEditor(cb){if(editor==false){$j("#profile-jot-text-loading").show();if(plaintext=="none"){$j("#profile-jot-text-loading").hide();$j("#profile-jot-text").css({height:200,color:"#000"});$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl");editor=true;$j("a#jot-perms-icon").fancybox({transitionIn:"none",transitionOut:"none"});$j(".jothidden").show();if(typeof cb!="undefined")cb();return}tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:window.editSelect,auto_focus:"profile-jot-text",plugins:"bbcode,paste,autoresize, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:true,paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,forced_root_block:"div",convert_urls:false,content_css:window.baseURL+"/view/custom_tinymce.css",theme_advanced_path:false,file_browser_callback:"fcFileBrowser",setup:function(ed){cPopup=null;ed.onKeyDown.add(function(ed,e){if(cPopup!==null)cPopup.onkey(e)});ed.onKeyUp.add(function(ed,e){var txt=tinyMCE.activeEditor.getContent();match=txt.match(/@([^ \n]+)$/);if(match!==null){if(cPopup===null){cPopup=new ACPopup(this,baseurl+"/acl")}if(cPopup.ready&&match[1]!==cPopup.searchText)cPopup.search(match[1]);if(!cPopup.ready)cPopup=null}else{if(cPopup!==null){cPopup.close();cPopup=null}}textlen=txt.length;if(textlen!=0&&$j("#jot-perms-icon").is(".unlock")){$j("#profile-jot-desc").html(ispublic)}else{$j("#profile-jot-desc").html(" ")}if(textlen<=140){$j("#character-counter").removeClass("red");$j("#character-counter").removeClass("orange");$j("#character-counter").addClass("grey")}if(textlen>140&&textlen<=420){$j("#character-counter").removeClass("grey");$j("#character-counter").removeClass("red");$j("#character-counter").addClass("orange")}if(textlen>420){$j("#character-counter").removeClass("grey");$j("#character-counter").removeClass("orange");$j("#character-counter").addClass("red")}$j("#character-counter").text(textlen)});ed.onInit.add(function(ed){ed.pasteAsPlainText=true;$j("#profile-jot-text-loading").hide();$j(".jothidden").show();if(typeof cb!="undefined")cb()})}});editor=true;$j("a#jot-perms-icon").fancybox({transitionIn:"none",transitionOut:"none"})}else{if(typeof cb!="undefined")cb()}}function msgInitEditor(){if(plaintext!="none"){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:/(profile-jot-text|prvmail-text)/,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:true,paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,forced_root_block:"div",convert_urls:false,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,setup:function(ed){ed.onInit.add(function(ed){ed.pasteAsPlainText=true;var editorId=ed.editorId;var textarea=$j("#"+editorId);if(typeof textarea.attr("tabindex")!="undefined"){$j("#"+editorId+"_ifr").attr("tabindex",textarea.attr("tabindex"));textarea.attr("tabindex",null)}})}})}else $j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function profInitEditor(){tinyMCE.init({theme:"advanced",mode:window.editSelect,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:true,paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,forced_root_block:"div",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,setup:function(ed){ed.onInit.add(function(ed){ed.pasteAsPlainText=true})}})}function eventInitEditor(){tinyMCE.init({theme:"advanced",mode:"textareas",plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:true,paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,forced_root_block:"div",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,setup:function(ed){ed.onInit.add(function(ed){ed.pasteAsPlainText=true})}})}function contactInitEditor(){tinyMCE.init({theme:"advanced",mode:window.editSelect,elements:"contact-edit-info",plugins:"bbcode",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_styles:"blockquote,code",gecko_spellcheck:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,forced_root_block:"div",content_css:baseurl+"/view/custom_tinymce.css"})}function wallInitEditor(){var plaintext=window.editSelect;if(plaintext!="none"){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:/(profile-jot-text|prvmail-text)/,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:true,paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,forced_root_block:"div",convert_urls:false,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,setup:function(ed){ed.onInit.add(function(ed){ed.pasteAsPlainText=true;var editorId=ed.editorId;var textarea=$j("#"+editorId);if(typeof textarea.attr("tabindex")!="undefined"){$j("#"+editorId+"_ifr").attr("tabindex",textarea.attr("tabindex"));textarea.attr("tabindex",null)}})}})}else $j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function deleteCheckedItems(delID){if(confirm(window.delItems)){var checkedstr="";$j(delID).hide();$j(delID+"-rotator").show();$j(".item-select").each(function(){if($j(this).is(":checked")){if(checkedstr.length!=0){checkedstr=checkedstr+","+$j(this).val()}else{checkedstr=$j(this).val()}}});$j.post("item",{dropitems:checkedstr},function(data){window.location.reload()})}}function jotVideoURL(){reply=prompt(window.vidURL);if(reply&&reply.length){addeditortext("[video]"+reply+"[/video]")}}function jotAudioURL(){reply=prompt(window.audURL);if(reply&&reply.length){addeditortext("[audio]"+reply+"[/audio]")}}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val());if(reply&&reply.length){$j("#jot-location").val(reply)}}function jotShare(id){if($j("#jot-popup").length!=0)$j("#jot-popup").show();$j("#like-rotator-"+id).show();$j.get("share/"+id,function(data){if(!editor)$j("#profile-jot-text").val("");initEditor(function(){addeditortext(data);$j("#like-rotator-"+id).hide();$j(window).scrollTop(0)})})}function linkdropper(event){var linkFound=event.dataTransfer.types.contains("text/uri-list");if(linkFound)event.preventDefault()}function itemTag(id){reply=prompt(window.term);if(reply&&reply.length){reply=reply.replace("#","");if(reply.length){commentBusy=true;$j("body").css("cursor","wait");$j.get("tagger/"+id+"?term="+reply,NavUpdate);liking=1}}}function itemFiler(id){var bordercolor=$j("input").css("border-color");$j.get("filer/",function(data){$j.fancybox(data);$j("#id_term").keypress(function(){$j(this).css("border-color",bordercolor)});$j("#select_term").change(function(){$j("#id_term").css("border-color",bordercolor)});$j("#filer_save").click(function(e){e.preventDefault();reply=$j("#id_term").val();if(reply&&reply.length){commentBusy=true;$j("body").css("cursor","wait");$j.get("filer/"+id+"?term="+reply,NavUpdate);liking=1;$j.fancybox.close()}else{$j("#id_term").css("border-color","#FF0000")}return false})})}function jotClearLocation(){$j("#jot-coord").val("");$j("#profile-nolocation-wrapper").hide()}function addeditortext(data){if(plaintext=="none"){var currentText=$j("#profile-jot-text").val();$j("#profile-jot-text").val(currentText+data)}else tinyMCE.execCommand("mceInsertRawHTML",false,data)}if(typeof window.geoTag==="function")window.geoTag();
\ No newline at end of file
diff --git a/view/theme/frost/photos_upload.tpl b/view/theme/frost/photos_upload.tpl
index 2aa12a3c..1a41fcbd 100644
--- a/view/theme/frost/photos_upload.tpl
+++ b/view/theme/frost/photos_upload.tpl
@@ -19,6 +19,7 @@
+ $default_upload_box
@@ -41,9 +42,9 @@
- $uploader
+ $alt_uploader
- $default
+ $default_upload_submit
diff --git a/view/theme/frost/smarty3/comment_item.tpl b/view/theme/frost/smarty3/comment_item.tpl
index 2f341072..4b18abce 100644
--- a/view/theme/frost/smarty3/comment_item.tpl
+++ b/view/theme/frost/smarty3/comment_item.tpl
@@ -3,7 +3,7 @@
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
-
+ -->*}}
-
+ {{**}}
diff --git a/view/theme/frost/smarty3/contact_template.tpl b/view/theme/frost/smarty3/contact_template.tpl
index 64982960..7eba7efe 100644
--- a/view/theme/frost/smarty3/contact_template.tpl
+++ b/view/theme/frost/smarty3/contact_template.tpl
@@ -16,7 +16,13 @@
{{/if}}
diff --git a/view/theme/frost/smarty3/photos_upload.tpl b/view/theme/frost/smarty3/photos_upload.tpl
index 233672a3..4c829a29 100644
--- a/view/theme/frost/smarty3/photos_upload.tpl
+++ b/view/theme/frost/smarty3/photos_upload.tpl
@@ -24,6 +24,7 @@
+ {{$default_upload_box}}
@@ -46,9 +47,9 @@
- {{$uploader}}
+ {{$alt_uploader}}
- {{$default}}
+ {{$default_upload_submit}}
diff --git a/view/theme/quattro/comment_item.tpl b/view/theme/quattro/comment_item.tpl
index 3fbde163..293f93f9 100644
--- a/view/theme/quattro/comment_item.tpl
+++ b/view/theme/quattro/comment_item.tpl
@@ -3,7 +3,7 @@
-
+ {##}
diff --git a/view/theme/quattro/contact_template.tpl b/view/theme/quattro/contact_template.tpl
index b826acc6..485ee6ca 100644
--- a/view/theme/quattro/contact_template.tpl
+++ b/view/theme/quattro/contact_template.tpl
@@ -10,7 +10,13 @@
{{ if $contact.photo_menu }}
{{ endif }}
diff --git a/view/theme/quattro/smarty3/comment_item.tpl b/view/theme/quattro/smarty3/comment_item.tpl
index 1e6a6e69..eca1f14f 100644
--- a/view/theme/quattro/smarty3/comment_item.tpl
+++ b/view/theme/quattro/smarty3/comment_item.tpl
@@ -8,7 +8,7 @@
-
+ {{**}}
diff --git a/view/theme/quattro/smarty3/contact_template.tpl b/view/theme/quattro/smarty3/contact_template.tpl
index 9788388e..c74a513b 100644
--- a/view/theme/quattro/smarty3/contact_template.tpl
+++ b/view/theme/quattro/smarty3/contact_template.tpl
@@ -15,7 +15,13 @@
{{if $contact.photo_menu}}
{{/if}}
diff --git a/view/theme/smoothly/jot-header.tpl b/view/theme/smoothly/jot-header.tpl
index 0d89c1c6..b9f6149c 100644
--- a/view/theme/smoothly/jot-header.tpl
+++ b/view/theme/smoothly/jot-header.tpl
@@ -53,9 +53,9 @@ function initEditor(cb){
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
- force_p_newlines : false,
- force_br_newlines : true,
- forced_root_block : '',
+ //force_p_newlines : false,
+ //force_br_newlines : true,
+ forced_root_block : 'div',
convert_urls: false,
content_css: "$baseurl/view/custom_tinymce.css",
theme_advanced_path : false,
diff --git a/view/theme/smoothly/smarty3/jot-header.tpl b/view/theme/smoothly/smarty3/jot-header.tpl
index 48875e3f..85190823 100644
--- a/view/theme/smoothly/smarty3/jot-header.tpl
+++ b/view/theme/smoothly/smarty3/jot-header.tpl
@@ -58,9 +58,9 @@ function initEditor(cb){
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
- force_p_newlines : false,
- force_br_newlines : true,
- forced_root_block : '',
+ //force_p_newlines : false,
+ //force_br_newlines : true,
+ forced_root_block : 'div',
convert_urls: false,
content_css: "{{$baseurl}}/view/custom_tinymce.css",
theme_advanced_path : false,
diff --git a/view/theme/testbubble/comment_item.tpl b/view/theme/testbubble/comment_item.tpl
index 1054b23e..f7fe22dd 100644
--- a/view/theme/testbubble/comment_item.tpl
+++ b/view/theme/testbubble/comment_item.tpl
@@ -3,7 +3,7 @@
-
+ {##}
diff --git a/view/theme/testbubble/jot-header.tpl b/view/theme/testbubble/jot-header.tpl
index 79f489e7..da50716d 100644
--- a/view/theme/testbubble/jot-header.tpl
+++ b/view/theme/testbubble/jot-header.tpl
@@ -53,9 +53,9 @@ function initEditor(cb) {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
- force_p_newlines : false,
- force_br_newlines : true,
- forced_root_block : '',
+ //force_p_newlines : false,
+ //force_br_newlines : true,
+ forced_root_block : 'div',
convert_urls: false,
content_css: "$baseurl/view/custom_tinymce.css",
theme_advanced_path : false,
diff --git a/view/theme/testbubble/smarty3/comment_item.tpl b/view/theme/testbubble/smarty3/comment_item.tpl
index 95ea5afd..ef993e8f 100644
--- a/view/theme/testbubble/smarty3/comment_item.tpl
+++ b/view/theme/testbubble/smarty3/comment_item.tpl
@@ -8,7 +8,7 @@
-
+ {{**}}
diff --git a/view/theme/testbubble/smarty3/jot-header.tpl b/view/theme/testbubble/smarty3/jot-header.tpl
index 08aa748d..67deaf81 100644
--- a/view/theme/testbubble/smarty3/jot-header.tpl
+++ b/view/theme/testbubble/smarty3/jot-header.tpl
@@ -58,9 +58,9 @@ function initEditor(cb) {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
- force_p_newlines : false,
- force_br_newlines : true,
- forced_root_block : '',
+ //force_p_newlines : false,
+ //force_br_newlines : true,
+ forced_root_block : 'div',
convert_urls: false,
content_css: "{{$baseurl}}/view/custom_tinymce.css",
theme_advanced_path : false,
diff --git a/view/theme/vier/comment_item.tpl b/view/theme/vier/comment_item.tpl
index fd27e494..4e39c077 100644
--- a/view/theme/vier/comment_item.tpl
+++ b/view/theme/vier/comment_item.tpl
@@ -7,7 +7,7 @@
-
+ {##}
diff --git a/view/theme/vier/smarty3/comment_item.tpl b/view/theme/vier/smarty3/comment_item.tpl
index 45b3c689..b683f124 100644
--- a/view/theme/vier/smarty3/comment_item.tpl
+++ b/view/theme/vier/smarty3/comment_item.tpl
@@ -12,7 +12,7 @@
-
+ {{**}}
diff --git a/view/wallmsg-header.tpl b/view/wallmsg-header.tpl
index cb392257..200dfcbd 100644
--- a/view/wallmsg-header.tpl
+++ b/view/wallmsg-header.tpl
@@ -21,9 +21,9 @@ if(plaintext != 'none') {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
- force_p_newlines : false,
- force_br_newlines : true,
- forced_root_block : '',
+ //force_p_newlines : false,
+ //force_br_newlines : true,
+ forced_root_block : 'div',
convert_urls: false,
content_css: "$baseurl/view/custom_tinymce.css",
//Character count