strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

Browse source 
* remotes/upstream/master:
  removed info
  add info
  fixed star-bug
  More improved transparency for smilies
  removed dolphin file (wtf?)
  .

* master:
This commit is contained in:
Simon L'nu 2012-03-08 23:59:43 -05:00
commit 20b2090182
13 changed files with 19 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
images/beer_mug.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1,021 B

BIN
images/smiley-Oo.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1,003 B

BIN
images/smiley-brokenheart.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 616 B

After

Width:  |  Height:  |  Size: 598 B

BIN
view/theme/diabook-blue/icons/starred.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
view/theme/diabook-blue/icons/unstarred.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 358 B

After

Width:  |  Height:  |  Size: 468 B

9
view/theme/diabook-blue/style.css
View file

@ -102,12 +102,11 @@
.icon.recycle { background-image: url("../../../view/theme/diabook-blue/icons/recycle.png");} .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.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.tagged { background-image: url("../../../view/theme/diabook-blue/icons/tagged.png");}
.icon.unstarred { background-image: url("../../../view/theme/diabook-blue/icons/star.png");} .star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-blue/icons/unstarred.png");}
.icon.star { background-image: url("../../../view/theme/diabook-blue/icons/star.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");} .icon.link { background-image: url("../../../view/theme/diabook-blue/icons/link.png");}
.icon.lock { background-image: url("../../../view/theme/diabook-blue/icons/lock.png");} .icon.lock { background-image: url("../../../view/theme/diabook-blue/icons/lock.png");}
.icon.unlock { background-image: url("../../../view/theme/diabook-blue/icons/unlock.png");} .icon.unlock { background-image: url("../../../view/theme/diabook-blue/icons/unlock.png");}
.icon.isstar { background-image: url("../../../view/theme/diabook-blue/icons/isstar.png");}
.icon.language { background-image: url("../../../view/theme/diabook-blue/icons/language.png");} .icon.language { background-image: url("../../../view/theme/diabook-blue/icons/language.png");}
@ -1078,9 +1077,7 @@ section {
top: -10px; top: -10px;
width: 16px; width: 16px;
} }
.unstarred {
display: none;
}
.wall-item-container { .wall-item-container {
display: table; display: table;
width: 780px; width: 780px;

9
view/theme/diabook-blue/wall_item.tpl
View file

@ -1,6 +1,5 @@
{{ if $item.indent }}{{ else }} {{ if $item.indent }}{{ else }}
<div class="wall-item-decor"> <div class="wall-item-decor">
<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 }} {{ 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;" /> <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div> </div>
@ -62,11 +61,9 @@
{{ if $item.star }} {{ if $item.star }}
<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classdo" title="$item.star.do" > <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a> <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"> <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
<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 }} {{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}

9
view/theme/diabook-blue/wallwall_item.tpl
View file

@ -1,6 +1,5 @@
{{ if $item.indent }}{{ else }} {{ if $item.indent }}{{ else }}
<div class="wall-item-decor"> <div class="wall-item-decor">
<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 }} {{ 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;" /> <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div> </div>
@ -68,11 +67,9 @@
{{ if $item.star }} {{ if $item.star }}
<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classdo" title="$item.star.do" > <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a> <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"> <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
<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 }} {{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}

BIN
view/theme/diabook/icons/starred.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
view/theme/diabook/icons/unstarred.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 358 B

After

Width:  |  Height:  |  Size: 468 B

9
view/theme/diabook/style.css
View file

@ -102,12 +102,11 @@
.icon.recycle { background-image: url("../../../view/theme/diabook/icons/recycle.png");} .icon.recycle { background-image: url("../../../view/theme/diabook/icons/recycle.png");}
.icon.remote-link { background-image: url("../../../view/theme/diabook/icons/remote.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.tagged { background-image: url("../../../view/theme/diabook/icons/tagged.png");}
.icon.unstarred { background-image: url("../../../view/theme/diabook/icons/star.png");} .star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/icons/unstarred.png");}
.icon.star { background-image: url("../../../view/theme/diabook/icons/star.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");} .icon.link { background-image: url("../../../view/theme/diabook/icons/link.png");}
.icon.lock { background-image: url("../../../view/theme/diabook/icons/lock.png");} .icon.lock { background-image: url("../../../view/theme/diabook/icons/lock.png");}
.icon.unlock { background-image: url("../../../view/theme/diabook/icons/unlock.png");} .icon.unlock { background-image: url("../../../view/theme/diabook/icons/unlock.png");}
.icon.isstar { background-image: url("../../../view/theme/diabook/icons/isstar.png");}
.icon.language { background-image: url("../../../view/theme/diabook/icons/language.png");} .icon.language { background-image: url("../../../view/theme/diabook/icons/language.png");}
@ -1077,9 +1076,7 @@ section {
top: -10px; top: -10px;
width: 16px; width: 16px;
} }
.unstarred {
display: none;
}
.wall-item-container { .wall-item-container {
display: table; display: table;
width: 780px; width: 780px;

9
view/theme/diabook/wall_item.tpl
View file

@ -1,6 +1,5 @@
{{ if $item.indent }}{{ else }} {{ if $item.indent }}{{ else }}
<div class="wall-item-decor"> <div class="wall-item-decor">
<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 }} {{ 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;" /> <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div> </div>
@ -62,11 +61,9 @@
{{ if $item.star }} {{ if $item.star }}
<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classdo" title="$item.star.do" > <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a> <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"> <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
<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 }} {{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}

9
view/theme/diabook/wallwall_item.tpl
View file

@ -1,6 +1,5 @@
{{ if $item.indent }}{{ else }} {{ if $item.indent }}{{ else }}
<div class="wall-item-decor"> <div class="wall-item-decor">
<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 }} {{ 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;" /> <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div> </div>
@ -68,11 +67,9 @@
{{ if $item.star }} {{ if $item.star }}
<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classdo" title="$item.star.do" > <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a> <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"> <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
<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 }} {{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}