aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2010-04-29 21:34:37 +0000
committerpatdenice <patdenice@piwigo.org>2010-04-29 21:34:37 +0000
commit5a44a6f5324bb2363d4d0827cd8a94e613e72837 (patch)
tree185b799645bdc6550a64a9f9e0340768a0efdc9c
parent0a5b09601b647cf22d9bd4ab291c58156931a761 (diff)
- Fix tab display on IE
- Display missing screenshot on themes_new if screenshot is missing. git-svn-id: http://piwigo.org/svn/trunk@6015 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--admin/themes/clear/theme.css2
-rw-r--r--admin/themes/default/template/themes_new.tpl2
-rw-r--r--admin/themes/roma/images/missing_screenshot.pngbin3316 -> 2848 bytes
-rw-r--r--admin/themes/roma/theme.css2
-rw-r--r--admin/themes_new.php4
5 files changed, 7 insertions, 3 deletions
diff --git a/admin/themes/clear/theme.css b/admin/themes/clear/theme.css
index e5b982ea4..6e3b50715 100644
--- a/admin/themes/clear/theme.css
+++ b/admin/themes/clear/theme.css
@@ -119,7 +119,7 @@ text-align:center; top:0; width:100%; z-index:99; }
.tabsheet {
background-color:#f9f9f9; border:1px solid #f9f9f9; border-bottom:1px solid #aaa; display:table;
font-family:verdana,arial,helvetica,sans-serif; font-size:8px;
-list-style-image:none; padding: 0; position:relative; text-decoration:none;
+list-style-type:none; list-style-image:none; padding: 0; position:relative; text-decoration:none;
top:-2px; white-space:nowrap; margin: 0 0 0 -6px; padding-left:10px;
width:100%; }
.tabsheet li { background:#f1f1f1; float:left; margin:0 6px 0 0; overflow:hidden; text-align:right; border:1px solid #aaa; border-bottom:none; position:relative; top:11px; -moz-border-radius-topleft:5px; -moz-border-radius-topright:5px;}
diff --git a/admin/themes/default/template/themes_new.tpl b/admin/themes/default/template/themes_new.tpl
index 7965cc0d4..ff7e4c514 100644
--- a/admin/themes/default/template/themes_new.tpl
+++ b/admin/themes/default/template/themes_new.tpl
@@ -7,7 +7,7 @@
{foreach from=$new_themes item=theme name=themes_loop}
<div class="themeBox">
<div class="themeName">{$theme.name}</div>
- <div class="themeShot"><img src="{$theme.screenshot}"></div>
+ <div class="themeShot"><img src="{$theme.screenshot}" onerror="this.src='{$default_screenshot}'"></div>
<div class="themeActions"><a href="{$theme.install_url}">{'Install'|@translate}</a></div>
</div>
{/foreach}
diff --git a/admin/themes/roma/images/missing_screenshot.png b/admin/themes/roma/images/missing_screenshot.png
index 97610eaeb..d830ece10 100644
--- a/admin/themes/roma/images/missing_screenshot.png
+++ b/admin/themes/roma/images/missing_screenshot.png
Binary files differ
diff --git a/admin/themes/roma/theme.css b/admin/themes/roma/theme.css
index bcb92a8a0..000443bc1 100644
--- a/admin/themes/roma/theme.css
+++ b/admin/themes/roma/theme.css
@@ -128,7 +128,7 @@ text-align:center; top:0; width:100%; z-index:99; }
.tabsheet {
background-color:#111111; border:0px none; border-bottom:1px solid #ff3363; display:table;
font-family:verdana,arial,helvetica,sans-serif; font-size:8px;
-list-style-image:none; padding: 0; position:relative; text-decoration:none;
+list-style-type:none; list-style-image:none; padding: 0; position:relative; text-decoration:none;
top:-2px; white-space:nowrap; margin: 0 0 0 -5px; padding-left:10px;
width:100%; }
.tabsheet li { background:#222222; float:left; margin:0 6px 0 0; overflow:hidden; text-align:right; border:1px solid #ff3363; border-bottom:none; position:relative; top:11px; -moz-border-radius-topleft:5px; -moz-border-radius-topright:5px;}
diff --git a/admin/themes_new.php b/admin/themes_new.php
index d5403b117..fda4a03d2 100644
--- a/admin/themes_new.php
+++ b/admin/themes_new.php
@@ -139,5 +139,9 @@ else
array_push($page['errors'], l10n('Can\'t connect to server.'));
}
+$template->assign('default_screenshot',
+ get_root_url().'admin/themes/'.$conf['admin_theme'].'/images/missing_screenshot.png'
+);
+
$template->assign_var_from_handle('ADMIN_CONTENT', 'themes');
?> \ No newline at end of file