jenkins-bot has submitted this change and it was merged. Change subject: Switch order of descriptions and aliases in header ......................................................................
Switch order of descriptions and aliases in header Bug: T93209 Change-Id: I66175f104661693d8bb1f712afc3496a527cf422 (cherry picked from commit e59cc39fa642c466a7ae282db192d12b63e07470) --- M lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguagelistview.js M lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguageview.js M lib/resources/jquery.wikibase/jquery.wikibase.entitytermsview.js M repo/includes/View/EntityTermsView.php M repo/resources/templates.php 5 files changed, 14 insertions(+), 14 deletions(-) Approvals: Aude: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguagelistview.js b/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguagelistview.js index 1cf2d1d..02f2e69 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguagelistview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguagelistview.js @@ -52,8 +52,8 @@ templateParams: [ mw.msg( 'wikibase-entitytermsforlanguagelistview-language' ), mw.msg( 'wikibase-entitytermsforlanguagelistview-label' ), - mw.msg( 'wikibase-entitytermsforlanguagelistview-aliases' ), mw.msg( 'wikibase-entitytermsforlanguagelistview-description' ), + mw.msg( 'wikibase-entitytermsforlanguagelistview-aliases' ), '' // entitytermsforlanguageview ], templateShortCuts: { diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguageview.js b/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguageview.js index 8f36f77..ffca465 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguageview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguageview.js @@ -67,8 +67,8 @@ ); }, '', // label - '', // aliases '', // description + '', // aliases '' // toolbar placeholder ], templateShortCuts: { diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsview.js b/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsview.js index a6296c4..a26d60c 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsview.js @@ -55,10 +55,10 @@ templateParams: [ '', // label class '', // labelview - '', // aliases class - '', // aliasesview '', // description class '', // descriptionview + '', // aliases class + '', // aliasesview '', // entitytermsforlanguagelistview '', // additional entitytermsforlanguagelistview container class(es) '' // toolbar placeholder diff --git a/repo/includes/View/EntityTermsView.php b/repo/includes/View/EntityTermsView.php index d1f06d7..88ee5bb 100644 --- a/repo/includes/View/EntityTermsView.php +++ b/repo/includes/View/EntityTermsView.php @@ -83,10 +83,10 @@ return $this->templateFactory->render( 'wikibase-entitytermsview', $labels->hasTermForLanguage( $this->languageCode ) ? '' : 'wb-empty', $this->getHtmlForLabel( $labels, $entityId ), - $aliasGroups->hasGroupForLanguage( $this->languageCode ) ? '' : 'wb-empty', - $this->getHtmlForAliases( $aliasGroups ), $descriptions->hasTermForLanguage( $this->languageCode ) ? '' : 'wb-empty', $this->getDescriptionText( $descriptions ), + $aliasGroups->hasGroupForLanguage( $this->languageCode ) ? '' : 'wb-empty', + $this->getHtmlForAliases( $aliasGroups ), $termBoxHtml, $textInjector->newMarker( 'entityViewPlaceholder-entitytermsview-entitytermsforlanguagelistview-class' @@ -182,8 +182,8 @@ return $this->templateFactory->render( 'wikibase-entitytermsforlanguagelistview', $this->msg( 'wikibase-entitytermsforlanguagelistview-language' ), $this->msg( 'wikibase-entitytermsforlanguagelistview-label' ), - $this->msg( 'wikibase-entitytermsforlanguagelistview-aliases' ), $this->msg( 'wikibase-entitytermsforlanguagelistview-description' ), + $this->msg( 'wikibase-entitytermsforlanguagelistview-aliases' ), $entityTermsForLanguageViewsHtml ); } @@ -226,7 +226,6 @@ '', '' ), - $this->getAliasesView( $aliasGroups, $languageCode ), $this->templateFactory->render( 'wikibase-descriptionview', $hasDescription ? '' : 'wb-empty', htmlspecialchars( $hasDescription @@ -236,6 +235,7 @@ '', '' ), + $this->getAliasesView( $aliasGroups, $languageCode ), '' ); } diff --git a/repo/resources/templates.php b/repo/resources/templates.php index 55c7835..0c6263c 100644 --- a/repo/resources/templates.php +++ b/repo/resources/templates.php @@ -158,8 +158,8 @@ <div class="wikibase-entitytermsview"> <div class="wikibase-entitytermsview-heading"> <h1 class="wikibase-entitytermsview-heading-label $1"><!-- wikibase-entitytermsview-label -->$2</h1> - <div class="wikibase-entitytermsview-heading-aliases $3"><!-- wikibase-entitytermsview-aliases -->$4</div> - <div class="wikibase-entitytermsview-heading-description $5">$6</div> + <div class="wikibase-entitytermsview-heading-description $3">$4</div> + <div class="wikibase-entitytermsview-heading-aliases $5"><!-- wikibase-entitytermsview-aliases -->$6</div> </div> <!-- ? wikibase-toolbar -->$9 <div class="wikibase-entitytermsview-entitytermsforlanguagelistview $8"><!-- wikibase-entitytermsforlanguagelistview -->$7</div> @@ -188,8 +188,8 @@ <tr class="wikibase-entitytermsforlanguagelistview-header-row"> <td class="wikibase-entitytermsforlanguagelistview-cell wikibase-entitytermsforlanguagelistview-language">$1</td> <td class="wikibase-entitytermsforlanguagelistview-cell wikibase-entitytermsforlanguagelistview-label">$2</td> - <td class="wikibase-entitytermsforlanguagelistview-cell wikibase-entitytermsforlanguagelistview-aliases">$3</td> - <td class="wikibase-entitytermsforlanguagelistview-cell wikibase-entitytermsforlanguagelistview-description">$4</td> + <td class="wikibase-entitytermsforlanguagelistview-cell wikibase-entitytermsforlanguagelistview-description">$3</td> + <td class="wikibase-entitytermsforlanguagelistview-cell wikibase-entitytermsforlanguagelistview-aliases">$4</td> </tr> </thead> <tbody class="wikibase-entitytermsforlanguagelistview-listview"><!-- [0,*] wikibase-entitytermsforlanguageview -->$5</tbody> @@ -201,8 +201,8 @@ <$1 class="wikibase-entitytermsforlanguageview wikibase-entitytermsforlanguageview-$3" > <$2 class="wikibase-entitytermsforlanguageview-language"><!-- wikibase-entitytermsforlanguageview-language -->$4</$2> <$2 class="wikibase-entitytermsforlanguageview-label">$5</$2> - <$2 class="wikibase-entitytermsforlanguageview-aliases">$6</$2> - <$2 class="wikibase-entitytermsforlanguageview-description">$7</$2> + <$2 class="wikibase-entitytermsforlanguageview-description">$6</$2> + <$2 class="wikibase-entitytermsforlanguageview-aliases">$7</$2> <!-- ? wikibase-toolbar -->$8 </$1> HTML; -- To view, visit https://gerrit.wikimedia.org/r/199262 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I66175f104661693d8bb1f712afc3496a527cf422 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: wmf/1.25wmf22 Gerrit-Owner: Aude <aude.w...@gmail.com> Gerrit-Reviewer: Aude <aude.w...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits