Merge pull request #40 from simonlnu/newsmilies

add :headdesk and fix doc/Pages.md to remove the absolute URL to /

3 files changed, 3 insertions, 1 deletions

diff --git a/doc/Pages.md b/doc/Pages.md
index ff2fb9fb3..d0e6776a4 100755
--- a/doc/Pages.md
+++ b/doc/Pages.md
@@ -24,7 +24,7 @@ The "Automatic Friend Account" is typically used for personal profile pages wher
 
 We recommend that you create group pages with the same email address and password as your normal account. If you do this, you will find a new "Manage" tab on the menu bar which lets you toggle identities easily and manage your pages. You are not required to do this, but the alternative is to logout and log back into the other account to manage alternate pages - and this could get cumbersome if you manage several different pages/identities. 
 
-You may also appoint a delegate to manage your page. Do this by visiting the [Delegation Setup Page](/delegate). This will provide you with a list of contacts on this system under "Potential Delegates". Selecting one or more persons will give them access to manage your page. They will be able to edit contacts, profiles, and all content for this account/page. Please use this facility wisely. Delegated managers will not be able to alter basic account settings such as passwords or page types and/or remove the account.  
+You may also appoint a delegate to manage your page. Do this by visiting the [Delegation Setup Page](delegate). This will provide you with a list of contacts on this system under "Potential Delegates". Selecting one or more persons will give them access to manage your page. They will be able to edit contacts, profiles, and all content for this account/page. Please use this facility wisely. Delegated managers will not be able to alter basic account settings such as passwords or page types and/or remove the account.
 
 
 **Posting to Community Pages**
diff --git a/images/smiley-bangheaddesk.gif b/images/smiley-bangheaddesk.gif
new file mode 100644
index 000000000..91ccb8bb4
--- /dev/null
+++ b/images/smiley-bangheaddesk.gif
diff --git a/include/text.php b/include/text.php
index 45881b9a6..b9813cfa9 100755
--- a/include/text.php
+++ b/include/text.php
@@ -716,6 +716,7 @@ function smilies($s, $sample = false) {
 		':homebrew', 
 		':coffee', 
 		':facepalm',
+		':headdesk',
 		'~friendika', 
 		'~friendica', 
 		'Diaspora*' 
@@ -756,6 +757,7 @@ function smilies($s, $sample = false) {
 		'<img src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" />',
 		'<img src="' . $a->get_baseurl() . '/images/coffee.gif" alt=":coffee" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-bangheaddesk.gif" alt=":headdesk" />',
 		'<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/friendika-16.png" alt="~friendica" /></a>',
 		'<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',