diff options
author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-03-22 11:54:09 +0100 |
---|---|---|
committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-03-22 11:54:09 +0100 |
commit | 5f7715529d147510c66d0bf68edcca09e7fe3f1b (patch) | |
tree | ae5af3e8b7dda429b744c70ea3fda111c30b15c3 | |
parent | 5189a56ef832e1c5c6976f87d77d218bf4a6c221 (diff) | |
parent | 576eb6cc389d54c29b29b97d3c6d160e61bbf6ca (diff) | |
download | volse-hubzilla-5f7715529d147510c66d0bf68edcca09e7fe3f1b.tar.gz volse-hubzilla-5f7715529d147510c66d0bf68edcca09e7fe3f1b.tar.bz2 volse-hubzilla-5f7715529d147510c66d0bf68edcca09e7fe3f1b.zip |
Merge branch 'master' of https://github.com/friendica/friendica
-rwxr-xr-x | view/theme/diabook-blue/icons/file_as.png | bin | 0 -> 352 bytes | |||
-rw-r--r-- | view/theme/diabook-blue/style.css | 1 | ||||
-rw-r--r-- | view/theme/diabook-blue/wall_item.tpl | 4 | ||||
-rwxr-xr-x | view/theme/diabook/icons/file_as.png | bin | 0 -> 352 bytes | |||
-rw-r--r-- | view/theme/diabook/style.css | 1 | ||||
-rw-r--r-- | view/theme/diabook/wall_item.tpl | 4 |
6 files changed, 10 insertions, 0 deletions
diff --git a/view/theme/diabook-blue/icons/file_as.png b/view/theme/diabook-blue/icons/file_as.png Binary files differnew file mode 100755 index 000000000..16713fa53 --- /dev/null +++ b/view/theme/diabook-blue/icons/file_as.png diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index f88c7b954..d3d3d9eb7 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -102,6 +102,7 @@ .icon.recycle { background-image: url("../../../view/theme/diabook-blue/icons/recycle.png");} .icon.remote-link { background-image: url("../../../view/theme/diabook-blue/icons/remote.png");} .icon.tagged { background-image: url("../../../view/theme/diabook-blue/icons/tagged.png");} +.icon.file-as { background-image: url("../../../view/theme/diabook-blue/icons/file_as.png");} .star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-blue/icons/unstarred.png");} .star-item.icon.starred { background-image: url("../../../view/theme/diabook-blue/icons/starred.png");} .icon.link { background-image: url("../../../view/theme/diabook-blue/icons/link.png");} diff --git a/view/theme/diabook-blue/wall_item.tpl b/view/theme/diabook-blue/wall_item.tpl index ebe40fd4e..20d24702b 100644 --- a/view/theme/diabook-blue/wall_item.tpl +++ b/view/theme/diabook-blue/wall_item.tpl @@ -66,6 +66,10 @@ <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a> {{ endif }} + {{ if $item.filer }} + <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a> + {{ endif }} + {{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }} diff --git a/view/theme/diabook/icons/file_as.png b/view/theme/diabook/icons/file_as.png Binary files differnew file mode 100755 index 000000000..16713fa53 --- /dev/null +++ b/view/theme/diabook/icons/file_as.png diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index ffab5b4c4..5841a96b3 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -102,6 +102,7 @@ .icon.recycle { background-image: url("../../../view/theme/diabook/icons/recycle.png");} .icon.remote-link { background-image: url("../../../view/theme/diabook/icons/remote.png");} .icon.tagged { background-image: url("../../../view/theme/diabook/icons/tagged.png");} +.icon.file-as { background-image: url("../../../view/theme/diabook/icons/file_as.png");} .star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/icons/unstarred.png");} .star-item.icon.starred { background-image: url("../../../view/theme/diabook/icons/starred.png");} .icon.link { background-image: url("../../../view/theme/diabook/icons/link.png");} diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl index ebe40fd4e..20d24702b 100644 --- a/view/theme/diabook/wall_item.tpl +++ b/view/theme/diabook/wall_item.tpl @@ -66,6 +66,10 @@ <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a> {{ endif }} + {{ if $item.filer }} + <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a> + {{ endif }} + {{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }} |