aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/diabook/wall_item.tpl
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-03-03 08:05:53 -0500
committerSimon L'nu <simon.lnu@gmail.com>2012-03-03 08:05:53 -0500
commitba284044707e0f66fed98c711b9262bd623a0d42 (patch)
tree8f9bfbf8047d65ef8691b9353d1124aeed765129 /view/theme/diabook/wall_item.tpl
parent7ef861907e32cd3d01877c0fdf8e2544f4f659b1 (diff)
parent8ffe15fbb1290fac839189f2de337efec223c5e1 (diff)
downloadvolse-hubzilla-ba284044707e0f66fed98c711b9262bd623a0d42.tar.gz
volse-hubzilla-ba284044707e0f66fed98c711b9262bd623a0d42.tar.bz2
volse-hubzilla-ba284044707e0f66fed98c711b9262bd623a0d42.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: fix text-editor in theme german strings as of 28th Feb from transilex small fix in style.css fix star/unstar fixes in wall_item.tpl and style.css in theme diabook fix in wall_item.tpl new icon link.png add diabook to default themes fixed broken tags and notifications in theme * master:
Diffstat (limited to 'view/theme/diabook/wall_item.tpl')
-rw-r--r--view/theme/diabook/wall_item.tpl25
1 files changed, 15 insertions, 10 deletions
diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl
index 1f1a878b4..10d395316 100644
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_item.tpl
@@ -5,6 +5,9 @@
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div>
{{ endif }}
+
+
+
<div class="wall-item-container $item.indent">
<div class="wall-item-item">
<div class="wall-item-info">
@@ -36,26 +39,21 @@
</div>
<div class="wall-item-bottom">
<div class="wall-item-links">
+ {{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
</div>
<div class="wall-item-tags">
- {{ for $item.tags as $item.tag }}
- <span class='tag'>$item.tag</span>
+ {{ for $item.tags as $tag }}
+ <span class='tag'>$tag</span>
{{ endfor }}
</div>
</div>
<div class="wall-item-bottom">
<div class="">
- {{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+
</div>
<div class="wall-item-actions">
<div class="wall-item-location">$item.location&nbsp;</div>
<div class="wall-item-actions-social">
-
- {{ if $item.star }}
- <a href="#" id="star-$item.id" class="icon unstarred" onclick="dostar($item.id); return false;" class="$item.star.classdo" title="$item.star.do">$item.star.do</a>
- <a href="#" id="unstar-$item.id" class="icon star" onclick="dostar($item.id); return false;" class="$item.star.classundo" title="$item.star.undo">$item.star.undo</a>
- <a href="#" id="tagger-$item.id" class="icon tagged" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
- {{ endif }}
{{ if $item.vote }}
<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
@@ -64,7 +62,14 @@
{{ if $item.vote.share }}
<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
- {{ endif }}
+ {{ endif }}
+
+ {{ if $item.star }}
+ <a href="#" id="star-$item.id" class="icon star" onclick="dostar($item.id); return false;" class="$item.star.classdo" title="$item.star.do">$item.star.do</a>
+ <a href="#" id="unstar-$item.id" class="icon unstarred" onclick="dostar($item.id); return false;" class="$item.star.classundo" title="$item.star.undo">$item.star.undo</a>
+ <a href="#" id="tagger-$item.id" class="icon tagged" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
+ {{ endif }}
+
</div>
<div class="wall-item-actions-tools">