mirror of
https://github.com/friendica/friendica
synced 2024-12-22 23:20:16 +00:00
tagging missing from wallwall and a couple of themes, star missing from dispy
This commit is contained in:
parent
89560edde2
commit
a1861d1128
13 changed files with 37 additions and 2 deletions
|
@ -6,6 +6,11 @@
|
||||||
function localize_item(&$item){
|
function localize_item(&$item){
|
||||||
|
|
||||||
$Text = $item['body'];
|
$Text = $item['body'];
|
||||||
|
|
||||||
|
|
||||||
|
// find private image (w/data url) if present and convert image
|
||||||
|
// link to a magic-auth redirect.
|
||||||
|
|
||||||
$saved_image = '';
|
$saved_image = '';
|
||||||
$img_start = strpos($Text,'[img]data:');
|
$img_start = strpos($Text,'[img]data:');
|
||||||
$img_end = strpos($Text,'[/img]');
|
$img_end = strpos($Text,'[/img]');
|
||||||
|
@ -403,6 +408,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
||||||
$toplevelprivate = false;
|
$toplevelprivate = false;
|
||||||
|
|
||||||
// Take care of author collapsing and comment collapsing
|
// Take care of author collapsing and comment collapsing
|
||||||
|
// (author collapsing is currently disabled)
|
||||||
// If a single author has more than 3 consecutive top-level posts, squash the remaining ones.
|
// If a single author has more than 3 consecutive top-level posts, squash the remaining ones.
|
||||||
// If there are more than two comments, squash all but the last 2.
|
// If there are more than two comments, squash all but the last 2.
|
||||||
|
|
||||||
|
@ -410,7 +416,9 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
||||||
$toplevelprivate = (($toplevelpost && $item['private']) ? true : false);
|
$toplevelprivate = (($toplevelpost && $item['private']) ? true : false);
|
||||||
$item_writeable = (($item['writable'] || $item['self']) ? true : false);
|
$item_writeable = (($item['writable'] || $item['self']) ? true : false);
|
||||||
|
|
||||||
/*if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile') && ($mode != 'notes')) {
|
// DISABLED
|
||||||
|
/*
|
||||||
|
if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile') && ($mode != 'notes')) {
|
||||||
$blowhard_count ++;
|
$blowhard_count ++;
|
||||||
if($blowhard_count == 3) {
|
if($blowhard_count == 3) {
|
||||||
$o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent']
|
$o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent']
|
||||||
|
@ -424,7 +432,9 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
||||||
if($blowhard_count >= 3)
|
if($blowhard_count >= 3)
|
||||||
$o .= '</div>';
|
$o .= '</div>';
|
||||||
$blowhard_count = 0;
|
$blowhard_count = 0;
|
||||||
}*/
|
}
|
||||||
|
// END DISABLED
|
||||||
|
*/
|
||||||
|
|
||||||
$comments_seen = 0;
|
$comments_seen = 0;
|
||||||
$comments_collapsed = false;
|
$comments_collapsed = false;
|
||||||
|
|
|
@ -134,6 +134,7 @@ EOT;
|
||||||
$arr['target'] = $target;
|
$arr['target'] = $target;
|
||||||
$arr['object-type'] = $objtype;
|
$arr['object-type'] = $objtype;
|
||||||
$arr['object'] = $obj;
|
$arr['object'] = $obj;
|
||||||
|
$arr['private'] = $item['private'];
|
||||||
$arr['allow_cid'] = $item['allow_cid'];
|
$arr['allow_cid'] = $item['allow_cid'];
|
||||||
$arr['allow_gid'] = $item['allow_gid'];
|
$arr['allow_gid'] = $item['allow_gid'];
|
||||||
$arr['deny_cid'] = $item['deny_cid'];
|
$arr['deny_cid'] = $item['deny_cid'];
|
||||||
|
|
BIN
view/theme/dispy/premium.png
Executable file
BIN
view/theme/dispy/premium.png
Executable file
Binary file not shown.
After Width: | Height: | Size: 2.3 KiB |
BIN
view/theme/dispy/star.png
Executable file
BIN
view/theme/dispy/star.png
Executable file
Binary file not shown.
After Width: | Height: | Size: 2.1 KiB |
|
@ -1099,6 +1099,21 @@ div[id$="wrapper"] br { clear: left; }
|
||||||
border-bottom: 0px;
|
border-bottom: 0px;
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
|
.starred {
|
||||||
|
background-image: url("star.png");
|
||||||
|
repeat: no-repeat;
|
||||||
|
}
|
||||||
|
.unstarred {
|
||||||
|
background-image: url("premium.png");
|
||||||
|
repeat: no-repeat;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tagged {
|
||||||
|
background-image: url("tag.png");
|
||||||
|
repaet: no-repeat;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
.border {
|
.border {
|
||||||
border: 1px solid #babdb6;
|
border: 1px solid #babdb6;
|
||||||
|
|
BIN
view/theme/dispy/tag.png
Normal file
BIN
view/theme/dispy/tag.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 535 B |
|
@ -24,6 +24,7 @@
|
||||||
<div class="wall-item-tools" id="wall-item-tools-$id">
|
<div class="wall-item-tools" id="wall-item-tools-$id">
|
||||||
{{ if $star }}
|
{{ if $star }}
|
||||||
<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
|
<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 }}
|
{{ endif }}
|
||||||
{{ if $vote }}
|
{{ if $vote }}
|
||||||
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
|
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
|
||||||
|
|
|
@ -29,6 +29,7 @@
|
||||||
<div class="wall-item-tools" id="wall-item-tools-$id">
|
<div class="wall-item-tools" id="wall-item-tools-$id">
|
||||||
{{ if $star }}
|
{{ if $star }}
|
||||||
<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
|
<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 }}
|
{{ endif }}
|
||||||
{{ if $vote }}
|
{{ if $vote }}
|
||||||
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
|
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
|
||||||
|
|
|
@ -59,6 +59,7 @@
|
||||||
|
|
||||||
{{ if $star }}
|
{{ if $star }}
|
||||||
<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
|
<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 }}
|
{{ endif }}
|
||||||
|
|
||||||
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
|
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
|
||||||
|
|
|
@ -49,6 +49,8 @@
|
||||||
|
|
||||||
{{ if $star }}
|
{{ if $star }}
|
||||||
<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
|
<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 }}
|
{{ endif }}
|
||||||
|
|
||||||
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
|
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
|
||||||
|
|
|
@ -53,6 +53,7 @@
|
||||||
|
|
||||||
{{ if $star }}
|
{{ if $star }}
|
||||||
<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
|
<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 }}
|
{{ endif }}
|
||||||
|
|
||||||
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
|
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
|
||||||
|
|
|
@ -62,6 +62,7 @@
|
||||||
{{ if $star }}
|
{{ if $star }}
|
||||||
<a href="#" id="star-$id" onclick="dostar($id); return false;" class="$star.classdo" title="$star.do">$star.do</a>
|
<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="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 }}
|
{{ endif }}
|
||||||
|
|
||||||
{{ if $vote }}
|
{{ if $vote }}
|
||||||
|
|
|
@ -55,6 +55,8 @@
|
||||||
{{ if $star }}
|
{{ if $star }}
|
||||||
<a href="#" id="star-$id" onclick="dostar($id); return false;" class="$star.classdo" title="$star.do">$star.do</a>
|
<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="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 }}
|
{{ endif }}
|
||||||
|
|
||||||
{{ if $vote }}
|
{{ if $vote }}
|
||||||
|
|
Loading…
Reference in a new issue