diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/conv_item.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/dir_sort_links.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/head.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/jot-header.tpl | 129 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 9 | ||||
| -rwxr-xr-x | view/tpl/js_strings.tpl | 16 | ||||
| -rwxr-xr-x | view/tpl/msg-header.tpl | 7 | ||||
| -rwxr-xr-x | view/tpl/peoplefind.tpl | 18 | ||||
| -rwxr-xr-x | view/tpl/photo_top.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/prv_message.tpl | 9 | ||||
| -rw-r--r-- | view/tpl/safesearch.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/search_item.tpl | 3 |
12 files changed, 178 insertions, 28 deletions
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 095bd0df3..781746b4b 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -39,7 +39,7 @@ <div class="wall-item-author"> <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.via}} <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}<br /> - <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i> {{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div> + <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i> {{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div> </div> <div class="wall-item-content" id="wall-item-content-{{$item.id}}" > <div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div> @@ -89,7 +89,7 @@ <div id="like-rotator-{{$item.id}}" class="like-rotator"></div> <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" > - {{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ><i class="icon-remove drop-icons"></i></a>{{/if}} + {{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ><i class="icon-remove drop-icons item-tool"></i></a>{{/if}} </div> {{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}} <div class="wall-item-delete-end"></div> diff --git a/view/tpl/dir_sort_links.tpl b/view/tpl/dir_sort_links.tpl index 58498e4d8..d78aec1f5 100644 --- a/view/tpl/dir_sort_links.tpl +++ b/view/tpl/dir_sort_links.tpl @@ -1,6 +1,6 @@ <div class="widget" id="dir_sort_links"> <h3>{{$header}}</h3> -<a href="directory?f=&order=">{{$normal}}</a><br /> +<a href="directory?f=&order=normal">{{$normal}}</a><br /> <a href="directory?f=&order=reverse">{{$reverse}}</a><br /> <a href="directory?f=&order=date">{{$date}}</a><br /> </div> diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index 4211eeab3..eb4c6c2ad 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -23,6 +23,7 @@ var updateInterval = {{$update_interval}}; var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}}; + var zid = {{if $zid}}'{{$zid}}'{{else}}null{{/if}}; </script> diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 810ec866f..c3e020619 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -191,6 +191,13 @@ function enableOnUser(){ } } + function jotGetExpiry() { + reply = prompt("{{$expirewhen}}", $('#jot-expire').val()); + if(reply && reply.length) { + $('#jot-expire').val(reply); + } + } + function jotShare(id) { if ($('#jot-popup').length != 0) $('#jot-popup').show(); @@ -284,15 +291,131 @@ function enableOnUser(){ $('#profile-nolocation-wrapper').hide(); } + + function addhtmltext(data) { + data = h2b(data); + addeditortext(data); + } + + function addeditortext(data) { - if(plaintext == 'none') { + if(typeof tinyMCE !== "undefined") { + tinyMCE.execCommand('mceInsertRawHTML',false,data); + } + else { var currentText = $("#profile-jot-text").val(); $("#profile-jot-text").val(currentText + data); } - else - tinyMCE.execCommand('mceInsertRawHTML',false,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}} </script> diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 12978038c..924f7d9bc 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -5,6 +5,7 @@ <input type="hidden" name="profile_uid" value="{{$profile_uid}}" /> <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="coord" id="jot-coord" value="" /> <input type="hidden" name="post_id" value="{{$post_id}}" /> <input type="hidden" name="webpage" value="{{$webpage}}" /> @@ -50,6 +51,14 @@ <div id="profile-nolocation-wrapper" style="display: none;" > <i id="profile-nolocation" class="icon-circle-blank jot-icons" title="{{$noloc}}" onclick="jotClearLocation();return false;"></i> </div> + <div id="profile-expire-wrapper" style="display: {{$feature_expire}};" > + <i id="profile-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="jotGetExpiry();return false;"></i> + </div> + <div id="profile-encrypt-wrapper" style="display: {{$feature_encrypt}};" > + <i id="profile-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"></i> + </div> + + <div id="profile-rotator-wrapper" style="display: {{$visitor}};" > <div id="profile-rotator"></div> </div> diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index b61c69b90..144ecb17c 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -2,13 +2,15 @@ var aStr = { - 'delitem' : '{{$delitem}}', - 'comment' : '{{$comment}}', - 'showmore' : '{{$showmore}}', - 'showfewer' : '{{$showfewer}}', - 'pwshort' : '{{$pwshort}}', - 'pwnomatch' : '{{$pwnomatch}}', - 'everybody' : '{{$everybody}}', + 'delitem' : '{{$delitem}}', + 'comment' : '{{$comment}}', + 'showmore' : '{{$showmore}}', + 'showfewer' : '{{$showfewer}}', + 'pwshort' : '{{$pwshort}}', + 'pwnomatch' : '{{$pwnomatch}}', + 'everybody' : '{{$everybody}}', + 'passphrase' : '{{$passphrase}}', + 'passhint' : '{{$passhint}}', 't01' : {{$t01}}, 't02' : {{$t02}}, diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index 5e2597605..79f9e23c1 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -85,6 +85,13 @@ else } } + function prvmailGetExpiry() { + reply = prompt("{{$expireswhen}}", $('#inp-prvmail-expires').val()); + if(reply && reply.length) { + $('#inp-prvmail-expires').val(reply); + } + } + function linkdropper(event) { var linkFound = event.dataTransfer.types.contains("text/uri-list"); if(linkFound) diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index c3cbb064b..aef341d41 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -1,16 +1,14 @@ <div id="peoplefind-sidebar" class="widget"> <h3>{{$findpeople}}</h3> - <div id="peoplefind-desc">{{$desc}}</div> + {{$desc}} <form action="directory" method="post" /> - <input id="side-peoplefind-url" type="text" name="search" size="24" title="{{$hint}}" /><input id="side-peoplefind-submit" type="submit" name="submit" value="{{$findthem}}" /> + <input class="icon-search" id="side-peoplefind-url" type="text" name="search" size="24" title="{{$hint}}" placeholder=""/> + <input id="side-peoplefind-submit" type="submit" name="submit" value="{{$findthem}}" /> </form> - {{if $similar}} - <div class="side-link" id="side-match-link"><a href="match" >{{$similar}}</a></div> - {{/if}} - <div class="side-link" id="side-suggest-link"><a href="suggest" >{{$suggest}}</a></div> - <div class="side-link" id="side-random-profile-link" ><a href="randprof" >{{$random}}</a></div> - {{if $inv}} - <div class="side-link" id="side-invite-link" ><a href="invite" >{{$inv}}</a></div> - {{/if}} + <br /> + {{if $similar}}<a href="match" >{{$similar}}</a><br />{{/if}} + <a href="suggest" >{{$suggest}}</a><br /> + <a href="randprof" >{{$random}}</a><br /> + {{if $inv}}<a href="invite" >{{$inv}}</a>{{/if}} </div> diff --git a/view/tpl/photo_top.tpl b/view/tpl/photo_top.tpl index 902f74232..944928f85 100755 --- a/view/tpl/photo_top.tpl +++ b/view/tpl/photo_top.tpl @@ -1,6 +1,6 @@ -<div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-{{$photo.id}}"> +<div class="photo-top-image-wrapper lframe {{$photo.twist}}" id="photo-top-image-wrapper-{{$photo.id}}"> <a href="{{$photo.link}}" class="photo-top-photo-link" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}"> - <img src="{{$photo.src}}" alt="{{$photo.alt}}" title="{{$photo.title}}" class="photo-top-photo{{$photo.twist}}" id="photo-top-photo-{{$photo.id}}" /> + <img src="{{$photo.src}}" alt="{{$photo.alt}}" title="{{$photo.title}}" class="photo-top-photo" id="photo-top-photo-{{$photo.id}}" /> </a> <div class="photo-top-album-name"><a href="{{$photo.album.link}}" class="photo-top-album-link" title="{{$photo.album.alt}}" >{{$photo.album.name}}</a></div> </div> diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index d65bc3570..621f56be7 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -14,6 +14,8 @@ {{$select}} {{/if}} +<input type="hidden" id="inp-prvmail-expires" name="expires" value="{{$defexpire}}" /> + <div id="prvmail-subject-label">{{$subject}}</div> <input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" /> @@ -31,10 +33,15 @@ <i id="prvmail-attach" class="icon-paper-clip jot-icons" title="{{$attach}}"></i> </div> - <div id="prvmail-link-wrapper" > <i id="prvmail-link" class="icon-link jot-icons" title="{{$insert}}" onclick="jotGetLink(); return false;"></i> </div> + + <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-rotator-wrapper" > <img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /> </div> diff --git a/view/tpl/safesearch.tpl b/view/tpl/safesearch.tpl new file mode 100644 index 000000000..e0b2ab538 --- /dev/null +++ b/view/tpl/safesearch.tpl @@ -0,0 +1,4 @@ +<div id="directory_safemode" class="widget"> +<h3>{{$safemode}}</h3> +<a href="toggle_safesearch">{{$toggle}}</a> +</div> diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index 5953522dc..853bbfdcd 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -24,8 +24,7 @@ </div> <div class="wall-item-author"> <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a><br /> - <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i> {{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div> - + <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i> {{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div> </div> <div class="wall-item-content" id="wall-item-content-{{$item.id}}" > <div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div> |