Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  prevent duplicate friend suggestions
  block filed items from deletion
  add the bang
  network filter is now a permission group
  small fix in css
  add right_aside to diabook-blue
  add connectable services to right_aside
  add PostIt to right_aside, fixes in css

* master:

1 files changed, 25 insertions, 7 deletions

diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
index 944aec2dd..78b80ab3b 100755
--- a/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
@@ -1,13 +1,27 @@
 {{ if $lastusers_title }}
-<h3 style="margin-top:0px;">Help or #NewHere?</h3>
-<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; color:#000;" title="Friendica Support" target="blank">Friendica Support</a><br>
-<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; color:#000;" title="Let's talk" target="blank">Let's talk</a><br>
-<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; color:#000;" target="blank">NewHere</a>
+<h3 style="margin-top:0px;">Help or #NewHere ?</h3>
+<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
+<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
+<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a>
+{{ endif }}
+
+{{ if $lastusers_title }}
+<h3>Connectable Services</h3>
+<div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
+<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook/icons/facebook.png" title="Facebook"></a>
+<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook/icons/StatusNet.png?" title="StatusNet"></a>
+<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook/icons/livejournal.png?" title="LiveJournal"></a>
+<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook/icons/posterous.png?" title="Posterous"></a>
+<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook/icons/tumblr.png?" title="Tumblr"></a>
+<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook/icons/twitter.png?" title="Twitter"></a>
+<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook/icons/wordpress.png?" title="WordPress"></a>
+<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook/icons/email.png?" title="E-Mail"></a>
+</div>
 {{ endif }}
 
 {{ if $lastusers_title }}
 <h3>$lastusers_title</h3>
-<div class='items-wrapper'>
+<div id='lastusers-wrapper' class='items-wrapper'>
 {{ for $lastusers_items as $i }}
 	$i
 {{ endfor }}
@@ -25,19 +39,23 @@
 
 {{ if $photos_title }}
 <h3>$photos_title</h3>
-<div class='items-wrapper'>
+<div id='ra-photos-wrapper' class='items-wrapper'>
 {{ for $photos_items as $i }}
 	$i
 {{ endfor }}
 </div>
 {{ endif }}
 
+{{ if $lastusers_title }}
+<h3>PostIt to Friendica</h3>
+<div style="padding-left: 8px;"><span >Post to Friendica from anywhere by bookmarking this <a href="$fostitJS" title="PostIt">Link</a>.</span></div>
+{{ endif }}
 
 {{ if $like_title }}
 <h3>$like_title</h3>
 <ul id='likes'>
 {{ for $like_items as $i }}
-	<li>$i</li>
+	<li id='ra-photos-wrapper'>$i</li>
 {{ endfor }}
 </ul>
 {{ endif }}