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

* remotes/upstream/master:
  small fix
  don't include friend suggestions for people with the same name as current contacts. This will remove a lot of #whoaretonybaldwin.
  position the theme-preview on settings page
  more wordsmithing of the Friendica invitation email
  screenshot gallery
  theme preview for end users

* master:

include/socgraph.php

@@ -237,12 +237,14 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
 
 	$r = q("SELECT count(glink.gcid) as `total`, gcontact.* from gcontact 
 		left join glink on glink.gcid = gcontact.id 
-		where uid = %d and not gcontact.nurl in ( select nurl from contact where uid = %d)
+		where uid = %d and not gcontact.nurl in ( select nurl from contact where uid = %d )
+		and not gcontact.name in ( select name from contact where uid = %d )
 		and not gcontact.id in ( select gcid from gcign where uid = %d )
 		group by glink.gcid order by total desc limit %d, %d ",
 		intval($uid),
 		intval($uid),
 		intval($uid),
+		intval($uid),
 		intval($start),
 		intval($limit)
 	);
@@ -252,11 +254,13 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
 
 	$r2 = q("SELECT gcontact.* from gcontact 
 		left join glink on glink.gcid = gcontact.id 
-		where glink.uid = 0 and glink.cid = 0 and not gcontact.nurl in ( select nurl from contact where uid = %d)
+		where glink.uid = 0 and glink.cid = 0 and not gcontact.nurl in ( select nurl from contact where uid = %d )
+		and not gcontact.name in ( select name from contact where uid = %d )
 		and not gcontact.id in ( select gcid from gcign where uid = %d )
 		order by rand() limit %d, %d ",
 		intval($uid),
 		intval($uid),
+		intval($uid),
 		intval($start),
 		intval($limit)
 	);

js/main.js

@@ -588,3 +588,10 @@ Array.prototype.remove = function(item) {
   return this.push.apply(this, rest);
 };
 
+function previewTheme(elm) {
+	theme = $(elm).val();
+	$.getJSON('pretheme?f=&theme=' + theme,function(data) {
+			$('#theme-preview').html('<a href="' + data.img + '"><img src="' + data.img + '" width="320" height="240" alt="' + theme + '" /></a>');
+	});
+
+}

mod/invite.php

@@ -56,7 +56,7 @@ function invite_post(&$a) {
 		else
 			$nmessage = $message;
 
-		$res = mail($recip, sprintf( t('Please join my close friends on Friendica'), $a->config['sitename']), 
+		$res = mail($recip, sprintf( t('Please join us on Friendica'), $a->config['sitename']), 
 			$nmessage, 
 			"From: " . $a->user['email'] . "\n"
 			. 'Content-type: text/plain; charset=UTF-8' . "\n"
@@ -97,9 +97,10 @@ function invite_content(&$a) {
 	$dirloc = get_config('system','directory_submit_url');
 	if(strlen($dirloc)) {
 		if($a->config['register_policy'] == REGISTER_CLOSED)
-			$linktxt = sprintf( t('Visit %s for a list of public sites you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.'), dirname($dirloc) . '/siteinfo');
+			$linktxt = sprintf( t('Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.'), dirname($dirloc) . '/siteinfo');
 		elseif($a->config['register_policy'] != REGISTER_CLOSED)
-			$linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website. They all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites.'),$a->get_baseurl(),dirname($dirloc) . '/siteinfo');
+			$linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), $a->get_baseurl())
+			. "\r\n" . "\r\n" . sprintf( t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join.'),dirname($dirloc) . '/siteinfo');
 	}
 	else {
 		$o = t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
@@ -110,7 +111,7 @@ function invite_content(&$a) {
 		'$invite' => t('Send invitations'),
 		'$addr_text' => t('Enter email addresses, one per line:'),
 		'$msg_text' => t('Your message:'),
-		'$default_message' => t('Please join my close friends on Friendica, and help us to build a better social web.') . "\r\n" . "\r\n"
+		'$default_message' => t('You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n"
 			. $linktxt
 			. "\r\n" . "\r\n" . (($invonly) ? t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') .t('Once you have registered, please connect with me via my profile page at:') 
 			. "\r\n" . "\r\n" . $a->get_baseurl() . '/profile/' . $a->user['nickname']

mod/pretheme.php

@@ -0,0 +1,6 @@
+<?php
+
+function pretheme_init(&$a) {
+	if($_REQUEST['theme']) echo json_encode(array('img' => get_theme_screenshot($_REQUEST['theme'])));
+	killme();
+}

view/field_themeselect.tpl

@@ -0,0 +1,9 @@
+	
+	<div class='field select'>
+		<label for='id_$field.0'>$field.1</label>
+		<select name='$field.0' id='id_$field.0' onchange="previewTheme(this);" >
+			{{ for $field.4 as $opt=>$val }}<option value="$opt" {{ if $opt==$field.2 }}selected="selected"{{ endif }}>$val</option>{{ endfor }}
+		</select>
+		<span class='field_help'>$field.3</span>
+		<div id="theme-preview"></div>
+	</div>

view/settings.tpl

@@ -28,7 +28,7 @@ $nickname_block
 {{inc field_custom.tpl with $field=$timezone }}{{endinc}}
 {{inc field_input.tpl with $field=$defloc }}{{endinc}}
 {{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
-{{inc field_select.tpl with $field=$theme }}{{endinc}}
+{{inc field_themeselect.tpl with $field=$theme }}{{endinc}}
 {{inc field_input.tpl with $field=$ajaxint }}{{endinc}}
 {{inc field_input.tpl with $field=$itemspage_network }}{{endinc}}
 {{inc field_checkbox.tpl with $field=$nosmile}}{{endinc}}

view/theme/diabook-blue/communityhome.tpl

@@ -46,7 +46,7 @@
 </div>
 {{ endif }}
 
-{{ if $lastusers_title }}
+{{ if $page }}
 <div>$page</div>
 {{ endif }}
 

view/theme/diabook-blue/theme.php

@@ -18,7 +18,7 @@ $cssFile = null;
 /**
  * prints last community activity
  */
-function diabook_community_info(){
+function diabook_blue_community_info(){
 	$a = get_app();
 	//right_aside at networkpages
 
@@ -170,6 +170,7 @@ function diabook_community_info(){
 	if (sizeof($contacts) > 0)
 		
 		$aside['$page'] = $page;
+		
   //END Community Page		   
    
    
@@ -214,7 +215,7 @@ if ($a->argv[0] === "network" && local_user()){
 	}
 	
 	// COMMUNITY
-	diabook_community_info();
+	diabook_blue_community_info();
 	
 	// CUSTOM CSS
 	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-network.css";
@@ -227,7 +228,7 @@ if ($a->argv[0] === "network" && local_user()){
 if ($a->argv[0] === "profile"){
 	
 	// COMMUNITY
-	diabook_community_info();
+	diabook_blue_community_info();
 	
 	// CUSTOM CSS
 	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-profile.css";

view/theme/diabook/communityhome.tpl

@@ -46,7 +46,7 @@
 </div>
 {{ endif }}
 
-{{ if $lastusers_title }}
+{{ if $page }}
 <div>$page</div>
 {{ endif }}
 

view/theme/diabook/theme.php

@@ -252,12 +252,7 @@ $a->page['htmlhead'] .= <<< EOT
 	$('a.lightbox').fancybox(); // Select all links with lightbox class
  });
  
- $(document).ready(function ()
+ 
-$('iframe').each(function()
-var url = $(this).attr("src");
-$(this).attr("src",url+"?wmode=transparent");
-);
-);
  
  </script>
 EOT;

view/theme/duepuntozero/style.css

@@ -249,6 +249,10 @@ div.wall-item-content-wrapper.shiny {
 	background: #FFFFC8;
 }
 
+#theme-preview {
+	margin: 15px 0 15px 150px;
+}
+
 /* from default */
 #jot-perms-icon, 
 #profile-location,