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

* remotes/upstream/master:
  theme screenshots

* master:

6 files changed, 22 insertions, 2 deletions

diff --git a/boot.php b/boot.php
index 19661805c..b2f91f3f7 100755
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1291' );
+define ( 'FRIENDICA_VERSION',      '2.3.1292' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1133      );
 
diff --git a/images/blank.png b/images/blank.png
new file mode 100644
index 000000000..67d391966
--- /dev/null
+++ b/images/blank.png
diff --git a/include/plugin.php b/include/plugin.php
index 8280b1022..df33fd3f2 100755
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -276,3 +276,13 @@ function get_theme_info($theme){
 	return $info;
 }}
 
+
+function get_theme_screenshot($theme) {
+	$a = get_app();
+	$exts = array('.png','.jpg');
+	foreach($exts as $ext) {
+		if(file_exists('view/theme/' . $theme . '/screenshot' . $ext))
+			return($a->get_baseurl() . '/view/theme/' . $theme . '/screenshot' . $ext);
+	}
+	return($a->get_baseurl() . '/images/blank.png');
+}
diff --git a/mod/admin.php b/mod/admin.php
index a64b26903..53b5ee354 100755
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -583,6 +583,7 @@ function admin_page_plugins(&$a){
 		
 			'$admin_form' => $admin_form,
 			'$function' => 'plugins',
+			'$screenshot' => '',
 			'$readme' => $readme
 		));
 	} 
@@ -738,7 +739,11 @@ function admin_page_themes(&$a){
 		} 
 		
 		$admin_form="";
-		
+
+		$screenshot = array( get_theme_screenshot($theme), t('Screenshot'));
+		if(! stristr($screenshot[0],$theme))
+			$screenshot = null;		
+
 		$t = get_markup_template("admin_plugins_details.tpl");
 		return replace_macros($t, array(
 			'$title' => t('Administration'),
@@ -755,6 +760,7 @@ function admin_page_themes(&$a){
 			'$admin_form' => $admin_form,
 			'$str_author' => t('Author: '),
 			'$str_maintainer' => t('Maintainer: '),			
+			'$screenshot' => $screenshot,
 			'$readme' => $readme
 		));
 	} 
diff --git a/view/admin_plugins_details.tpl b/view/admin_plugins_details.tpl
index ead356f5b..cbaef2d66 100755
--- a/view/admin_plugins_details.tpl
+++ b/view/admin_plugins_details.tpl
@@ -16,6 +16,10 @@
 	{{ endfor }}
 	</p>
 	
+	{{ if $screenshot }}
+	<a href="$screenshot.0" ><img src="$screenshot.0" width="320" height="240" alt="$screenshot.1" /></a>
+	{{ endif }}
+
 	{{ if $admin_form }}
 	<h3>$settings</h3>
 	<form method="post" action="$baseurl/admin/$function/$plugin/">
diff --git a/view/theme/comix-plain/screenshot.jpg b/view/theme/comix-plain/screenshot.jpg
new file mode 100644
index 000000000..80e66e312
--- /dev/null
+++ b/view/theme/comix-plain/screenshot.jpg