Merge branch 'master' of https://github.com/friendica/red

7 files changed, 10 insertions, 5 deletions

diff --git a/view/js/icon_translate.js b/view/js/icon_translate.js
index 930d3b265..fcbc26a3f 100644
--- a/view/js/icon_translate.js
+++ b/view/js/icon_translate.js
@@ -54,4 +54,5 @@ $(document).ready(function() {
 		$('.icon-bookmark').addClass('');
 		$('.icon-fullscreen').addClass('');
 		$('.icon-share').addClass('');
+		$('.icon-plus').addClass('');
 });
\ No newline at end of file
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 262819469..422a72e26 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -43,6 +43,10 @@ abbr {
   text-indent: 0px;
 }
 
+.connect-icon {
+	margin-right: 5px;
+}
+
 a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { 
 	font-weight: bold;
 	color: $link_colour; 
diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
index 7a3d42e01..e5f12944e 100755
--- a/view/tpl/direntry.tpl
+++ b/view/tpl/direntry.tpl
@@ -9,7 +9,7 @@
 
 <div class="contact-name" id="directory-name-{{$entry.id}}"  ><span onclick="dirdetails('{{$entry.hash}}');" class="fakelink" >{{$entry.name}}</span></div>
 {{if $entry.connect}}
-<div class="directory-connect btn btn-default"><a href="{{$entry.connect}}">{{$entry.conn_label}}</a></div>
+<div class="directory-connect btn btn-default"><a href="{{$entry.connect}}"><i class="icon-plus connect-icon"></i> {{$entry.conn_label}}</a></div>
 {{/if}}
 <div class="contact-details">{{$entry.details}}</div>
 </div>
diff --git a/view/tpl/direntry_large.tpl b/view/tpl/direntry_large.tpl
index 487839f7a..da6ea1a44 100755
--- a/view/tpl/direntry_large.tpl
+++ b/view/tpl/direntry_large.tpl
@@ -15,7 +15,7 @@
 
 <div class="contact-name" id="directory-name-{{$id}}"  >{{$name}}{{if $online}} <i class="icon-asterisk online-now" title="{{$online}}"></i>{{/if}}</div>
 {{if $connect}}
-<div class="directory-connect btn btn-default"><a href="{{$connect}}">{{$conn_label}}</a></div>
+<div class="directory-connect btn btn-default"><a href="{{$connect}}"><i class="icon-plus connect-icon"></i> {{$conn_label}}</a></div>
 {{/if}}
 
 <div class="contact-webbie">{{$address}}</div>
diff --git a/view/tpl/match.tpl b/view/tpl/match.tpl
index 0688ca26b..41587430b 100755
--- a/view/tpl/match.tpl
+++ b/view/tpl/match.tpl
@@ -10,7 +10,7 @@
 	</div>
 	<div class="profile-match-end"></div>
 	{{if $connlnk}}
-	<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
+	<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}"><i class="icon-plus connect-icon"></i> {{$conntxt}}</a></div>
 	{{/if}}
 
 </div>
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 10a0a25a9..d72507d4c 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -45,7 +45,7 @@
 
 
 {{if $connect}}
-<a href="{{$connect_url}}" class="rconnect">{{$connect}}</a>
+<a href="{{$connect_url}}" class="rconnect"><i class="icon-plus connect-icon"></i> {{$connect}}</a>
 {{/if}}
 	
 </div>
diff --git a/view/tpl/suggest_friends.tpl b/view/tpl/suggest_friends.tpl
index 0388504d2..6cf8f7ba8 100755
--- a/view/tpl/suggest_friends.tpl
+++ b/view/tpl/suggest_friends.tpl
@@ -11,6 +11,6 @@
 	</div>
 	<div class="profile-match-end"></div>
 	{{if $entry.connlnk}}
-	<div class="profile-match-connect"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}">{{$entry.conntxt}}</a></div>
+	<div class="profile-match-connect"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}"><i class="icon-plus connect-icon"></i> {{$entry.conntxt}}</a></div>
 	{{/if}}
 </div>