From 3149e3cd3efc62bda255a49324c9292b7a4dd993 Mon Sep 17 00:00:00 2001 From: zottel Date: Mon, 30 Jan 2012 13:33:25 -0800 Subject: testbubble fix: tools for wall-to-wall items now appear at the bottom where they should be --- view/theme/testbubble/wallwall_item.tpl | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'view/theme/testbubble') diff --git a/view/theme/testbubble/wallwall_item.tpl b/view/theme/testbubble/wallwall_item.tpl index 015e62f3e..e29b66c57 100755 --- a/view/theme/testbubble/wallwall_item.tpl +++ b/view/theme/testbubble/wallwall_item.tpl @@ -26,6 +26,17 @@ {{ if $lock }}
$lock
{{ else }}
{{ endif }} +
+
$title
+
+
$body +
+ {{ for $tags as $tag }} + $tag + {{ endfor }} +
+
+
{{ if $vote }} -
-
$title
-
-
$body -
- {{ for $tags as $tag }} - $tag - {{ endfor }} -
-
-
$name
$ago
-- cgit v1.2.3 From c6cdad946eac99ced15cd8fa294ab0fdaa05f3a5 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 7 Feb 2012 00:13:16 -0800 Subject: more fixes for textmode --- view/theme/testbubble/jot-header.tpl | 52 +++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 7 deletions(-) (limited to 'view/theme/testbubble') diff --git a/view/theme/testbubble/jot-header.tpl b/view/theme/testbubble/jot-header.tpl index 0d9a824f7..b44ea78fd 100755 --- a/view/theme/testbubble/jot-header.tpl +++ b/view/theme/testbubble/jot-header.tpl @@ -4,10 +4,38 @@ var editor=false; var textlen = 0; +var plaintext = '$editselect'; function initEditor(cb) { if (editor==false) { $("#profile-jot-text-loading").show(); + if(plaintext == 'none') { + $("#profile-jot-text-loading").hide(); + $("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); + $(".jothidden").show(); + editor = true; + $("a#jot-perms-icon").fancybox({ + 'transitionIn' : 'elastic', + 'transitionOut' : 'elastic' + }); + $("#profile-jot-submit-wrapper").show(); + {{ if $newpost }} + $("#profile-upload-wrapper").show(); + $("#profile-attach-wrapper").show(); + $("#profile-link-wrapper").show(); + $("#profile-video-wrapper").show(); + $("#profile-audio-wrapper").show(); + $("#profile-location-wrapper").show(); + $("#profile-nolocation-wrapper").show(); + $("#profile-title-wrapper").show(); + $("#profile-jot-plugin-wrapper").show(); + $("#jot-preview-link").show(); + {{ endif }} + + + if (typeof cb!="undefined") cb(); + return; + } tinyMCE.init({ theme : "advanced", mode : "specific_textareas", @@ -132,7 +160,7 @@ function initEditor(cb) { name: 'userfile', onSubmit: function(file,ext) { $('#profile-rotator').show(); }, onComplete: function(file,response) { - tinyMCE.execCommand('mceInsertRawHTML',false,response); + addeditortext(response); $('#profile-rotator').hide(); } } @@ -143,7 +171,7 @@ function initEditor(cb) { name: 'userfile', onSubmit: function(file,ext) { $('#profile-rotator').show(); }, onComplete: function(file,response) { - tinyMCE.execCommand('mceInsertRawHTML',false,response); + addeditortext(response); $('#profile-rotator').hide(); } } @@ -190,7 +218,7 @@ function initEditor(cb) { reply = bin2hex(reply); $('#profile-rotator').show(); $.get('parse_url?binurl=' + reply, function(data) { - tinyMCE.execCommand('mceInsertRawHTML',false,data); + addeditortext(data); $('#profile-rotator').hide(); }); } @@ -199,14 +227,14 @@ function initEditor(cb) { function jotVideoURL() { reply = prompt("$vidurl"); if(reply && reply.length) { - tinyMCE.execCommand('mceInsertRawHTML',false,'[video]' + reply + '[/video]'); + addeditortext('[video]' + reply + '[/video]'); } } function jotAudioURL() { reply = prompt("$audurl"); if(reply && reply.length) { - tinyMCE.execCommand('mceInsertRawHTML',false,'[audio]' + reply + '[/audio]'); + addeditortext('[audio]' + reply + '[/audio]'); } } @@ -230,7 +258,7 @@ function initEditor(cb) { $.get('share/' + id, function(data) { if (!editor) $("#profile-jot-text").val(""); initEditor(function(){ - tinyMCE.execCommand('mceInsertRawHTML',false,data); + addeditortext(data); $('#like-rotator-' + id).hide(); $(window).scrollTop(0); }); @@ -253,7 +281,7 @@ function initEditor(cb) { $.get('parse_url?binurl=' + reply, function(data) { if (!editor) $("#profile-jot-text").val(""); initEditor(function(){ - tinyMCE.execCommand('mceInsertRawHTML',false,data); + addeditortext(data); $('#profile-rotator').hide(); }); }); @@ -282,6 +310,16 @@ function initEditor(cb) { $('#profile-nolocation-wrapper').hide(); } + function addeditortext(data) { + if(plaintext == 'none') { + var currentText = $("#profile-jot-text").val(); + $("#profile-jot-text").val(currentText + data); + } + else + tinyMCE.execCommand('mceInsertRawHTML',false,data); + } + + $geotag -- cgit v1.2.3 From bcad629633c27594dfe2b0af5540d6f028011e85 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 13 Feb 2012 18:28:51 -0800 Subject: more stray quotes --- view/theme/testbubble/wall_item.tpl | 2 +- view/theme/testbubble/wallwall_item.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'view/theme/testbubble') diff --git a/view/theme/testbubble/wall_item.tpl b/view/theme/testbubble/wall_item.tpl index 4fe819f4b..2b0e6740a 100755 --- a/view/theme/testbubble/wall_item.tpl +++ b/view/theme/testbubble/wall_item.tpl @@ -39,7 +39,7 @@ {{ endif }} diff --git a/view/theme/testbubble/wallwall_item.tpl b/view/theme/testbubble/wallwall_item.tpl index e29b66c57..cd4def7fc 100755 --- a/view/theme/testbubble/wallwall_item.tpl +++ b/view/theme/testbubble/wallwall_item.tpl @@ -42,7 +42,7 @@ {{ endif }} -- cgit v1.2.3 From b1d31aca519bf7ca99420ad99ccd9575cc24455f Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 15 Feb 2012 18:13:41 -0800 Subject: quick comments --- view/theme/testbubble/comment_item.tpl | 7 +++++++ view/theme/testbubble/style.css | 9 +++++++++ 2 files changed, 16 insertions(+) (limited to 'view/theme/testbubble') diff --git a/view/theme/testbubble/comment_item.tpl b/view/theme/testbubble/comment_item.tpl index cad572f4e..bc75eb1a6 100755 --- a/view/theme/testbubble/comment_item.tpl +++ b/view/theme/testbubble/comment_item.tpl @@ -11,6 +11,13 @@ $mytitle
+ {{ if $qcomment }} + {{ for $qcomment as $qc }} + $qc +   + {{ endfor }} + {{ endif }} +
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css index 118fc2e7c..fcb7bea7a 100755 --- a/view/theme/testbubble/style.css +++ b/view/theme/testbubble/style.css @@ -3259,3 +3259,12 @@ ul.menu-popup { background-color:#b20202; order-bottom: none; } + +.qcomment { + opacity: 0; + filter:alpha(opacity=0); +} +.qcomment:hover { + opacity: 1.0; + filter:alpha(opacity=100); +} -- cgit v1.2.3 From 75acc1ed966a6bb3e3ec690a667d148f900dba9c Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 17 Feb 2012 11:49:27 -0800 Subject: support plaintext on editpost, editorinit called before all buttons laid out --- view/theme/testbubble/jot.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/testbubble') diff --git a/view/theme/testbubble/jot.tpl b/view/theme/testbubble/jot.tpl index e2fd7132a..5bb5b4673 100755 --- a/view/theme/testbubble/jot.tpl +++ b/view/theme/testbubble/jot.tpl @@ -20,7 +20,6 @@ - {{ if $content }}{{ endif }} + {{ if $content }}{{ endif }} -- cgit v1.2.3