4 files changed, 56 insertions, 9 deletions
diff --git a/admin/themes/default/default-layout.css b/admin/themes/default/default-layout.css
index 6b7827fad..4aa719cda 100644
--- a/admin/themes/default/default-layout.css
+++ b/admin/themes/default/default-layout.css
@@ -737,8 +737,13 @@ BODY#thePopuphelpPage {
   height: 4em;    /* legend height (don't set auto to be Gecko friendly)*/
 }
 
-.themeBox {float:left; text-align:center; height:170px; background-color:#eee; margin:5px; -moz-border-radius:5px;}
+.themeBox {float:left; text-align:center; height:180px; background-color:#eee; margin:5px; -moz-border-radius:5px;}
 .themeBox IMG {border:1px solid white; margin:0 15px;}
 .themeName {font-size:1.1em; margin:5px 0;}
-.themeActions {margin:5px 0;}
-.themeActions A {display:block;}
+.themeActions {margin:5px 0; font-size:12px;}
+.themeActions A {}
+
+#themesContent .themeBox IMG {width:150px; height:120px;}
+#themesContent H3 {font-size:16px; text-align:left; border-bottom:1px solid #444; letter-spacing:1px; margin:5px;}
+
+.themeBoxes {min-height:300px;}
+\ No newline at end of file
diff --git a/admin/themes/default/template/footer.tpl b/admin/themes/default/template/footer.tpl
index e8709b59f..f7c83474e 100644
--- a/admin/themes/default/template/footer.tpl
+++ b/admin/themes/default/template/footer.tpl
@@ -45,7 +45,7 @@
 {literal}
 <script type='text/javascript'>
   $(function() {
-    $('#pwgHead A, #footer A').tipTip({
+    $('#pwgHead A, #footer A, .themeActions A').tipTip({
         'delay' : 0,
         'fadeIn' : 200,
         'fadeOut' : 200,
diff --git a/admin/themes/default/template/themes_installed.tpl b/admin/themes/default/template/themes_installed.tpl
new file mode 100644
index 000000000..8c0fca6fa
--- /dev/null
+++ b/admin/themes/default/template/themes_installed.tpl
@@ -0,0 +1,42 @@
+<div class="titrePage">
+  <h2>{'Installed Themes'|@translate}</h2>
+</div>
+
+<div id="themesContent">
+
+<h3>Active Themes</h3>
+{if isset($active_themes)}
+<div class="themeBoxes">
+{foreach from=$active_themes item=theme}
+  <div class="themeBox{if $theme.is_default} themeDefault{/if}">
+    <div class="themeName">{$theme.name}{if $theme.is_default} <em>(default)</em>{/if}</div>
+    <div class="themeShot"><img src="{$theme.screenshot}"></div>
+    <div class="themeActions">
+      <a href="{$deactivate_baseurl}{$theme.id}" title="{'Forbid this theme to users'|@translate}">{'Deactivate'|@translate}</a>
+{if not $theme.is_default}
+      | <a href="{$set_default_baseurl}{$theme.id}" title="{'Set as default theme for unregistered and new users'|@translate}">{'Default'|@translate}</a>
+{/if}
+    </div> <!-- themeActions -->
+  </div>
+{/foreach}
+</div> <!-- themeBoxes -->
+{/if}
+
+{if isset($inactive_themes)}
+<h3>Inactive Themes</h3>
+<div class="themeBoxes">
+{foreach from=$inactive_themes item=theme}
+  <div class="themeBox">
+    <div class="themeName">{$theme.name}</div>
+    <div class="themeShot"><img src="{$theme.screenshot}"></div>
+    <div class="themeActions">
+      <a href="{$activate_baseurl}{$theme.id}" title="{'Make this theme available to users'|@translate}">{'Activate'|@translate}</a>
+      | <a href="{$delete_baseurl}{$theme.id}" title="{'Delete this theme'|@translate}">{'Delete'|@translate}</a>
+    </div>
+    
+  </div>
+{/foreach}
+</div> <!-- themeBoxes -->
+{/if}
+
+</div> <!-- themesContent -->
+\ No newline at end of file
diff --git a/admin/themes/default/template/themes_new.tpl b/admin/themes/default/template/themes_new.tpl
index 0edcb4130..1eb67b74b 100644
--- a/admin/themes/default/template/themes_new.tpl
+++ b/admin/themes/default/template/themes_new.tpl
@@ -1,15 +1,15 @@
 <div class="titrePage">
-  <h2>{'Install New Theme'|@translate}</h2>
+  <h2>{'Add New Theme'|@translate}</h2>
 </div>
 
 {if isset($themes)}
-<div id="themesBox">
+<div id="themeBoxes">
 {foreach from=$new_themes item=theme name=themes_loop}
   <div class="themeBox">
     <div class="themeName">{$theme.name}</div>
-    <div class="themeShot"><img src="{$theme.src}"></div>
-    <div class="themeActions"><a href="{$theme.install_url}">Install</a></div>
+    <div class="themeShot"><img src="{$theme.screenshot}"></div>
+    <div class="themeActions"><a href="{$theme.install_url}">{'Install'|@translate}</a></div>
   </div>
 {/foreach}
-</div> <!-- themesBox -->
+</div> <!-- themeBoxes -->
 {/if}
 \ No newline at end of file