Phoenix303 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/232392
Change subject: List the selected filters at the top left in
Special:SearchTranslations.
......................................................................
List the selected filters at the top left in Special:SearchTranslations.
Bug: T98560
Change-Id: Ib98168aaf7dfc8b2a7a130870b2af15596cf5626
---
M resources/css/ext.translate.special.searchtranslations.css
M resources/js/ext.translate.special.searchtranslations.js
M specials/SpecialSearchTranslations.php
3 files changed, 36 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/92/232392/1
diff --git a/resources/css/ext.translate.special.searchtranslations.css
b/resources/css/ext.translate.special.searchtranslations.css
index 5a7b8c6..22a1145 100644
--- a/resources/css/ext.translate.special.searchtranslations.css
+++ b/resources/css/ext.translate.special.searchtranslations.css
@@ -167,3 +167,8 @@
font-size: 14px;
padding: 0 8px;
}
+
+.tux-searchpage .selectedbox .facet-item {
+ background-color: #EDEDED;
+ margin-right: 5px;
+}
diff --git a/resources/js/ext.translate.special.searchtranslations.js
b/resources/js/ext.translate.special.searchtranslations.js
index 1923e84..8e2a515 100644
--- a/resources/js/ext.translate.special.searchtranslations.js
+++ b/resources/js/ext.translate.special.searchtranslations.js
@@ -56,13 +56,13 @@
$count,
result,
i,
- selectedClasss = '',
docLanguageCode,
languageCode,
quickLanguageList = [],
unique = [],
regions,
- $ulsTrigger;
+ $ulsTrigger,
+ languageLabel;
$languages = $( '.facet.languages' );
languages = $languages.data( 'facets' );
@@ -112,21 +112,20 @@
}
if ( currentLanguage === languageCode ) {
- selectedClasss = 'selected';
- } else {
- selectedClasss = '';
+ languageLabel = mw.config.get( 'wgULSLanguages'
)[languageCode] || languageCode;
+ addToSelectedBox( languageLabel, result.url );
}
$languages.append( $( '<div>')
.addClass( 'row facet-item' )
.append( $( '<span>')
- .addClass('facet-name ' +
selectedClasss )
+ .addClass( 'facet-name' )
.append( $('<a>')
.attr( 'href', result.url )
.text( mw.config.get(
'wgULSLanguages' )[languageCode] || languageCode )
),
$( '<span>')
- .addClass('facet-count')
+ .addClass( 'facet-count' )
.text( result.count )
)
);
@@ -176,7 +175,6 @@
function listGroups( groupList, parentGrouppath, $parent, level ) {
var i,
$grouSelectorTrigger,
- selectedClass = '',
group,
groupId,
$groupRow,
@@ -219,23 +217,22 @@
uri.extend( { 'group': groupId, 'grouppath': grouppath
} );
if ( currentGroup === groupId ) {
- selectedClass = 'selected';
uri.extend( { 'group': '', 'grouppath': '' } );
+ addToSelectedBox( group.label, uri.toString() );
} else {
- selectedClass = '';
uri.extend( { 'group': groupId, 'grouppath':
grouppath } );
}
$groupRow = $( '<div>' )
.addClass( 'row facet-item ' + ' facet-level-'
+ level )
.append( $( '<span>' )
- .addClass( 'facet-name ' +
selectedClass)
+ .addClass( 'facet-name' )
.append( $( '<a>' )
.attr( 'href', uri.toString() )
.text( group.label )
),
$( '<span>' )
- .addClass( 'facet-count ' +
selectedClass )
+ .addClass( 'facet-count' )
.text(
mw.language.convertNumber( group.count ) )
);
$parent.append( $groupRow );
@@ -313,4 +310,20 @@
var uri = new mw.Uri();
return uri.query[ name ] || '';
}
+
+ function addToSelectedBox( label, link ) {
+ $( '.tux-searchpage .selectedbox' ).append( $( '<div>' )
+ .addClass( 'row facet-item' )
+ .append( $( '<span>' )
+ .addClass( 'facet-name selected' )
+ .append( $( '<a>' )
+ .attr( 'href', link )
+ .text( label )
+ ),
+ $( '<span>' )
+ .addClass( 'facet-count' )
+ .text( 'X' )
+ )
+ );
+ }
}( jQuery, mediaWiki ) );
diff --git a/specials/SpecialSearchTranslations.php
b/specials/SpecialSearchTranslations.php
index e83ccab..acd52dc 100644
--- a/specials/SpecialSearchTranslations.php
+++ b/specials/SpecialSearchTranslations.php
@@ -315,11 +315,12 @@
protected function showSearch( $search, $count, $facets, $results ) {
$this->getOutput()->addHtml( <<<HTML
<div class="grid tux-searchpage">
- <div class="row searchinput">
- <div class="nine columns offset-by-three">$search</div>
- </div>
- <div class="row count">
- <div class="nine columns offset-by-three">$count</div>
+ <div class="row">
+ <div class="three columns selectedbox"></div>
+ <div class="nine columns">
+ <div class="row searchinput">$search</div>
+ <div class="row count">$count</div>
+ </div>
</div>
<div class="row searchcontent">
<div class="three columns facets">$facets</div>
--
To view, visit https://gerrit.wikimedia.org/r/232392
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib98168aaf7dfc8b2a7a130870b2af15596cf5626
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Phoenix303 <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
