4 files changed, 28 insertions, 3 deletions
diff --git a/themes/default/template/mail/text/html/cat_group_info.tpl b/themes/default/template/mail/text/html/cat_group_info.tpl
index e8d7d7c10..6a136c63c 100644
--- a/themes/default/template/mail/text/html/cat_group_info.tpl
+++ b/themes/default/template/mail/text/html/cat_group_info.tpl
@@ -1,6 +1,6 @@
 <div id="cat_group_info">
 <h2>{'Informations'|@translate}</h2>
-<p>{$IMG_URL}</p>
+<p><a href="{$IMG.link}" class="thumblnk"><img src="{$IMG.src}"></a></p>
 <p>{'Hello,'|@translate}</p>
 <p>{'Discover album:'|@translate} <a href="{$LINK}">{$CAT_NAME}</a></p>
 <p>{$CPL_CONTENT}</p>
diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl
index 733cefcf8..bfc0c2498 100644
--- a/themes/default/template/picture.tpl
+++ b/themes/default/template/picture.tpl
@@ -65,9 +65,28 @@ function changeImgSrc(url,typeSave,typeMap)
 	</a>
 {/if}{/strip}
 {strip}{if isset($current.U_DOWNLOAD)}
-	<a href="{$current.U_DOWNLOAD}" title="{'Download this file'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
+	<a id="downloadSwitchLink" href="{$current.U_DOWNLOAD}" title="{'Download this file'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
 		<span class="pwg-icon pwg-icon-save"></span><span class="pwg-button-text">{'Download'|@translate}</span>
 	</a>
+
+{if !empty($current.formats)}
+{footer_script require='jquery'}{literal}
+jQuery().ready(function() {
+  jQuery("#downloadSwitchLink").removeAttr("href");
+
+  (window.SwitchBox=window.SwitchBox||[]).push("#downloadSwitchLink", "#downloadSwitchBox");
+});
+{/literal}{/footer_script}
+
+<div id="downloadSwitchBox" class="switchBox">
+  <div class="switchBoxTitle">{'Download'|translate} - {'Formats'|translate}</div>
+  <ul>
+  {foreach from=$current.formats item=format}
+    <li><a href="{$format.download_url}" rel="nofollow">{$format.label}<span class="downloadformatDetails"> ({$format.filesize})</span></a></li>
+  {/foreach}
+  </ul>
+</div>
+{/if} {* has formats *}
 {/if}{/strip}
 {if isset($PLUGIN_PICTURE_BUTTONS)}{foreach from=$PLUGIN_PICTURE_BUTTONS item=button}{$button}{/foreach}{/if}
 {if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if}
diff --git a/themes/default/template/slideshow.tpl b/themes/default/template/slideshow.tpl
index 8a2304b8a..03f3655c3 100644
--- a/themes/default/template/slideshow.tpl
+++ b/themes/default/template/slideshow.tpl
@@ -21,4 +21,4 @@
 	  {/if}
 	</div>
 	</div>
-<div>
+</div>
diff --git a/themes/default/theme.css b/themes/default/theme.css
index 3a68f1577..5a438be9c 100644
--- a/themes/default/theme.css
+++ b/themes/default/theme.css
@@ -363,6 +363,12 @@ TD.calDayCellFull, TD.calDayCellEmpty {
   margin-bottom:5px;
 }
 
+#downloadSwitchBox ul {
+  margin:0;
+  padding:0;
+  list-style-type:none;
+}
+
 #theImage {
 	text-align: center;
 }