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:

3 files changed, 2 insertions, 7 deletions

diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
index c1b395dbe..1ba9ad081 100755
--- a/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
@@ -46,7 +46,7 @@
 </div>
 {{ endif }}
 
-{{ if $lastusers_title }}
+{{ if $page }}
 <div>$page</div>
 {{ endif }}
 
diff --git a/view/theme/diabook/screenshot.jpg b/view/theme/diabook/screenshot.jpg
new file mode 100644
index 000000000..abc31e329
--- /dev/null
+++ b/view/theme/diabook/screenshot.jpg
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 5b87e3142..5bd206100 100755
--- a/view/theme/diabook/theme.php
+++ b/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;