diff options
| author | Fred Thomsen <fredthomsen@fredthomsen.net> | 2013-01-23 01:12:46 -0500 |
|---|---|---|
| committer | Paul Arthur <paul.arthur@flowerysong.com> | 2013-01-23 13:13:37 -0500 |
| commit | 6031914382357b390c433abc23bda1c2009a753a (patch) | |
| tree | 9b7a6db7adf07493e8a03e13101fa113bc39dbc4 | |
| parent | 9340ff287c01eb9e5ebd0301dc9988f3536221dc (diff) | |
| download | ampache-6031914382357b390c433abc23bda1c2009a753a.tar.gz ampache-6031914382357b390c433abc23bda1c2009a753a.tar.bz2 ampache-6031914382357b390c433abc23bda1c2009a753a.zip | |
Fix add and edit catalog legend format specifiers in penguin theme
| -rwxr-xr-x | docs/CHANGELOG | 2 | ||||
| -rw-r--r-- | templates/show_add_catalog.inc.php | 14 | ||||
| -rw-r--r-- | templates/show_edit_catalog.inc.php | 14 | ||||
| -rw-r--r-- | themes/penguin/templates/default-rtl.css | 3 | ||||
| -rw-r--r-- | themes/penguin/templates/default.css | 3 |
5 files changed, 22 insertions, 14 deletions
diff --git a/docs/CHANGELOG b/docs/CHANGELOG index 68c7b73b..df770ac2 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -4,6 +4,8 @@ -------------------------------------------------------------------------- v.3.6-FUTURE + - Fixed a display problem with the Penguin theme by adding a new CSS class + (patch by Fred Thomsen) - Made transcoding and its configuration more flexible - Made transcoded streams more standards compliant by not sending a random value as the Content-Length or claiming that ranged requests are diff --git a/templates/show_add_catalog.inc.php b/templates/show_add_catalog.inc.php index 2bd217b6..501dddd6 100644 --- a/templates/show_add_catalog.inc.php +++ b/templates/show_add_catalog.inc.php @@ -39,13 +39,13 @@ $default_sort = "%a/%A"; <td><input size="60" type="text" name="name" value="<?php echo scrub_out($_POST['name']); ?>" /></td> <td style="vertical-align:top; font-family: monospace;" rowspan="6" id="patterns_example"> <strong><?php echo T_('Auto-inserted Fields'); ?>:</strong><br /> - %A = <?php echo T_('album name'); ?><br /> - %a = <?php echo T_('artist name'); ?><br /> - %c = <?php echo T_('id3 comment'); ?><br /> - %T = <?php echo T_('track number (padded with leading 0)'); ?><br /> - %t = <?php echo T_('song title'); ?><br /> - %y = <?php echo T_('year'); ?><br /> - %o = <?php echo T_('other'); ?><br /> + <span class="format-specifier">%A</span> = <?php echo T_('album name'); ?><br /> + <span class="format-specifier">%a</span> = <?php echo T_('artist name'); ?><br /> + <span class="format-specifier">%c</span> = <?php echo T_('id3 comment'); ?><br /> + <span class="format-specifier">%T</span> = <?php echo T_('track number (padded with leading 0)'); ?><br /> + <span class="format-specifier">%t</span> = <?php echo T_('song title'); ?><br /> + <span class="format-specifier">%y</span> = <?php echo T_('year'); ?><br /> + <span class="format-specifier">%o</span> = <?php echo T_('other'); ?><br /> </td> </tr> diff --git a/templates/show_edit_catalog.inc.php b/templates/show_edit_catalog.inc.php index 02041978..6ef0763c 100644 --- a/templates/show_edit_catalog.inc.php +++ b/templates/show_edit_catalog.inc.php @@ -35,13 +35,13 @@ <td><input size="60" type="text" name="name" value="<?php echo scrub_out($catalog->name); ?>"></input></td> <td style="vertical-align:top; font-family: monospace;" rowspan="5"> <strong><?php echo T_('Auto-inserted Fields'); ?>:</strong><br /> - %A = <?php echo T_('album name'); ?><br /> - %a = <?php echo T_('artist name'); ?><br /> - %c = <?php echo T_('id3 comment'); ?><br /> - %T = <?php echo T_('track number (padded with leading 0)'); ?><br /> - %t = <?php echo T_('song title'); ?><br /> - %y = <?php echo T_('year'); ?><br /> - %o = <?php echo T_('other'); ?><br /> + <span class="format-specifier">%A</span>= <?php echo T_('album name'); ?><br /> + <span class="format-specifier">%a</span>= <?php echo T_('artist name'); ?><br /> + <span class="format-specifier">%c</span>= <?php echo T_('id3 comment'); ?><br /> + <span class="format-specifier">%T</span>= <?php echo T_('track number (padded with leading 0)'); ?><br /> + <span class="format-specifier">%t</span>= <?php echo T_('song title'); ?><br /> + <span class="format-specifier">%y</span>= <?php echo T_('year'); ?><br /> + <span class="format-specifier">%o</span>= <?php echo T_('other'); ?><br /> </td> </tr> <tr> diff --git a/themes/penguin/templates/default-rtl.css b/themes/penguin/templates/default-rtl.css index 50c2f466..b40a37db 100644 --- a/themes/penguin/templates/default-rtl.css +++ b/themes/penguin/templates/default-rtl.css @@ -1029,3 +1029,6 @@ td.lp_current a { text-transform:uppercase;
color: #FC0;
}
+.format-specifier {
+ text-transform: none;
+}
diff --git a/themes/penguin/templates/default.css b/themes/penguin/templates/default.css index d4b99896..e67396f0 100644 --- a/themes/penguin/templates/default.css +++ b/themes/penguin/templates/default.css @@ -1033,3 +1033,6 @@ td.lp_current a { text-transform:uppercase;
color: #FC0;
}
+.format-specifier {
+ text-transform: none;
+}
|