diff options
| -rw-r--r-- | images/beard.jpg | bin | 989 -> 0 bytes | |||
| -rw-r--r-- | images/smiley-beard.png | bin | 0 -> 1094 bytes | |||
| -rwxr-xr-x | images/smiley-cool.gif | bin | 354 -> 315 bytes | |||
| -rwxr-xr-x | images/smiley-cry.gif | bin | 329 -> 303 bytes | |||
| -rwxr-xr-x | images/smiley-embarassed.gif | bin | 331 -> 300 bytes | |||
| -rwxr-xr-x | images/smiley-foot-in-mouth.gif | bin | 344 -> 306 bytes | |||
| -rwxr-xr-x | images/smiley-frown.gif | bin | 340 -> 301 bytes | |||
| -rwxr-xr-x | images/smiley-heart.gif | bin | 592 -> 577 bytes | |||
| -rwxr-xr-x | images/smiley-innocent.gif | bin | 336 -> 305 bytes | |||
| -rwxr-xr-x | images/smiley-kiss.gif | bin | 338 -> 299 bytes | |||
| -rwxr-xr-x | images/smiley-laughing.gif | bin | 344 -> 306 bytes | |||
| -rwxr-xr-x | images/smiley-money-mouth.gif | bin | 321 -> 291 bytes | |||
| -rwxr-xr-x | images/smiley-sealed.gif | bin | 325 -> 293 bytes | |||
| -rwxr-xr-x | images/smiley-smile.gif | bin | 345 -> 306 bytes | |||
| -rwxr-xr-x | images/smiley-surprised.gif | bin | 342 -> 303 bytes | |||
| -rwxr-xr-x | images/smiley-tongue-out.gif | bin | 328 -> 290 bytes | |||
| -rwxr-xr-x | images/smiley-undecided.gif | bin | 337 -> 299 bytes | |||
| -rw-r--r-- | images/smiley-whitebeard.png | bin | 0 -> 1060 bytes | |||
| -rwxr-xr-x | images/smiley-wink.gif | bin | 351 -> 312 bytes | |||
| -rwxr-xr-x | images/smiley-yell.gif | bin | 336 -> 298 bytes | |||
| -rw-r--r-- | images/whitebeard.jpg | bin | 951 -> 0 bytes | |||
| -rw-r--r-- | include/text.php | 4 | ||||
| -rw-r--r-- | view/theme/diabook/nav.tpl | 4 |
23 files changed, 6 insertions, 2 deletions
diff --git a/images/beard.jpg b/images/beard.jpg Binary files differdeleted file mode 100644 index d65e0c33b..000000000 --- a/images/beard.jpg +++ /dev/null diff --git a/images/smiley-beard.png b/images/smiley-beard.png Binary files differnew file mode 100644 index 000000000..5d4b28463 --- /dev/null +++ b/images/smiley-beard.png diff --git a/images/smiley-cool.gif b/images/smiley-cool.gif Binary files differindex ba90cc36f..cee1c1aa3 100755 --- a/images/smiley-cool.gif +++ b/images/smiley-cool.gif diff --git a/images/smiley-cry.gif b/images/smiley-cry.gif Binary files differindex 74d897a4f..06e6ca2c2 100755 --- a/images/smiley-cry.gif +++ b/images/smiley-cry.gif diff --git a/images/smiley-embarassed.gif b/images/smiley-embarassed.gif Binary files differindex 963a96b8a..adc12e7c5 100755 --- a/images/smiley-embarassed.gif +++ b/images/smiley-embarassed.gif diff --git a/images/smiley-foot-in-mouth.gif b/images/smiley-foot-in-mouth.gif Binary files differindex 16f68cc1e..b444e5781 100755 --- a/images/smiley-foot-in-mouth.gif +++ b/images/smiley-foot-in-mouth.gif diff --git a/images/smiley-frown.gif b/images/smiley-frown.gif Binary files differindex 716f55e16..9ff19850d 100755 --- a/images/smiley-frown.gif +++ b/images/smiley-frown.gif diff --git a/images/smiley-heart.gif b/images/smiley-heart.gif Binary files differindex 21c0c6530..6a11e7065 100755 --- a/images/smiley-heart.gif +++ b/images/smiley-heart.gif diff --git a/images/smiley-innocent.gif b/images/smiley-innocent.gif Binary files differindex 334d49e0e..9d747140e 100755 --- a/images/smiley-innocent.gif +++ b/images/smiley-innocent.gif diff --git a/images/smiley-kiss.gif b/images/smiley-kiss.gif Binary files differindex 4efd549ed..cc356611e 100755 --- a/images/smiley-kiss.gif +++ b/images/smiley-kiss.gif diff --git a/images/smiley-laughing.gif b/images/smiley-laughing.gif Binary files differindex 1606c119e..1bf29de79 100755 --- a/images/smiley-laughing.gif +++ b/images/smiley-laughing.gif diff --git a/images/smiley-money-mouth.gif b/images/smiley-money-mouth.gif Binary files differindex ca2451e10..1e8ccd0f3 100755 --- a/images/smiley-money-mouth.gif +++ b/images/smiley-money-mouth.gif diff --git a/images/smiley-sealed.gif b/images/smiley-sealed.gif Binary files differindex b33d3cca1..98186742d 100755 --- a/images/smiley-sealed.gif +++ b/images/smiley-sealed.gif diff --git a/images/smiley-smile.gif b/images/smiley-smile.gif Binary files differindex e6a9e60d5..b9bff40a4 100755 --- a/images/smiley-smile.gif +++ b/images/smiley-smile.gif diff --git a/images/smiley-surprised.gif b/images/smiley-surprised.gif Binary files differindex cb99cdd91..b07465326 100755 --- a/images/smiley-surprised.gif +++ b/images/smiley-surprised.gif diff --git a/images/smiley-tongue-out.gif b/images/smiley-tongue-out.gif Binary files differindex 2075dc160..48867dc26 100755 --- a/images/smiley-tongue-out.gif +++ b/images/smiley-tongue-out.gif diff --git a/images/smiley-undecided.gif b/images/smiley-undecided.gif Binary files differindex bef7e2573..28029794f 100755 --- a/images/smiley-undecided.gif +++ b/images/smiley-undecided.gif diff --git a/images/smiley-whitebeard.png b/images/smiley-whitebeard.png Binary files differnew file mode 100644 index 000000000..2a1fccbb7 --- /dev/null +++ b/images/smiley-whitebeard.png diff --git a/images/smiley-wink.gif b/images/smiley-wink.gif Binary files differindex 9faf1aff8..e1cefb05c 100755 --- a/images/smiley-wink.gif +++ b/images/smiley-wink.gif diff --git a/images/smiley-yell.gif b/images/smiley-yell.gif Binary files differindex 648e6e879..5296c8836 100755 --- a/images/smiley-yell.gif +++ b/images/smiley-yell.gif diff --git a/images/whitebeard.jpg b/images/whitebeard.jpg Binary files differdeleted file mode 100644 index 363eba6a5..000000000 --- a/images/whitebeard.jpg +++ /dev/null diff --git a/include/text.php b/include/text.php index e7c95d35c..5ad0154d7 100644 --- a/include/text.php +++ b/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); diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index 3a36e7daa..027a8b7b7 100644 --- a/view/theme/diabook/nav.tpl +++ b/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> + {# |
