aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--view/jot-header.tpl3
-rw-r--r--view/theme/dispy/jot-header.tpl3
-rw-r--r--view/theme/testbubble/jot-header.tpl54
-rw-r--r--view/theme/testbubble/jot.tpl3
-rw-r--r--view/theme/testbubble/mail_head.tpl6
5 files changed, 39 insertions, 30 deletions
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 9ded3e9b4..81d7d6d91 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -222,8 +222,9 @@ function initEditor(cb){
event.target.textContent = reply;
event.preventDefault();
if(reply && reply.length) {
+ reply = bin2hex(reply);
$('#profile-rotator').show();
- $.get('parse_url?url=' + reply, function(data) {
+ $.get('parse_url?binurl=' + reply, function(data) {
if (!editor) $("#profile-jot-text").val("");
initEditor(function(){
tinyMCE.execCommand('mceInsertRawHTML',false,data);
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 79b10fd40..7a1012230 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -229,8 +229,9 @@ function initEditor(cb) {
event.target.textContent = reply;
event.preventDefault();
if(reply && reply.length) {
+ reply = bin2hex(reply);
$('#profile-rotator').show();
- $.get('parse_url?url=' + reply, function(data) {
+ $.get('parse_url?binurl=' + reply, function(data) {
if (!editor) $("#profile-jot-text").val("");
initEditor(function(){
tinyMCE.execCommand('mceInsertRawHTML',false,data);
diff --git a/view/theme/testbubble/jot-header.tpl b/view/theme/testbubble/jot-header.tpl
index 0093bf82a..5ada1fdf8 100644
--- a/view/theme/testbubble/jot-header.tpl
+++ b/view/theme/testbubble/jot-header.tpl
@@ -32,16 +32,37 @@ function initEditor(cb) {
content_css: "$baseurl/view/custom_tinymce.css",
theme_advanced_path : false,
setup : function(ed) {
- //Character count
- ed.onKeyUp.add(function(ed, e) {
- var txt = tinyMCE.activeEditor.getContent();
- textlen = txt.length;
- if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
- $('#profile-jot-desc').html(ispublic);
- }
- else {
- $('#profile-jot-desc').html(' ');
- }
+ 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 && $('#jot-perms-icon').is('.unlock')) {
+ $('#profile-jot-desc').html(ispublic);
+ }
+ else {
+ $('#profile-jot-desc').html(' ');
+ }
+
+ //Character count
if(textlen <= 140) {
$('#character-counter').removeClass('red');
@@ -67,7 +88,6 @@ function initEditor(cb) {
$("#profile-upload-wrapper").show();
$("#profile-attach-wrapper").show();
$("#profile-link-wrapper").show();
- $("#profile-youtube-wrapper").show();
$("#profile-video-wrapper").show();
$("#profile-audio-wrapper").show();
$("#profile-location-wrapper").show();
@@ -163,20 +183,13 @@ function initEditor(cb) {
if(reply && reply.length) {
reply = bin2hex(reply);
$('#profile-rotator').show();
- $.get('parse_url?url=' + reply, function(data) {
+ $.get('parse_url?binurl=' + reply, function(data) {
tinyMCE.execCommand('mceInsertRawHTML',false,data);
$('#profile-rotator').hide();
});
}
}
- function jotGetVideo() {
- reply = prompt("$utubeurl");
- if(reply && reply.length) {
- tinyMCE.execCommand('mceInsertRawHTML',false,'[youtube]' + reply + '[/youtube]');
- }
- }
-
function jotVideoURL() {
reply = prompt("$vidurl");
if(reply && reply.length) {
@@ -229,8 +242,9 @@ function initEditor(cb) {
event.target.textContent = reply;
event.preventDefault();
if(reply && reply.length) {
+ reply = bin2hex(reply);
$('#profile-rotator').show();
- $.get('parse_url?url=' + reply, function(data) {
+ $.get('parse_url?binurl=' + reply, function(data) {
if (!editor) $("#profile-jot-text").val("");
initEditor(function(){
tinyMCE.execCommand('mceInsertRawHTML',false,data);
diff --git a/view/theme/testbubble/jot.tpl b/view/theme/testbubble/jot.tpl
index d60e8adc2..e0e864572 100644
--- a/view/theme/testbubble/jot.tpl
+++ b/view/theme/testbubble/jot.tpl
@@ -30,9 +30,6 @@
<div id="profile-link-wrapper" class="jot-tool" style="display: none;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
<a id="profile-link" class="icon border link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
</div>
- <div id="profile-youtube-wrapper" class="jot-tool" style="display: none;" >
- <a id="profile-youtube" class="icon border youtube" title="$youtube" onclick="jotGetVideo(); return false;"></a>
- </div>
<div id="profile-video-wrapper" class="jot-tool" style="display: none;" >
<a id="profile-video" class="icon border video" title="$video" onclick="jotVideoURL(); return false;"></a>
</div>
diff --git a/view/theme/testbubble/mail_head.tpl b/view/theme/testbubble/mail_head.tpl
index 2a4596cd6..afb65f537 100644
--- a/view/theme/testbubble/mail_head.tpl
+++ b/view/theme/testbubble/mail_head.tpl
@@ -1,7 +1,3 @@
<h3>$messages</h3>
-<ul class="tabs-wrapper">
-<li><a href="message" class="tabs button {{if $activetab==inbox}}active{{endif}}">$inbox</a></li>
-<li><a href="message/sent" class="tabs button {{if $activetab==sent}}active{{endif}}">$outbox</a></li>
-<li><a href="message/new" class="tabs button {{if $activetab==new}}active{{endif}}">$new</a></li>
-</ul>
+$tab_content
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 23:42:54 +0000