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

* remotes/upstream/master: theme screenshots * master:
2012-03-25 22:40:24 -04:00 · 2012-03-25 22:40:24 -04:00 · 758e1b7424
commit 758e1b7424
parent 3d62cb9782 7ab117fd31
6 changed files with 22 additions and 2 deletions
--- 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/">
--- a/view/theme/comix-plain/screenshot.jpg
+++ b/view/theme/comix-plain/screenshot.jpg