Henning Snater has uploaded a new change for review. https://gerrit.wikimedia.org/r/186779
Change subject: Renamed wb-referenceview to wikibase-referenceview ...................................................................... Renamed wb-referenceview to wikibase-referenceview In compliance to the common widget naming schema. Change-Id: Ic3baeb64851999a2256f54eb7918b140c51b7fb9 --- M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js M lib/resources/jquery.wikibase/toolbar/controller/definitions/addtoolbar/referenceview-snakview.js M lib/resources/jquery.wikibase/toolbar/controller/definitions/edittoolbar/referenceview.js M lib/resources/jquery.wikibase/toolbar/controller/definitions/removetoolbar/referenceview-snakview.js M lib/resources/wikibase.css M repo/includes/View/ClaimHtmlGenerator.php M repo/resources/templates.php 7 files changed, 33 insertions(+), 37 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/79/186779/1 diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js index 9840d6f..7007d05 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js @@ -53,13 +53,13 @@ * @see jQuery.Widget.options */ options: { - template: 'wb-referenceview', + template: 'wikibase-referenceview', templateParams: [ '', // additional css classes '' // snaklistview widget ], templateShortCuts: { - '$listview': '.wb-referenceview-listview' + $listview: '.wikibase-referenceview-listview' }, statementGuid: null, entityStore: null, @@ -533,9 +533,5 @@ } } } ); - -// We have to override this here because $.widget sets it no matter what's in -// the prototype -$.wikibase.referenceview.prototype.widgetBaseClass = 'wb-referenceview'; }( mediaWiki, wikibase, jQuery ) ); diff --git a/lib/resources/jquery.wikibase/toolbar/controller/definitions/addtoolbar/referenceview-snakview.js b/lib/resources/jquery.wikibase/toolbar/controller/definitions/addtoolbar/referenceview-snakview.js index a07366e..36c5d3e 100644 --- a/lib/resources/jquery.wikibase/toolbar/controller/definitions/addtoolbar/referenceview-snakview.js +++ b/lib/resources/jquery.wikibase/toolbar/controller/definitions/addtoolbar/referenceview-snakview.js @@ -9,7 +9,7 @@ */ $.wikibase.toolbarcontroller.definition( 'addtoolbar', { id: 'referenceview-snakview', - selector: '.wikibase-statementview-references .wb-referenceview', + selector: '.wikibase-statementview-references .wikibase-referenceview', events: { referenceviewafterstartediting: function( event, toolbarController ) { var $referenceview = $( event.target ), diff --git a/lib/resources/jquery.wikibase/toolbar/controller/definitions/edittoolbar/referenceview.js b/lib/resources/jquery.wikibase/toolbar/controller/definitions/edittoolbar/referenceview.js index f46ee13..cb49b3c 100644 --- a/lib/resources/jquery.wikibase/toolbar/controller/definitions/edittoolbar/referenceview.js +++ b/lib/resources/jquery.wikibase/toolbar/controller/definitions/edittoolbar/referenceview.js @@ -22,7 +22,7 @@ if( !$container.length ) { $container = $( '<div/>' ).appendTo( - $referenceview.find( '.wb-referenceview-heading' ) + $referenceview.find( '.wikibase-referenceview-heading' ) ); } diff --git a/lib/resources/jquery.wikibase/toolbar/controller/definitions/removetoolbar/referenceview-snakview.js b/lib/resources/jquery.wikibase/toolbar/controller/definitions/removetoolbar/referenceview-snakview.js index 89d1239..4145d35 100644 --- a/lib/resources/jquery.wikibase/toolbar/controller/definitions/removetoolbar/referenceview-snakview.js +++ b/lib/resources/jquery.wikibase/toolbar/controller/definitions/removetoolbar/referenceview-snakview.js @@ -9,7 +9,7 @@ */ $.wikibase.toolbarcontroller.definition( 'removetoolbar', { id: 'referenceview-snakview', - selector: '.wikibase-statementview-references .wb-referenceview', + selector: '.wikibase-statementview-references .wikibase-referenceview', events: { 'snakviewafterstartediting snakviewchange referenceviewitemremoved': function( event, toolbarController ) { var $target = $( event.target ), diff --git a/lib/resources/wikibase.css b/lib/resources/wikibase.css index 0f412e5..039aae9 100644 --- a/lib/resources/wikibase.css +++ b/lib/resources/wikibase.css @@ -525,7 +525,7 @@ clear: both; } -.wb-referenceview { +.wikibase-referenceview { position: relative; background: #F8F8F8; overflow: hidden; @@ -533,81 +533,81 @@ min-height: 3.2em; } -.wb-referenceview .wb-referenceview-heading { +.wikibase-referenceview .wikibase-referenceview-heading { min-height: 1.5em; padding: 5px; background-color: #F0F0F0; } -.wb-referenceview .wb-referenceview-heading .wikibase-toolbar-container { +.wikibase-referenceview .wikibase-referenceview-heading .wikibase-toolbar-container { top: 5px; } -.wb-referenceview.wb-edit { +.wikibase-referenceview.wb-edit { background-color: #D6F3FF; } -.wb-referenceview.wb-edit > .wb-referenceview-heading { +.wikibase-referenceview.wb-edit > .wikibase-referenceview-heading { background-color: #C0DAE5; } -.wb-referenceview.wb-error { +.wikibase-referenceview.wb-error { background-color: #FFDFC9; } -.wb-referenceview.wb-error > .wb-referenceview-heading { +.wikibase-referenceview.wb-error > .wikibase-referenceview-heading { background-color: #E5C8B5; } -.wb-referenceview .wikibase-snaklistview { +.wikibase-referenceview .wikibase-snaklistview { border-top: 1px dotted #D8D8D8; } -.wb-referenceview .wikibase-snaklistview:nth-child(2) { +.wikibase-referenceview .wikibase-snaklistview:nth-child(2) { border-top: none; } -.wb-referenceview.wb-edit .wikibase-snaklistview { +.wikibase-referenceview.wb-edit .wikibase-snaklistview { border-color: #C0DAE5; } -.wb-referenceview .wikibase-snaklistview-listview .wikibase-snakview-property { +.wikibase-referenceview .wikibase-snaklistview-listview .wikibase-snakview-property { width: 12em; position: absolute; font-size: 90%; } -.wb-referenceview .wikibase-snaklistview-listview .wikibase-snakview-property input { +.wikibase-referenceview .wikibase-snaklistview-listview .wikibase-snakview-property input { width: 100%; font-size: 100%; top: 0; position: absolute; } -.wb-referenceview .wikibase-snaklistview-listview .wikibase-snakview-value-container { +.wikibase-referenceview .wikibase-snaklistview-listview .wikibase-snakview-value-container { margin-left: 12em; position: relative; } -.wb-referenceview .wikibase-snaklistview-listview .wikibase-snakview-value-container .wikibase-snakview-value { +.wikibase-referenceview .wikibase-snaklistview-listview .wikibase-snakview-value-container .wikibase-snakview-value { margin-left: 16px; margin-right: 18em; word-wrap: break-word; } -.wb-referenceview .wikibase-snaklistview-listview .wikibase-snakview-value-container .wikibase-snakview-value .valueview-value { +.wikibase-referenceview .wikibase-snaklistview-listview .wikibase-snakview-value-container .wikibase-snakview-value .valueview-value { font-size: 90%; } -.wb-referenceview .wikibase-snaklistview-listview .wikibase-snakview-value-container .wikibase-snakview-typeselector { +.wikibase-referenceview .wikibase-snaklistview-listview .wikibase-snakview-value-container .wikibase-snakview-typeselector { left: 0; } -.wb-referenceview .wikibase-snaklistview-listview .wikibase-snakview-value-container .wikibase-snakview-value .valueview-value textarea { +.wikibase-referenceview .wikibase-snaklistview-listview .wikibase-snakview-value-container .wikibase-snakview-value .valueview-value textarea { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } -.wb-referenceview .wikibase-snaklistview-listview .wikibase-snakview { +.wikibase-referenceview .wikibase-snaklistview-listview .wikibase-snakview { position: relative; min-height: 1.8em; padding-top: 4px; @@ -615,24 +615,24 @@ } /* a reference's "edit" toolbar */ -.wb-referenceview .wb-edittoolbar { +.wikibase-referenceview .wb-edittoolbar { position: absolute; right: 0; top: 0; } -.wb-referenceview .wikibase-toolbar-container { +.wikibase-referenceview .wikibase-toolbar-container { top: 5px; } /* "remove" link at each reference's snak */ -.wb-referenceview .wikibase-snaklistview-listview .wikibase-snakview > .wb-removetoolbar { +.wikibase-referenceview .wikibase-snaklistview-listview .wikibase-snakview > .wb-removetoolbar { position: absolute; top: 5px; right: 0; } /* "add" link in one reference's snak list */ -.wb-referenceview > .wikibase-addtoolbar-container { +.wikibase-referenceview > .wikibase-addtoolbar-container { float: right; margin-bottom: 1em; position: static; diff --git a/repo/includes/View/ClaimHtmlGenerator.php b/repo/includes/View/ClaimHtmlGenerator.php index 1225c91..8bb040b 100644 --- a/repo/includes/View/ClaimHtmlGenerator.php +++ b/repo/includes/View/ClaimHtmlGenerator.php @@ -190,8 +190,8 @@ ); } - return $this->templateFactory->render( 'wb-referenceview', - 'wb-referenceview-' . $reference->getHash(), + return $this->templateFactory->render( 'wikibase-referenceview', + 'wikibase-referenceview-' . $reference->getHash(), $snaklistviewsHtml ); } diff --git a/repo/resources/templates.php b/repo/resources/templates.php index 34e698d..32ed2f8 100644 --- a/repo/resources/templates.php +++ b/repo/resources/templates.php @@ -117,11 +117,11 @@ </div> HTML; - $templates['wb-referenceview'] = + $templates['wikibase-referenceview'] = <<<HTML -<div class="wb-referenceview $1"> - <div class="wb-referenceview-heading"></div> - <div class="wb-referenceview-listview">$2<!-- [0,*] wikibase-snaklistview --></div> +<div class="wikibase-referenceview $1"> + <div class="wikibase-referenceview-heading"></div> + <div class="wikibase-referenceview-listview">$2<!-- [0,*] wikibase-snaklistview --></div> </div> HTML; -- To view, visit https://gerrit.wikimedia.org/r/186779 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic3baeb64851999a2256f54eb7918b140c51b7fb9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Henning Snater <henning.sna...@wikimedia.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits