Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3895
Modified Files:
Tag: branch-smarty
serendipity_functions.inc.php serendipity_sidebar_items.php
Log Message:
- Use a smaller and more pretty XML button
- Align XML button correctly according to text
Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.84.2.4
retrieving revision 1.84.2.5
diff -u -d -r1.84.2.4 -r1.84.2.5
--- serendipity_sidebar_items.php 28 Sep 2004 15:52:53 -0000 1.84.2.4
+++ serendipity_sidebar_items.php 3 Oct 2004 21:27:53 -0000 1.84.2.5
@@ -528,48 +528,55 @@
if (serendipity_db_bool($this->get_config('show_0.91', true))) {
?>
- <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=0.91<?php echo $cache; ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" /></a>
+ <div style="padding-bottom: 2px;">
+ <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=0.91<?php echo $cache; ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" style="vertical-align: text-bottom" /></a>
<a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=0.91<?php echo $cache; ?>">RSS 0.91 feed</a>
- <br />
+ </div>
<?php
}
if (serendipity_db_bool($this->get_config('show_1.0', true))) {
?>
- <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=1.0<?php echo $cache; ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" /></a>
+ <div style="padding-bottom: 2px;">
+ <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=1.0<?php echo $cache; ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" style="vertical-align: text-bottom" /></a>
<a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=1.0<?php echo $cache; ?>">RSS 1.0 feed</a>
- <br />
+ </div>
<?php
}
if (serendipity_db_bool($this->get_config('show_2.0', true))) {
?>
- <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0<?php echo $cache; ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" /></a>
+ <div style="padding-bottom: 2px;">
+ <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0<?php echo $cache; ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" style="vertical-align: text-bottom" /></a>
<a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0<?php echo $cache; ?>">RSS 2.0 feed</a>
- <br />
+ </div>
<?php
}
if (serendipity_db_bool($this->get_config('show_atom0.3', true))) {
?>
- <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=atom0.3<?php echo $cache; ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="ATOM/XML" /></a>
+ <div style="padding-bottom: 2px;">
+ <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=atom0.3<?php echo $cache; ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="ATOM/XML" style="vertical-align: text-bottom" /></a>
<a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=atom0.3<?php echo $cache; ?>">ATOM 0.3 feed</a>
- <br />
+ </div>
<?php
}
if (serendipity_db_bool($this->get_config('show_2.0c', true))) {
?>
- <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0&type=comments<?php echo $cache; ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" /></a>
+ <div style="padding-bottom: 2px;">
+ <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0&type=comments<?php echo $cache; ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" style="vertical-align: text-bottom" /></a>
<a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0&type=comments<?php echo $cache; ?>"><?php echo ($serendipity['XHTML11'] ? '<span style="white-space: nowrap">' : '<nobr>'); ?>RSS 2.0 <?php echo COMMENTS; ?><?php echo ($serendipity['XHTML11'] ? '</span>' : '</nobr>'); ?></a>
- <br />
+ </div>
<?php
}
if (serendipity_db_bool($this->get_config('show_opml1.0', false))) {
?>
- <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=opml1.0<?php echo $cache; ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" /></a>
+ <div style="padding-bottom: 2px;">
+ <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=opml1.0<?php echo $cache; ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" style="vertical-align: text-bottom" /></a>
<a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=opml1.0<?php echo $cache; ?>">OPML 1.0 feed</a>
+ </div>
<?php
}
}
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.37
retrieving revision 1.419.2.38
diff -u -d -r1.419.2.37 -r1.419.2.38
--- serendipity_functions.inc.php 1 Oct 2004 18:32:42 -0000 1.419.2.37
+++ serendipity_functions.inc.php 3 Oct 2004 21:27:53 -0000 1.419.2.38
@@ -2381,8 +2381,10 @@
$category_id = serendipity_makeFilename($cat['category_name']);
if (!empty($xmlImg)) {
$ret .= sprintf(
- '<a href="%s" title="%s"><img alt="xml" %s src="%s" /></a> %s' .
- '<a href="%s" title="%s">%s</a><br />',
+ '<div style="padding-bottom: 2px;">' .
+ '<a href="%s" title="%s"><img alt="xml" %s src="%s" style="vertical-align: bottom" /></a> %s' .
+ '<a href="%s" title="%s">%s</a>' .
+ '</div>',
$serendipity['serendipityHTTPPath'] . 'rss.php?category=' . $cat['categoryid'] . '_' . $category_id,
htmlspecialchars($cat['category_description']),
($serendipity['XHTML11'] ? 'style="display: inline; border: 0px"' : 'border="0"'),
|