Henning Snater has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/49648


Change subject: (bug 44755) Language terms reacting on page edit mode event
......................................................................

(bug 44755) Language terms reacting on page edit mode event

Changing the status (disabled/enabled) of the language terms edit tools
when some edit mode is started/stopped. In addition, some minor css
optimizations.

Change-Id: Ia796d41414b741047c3dfb1cfd011efed8b357b6
---
M lib/resources/wikibase.css
M repo/resources/wikibase.ui.entityViewInit.js
2 files changed, 35 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/48/49648/1

diff --git a/lib/resources/wikibase.css b/lib/resources/wikibase.css
index 35f55c9..78d54e0 100644
--- a/lib/resources/wikibase.css
+++ b/lib/resources/wikibase.css
@@ -307,11 +307,13 @@
 
 /********** /ALIASES **********/
 
+
 /********** TERMS **********/
+
 h2.wb-terms-heading {
     float: left;
     width: 100%;
-    margin-top: 2em;
+    margin-top: 0.6em;
     margin-bottom: 0.2em;
     padding-left: 10px;
     border-bottom: none;
@@ -342,7 +344,6 @@
 }
 
 table.wb-terms td {
-    height: 2.2em;
     border-top: 1px solid #C9C9C9;
 }
 
@@ -351,6 +352,16 @@
 }
 table.wb-terms .even td {
     background: #F8F8F8;
+}
+
+table.wb-terms td.wb-terms-label,
+table.wb-terms td.wb-terms-description {
+       padding: 10px;
+}
+
+table.wb-terms .wb-edit td.wb-terms-label,
+table.wb-terms .wb-edit td.wb-terms-description {
+       padding: 8px 8px 9px 7px;
 }
 
 /* the right column of the site links table (...-toolbarparent) should be 
treated as "action" column */
@@ -375,6 +386,11 @@
     margin-left: 0; /* do not apply margin to nested toolbar groups */
 }
 
+table.wb-terms input {
+       font-family: inherit;
+       width: 100%;
+}
+
 /********** /TERMS **********/
 
 
diff --git a/repo/resources/wikibase.ui.entityViewInit.js 
b/repo/resources/wikibase.ui.entityViewInit.js
index bc8df52..91ef302 100644
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -54,6 +54,8 @@
                        }
                } );
 
+               var termsValueTools = [];
+
                $( 'tr.wb-terms-label, tr.wb-terms-description' ).each( 
function() {
                        var $termsRow = $( this ),
                                editTool = wb.ui.PropertyEditTool[
@@ -67,7 +69,21 @@
                        toolbar.addElement( editGroup );
                        toolbar.editGroup = editGroup; // TODO: EditableLabel 
should not assume that this is set
 
-                       editTool.newFromDom( $termsRow, {}, toolbar );
+                       termsValueTools.push( editTool.newFromDom( $termsRow, 
{}, toolbar ) );
+               } );
+
+               $( wb )
+               .on( 'startItemPageEditMode', function( event, origin ) {
+                       $.each( termsValueTools, function( i, termValueTool ) {
+                               if ( !origin || origin.getSubject() !== 
termValueTool.getSubject() ) {
+                                       termValueTool.disable();
+                               }
+                       } );
+               } )
+               .on( 'stopItemPageEditMode', function( event, origin ) {
+                       $.each( termsValueTools, function( i, termValueTool ) {
+                               termValueTool.enable();
+                       } );
                } );
 
                if( mw.config.get( 'wbEntity' ) !== null ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/49648
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia796d41414b741047c3dfb1cfd011efed8b357b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to