Robert Vogel has submitted this change and it was merged.
Change subject: replaced search button due to the path included that wasnt
needed
......................................................................
replaced search button due to the path included that wasnt needed
Change-Id: Ibc81894e7d4013defe96f20ffca153830b2895d0
---
M includes/BsBaseTemplate.php
1 file changed, 29 insertions(+), 15 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/includes/BsBaseTemplate.php b/includes/BsBaseTemplate.php
index abeb726..14580e9 100644
--- a/includes/BsBaseTemplate.php
+++ b/includes/BsBaseTemplate.php
@@ -589,21 +589,35 @@
?>
<div id="p-search" role="search">
<h3<?php $this->html( 'userlangattributes' ) ?>><label
for="searchInput"><?php $this->msg( 'search' ) ?></label></h3>
- <form action="<?php $this->text( 'wgScript' ) ?>" id="searchform">
- <?php if ( $this->data['rtl'] ) { ?>
- <?php echo $this->makeSearchButton( 'image', array( 'id' =>
'searchButton', 'src' => $this->getSkin()->getSkinStylePath(
'resources/images/search-rtl.png' ), 'width' => '12', 'height' => '13', 'class'
=> 'icon-search-light' ) ); ?>
- <?php } ?>
- <?php echo $this->makeSearchInput(
$this->data['bs_search_input'] ); ?>
- <?php if ( !$this->data['rtl'] ) { ?>
- <?php echo $this->makeSearchButton( 'image', array( 'id' =>
'searchButton', 'src' => $this->getSkin()->getSkinStylePath(
'resources/images/search-ltr.png' ), 'width' => '12', 'height' => '13', 'class'
=> 'icon-search-light' ) ); ?>
- <?php } ?>
- <input type='hidden' name="title" value="<?php $this->text(
'searchtitle' ) ?>"/>
- <?php
- foreach( $this->data['bs_search_hidden_fields'] as $key =>
$value ) {
- echo Html::hidden($key, $value);
- }
- ?>
- </form>
+ <form action="<?php $this->text( 'wgScript' ) ?>"
id="searchform">
+ <?php
+ $class = $this->data['rtl'] ? "search-rtl" :
"search-ltr";
+ $attrs = array(
+ 'id' => 'searchButton',
+ 'type' => 'submit',
+ 'name' => 'button',
+ 'alt' => wfMessage( "searchbutton" )->plain(),
+ 'width' => '12',
+ 'height' => '13',
+ 'class' => $class . ' icon-search-light'
+ );
+ $attrs += Linker::tooltipAndAccesskeyAttribs(
'search-fulltext' );
+
+ if ( $this->data['rtl'] ) {
+ echo HTML::element( 'button', $attrs );
+ }
+ echo $this->makeSearchInput(
$this->data['bs_search_input'] );
+ if ( !$this->data['rtl'] ) {
+ echo HTML::element( 'button', $attrs );
+ }
+ ?>
+ <input type='hidden' name="title" value="<?php
$this->text( 'searchtitle' ) ?>"/>
+ <?php
+ foreach ( $this->data['bs_search_hidden_fields'] as
$key => $value ) {
+ echo Html::hidden( $key, $value );
+ }
+ ?>
+ </form>
</div>
<?php
}
--
To view, visit https://gerrit.wikimedia.org/r/177187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc81894e7d4013defe96f20ffca153830b2895d0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Tweichart <[email protected]>
Gerrit-Reviewer: Mglaser <[email protected]>
Gerrit-Reviewer: Pigpen <[email protected]>
Gerrit-Reviewer: Robert Vogel <[email protected]>
Gerrit-Reviewer: Smuggli <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
