Tpt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/94678
Change subject: Improve page pages CSS and JavaScript
......................................................................
Improve page pages CSS and JavaScript
Change-Id: I4259826d8d29a6da4711fbfc2ded6301b26f36e8
---
M ProofreadPage.php
M modules/page/ext.proofreadpage.page.css
M modules/page/ext.proofreadpage.page.edit.css
M modules/page/ext.proofreadpage.page.edit.js
A modules/page/ext.proofreadpage.page.vector.css
5 files changed, 58 insertions(+), 54 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/78/94678/1
diff --git a/ProofreadPage.php b/ProofreadPage.php
index c51d630..dec139e 100644
--- a/ProofreadPage.php
+++ b/ProofreadPage.php
@@ -114,6 +114,9 @@
'ext.proofreadpage.page' => $prpResourceTemplate + array(
'styles' => 'page/ext.proofreadpage.page.css',
'scripts' => 'page/ext.proofreadpage.page.js',
+ 'skinStyles' => array(
+ 'vector' => 'page/ext.proofreadpage.page.vector.css',
+ ),
'dependencies' => array( 'ext.proofreadpage.base' )
),
'ext.proofreadpage.page.edit' => $prpResourceTemplate + array(
diff --git a/modules/page/ext.proofreadpage.page.css
b/modules/page/ext.proofreadpage.page.css
index 8512e62..5d81ffc 100644
--- a/modules/page/ext.proofreadpage.page.css
+++ b/modules/page/ext.proofreadpage.page.css
@@ -19,44 +19,4 @@
#prp-page-qualityheader {
width: 100%;
-}
-
-.table-cell-left {
- display:table-cell;
-}
-.table-cell-right {
- display:table-cell;
-}
-
-#ca-proofreadPagePrevLink.icon a,
-#ca-proofreadPageNextLink.icon a,
-#ca-proofreadPageIndexLink.icon a {
- margin: 0;
- padding: 0;
- outline: none;
- display: block;
- width: 26px;
- /* This hides the text but shows the background image */
- padding-top: 3.1em;
- margin-top: 0;
- /* Only applied in IE6 */
- margin-top: -0.8em !ie;
- height: 0;
- overflow: hidden;
- background-position: 50% 70%;
-}
-
-#ca-proofreadPagePrevLink.icon a {
- /* @embed */
- background-image: url( 'images/leftarrow.png' );
-}
-
-#ca-proofreadPageNextLink.icon a {
- /* @embed */
- background-image: url( 'images/rightarrow.png' );
-}
-
-#ca-proofreadPageIndexLink.icon a {
- /* @embed */
- background-image: url( 'images/uparrow.png' );
}
\ No newline at end of file
diff --git a/modules/page/ext.proofreadpage.page.edit.css
b/modules/page/ext.proofreadpage.page.edit.css
index 06b4357..770f9a5 100644
--- a/modules/page/ext.proofreadpage.page.edit.css
+++ b/modules/page/ext.proofreadpage.page.edit.css
@@ -1,7 +1,7 @@
-.prp-page-content {
+#editform .prp-page-content {
line-height: 1.5em;
}
-.prp-page-content label {
+#editform .prp-page-content label {
color: gray;
font-size: 80%;
}
diff --git a/modules/page/ext.proofreadpage.page.edit.js
b/modules/page/ext.proofreadpage.page.edit.js
index 8465f9a..7524eb9 100644
--- a/modules/page/ext.proofreadpage.page.edit.js
+++ b/modules/page/ext.proofreadpage.page.edit.js
@@ -14,14 +14,20 @@
var $zoomImage;
/**
+ * The edit form
+ * @type {jQuery}
+ */
+ var $editForm;
+
+ /**
* Show or hide header and footer areas
*
* @param speed string speed of the toogle. May be 'fast', 'slow' or
undefined
*/
function toggleHeaders( speed ) {
- $( '.prp-page-edit-header' ).toggle( speed );
- $( '.prp-page-edit-body label' ).toggle( speed );
- $( '.prp-page-edit-footer' ).toggle( speed );
+ $editForm.find( '.prp-page-edit-header' ).toggle( speed );
+ $editForm.find( '.prp-page-edit-body label' ).toggle( speed );
+ $editForm.find( '.prp-page-edit-footer' ).toggle( speed );
}
/**
@@ -35,12 +41,12 @@
var $container = $zoomImage.parent();
if( isLayoutHorizontal ) {
- $container.appendTo( '#editform .prp-page-container' );
+ $container.appendTo( $editForm.find(
'.prp-page-container' ) );
$container.css( {
width: ''
} );
- $( '#editform' ).find( '.prp-page-content' ).css( {
+ $editForm.find( '.prp-page-content' ).css( {
width: ''
} );
@@ -49,14 +55,14 @@
isLayoutHorizontal = false;
} else {
- $container.insertBefore( '#editform' );
+ $container.insertBefore( $editForm );
$container.css( {
width: '100%',
overflow: 'auto',
height: $( window ).height() / 3 + 'px'
} );
- $( '#editform' ).find( '.prp-page-content' ).css( {
+ $editForm.find( '.prp-page-content' ).css( {
width: '100%'
} );
@@ -87,7 +93,7 @@
function setupPageQuality() {
$( 'input[name="wpQuality"]' ).click( function() {
var text = mw.msg( 'proofreadpage_quality' + this.value
+ '_category' );
- $( 'input#wpSummary' ).val( '/* ' + text + ' */ ' );
+ $( '#wpSummary' ).val( '/* ' + text + ' */ ' );
} );
}
@@ -252,9 +258,9 @@
return;
}
mw.loader.using( 'ext.wikiEditor', function() {
- $( '.prp-page-edit-body' ).append( $( '#wpTextbox1' ) );
- $( '.wikiEditor-oldToolbar' ).after( $(
'.wikiEditor-ui' ) );
- $( '.wikiEditor-ui-text' ).append( $( '#editform'
).find( '.prp-page-container' ) );
+ $editForm.find( '.prp-page-edit-body' ).append( $(
'#wpTextbox1' ) );
+ $editForm.find( '.wikiEditor-oldToolbar' ).after(
$editForm.find( '.wikiEditor-ui' ) );
+ $editForm.find( '.wikiEditor-ui-text' ).append(
$editForm.find( '.prp-page-container' ) );
} );
}
@@ -262,8 +268,11 @@
* Init global variables of the script
*/
function initEnvironment() {
+ if( $editForm === undefined ) {
+ $editForm = $( '#editform' );
+ }
if( $zoomImage === undefined ) {
- $zoomImage = $( '#editform' ).find( '.prp-page-image
img' );
+ $zoomImage = $editForm.find( '.prp-page-image img' );
}
}
diff --git a/modules/page/ext.proofreadpage.page.vector.css
b/modules/page/ext.proofreadpage.page.vector.css
new file mode 100644
index 0000000..e86cf54
--- /dev/null
+++ b/modules/page/ext.proofreadpage.page.vector.css
@@ -0,0 +1,32 @@
+#ca-proofreadPagePrevLink.icon a,
+#ca-proofreadPageNextLink.icon a,
+#ca-proofreadPageIndexLink.icon a {
+ margin: 0;
+ padding: 0;
+ outline: none;
+ display: block;
+ width: 26px;
+ /* This hides the text but shows the background image */
+ padding-top: 3.1em;
+ margin-top: 0;
+ /* Only applied in IE6 */
+ margin-top: -0.8em !ie;
+ height: 0;
+ overflow: hidden;
+ background-position: 50% 70%;
+}
+
+#ca-proofreadPagePrevLink.icon a {
+ /* @embed */
+ background-image: url( 'images/leftarrow.png' );
+}
+
+#ca-proofreadPageNextLink.icon a {
+ /* @embed */
+ background-image: url( 'images/rightarrow.png' );
+}
+
+#ca-proofreadPageIndexLink.icon a {
+ /* @embed */
+ background-image: url( 'images/uparrow.png' );
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/94678
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4259826d8d29a6da4711fbfc2ded6301b26f36e8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
