diff options
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | include/conversation.php | 3 | ||||
| -rw-r--r-- | include/text.php | 10 | ||||
| -rw-r--r-- | mod/like.php | 3 | ||||
| -rw-r--r-- | mod/tagger.php | 7 | ||||
| -rw-r--r-- | view/jot-header.tpl | 13 | ||||
| -rw-r--r-- | view/theme/duepuntozero/style.css | 5 | ||||
| -rw-r--r-- | view/theme/duepuntozero/wall_item.tpl | 1 | ||||
| -rw-r--r-- | view/wall_item.tpl | 1 |
9 files changed, 37 insertions, 8 deletions
@@ -8,7 +8,7 @@ require_once("include/pgettext.php"); require_once('include/nav.php'); define ( 'FRIENDIKA_PLATFORM', 'Free Friendika'); -define ( 'FRIENDIKA_VERSION', '2.3.1143' ); +define ( 'FRIENDIKA_VERSION', '2.3.1144' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1098 ); diff --git a/include/conversation.php b/include/conversation.php index 29fa77902..dec70c1a9 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -466,6 +466,8 @@ function conversation(&$a, $items, $mode, $update) { 'classdo' => (($item['starred']) ? "hidden" : ""), 'classundo' => (($item['starred']) ? "" : "hidden"), 'starred' => t('starred'), + 'tagger' => t("add tag"), + 'classtagger' => "", ); } @@ -747,6 +749,7 @@ function status_editor($a,$x, $notes_cid = 0) { '$linkurl' => t('Please enter a link URL:'), '$vidurl' => t("Please enter a video link/URL:"), '$audurl' => t("Please enter an audio link/URL:"), + '$term' => t('Tag term:'), '$whereareu' => t('Where are you right now?'), '$title' => t('Enter a title for this item') )); diff --git a/include/text.php b/include/text.php index ca8dc5ac3..ba6c2531f 100644 --- a/include/text.php +++ b/include/text.php @@ -751,7 +751,9 @@ function prepare_body($item,$attach = false) { $s = prepare_text($item['body']); - call_hooks('prepare_body', $s); + $prep_arr = array('item' => $item, 'html' => $s); + call_hooks('prepare_body', $prep_arr); + $s = $prep_arr['html']; if(! $attach) return $s; @@ -784,8 +786,10 @@ function prepare_body($item,$attach = false) { } $s .= '<div class="clear"></div></div>'; } - call_hooks('prepare_body_final', $s); - return $s; + + $prep_arr = array('item' => $item, 'html' => $s); + call_hooks('prepare_body_final', $prep_arr); + return $prep_arr['html']; }} diff --git a/mod/like.php b/mod/like.php index 5c3dd323e..6b97fafb5 100644 --- a/mod/like.php +++ b/mod/like.php @@ -197,5 +197,6 @@ EOT; proc_run('php',"include/notifier.php","like","$post_id"); - return; // NOTREACHED + killme(); +// return; // NOTREACHED }
\ No newline at end of file diff --git a/mod/tagger.php b/mod/tagger.php index dd4b8ffea..4127aaadd 100644 --- a/mod/tagger.php +++ b/mod/tagger.php @@ -22,7 +22,6 @@ function tagger_content(&$a) { $r = q("SELECT * FROM `item` WHERE `id` = '%s' LIMIT 1", - dbesc($item_id), dbesc($item_id) ); @@ -43,8 +42,8 @@ function tagger_content(&$a) { $blocktags = $r[0]['blocktags']; } -// if(local_user() != $owner_uid) -// return; + if(local_user() != $owner_uid) + return; if(remote_user()) { $r = q("select * from contact where id = %d AND `uid` = %d limit 1", @@ -189,6 +188,8 @@ EOT; proc_run('php',"include/notifier.php","tag","$post_id"); + killme(); + return; // NOTREACHED diff --git a/view/jot-header.tpl b/view/jot-header.tpl index 22bd0aa5b..b06712407 100644 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -214,6 +214,19 @@ function initEditor(cb){ } } + function itemTag(id) { + $('#like-rotator-' + id).show(); + reply = prompt("$term"); + if(reply && reply.length) { + reply.replace('#',''); + if(reply.length) { + $.get('tagger/' + id + '?term=' + reply, function(data) { + $('#like-rotator-' + id).hide(); + }); + } + } + } + function jotClearLocation() { $('#jot-coord').val(''); $('#profile-nolocation-wrapper').hide(); diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 6f452cebc..378e0da1e 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -958,6 +958,11 @@ input#dfrn-url { margin-left: 10px; float: left; } +.tag-item { + margin-left: 10px; + float: left; +} + .wall-item-links-wrapper { float: left; diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/duepuntozero/wall_item.tpl index d264d3999..3a4a49729 100644 --- a/view/theme/duepuntozero/wall_item.tpl +++ b/view/theme/duepuntozero/wall_item.tpl @@ -49,6 +49,7 @@ {{ if $star }} <a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a> + <a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a> {{ endif }} <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" > diff --git a/view/wall_item.tpl b/view/wall_item.tpl index cec5e5404..ef822750a 100644 --- a/view/wall_item.tpl +++ b/view/wall_item.tpl @@ -40,6 +40,7 @@ {{ if $star }} <a href="#" id="star-$id" onclick="dostar($id); return false;" class="$star.classdo" title="$star.do">$star.do</a> <a href="#" id="unstar-$id" onclick="dostar($id); return false;" class="$star.classundo" title="$star.undo">$star.undo</a> + <a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="$star.classtagger" title="$star.tagger">$star.tagger</a> {{ endif }} {{ if $vote }} |