Merge branch 'pull'
BIN
images/beard.jpg
Before Width: | Height: | Size: 989 B |
BIN
images/smiley-beard.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 354 B After Width: | Height: | Size: 315 B |
Before Width: | Height: | Size: 329 B After Width: | Height: | Size: 303 B |
Before Width: | Height: | Size: 331 B After Width: | Height: | Size: 300 B |
Before Width: | Height: | Size: 344 B After Width: | Height: | Size: 306 B |
Before Width: | Height: | Size: 340 B After Width: | Height: | Size: 301 B |
Before Width: | Height: | Size: 592 B After Width: | Height: | Size: 577 B |
Before Width: | Height: | Size: 336 B After Width: | Height: | Size: 305 B |
Before Width: | Height: | Size: 338 B After Width: | Height: | Size: 299 B |
Before Width: | Height: | Size: 344 B After Width: | Height: | Size: 306 B |
Before Width: | Height: | Size: 321 B After Width: | Height: | Size: 291 B |
Before Width: | Height: | Size: 325 B After Width: | Height: | Size: 293 B |
Before Width: | Height: | Size: 345 B After Width: | Height: | Size: 306 B |
Before Width: | Height: | Size: 342 B After Width: | Height: | Size: 303 B |
Before Width: | Height: | Size: 328 B After Width: | Height: | Size: 290 B |
Before Width: | Height: | Size: 337 B After Width: | Height: | Size: 299 B |
BIN
images/smiley-whitebeard.png
Normal file
After Width: | Height: | Size: 1 KiB |
Before Width: | Height: | Size: 351 B After Width: | Height: | Size: 312 B |
Before Width: | Height: | Size: 336 B After Width: | Height: | Size: 298 B |
Before Width: | Height: | Size: 951 B |
|
@ -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);
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
||||
{#
|
||||
|
||||
|
|