Browse Source

Merge branch 'pull'

pull/103/merge
friendica 11 years ago
parent
commit
1224e256b1
  1. BIN
      images/beard.jpg
  2. BIN
      images/smiley-beard.png
  3. BIN
      images/smiley-cool.gif
  4. BIN
      images/smiley-cry.gif
  5. BIN
      images/smiley-embarassed.gif
  6. BIN
      images/smiley-foot-in-mouth.gif
  7. BIN
      images/smiley-frown.gif
  8. BIN
      images/smiley-heart.gif
  9. BIN
      images/smiley-innocent.gif
  10. BIN
      images/smiley-kiss.gif
  11. BIN
      images/smiley-laughing.gif
  12. BIN
      images/smiley-money-mouth.gif
  13. BIN
      images/smiley-sealed.gif
  14. BIN
      images/smiley-smile.gif
  15. BIN
      images/smiley-surprised.gif
  16. BIN
      images/smiley-tongue-out.gif
  17. BIN
      images/smiley-undecided.gif
  18. BIN
      images/smiley-whitebeard.png
  19. BIN
      images/smiley-wink.gif
  20. BIN
      images/smiley-yell.gif
  21. BIN
      images/whitebeard.jpg
  22. 4
      include/text.php
  23. 4
      view/theme/diabook/nav.tpl

BIN
images/beard.jpg

Binary file not shown.

Before

Width:  |  Height:  |  Size: 989 B

BIN
images/smiley-beard.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
images/smiley-cool.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 354 B

After

Width:  |  Height:  |  Size: 315 B

BIN
images/smiley-cry.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 329 B

After

Width:  |  Height:  |  Size: 303 B

BIN
images/smiley-embarassed.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 331 B

After

Width:  |  Height:  |  Size: 300 B

BIN
images/smiley-foot-in-mouth.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 344 B

After

Width:  |  Height:  |  Size: 306 B

BIN
images/smiley-frown.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 340 B

After

Width:  |  Height:  |  Size: 301 B

BIN
images/smiley-heart.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 592 B

After

Width:  |  Height:  |  Size: 577 B

BIN
images/smiley-innocent.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 336 B

After

Width:  |  Height:  |  Size: 305 B

BIN
images/smiley-kiss.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 338 B

After

Width:  |  Height:  |  Size: 299 B

BIN
images/smiley-laughing.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 344 B

After

Width:  |  Height:  |  Size: 306 B

BIN
images/smiley-money-mouth.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 321 B

After

Width:  |  Height:  |  Size: 291 B

BIN
images/smiley-sealed.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 325 B

After

Width:  |  Height:  |  Size: 293 B

BIN
images/smiley-smile.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 345 B

After

Width:  |  Height:  |  Size: 306 B

BIN
images/smiley-surprised.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 342 B

After

Width:  |  Height:  |  Size: 303 B

BIN
images/smiley-tongue-out.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 328 B

After

Width:  |  Height:  |  Size: 290 B

BIN
images/smiley-undecided.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 337 B

After

Width:  |  Height:  |  Size: 299 B

BIN
images/smiley-whitebeard.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
images/smiley-wink.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 351 B

After

Width:  |  Height:  |  Size: 312 B

BIN
images/smiley-yell.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 336 B

After

Width:  |  Height:  |  Size: 298 B

BIN
images/whitebeard.jpg

Binary file not shown.

Before

Width:  |  Height:  |  Size: 951 B

4
include/text.php

@ -782,8 +782,8 @@ function smilies($s, $sample = false) {
'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
'<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>',
// '<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',
'<img src="' . $a->get_baseurl() . '/images/beard.jpg" alt=":beard" />',
'<img src="' . $a->get_baseurl() . '/images/whitebeard.jpg" alt=":whitebeard" />'
'<img src="' . $a->get_baseurl() . '/images/smiley-beard.png" alt=":beard" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-whitebeard.png" alt=":whitebeard" />'
);
$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);

4
view/theme/diabook/nav.tpl

@ -142,6 +142,10 @@
<div style="position: fixed; bottom: 5px; left: 25px;">$langselector</div>
<div style="position: fixed; bottom: 25px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/ftdevs.gif" title="Fehlerreport für das Theme diaBook erstellen"/></a></div>
<ul id="nav-notifications-template" style="display:none;" rel="template">
<li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
</ul>
{#

Loading…
Cancel
Save