aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-03-06 18:26:22 -0500
committerSimon L'nu <simon.lnu@gmail.com>2012-03-06 18:26:22 -0500
commita33ca0a7318cf727b5c605c381e4c6f20463ad3e (patch)
treed9e51a0d8667cad5fcf3fc22cde9b7080ecb12a7 /include
parent94d4cad701ab6b618afb288c88165c0ec17ae238 (diff)
parent1fae778421253b713c166f3e4d329997a9e214a3 (diff)
downloadvolse-hubzilla-a33ca0a7318cf727b5c605c381e4c6f20463ad3e.tar.gz
volse-hubzilla-a33ca0a7318cf727b5c605c381e4c6f20463ad3e.tar.bz2
volse-hubzilla-a33ca0a7318cf727b5c605c381e4c6f20463ad3e.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: search should be ok, but a little extra security won't hurt messages-menu translation, add scroll-to-top and theme-bug-report in theme Fixed...merged with mainline THEN added beards. added beard smileys doc/Account-Basics.md doc/Account-Basics.md a doc/Remove-Account.md doc/Making-Friends.md doc/Bugs-and-Issues.md doc/Account-Basics.md * master:
Diffstat (limited to 'include')
-rwxr-xr-xinclude/nav.php3
-rw-r--r--[-rwxr-xr-x]include/text.php6
2 files changed, 8 insertions, 1 deletions
diff --git a/include/nav.php b/include/nav.php
index 511ca07fc..aadfa82fd 100755
--- a/include/nav.php
+++ b/include/nav.php
@@ -122,6 +122,9 @@ function nav(&$a) {
}
$nav['messages'] = array('message', t('Messages'), "", t('Private mail'));
+ $nav['messages']['inbox'] = array('message', t('Inbox'), "", t('Inbox'));
+ $nav['messages']['outbox']= array('message/sent', t('Outbox'), "", t('Outbox'));
+ $nav['messages']['new'] = array('message/new', t('New Message'), "", t('New Message'));
if(is_array($a->identities) && count($a->identities) > 1) {
$nav['manage'] = array('manage', t('Manage'), "", t('Manage other pages'));
diff --git a/include/text.php b/include/text.php
index c8c03174e..e7c95d35c 100755..100644
--- a/include/text.php
+++ b/include/text.php
@@ -738,6 +738,9 @@ function smilies($s, $sample = false) {
'~friendika',
'~friendica',
// 'Diaspora*'
+ ':beard',
+ ':whitebeard'
+
);
$icons = array(
@@ -779,7 +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" />'
);
$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);