diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/comment_item.tpl | 21 | ||||
| -rwxr-xr-x | view/tpl/jot-header.tpl | 125 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/prv_message.tpl | 5 | ||||
| -rwxr-xr-x | view/tpl/removeme.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/xchan_vcard.tpl | 2 |
6 files changed, 24 insertions, 133 deletions
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index 7b6113105..b8e2b4730 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -18,28 +18,33 @@ <ul class="comment-edit-bb-{{$id}}"> <li><i class="icon-bold shadow comment-icon" style="cursor: pointer;" title="{{$edbold}}" - onclick="insertFormatting('{{$comment}}','b', {{$id}});"></i></li> + onclick="insertbbcomment('{{$comment}}','b', {{$id}});"></i></li> <li><i class="icon-italic shadow comment-icon" style="cursor: pointer;" title="{{$editalic}}" - onclick="insertFormatting('{{$comment}}','i', {{$id}});"></i></li> + onclick="insertbbcomment('{{$comment}}','i', {{$id}});"></i></li> <li><i class="icon-underline shadow comment-icon" style="cursor: pointer;" title="{{$eduline}}" - onclick="insertFormatting('{{$comment}}','u', {{$id}});"></i></li> + onclick="insertbbcomment('{{$comment}}','u', {{$id}});"></i></li> <li><i class="icon-quote-left shadow comment-icon" style="cursor: pointer;" title="{{$edquote}}" - onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></i></li> + onclick="insertbbcomment('{{$comment}}','quote', {{$id}});"></i></li> <li><i class="icon-terminal shadow comment-icon" style="cursor: pointer;" title="{{$edcode}}" - onclick="insertFormatting('{{$comment}}','code', {{$id}});"></i></li> + onclick="insertbbcomment('{{$comment}}','code', {{$id}});"></i></li> <li><i class="icon-camera shadow comment-icon" style="cursor: pointer;" title="{{$edimg}}" - onclick="insertFormatting('{{$comment}}','img', {{$id}});"></i></li> + onclick="insertbbcomment('{{$comment}}','img', {{$id}});"></i></li> <li><i class="icon-link shadow comment-icon" style="cursor: pointer;" title="{{$edurl}}" - onclick="insertFormatting('{{$comment}}','url', {{$id}});"></i></li> + onclick="insertbbcomment('{{$comment}}','url', {{$id}});"></i></li> <li><i class="icon-facetime-video shadow comment-icon" style="cursor: pointer;" title="{{$edvideo}}" - onclick="insertFormatting('{{$comment}}','video', {{$id}});"></i></li> + onclick="insertbbcomment('{{$comment}}','video', {{$id}});"></i></li> + {{if $feature_encrypt}} + <li><i class="icon-key shadow comment-icon" + style="cursor: pointer;" title="{{$encrypt}}" + onclick="red_encrypt('{{$cipher}}','#comment-edit-text-' + '{{$id}}',''); return false;"></i></li> + {{/if}} </ul> <div class="comment-edit-bb-end"></div> <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen(this, {{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose(this,{{$id}});" >{{$comment}}</textarea> diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index c3e020619..1ceca04c6 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -120,6 +120,7 @@ function enableOnUser(){ onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, onComplete: function(file,response) { addeditortext(response); + $('#jot-media').val($('#jot-media').val() + response); $('#profile-rotator').spin(false); } } @@ -131,6 +132,7 @@ function enableOnUser(){ onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, onComplete: function(file,response) { addeditortext(response); + $('#jot-media').val($('#jot-media').val() + response); $('#profile-rotator').spin(false); } } @@ -292,129 +294,6 @@ function enableOnUser(){ } - function addhtmltext(data) { - data = h2b(data); - addeditortext(data); - } - - - function addeditortext(data) { - if(typeof tinyMCE !== "undefined") { - tinyMCE.execCommand('mceInsertRawHTML',false,data); - } - else { - var currentText = $("#profile-jot-text").val(); - $("#profile-jot-text").val(currentText + data); - } - } - - function h2b(s) { - var y = s; - function rep(re, str) { - y = y.replace(re,str); - }; - - rep(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]"); - rep(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]"); - rep(/<span style=\"color:(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]"); - rep(/<font>(.*?)<\/font>/gi,"$1"); - rep(/<img.*?width=\"(.*?)\".*?height=\"(.*?)\".*?src=\"(.*?)\".*?\/>/gi,"[img=$1x$2]$3[/img]"); - rep(/<img.*?height=\"(.*?)\".*?width=\"(.*?)\".*?src=\"(.*?)\".*?\/>/gi,"[img=$2x$1]$3[/img]"); - rep(/<img.*?src=\"(.*?)\".*?height=\"(.*?)\".*?width=\"(.*?)\".*?\/>/gi,"[img=$3x$2]$1[/img]"); - rep(/<img.*?src=\"(.*?)\".*?width=\"(.*?)\".*?height=\"(.*?)\".*?\/>/gi,"[img=$2x$3]$1[/img]"); - rep(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]"); - - - rep(/<ul class=\"listbullet\" style=\"list-style-type\: circle\;\">(.*?)<\/ul>/gi,"[list]$1[/list]"); - rep(/<ul class=\"listnone\" style=\"list-style-type\: none\;\">(.*?)<\/ul>/gi,"[list=]$1[/list]"); - rep(/<ul class=\"listdecimal\" style=\"list-style-type\: decimal\;\">(.*?)<\/ul>/gi,"[list=1]$1[/list]"); - rep(/<ul class=\"listlowerroman\" style=\"list-style-type\: lower-roman\;\">(.*?)<\/ul>/gi,"[list=i]$1[/list]"); - rep(/<ul class=\"listupperroman\" style=\"list-style-type\: upper-roman\;\">(.*?)<\/ul>/gi,"[list=I]$1[/list]"); - rep(/<ul class=\"listloweralpha\" style=\"list-style-type\: lower-alpha\;\">(.*?)<\/ul>/gi,"[list=a]$1[/list]"); - rep(/<ul class=\"listupperalpha\" style=\"list-style-type\: upper-alpha\;\">(.*?)<\/ul>/gi,"[list=A]$1[/list]"); - rep(/<li>(.*?)<\/li>/gi,"[li]$1[/li]"); - - rep(/<code>(.*?)<\/code>/gi,"[code]$1[/code]"); - rep(/<\/(strong|b)>/gi,"[/b]"); - rep(/<(strong|b)>/gi,"[b]"); - rep(/<\/(em|i)>/gi,"[/i]"); - rep(/<(em|i)>/gi,"[i]"); - rep(/<\/u>/gi,"[/u]"); - - - rep(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]"); - rep(/<u>/gi,"[u]"); - rep(/<blockquote[^>]*>/gi,"[quote]"); - rep(/<\/blockquote>/gi,"[/quote]"); - rep(/<hr \/>/gi,"[hr]"); - rep(/<br (.*?)\/>/gi,"\n"); - rep(/<br\/>/gi,"\n"); - rep(/<br>/gi,"\n"); - rep(/<p>/gi,""); - rep(/<\/p>/gi,"\n"); - rep(/ /gi," "); - rep(/"/gi,"\""); - rep(/</gi,"<"); - rep(/>/gi,">"); - rep(/&/gi,"&"); - - return y; - }; - - - function b2h(s) { - var y = s; - function rep(re, str) { - y = y.replace(re,str); - }; - - rep(/\&/gi,"&"); - rep(/\</gi,"<"); - rep(/\>/gi,">"); - rep(/\"/gi,"""); - - rep(/\n/gi,"<br />"); - rep(/\[b\]/gi,"<strong>"); - rep(/\[\/b\]/gi,"</strong>"); - rep(/\[i\]/gi,"<em>"); - rep(/\[\/i\]/gi,"</em>"); - rep(/\[u\]/gi,"<u>"); - rep(/\[\/u\]/gi,"</u>"); - rep(/\[hr\]/gi,"<hr />"); - rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"<a href=\"$1\">$2</a>"); - rep(/\[url\](.*?)\[\/url\]/gi,"<a href=\"$1\">$1</a>"); - rep(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,"<img width=\"$1\" height=\"$2\" src=\"$3\" />"); - rep(/\[img\](.*?)\[\/img\]/gi,"<img src=\"$1\" />"); - - // FIXME - add zid - rep(/\[zrl=([^\]]+)\](.*?)\[\/zrl\]/gi,"<a href=\"$1\">$2</a>"); - rep(/\[zrl\](.*?)\[\/zrl\]/gi,"<a href=\"$1\">$1</a>"); - rep(/\[zmg=(.*?)x(.*?)\](.*?)\[\/zmg\]/gi,"<img width=\"$1\" height=\"$2\" src=\"$3\" />"); - rep(/\[zmg\](.*?)\[\/zmg\]/gi,"<img src=\"$1\" />"); - - rep(/\[list\](.*?)\[\/list\]/gi, '<ul class="listbullet" style="list-style-type: circle;">$1</ul>'); - rep(/\[list=\](.*?)\[\/list\]/gi, '<ul class="listnone" style="list-style-type: none;">$1</ul>'); - rep(/\[list=1\](.*?)\[\/list\]/gi, '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>'); - rep(/\[list=i\](.*?)\[\/list\]/gi,'<ul class="listlowerroman" style="list-style-type: lower-roman;">$1</ul>'); - rep(/\[list=I\](.*?)\[\/list\]/gi, '<ul class="listupperroman" style="list-style-type: upper-roman;">$1</ul>'); - rep(/\[list=a\](.*?)\[\/list\]/gi, '<ul class="listloweralpha" style="list-style-type: lower-alpha;">$1</ul>'); - rep(/\[list=A\](.*?)\[\/list\]/gi, '<ul class="listupperalpha" style="list-style-type: upper-alpha;">$1</ul>'); - rep(/\[li\](.*?)\[\/li\]/gi, '<li>$1</li>'); - rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"<span style=\"color: $1;\">$2</span>"); - rep(/\[size=(.*?)\](.*?)\[\/size\]/gi,"<span style=\"font-size: $1;\">$2</span>"); - rep(/\[code\](.*?)\[\/code\]/gi,"<code>$1</code>"); - rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"<blockquote>$1</blockquote>"); - - rep(/\[video\](.*?)\[\/video\]/gi,"<a href=\"$1\">$1</a>"); - rep(/\[audio\](.*?)\[\/audio\]/gi,"<a href=\"$1\">$1</a>"); - - rep(/\[\&\;([#a-z0-9]+)\;\]/gi,'&$1;'); - - rep(/\<(.*?)(src|href)=\"[^hfm](.*?)\>/gi,'<$1$2="">'); - - return y; - }; - {{$geotag}} diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 924f7d9bc..ef91f45be 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -6,6 +6,8 @@ <input type="hidden" name="return" value="{{$return_path}}" /> <input type="hidden" name="location" id="jot-location" value="{{$defloc}}" /> <input type="hidden" name="expire" id="jot-expire" value="{{$defexpire}}" /> + <input type="hidden" name="media_str" id="jot-media" value="" /> + <input type="hidden" name="source" id="jot-source" value="{{$source}}" /> <input type="hidden" name="coord" id="jot-coord" value="" /> <input type="hidden" name="post_id" value="{{$post_id}}" /> <input type="hidden" name="webpage" value="{{$webpage}}" /> diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index 621f56be7..b7654dc2d 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -15,6 +15,7 @@ {{/if}} <input type="hidden" id="inp-prvmail-expires" name="expires" value="{{$defexpire}}" /> +<input type="hidden" name="media_str" id="jot-media" value="" /> <div id="prvmail-subject-label">{{$subject}}</div> <input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" /> @@ -40,7 +41,9 @@ <div id="prvmail-expire-wrapper" style="display: {{$feature_expire}};" > <i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="prvmailGetExpiry();return false;"></i> </div> - + <div id="prvmail-encrypt-wrapper" style="display: {{$feature_encrypt}};" > + <i id="prvmail-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;"></i> + </div> <div id="prvmail-rotator-wrapper" > <img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /> diff --git a/view/tpl/removeme.tpl b/view/tpl/removeme.tpl index 496f91ff5..c42eaf0e1 100755 --- a/view/tpl/removeme.tpl +++ b/view/tpl/removeme.tpl @@ -13,6 +13,8 @@ </div> <div id="remove-account-pass-end"></div> +{{include file="field_checkbox.tpl" field=$global}} + <input type="submit" name="submit" value="{{$submit}}" /> </form> diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl index ac2eaf7ae..929965727 100755 --- a/view/tpl/xchan_vcard.tpl +++ b/view/tpl/xchan_vcard.tpl @@ -1,6 +1,6 @@ <div class="vcard"> <div class="fn">{{$name}}</div> -<div id="profile-photo-wrapper"><img class="vcard-photo photo" src="{{$photo}}" alt="name" /></div> +<div id="profile-photo-wrapper"><img class="vcard-photo photo" src="{{$photo}}" alt="{{$name}}" /></div> </div> |