Tweak wording and appearance of themes, to make it clear that the
attribution is for the theme and not the layout.
Patch by ninetydegrees.
diffs (127 lines):
diff -r 11d9be19dc1d -r 9b94348c53df bin/upgrading/en.dat
--- a/bin/upgrading/en.dat Wed Oct 20 12:08:10 2010 +0800
+++ b/bin/upgrading/en.dat Wed Oct 20 14:17:00 2010 +0800
@@ -4980,7 +4980,9 @@ widget.themechooser.theme.apply=Apply Th
widget.themechooser.theme.customize=Customize
-widget.themechooser.theme.desc=[[layout]] by [[designer]]
+widget.themechooser.theme.desc2=for [[style]]
+
+widget.themechooser.theme.designer=by [[designer]]
widget.themechooser.theme.editlayoutlayer=Edit Layout Layer
@@ -4988,7 +4990,7 @@ widget.themechooser.theme.editthemelayer
widget.themechooser.theme.preview=Preview
-widget.themechooser.theme.specialdesc=<a [[aopts]]><em>Special</em></a> by
[[designer]]
+widget.themechooser.theme.specialdesc2=for <a [[aopts]]><em>Special</em></a>
widget.themenav.btn.filteravailable=Submit
diff -r 11d9be19dc1d -r 9b94348c53df cgi-bin/LJ/Widget/ThemeChooser.pm
--- a/cgi-bin/LJ/Widget/ThemeChooser.pm Wed Oct 20 12:08:10 2010 +0800
+++ b/cgi-bin/LJ/Widget/ThemeChooser.pm Wed Oct 20 14:17:00 2010 +0800
@@ -189,7 +189,13 @@ sub render_body {
$ret .= "<div class='theme-item$theme_class'>";
$ret .= "<img src='" . $theme->preview_imgurl . "'
class='theme-preview' />";
- $ret .= "<h4>" . $theme->name . "</h4>";
+
+ $ret .= "<h4>" . $theme->name . "</h4><div class='theme-action'><span
class='theme-desc'>";
+
+ if ($theme_designer) {
+ my $designer_link = "<a
href='$LJ::SITEROOT/customize/$getextra${getsep}designer=" .
LJ::eurl($theme_designer) . "$showarg'
class='theme-designer'>$theme_designer</a> ";
+ $ret .= $class->ml('widget.themechooser.theme.designer',
{'designer' => $designer_link});
+ }
my $preview_redirect_url;
if ($theme->themeid) {
@@ -204,18 +210,12 @@ sub render_body {
my $layout_link = "<a
href='$LJ::SITEROOT/customize/$getextra${getsep}layoutid=" . $theme->layoutid .
"$showarg' class='theme-layout'><em>$theme_layout_name</em></a>";
my $special_link_opts =
"href='$LJ::SITEROOT/customize/$getextra${getsep}cat=special$showarg'
class='theme-cat'";
- $ret .= "<div class='theme-action'><p class='theme-desc'>";
- if ($theme_designer) {
- my $designer_link = "<a
href='$LJ::SITEROOT/customize/$getextra${getsep}designer=" .
LJ::eurl($theme_designer) . "$showarg'
class='theme-designer'>$theme_designer</a>";
- if ($theme_types{special}) {
- $ret .= $class->ml('widget.themechooser.theme.specialdesc',
{'aopts' => $special_link_opts, 'designer' => $designer_link});
- } else {
- $ret .= $class->ml('widget.themechooser.theme.desc', {'layout'
=> $layout_link, 'designer' => $designer_link});
- }
- } elsif ($theme_layout_name) {
- $ret .= $layout_link;
+ if ($theme_types{special}) {
+ $ret .= $class->ml('widget.themechooser.theme.specialdesc2',
{'aopts' => $special_link_opts});
+ } else {
+ $ret .= $class->ml('widget.themechooser.theme.desc2', {'style' =>
$layout_link});
}
- $ret .= "</p>";
+ $ret .= "</span>";
if ($theme_options) {
$ret .= $theme_options;
diff -r 11d9be19dc1d -r 9b94348c53df htdocs/stc/widgets/themechooser.css
--- a/htdocs/stc/widgets/themechooser.css Wed Oct 20 12:08:10 2010 +0800
+++ b/htdocs/stc/widgets/themechooser.css Wed Oct 20 14:17:00 2010 +0800
@@ -7,12 +7,12 @@
font-size: 22px;
}
.theme-item {
+ font-size: 1em;
position: relative;
float: left;
width: 156px;
text-align: center;
padding: 8px;
- font-size: 11px;
}
.theme-item img.theme-preview {
padding: 1px;
@@ -35,18 +35,24 @@
border: none;
}
.theme-item h4 {
- font-size: 11px;
- padding: 4px 0 0 0;
+ font-size: 1em;
+ height: 2.6em;
+ line-height: 1.3em;
+ min-height: 2.6em;
margin: 0;
- height: 2.5em;
+ padding: .2em 0;
}
.theme-item .theme-desc {
- font-size: 10px;
+ display: block;
+ font-size: 1em;
+ height: 5.2em;
+ line-height: 1.3em;
+ min-height: 5.2em;
margin: 0;
}
.theme-item .theme-action {
- height: 6em;
- padding: 4px 0 6px 0;
+ height: 8em;
+ min-height: 8em;
}
.theme-item.special h4,
.theme-item.special .theme-desc {
@@ -61,7 +67,12 @@
padding-bottom: 4px;
}
.theme-item .theme-button {
- font-size: 11px;
+ font-size: 1em;
+ height: 1.9em;
+ line-height: 1.3em;
+ margin-top: .2em;
+ min-height: 1.9em;
+ padding: .3em;
}
.theme-item .theme-icons {
position: absolute;
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog
