|
From: Tom S. <tom...@us...> - 2004-08-25 21:50:14
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8273 Modified Files: serendipity_admin_image_selector.php serendipity_functions.inc.php serendipity_functions_images.inc.php serendipity_functions_installer.inc.php serendipity_sidebar_items.php Log Message: - Move images, previously located in the /pixel folder, to the default template folder - thereby allowing a unique image for each theme - Nuke some old and unused files in the process Index: serendipity_sidebar_items.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v retrieving revision 1.83 retrieving revision 1.84 diff -u -d -r1.83 -r1.84 --- serendipity_sidebar_items.php 14 Aug 2004 11:54:57 -0000 1.83 +++ serendipity_sidebar_items.php 25 Aug 2004 21:50:05 -0000 1.84 @@ -425,7 +425,7 @@ function generate_rss_fields(&$title, &$description, &$entries) { global $serendipity; // Check for a logo to use for an RSS feed. Can either be set by configuring the - // syndication plugin OR by just placing a rss_banner.png file in the pixel directory. + // syndication plugin OR by just placing a rss_banner.png file in the template directory. // If both is not set, we will display our happy own branding. :-) $bag = new serendipity_property_bag; @@ -436,13 +436,13 @@ $img = $this->get_config('bannerURL'); $w = $this->get_config('bannerWidth'); $h = $this->get_config('bannerHeight'); - } elseif (file_exists($serendipity['serendipityPath'] . 'pixel/rss_banner.png')) { - $i = getimagesize($serendipity['serendipityPath'] . 'pixel/rss_banner.png'); - $img = $serendipity['baseURL'] . 'pixel/rss_banner.png'; + } elseif (($banner = serendipity_getTemplateFile('img/rss_banner.png', 'serendipityPath'))) { + $img = serendipity_getTemplateFile('img/rss_banner.png', 'baseURL'); + $i = getimagesize($banner); $w = $i[0]; $h = $i[1]; } else { - $img = $serendipity['baseURL'] . 'pixel/s9y_banner_tiny.png'; + $img = serendipity_getTemplateFile('img/s9y_banner_small.png', 'baseURL'); $w = 100; $h = 21; } @@ -582,7 +582,7 @@ ?> <div class="serendipityPlug"> <?php if ( $this->get_config('image', 'true') == 'true' ) { ?> - <a title="<?php echo $title ?> Serendipity" href="http://www.s9y.org/"><img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/s9y_banner_tiny.png" alt="s9y php blog system" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> /></a> + <a title="<?php echo $title ?> Serendipity" href="http://www.s9y.org/"><img src="<?php echo serendipity_getTemplateFile('img/s9y_banner_small.png') ?>" alt="Serendipity PHP Weblog" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> /></a> <?php } ?> <?php if ( $this->get_config('text', 'false') == 'true' ) { ?> <div> Index: serendipity_functions_installer.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- serendipity_functions_installer.inc.php 18 Aug 2004 10:15:45 -0000 1.31 +++ serendipity_functions_installer.inc.php 25 Aug 2004 21:50:05 -0000 1.32 @@ -320,10 +320,10 @@ if (document.getElementById) { el = document.getElementById(id); if (el.style.display == 'none') { - document.getElementById('option' + id).src = 'pixel/minus.png'; + document.getElementById('option' + id).src = '<?php echo serendipity_getTemplateFile('img/minus.png') ?>'; el.style.display = ''; } else { - document.getElementById('option' + id).src = 'pixel/plus.png'; + document.getElementById('option' + id).src = '<?php echo serendipity_getTemplateFile('img/plus.png') ?>'; el.style.display = 'none'; } } @@ -334,14 +334,14 @@ if (document.getElementById) { for (i = 1; i <= count; i++) { document.getElementById('el' + i).style.display = state; - document.getElementById('optionel' + i).src = 'pixel/' + (state == '' ? 'minus.png' : 'plus.png'); + document.getElementById('optionel' + i).src = (state == '' ? '<?php echo serendipity_getTemplateFile('img/minus.png') ?>' : '<?php echo serendipity_getTemplateFile('img/plus.png') ?>'); } if (state == '') { - document.getElementById('optionall').src = 'pixel/minus.png'; + document.getElementById('optionall').src = '<?php echo serendipity_getTemplateFile('img/minus.png') ?>'; state = 'none'; } else { - document.getElementById('optionall').src = 'pixel/plus.png'; + document.getElementById('optionall').src = '<?php echo serendipity_getTemplateFile('img/plus.png') ?>'; state = ''; } } @@ -359,7 +359,7 @@ <?php } if ( sizeof($t['categories']) > 1 ) { ?> <div align="right"> - <a style="border:0; text-decoration: none" href="#" onclick="showConfigAll(<?php echo count($t['categories']); ?>)" title="<?php echo TOGGLE_ALL; ?>"><img src="pixel/<?php echo ($folding === true ? 'plus' : 'minus'); ?>.png" id="optionall" alt="+/-" border="0" /> <?php echo TOGGLE_ALL; ?></a></a><br /> + <a style="border:0; text-decoration: none" href="#" onclick="showConfigAll(<?php echo count($t['categories']); ?>)" title="<?php echo TOGGLE_ALL; ?>"><img src="<?php echo serendipity_getTemplateFile('img/'. ($folding === true ? 'plus' : 'minus') .'.png') ?>" id="optionall" alt="+/-" border="0" /> <?php echo TOGGLE_ALL; ?></a></a><br /> </div> <?php } @@ -373,7 +373,7 @@ ?> <tr> <th align="left" colspan="2" style="padding-left: 15px;"> - <a style="border:0; text-decoration: none" href="#" onclick="showConfig('el<?php echo $el_count; ?>'); return false" title="<?php echo TOGGLE_OPTION; ?>"><img src="pixel/<?php echo ($folding === true ? 'plus' : 'minus'); ?>.png" id="optionel<?php echo $el_count; ?>" alt="+/-" border="0" /> <?php echo $key; ?></a></th> + <a style="border:0; text-decoration: none" href="#" onclick="showConfig('el<?php echo $el_count; ?>'); return false" title="<?php echo TOGGLE_OPTION; ?>"><img src="<?php echo serendipity_getTemplateFile('img/'. ($folding === true ? 'plus' : 'minus') .'.png') ?>" id="optionel<?php echo $el_count; ?>" alt="+/-" border="0" /> <?php echo $key; ?></a></th> </tr> <?php } ?> <tr> @@ -766,4 +766,4 @@ return $_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/'; } -?> \ No newline at end of file +?> Index: serendipity_functions_images.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- serendipity_functions_images.inc.php 18 Aug 2004 10:15:45 -0000 1.33 +++ serendipity_functions_images.inc.php 25 Aug 2004 21:50:05 -0000 1.34 @@ -825,10 +825,10 @@ $popupWidth = ($is_image ? ($file['dimensions_width'] + 20) : 600); $popupHeight = ($is_image ? ($file['dimensions_height'] + 20) : 500); ?> - <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_FULLSIZE; ?>" alt="<?php echo MEDIA_FULLSIZE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/zoom.png" border="0" onclick="F1 = window.open('<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.'. $file['extension']; ?>','Zoom','height=<?php echo $popupHeight; ?>,width=<?php echo $popupWidth; ?>,top='+ (screen.height-<?php echo $popupHeight ?>)/2 +',left='+ (screen.width-<?php echo $popupWidth ?>)/2 +',toolbar=no,menubar=no,location=no,resize=1,resizable=1<?php echo ($is_image ? '' : ',scrollbars=yes'); ?>');" /></td> - <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_RENAME; ?>" alt="<?php echo MEDIA_RENAME; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/rename.png" border="0" onclick="rename('<?php echo $file['id']; ?>', '<?php echo addslashes($file['name']); ?>')" /></td> - <?php if ($is_image) { ?><td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo IMAGE_RESIZE; ?>" alt="<?php echo IMAGE_RESIZE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/scale.png" border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=scaleSelect&serendipity[fid]=<?php echo $file['id']; ?>';" /></td><?php } ?> - <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_DELETE; ?>" alt="<?php echo MEDIA_DELETE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/delete.png" border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=delete&serendipity[fid]=<?php echo $file['id']; ?>';" /></td> + <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_FULLSIZE; ?>" alt="<?php echo MEDIA_FULLSIZE; ?>" src="<?php echo serendipity_getTemplateFile('img/zoom.png') ?>" border="0" onclick="F1 = window.open('<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.'. $file['extension']; ?>','Zoom','height=<?php echo $popupHeight; ?>,width=<?php echo $popupWidth; ?>,top='+ (screen.height-<?php echo $popupHeight ?>)/2 +',left='+ (screen.width-<?php echo $popupWidth ?>)/2 +',toolbar=no,menubar=no,location=no,resize=1,resizable=1<?php echo ($is_image ? '' : ',scrollbars=yes'); ?>');" /></td> + <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_RENAME; ?>" alt="<?php echo MEDIA_RENAME; ?>" src="<?php echo serendipity_getTemplateFile('img/rename.png') ?>" border="0" onclick="rename('<?php echo $file['id']; ?>', '<?php echo addslashes($file['name']); ?>')" /></td> + <?php if ($is_image) { ?><td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo IMAGE_RESIZE; ?>" alt="<?php echo IMAGE_RESIZE; ?>" src="<?php echo serendipity_getTemplateFile('img/scale.png') ?>" border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=scaleSelect&serendipity[fid]=<?php echo $file['id']; ?>';" /></td><?php } ?> + <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_DELETE; ?>" alt="<?php echo MEDIA_DELETE; ?>" src="<?php echo serendipity_getTemplateFile('img/delete.png') ?>" border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=delete&serendipity[fid]=<?php echo $file['id']; ?>';" /></td> <?php } ?> @@ -1031,4 +1031,4 @@ return $fdim; } -?> \ No newline at end of file +?> Index: serendipity_admin_image_selector.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- serendipity_admin_image_selector.php 9 Aug 2004 10:20:35 -0000 1.30 +++ serendipity_admin_image_selector.php 25 Aug 2004 21:50:04 -0000 1.31 @@ -74,9 +74,9 @@ <?php if (empty($serendipity['GET']['filename_only']) || $serendipity['GET']['filename_only'] != 'true') { ?> <b><?php echo IMAGE_ALIGNMENT; ?>:</b> <br /> - <input type="radio" name="serendipity[align]" value="" /> <img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/img_align_top.png" vspace="5"><br /> - <input type="radio" name="serendipity[align]" value="left" checked="checked" /> <img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/img_align_left.png" vspace="5"><br /> - <input type="radio" name="serendipity[align]" value="right" /> <img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/img_align_right.png" vspace="5"><br /> + <input type="radio" name="serendipity[align]" value="" /> <img src="<?php echo serendipity_getTemplateFile('img/img_align_top.png') ?>" vspace="5"><br /> + <input type="radio" name="serendipity[align]" value="left" checked="checked" /> <img src="<?php echo serendipity_getTemplateFile('img/img_align_left.png') ?>" vspace="5"><br /> + <input type="radio" name="serendipity[align]" value="right" /> <img src="<?php echo serendipity_getTemplateFile('img/img_align_right.png') ?>" vspace="5"><br /> <br /> <b><?php echo IMAGE_AS_A_LINK; ?>:</b> Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.405 retrieving revision 1.406 diff -u -d -r1.405 -r1.406 --- serendipity_functions.inc.php 25 Aug 2004 06:44:00 -0000 1.405 +++ serendipity_functions.inc.php 25 Aug 2004 21:50:04 -0000 1.406 @@ -2850,7 +2850,7 @@ <?php } ?> - <a style="border:0; text-decoration: none" href="#" onclick="showItem('categoryselector'); return false" title="<?php echo TOGGLE_OPTION; ?>"><img src="pixel/plus.png" id="option_categoryselector" alt="+/-" border="0" /></a> <b><?php echo CATEGORY; ?>:</b> <?php echo $cat_list ; ?> + <a style="border:0; text-decoration: none" href="#" onclick="showItem('categoryselector'); return false" title="<?php echo TOGGLE_OPTION; ?>"><img src="<?php echo serendipity_getTemplateFile('img/plus.png') ?>" id="option_categoryselector" alt="+/-" border="0" /></a> <b><?php echo CATEGORY; ?>:</b> <?php echo $cat_list ; ?> <script type="text/javascript" language="JavaScript"> function toggle_extended(setCookie) { @@ -2860,14 +2860,14 @@ if ( textarea.style.display == 'none' ) { textarea.style.display = ''; tools.style.display = ''; - button.src = 'pixel/minus.png'; + button.src = '<?php echo serendipity_getTemplateFile('img/minus.png') ?>'; if (setCookie == true) { document.cookie = 'serendipity[toggle_extended]=true;'; } } else { textarea.style.display = 'none'; tools.style.display = 'none'; - button.src = 'pixel/plus.png'; + button.src = '<?php echo serendipity_getTemplateFile('img/plus.png') ?>'; if (setCookie == true) { document.cookie = 'serendipity[toggle_extended]=;'; } @@ -2923,7 +2923,7 @@ if (el.selectedIndex == -1) el.selectedIndex = 0; - document.getElementById('option_' + id).src = 'pixel/plus.png'; + document.getElementById('option_' + id).src = '<?php echo serendipity_getTemplateFile('img/plus.png') ?>'; } else { selector_store[id] = el.size; el.size = <?php echo count($cats)+1; ?>; @@ -2944,7 +2944,7 @@ } } - document.getElementById('option_' + id).src = 'pixel/minus.png'; + document.getElementById('option_' + id).src = '<?php echo serendipity_getTemplateFile('img/minus.png') ?>'; } } } @@ -3019,7 +3019,7 @@ <tr> <td colspan="2"> <?php if (!$serendipity['wysiwyg']) { ?> - <a style="border:0; text-decoration: none" href="#" onclick="toggle_extended(true); return false;" title="<?php echo TOGGLE_OPTION; ?>"><img src="pixel/plus.png" id="option_extended" alt="+/-" border="0" /></a> + <a style="border:0; text-decoration: none" href="#" onclick="toggle_extended(true); return false;" title="<?php echo TOGGLE_OPTION; ?>"><img src="<?php echo serendipity_getTemplateFile('img/plus.png') ?>" id="option_extended" alt="+/-" border="0" /></a> <?php } ?> <b><?php echo EXTENDED_BODY; ?></b></td> <td align="right"> <?php @@ -3492,7 +3492,7 @@ ?> <tr> <td> - <img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/bar1.png" height="10" width="<?php echo ceil($months[$y][0]*$fac); ?>" hspace="0" vspace="0" alt="" /><img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/blank.png" height="10" width="<?php echo ($barwidth-ceil($months[$y][0]*$fac)); ?>" hspace="0" vspace="0" alt="" /> + <img src="<?php echo serendipity_getTemplateFile('img/graph_bar_horisontal.png') ?>" height="10" width="<?php echo ceil($months[$y][0]*$fac); ?>" hspace="0" vspace="0" alt="" /><img src="<?php echo serendipity_getTemplateFile('img/blank.png') ?>" height="10" width="<?php echo ($barwidth-ceil($months[$y][0]*$fac)); ?>" hspace="0" vspace="0" alt="" /> </td> <td> <?php echo $months[$y][1] . serendipity_formatTime('%B', $time) . $months[$y][2]; ?> |
