| Index: trunk/phase3/skins/Vector.php |
| — | — | @@ -758,7 +758,7 @@ |
| 759 | 759 | <?php if ( $wgVectorUseSimpleSearch && $wgUser->getOption( 'vector-simplesearch' ) ): ?> |
| 760 | 760 | <div id="simpleSearch"> |
| 761 | 761 | <input id="searchInput" name="search" type="text" <?php echo $this->skin->tooltipAndAccesskey( 'search' ); ?> <?php if( isset( $this->data['search'] ) ): ?> value="<?php $this->text( 'search' ) ?>"<?php endif; ?> /> |
| 762 | | - <button id="searchButton" type='submit' name='button' <?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?>><img src="<?php echo $GLOBALS['wgStylePath'] . "/{$this->skin->stylename}/images/search-" . ( $GLOBALS['wgContLang']->isRTL() ? 'rtl' : 'ltr' ) . '.png?' . $GLOBALS['wgStyleVersion'] ?>" alt="<?php $this->msg( 'searchbutton' ) ?>" /></button> |
| | 762 | + <button id="searchButton" type='submit' name='button' <?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?>><img src="<?php echo $this->skin->getSkinStylePath('images/search-' . ( $this->data['rtl'] ? 'rtl' : 'ltr' ) . '.png'); ?>" alt="<?php $this->msg( 'searchbutton' ) ?>" /></button> |
| 763 | 763 | </div> |
| 764 | 764 | <?php else: ?> |
| 765 | 765 | <input id="searchInput" name="search" type="text" <?php echo $this->skin->tooltipAndAccesskey( 'search' ); ?> <?php if( isset( $this->data['search'] ) ): ?> value="<?php $this->text( 'search' ) ?>"<?php endif; ?> /> |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -2036,6 +2036,16 @@ |
| 2037 | 2037 | } |
| 2038 | 2038 | } |
| 2039 | 2039 | |
| | 2040 | + function getCommonStylePath( $fname ) { |
| | 2041 | + global $wgStylePath, $wgStyleVersion; |
| | 2042 | + return "{$wgStylePath}/common/$name?$wgStyleVersion"; |
| | 2043 | + } |
| | 2044 | + |
| | 2045 | + function getSkinStylePath( $fname ) { |
| | 2046 | + global $wgStylePath, $wgStyleVersion; |
| | 2047 | + return "{$wgStylePath}/{$this->stylename}/$fname?$wgStyleVersion"; |
| | 2048 | + } |
| | 2049 | + |
| 2040 | 2050 | /* these are used extensively in SkinTemplate, but also some other places */ |
| 2041 | 2051 | static function makeMainPageUrl( $urlaction = '' ) { |
| 2042 | 2052 | $title = Title::newMainPage(); |