aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-03-03 13:39:56 -0500
committerSimon L'nu <simon.lnu@gmail.com>2012-03-03 13:39:56 -0500
commitda78d8594f79792f2c144cdb5b76b561ec03b278 (patch)
treed2986a36db224e06754f43ad8c52c2518b65ccd5
parent2b9ea33e8b2f774d7c4da5175e167470f1070282 (diff)
parent1dfd5c4f85f2e0407f006ca962dc3dd62b092aba (diff)
downloadvolse-hubzilla-da78d8594f79792f2c144cdb5b76b561ec03b278.tar.gz
volse-hubzilla-da78d8594f79792f2c144cdb5b76b561ec03b278.tar.bz2
volse-hubzilla-da78d8594f79792f2c144cdb5b76b561ec03b278.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: fixed star/unstar fixed admin fixed editor * master:
-rwxr-xr-ximages/star.pngbin0 -> 388 bytes
-rw-r--r--images/star_dummy.pngbin0 -> 183 bytes
-rwxr-xr-xview/theme/diabook/icons/attach.pngbin862 -> 1069 bytes
-rwxr-xr-xview/theme/diabook/icons/audio.pngbin655 -> 762 bytes
-rwxr-xr-xview/theme/diabook/icons/camera.pngbin568 -> 685 bytes
-rwxr-xr-xview/theme/diabook/icons/globe.pngbin680 -> 875 bytes
-rw-r--r--view/theme/diabook/icons/isstar.pngbin0 -> 1277 bytes
-rwxr-xr-xview/theme/diabook/icons/star.pngbin339 -> 388 bytes
-rw-r--r--view/theme/diabook/icons/star_dummy.pngbin0 -> 183 bytes
-rwxr-xr-xview/theme/diabook/icons/toogle_off.pngbin0 -> 391 bytes
-rwxr-xr-xview/theme/diabook/icons/toogle_on.pngbin0 -> 429 bytes
-rwxr-xr-xview/theme/diabook/icons/unglobe.pngbin659 -> 798 bytes
-rwxr-xr-xview/theme/diabook/icons/unlock.pngbin314 -> 362 bytes
-rwxr-xr-xview/theme/diabook/icons/video.pngbin373 -> 472 bytes
-rwxr-xr-xview/theme/diabook/icons/weblink.pngbin305 -> 505 bytes
-rw-r--r--view/theme/diabook/style.css8
-rw-r--r--view/theme/diabook/wall_item.tpl23
17 files changed, 19 insertions, 12 deletions
diff --git a/images/star.png b/images/star.png
new file mode 100755
index 000000000..0b00cb189
--- /dev/null
+++ b/images/star.png
Binary files differ
diff --git a/images/star_dummy.png b/images/star_dummy.png
new file mode 100644
index 000000000..ce11f30d4
--- /dev/null
+++ b/images/star_dummy.png
Binary files differ
diff --git a/view/theme/diabook/icons/attach.png b/view/theme/diabook/icons/attach.png
index 4412d94a5..1958041cf 100755
--- a/view/theme/diabook/icons/attach.png
+++ b/view/theme/diabook/icons/attach.png
Binary files differ
diff --git a/view/theme/diabook/icons/audio.png b/view/theme/diabook/icons/audio.png
index 075e04734..8d779a409 100755
--- a/view/theme/diabook/icons/audio.png
+++ b/view/theme/diabook/icons/audio.png
Binary files differ
diff --git a/view/theme/diabook/icons/camera.png b/view/theme/diabook/icons/camera.png
index 8769cc82f..a5c7f1236 100755
--- a/view/theme/diabook/icons/camera.png
+++ b/view/theme/diabook/icons/camera.png
Binary files differ
diff --git a/view/theme/diabook/icons/globe.png b/view/theme/diabook/icons/globe.png
index daec0c256..bf27a8f3f 100755
--- a/view/theme/diabook/icons/globe.png
+++ b/view/theme/diabook/icons/globe.png
Binary files differ
diff --git a/view/theme/diabook/icons/isstar.png b/view/theme/diabook/icons/isstar.png
new file mode 100644
index 000000000..c955b25b5
--- /dev/null
+++ b/view/theme/diabook/icons/isstar.png
Binary files differ
diff --git a/view/theme/diabook/icons/star.png b/view/theme/diabook/icons/star.png
index 32eff5a50..0b00cb189 100755
--- a/view/theme/diabook/icons/star.png
+++ b/view/theme/diabook/icons/star.png
Binary files differ
diff --git a/view/theme/diabook/icons/star_dummy.png b/view/theme/diabook/icons/star_dummy.png
new file mode 100644
index 000000000..ce11f30d4
--- /dev/null
+++ b/view/theme/diabook/icons/star_dummy.png
Binary files differ
diff --git a/view/theme/diabook/icons/toogle_off.png b/view/theme/diabook/icons/toogle_off.png
new file mode 100755
index 000000000..99490bcd9
--- /dev/null
+++ b/view/theme/diabook/icons/toogle_off.png
Binary files differ
diff --git a/view/theme/diabook/icons/toogle_on.png b/view/theme/diabook/icons/toogle_on.png
new file mode 100755
index 000000000..81e8f9120
--- /dev/null
+++ b/view/theme/diabook/icons/toogle_on.png
Binary files differ
diff --git a/view/theme/diabook/icons/unglobe.png b/view/theme/diabook/icons/unglobe.png
index ddcdfa23c..aa9b0e189 100755
--- a/view/theme/diabook/icons/unglobe.png
+++ b/view/theme/diabook/icons/unglobe.png
Binary files differ
diff --git a/view/theme/diabook/icons/unlock.png b/view/theme/diabook/icons/unlock.png
index 3d6543087..a0cda0ae5 100755
--- a/view/theme/diabook/icons/unlock.png
+++ b/view/theme/diabook/icons/unlock.png
Binary files differ
diff --git a/view/theme/diabook/icons/video.png b/view/theme/diabook/icons/video.png
index c9a905e32..a03d1d818 100755
--- a/view/theme/diabook/icons/video.png
+++ b/view/theme/diabook/icons/video.png
Binary files differ
diff --git a/view/theme/diabook/icons/weblink.png b/view/theme/diabook/icons/weblink.png
index 45c471e6c..216e78344 100755
--- a/view/theme/diabook/icons/weblink.png
+++ b/view/theme/diabook/icons/weblink.png
Binary files differ
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index df586c770..ecd995d5f 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -100,11 +100,13 @@
.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.unstarred { background-image: url("../../../view/theme/diabook/icons/unstarred.png");}
+.icon.unstarred { background-image: url("../../../view/theme/diabook/icons/star.png");}
.icon.star { background-image: url("../../../view/theme/diabook/icons/star.png");}
.icon.link { background-image: url("../../../view/theme/diabook/icons/link.png");}
.icon.lock { background-image: url("../../../view/theme/diabook/icons/lock.png");}
.icon.unlock { background-image: url("../../../view/theme/diabook/icons/unlock.png");}
+.icon.isstar { background-image: url("../../../view/theme/diabook/icons/isstar.png");}
+
.camera { background-image: url("../../../view/theme/diabook/icons/camera.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -163,8 +165,8 @@
.language { background-position: -210px -40px;}
-.on { background-position: -50px -60px;}
-.off { background-position: -70px -60px;}
+.icon.on { background-image: url("../../../view/theme/diabook/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off { background-image: url("../../../view/theme/diabook/icons/toogle_off.png"); background-repeat: no-repeat;}
.prev { background-position: -90px -60px;}
.next { background-position: -110px -60px;}
/*.tagged { background-position: -130px -60px;}*/
diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl
index 10d395316..c836d4fbb 100644
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_item.tpl
@@ -1,6 +1,6 @@
{{ if $item.indent }}{{ else }}
<div class="wall-item-decor">
- <span class="icon star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
+ <span class="icon isstar $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
{{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div>
@@ -38,9 +38,7 @@
</div>
</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></div>
<div class="wall-item-tags">
{{ for $item.tags as $tag }}
<span class='tag'>$tag</span>
@@ -54,7 +52,8 @@
<div class="wall-item-actions">
<div class="wall-item-location">$item.location&nbsp;</div>
<div class="wall-item-actions-social">
-
+
+
{{ 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>
<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
@@ -62,13 +61,19 @@
{{ 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="star-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classdo" title="$item.star.do" >
+ <img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
+ <a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classundo" title="$item.star.undo">
+ <img src="images/star_dummy.png" class="icon star" alt="$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 }}
+ {{ endif }}
+
+ {{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+
+
</div>