From c66b886d7e47f6721d2f3eb39cae8599001f79d9 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 10 Nov 2011 17:11:55 -0800 Subject: shared tags for testbubble, prevent tag hijacking of shared tag activities --- view/theme/testbubble/icons.png | Bin 22600 -> 20316 bytes view/theme/testbubble/icons.svg | 55 ++++++++++++++++++++++---------- view/theme/testbubble/jot-header.tpl | 17 ++++++++++ view/theme/testbubble/style.css | 8 ++++- view/theme/testbubble/wall_item.tpl | 1 + view/theme/testbubble/wallwall_item.tpl | 1 + 6 files changed, 64 insertions(+), 18 deletions(-) (limited to 'view/theme') diff --git a/view/theme/testbubble/icons.png b/view/theme/testbubble/icons.png index 57c4bfb05..0e1e7662d 100644 Binary files a/view/theme/testbubble/icons.png and b/view/theme/testbubble/icons.png differ diff --git a/view/theme/testbubble/icons.svg b/view/theme/testbubble/icons.svg index b435ba665..91bb2ff38 100644 --- a/view/theme/testbubble/icons.svg +++ b/view/theme/testbubble/icons.svg @@ -7,15 +7,16 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="250" height="200" id="svg3403" version="1.1" - inkscape:version="0.48.1 r9760" - sodipodi:docname="icons.svg" - inkscape:export-filename="/home/fabio/public_html/friendika/view/theme/dispy/icons.png" + inkscape:version="0.48.2 r9819" + sodipodi:docname="tbicons.svg" + inkscape:export-filename="C:\Users\mikemac\Downloads\bitmap.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> ? + diff --git a/view/theme/testbubble/jot-header.tpl b/view/theme/testbubble/jot-header.tpl index 5ada1fdf8..4a1526ab5 100644 --- a/view/theme/testbubble/jot-header.tpl +++ b/view/theme/testbubble/jot-header.tpl @@ -254,6 +254,23 @@ function initEditor(cb) { } } + function itemTag(id) { + reply = prompt("$term"); + if(reply && reply.length) { + reply = reply.replace('#',''); + if(reply.length) { + + commentBusy = true; + $('body').css('cursor', 'wait'); + + $.get('tagger/' + id + '?term=' + reply); + if(timer) clearTimeout(timer); + timer = setTimeout(NavUpdate,3000); + liking = 1; + } + } + } + function jotClearLocation() { $('#jot-coord').val(''); $('#profile-nolocation-wrapper').hide(); diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css index 695e20ffd..bce4a9c71 100644 --- a/view/theme/testbubble/style.css +++ b/view/theme/testbubble/style.css @@ -937,6 +937,11 @@ profile-jot-banner-wrapper { margin-right: 2px; float: left; } +.tag-item { + margin-left: 5px; + margin-right: 2px; + float: left; +} .wall-item-title { font-size: 1.2em; font-weight: bold;} .wall-item-body { margin-left: 140px; @@ -2836,7 +2841,8 @@ tr { .on { background-position: -50px -60px;} .off { background-position: -70px -60px;} .prev { background-position: -90px -60px;} -.next { background-position: -110px -60px;} +.next { background-position: -110px -60px;} +.tagged { background-position: -130px -60px;} .icon.dim { opacity: 0.3;filter:alpha(opacity=30); } diff --git a/view/theme/testbubble/wall_item.tpl b/view/theme/testbubble/wall_item.tpl index 6efd331c9..199381fd3 100644 --- a/view/theme/testbubble/wall_item.tpl +++ b/view/theme/testbubble/wall_item.tpl @@ -46,6 +46,7 @@ {{ if $star }} + {{ endif }}
diff --git a/view/theme/testbubble/wallwall_item.tpl b/view/theme/testbubble/wallwall_item.tpl index 7cefc85ad..ba62d30fb 100644 --- a/view/theme/testbubble/wallwall_item.tpl +++ b/view/theme/testbubble/wallwall_item.tpl @@ -44,6 +44,7 @@ {{ if $star }} + {{ endif }}
-- cgit v1.2.3