https://www.mediawiki.org/wiki/Special:Code/MediaWiki/103420
Revision: 103420
Author: seanheavey
Date: 2011-11-17 00:04:56 +0000 (Thu, 17 Nov 2011)
Log Message:
-----------
Fixed some bugs regarding the stylesheet and displaying the disclosure info as
seperate values
Modified Paths:
--------------
trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php
trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
Modified: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php
2011-11-16 23:57:12 UTC (rev 103419)
+++ trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php
2011-11-17 00:04:56 UTC (rev 103420)
@@ -71,9 +71,6 @@
'articlefeedbackv5-bucket1-toggle-found-no-full',
'articlefeedbackv5-bucket1-question-comment-yes',
'articlefeedbackv5-bucket1-question-comment-no',
- 'articlefeedbackv5-bucket1-disclosure',
-
'articlefeedbackv5-bucket1-disclosure-shared-linktext',
-
'articlefeedbackv5-bucket1-disclosure-privacy-policy-linktext',
'articlefeedbackv5-bucket1-form-pending',
'articlefeedbackv5-bucket1-form-success',
'articlefeedbackv5-bucket1-form-submit',
Modified: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
2011-11-16 23:57:12 UTC (rev 103419)
+++ trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
2011-11-17 00:04:56 UTC (rev 103420)
@@ -46,7 +46,7 @@
'articlefeedbackv5-bucket1-disclosure-privacy-policy-linktext' => 'terms',
'articlefeedbackv5-bucket1-form-pending' => 'Your feedback has not been
submitted yet',
'articlefeedbackv5-bucket5-form-success' => 'Saved successfully',
- 'articlefeedbackv5-bucket1-form-submit' => 'Submit Your Feedback',
+ 'articlefeedbackv5-bucket1-form-submit' => 'Post Your Feedback',
'articlefeedbackv5-shared-on-feedback' => 'Your comment will be shared
on this $1.',
'articlefeedbackv5-shared-on-feedback-linktext' => 'feedback page',
'articlefeedbackv5-transparency-terms' => 'By posting, you agree to
transparency under these $1.',
Modified:
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css
===================================================================
---
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css
2011-11-16 23:57:12 UTC (rev 103419)
+++
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css
2011-11-17 00:04:56 UTC (rev 103420)
@@ -414,32 +414,19 @@
width: 100%;
}
/* tooltip styling. by default the element to be styled is .tooltip */
-<<<<<<< .mine
.articleFeedbackv5-panel .title-wrap {
position: relative;
}
.articleFeedbackv5-panel .articleFeedbackv5-tooltip {
- display:none;
+ display: none;
position: absolute;
z-index: 15;
top: -185px;
right: -105px;
-=======
-.articleFeedbackv5-panel .title-wrap {
- position: relative;
+ font-size: 12px;
+ width: 234px;
+ color: #000;
}
-.articleFeedbackv5-panel .articleFeedbackv5-tooltip {
- display:none;
- position: absolute;
- z-index: 15;
- top: -175px;
- right: -105px;
->>>>>>> .r103389
- font-size:12px;
- width:234px;
- color:#000;
-}
-<<<<<<< .mine
.articleFeedbackv5-panel .articleFeedbackv5-tooltip .tooltip-top {
background: url(images/bg-tooltip-top.png);
height: 11px;
@@ -453,24 +440,6 @@
background: url(images/bg-tooltip-bottom.png);
height: 26px;
}
-=======
-.articleFeedbackv5-panel .articleFeedbackv5-tooltip .tooltip-top {
- background: url(images/bg-tooltip-top.png);
- height: 11px;
-}
-.articleFeedbackv5-panel .articleFeedbackv5-tooltip .tooltip-repeat {
- background: url(images/bg-tooltip.png) repeat-y;
- padding: 0 20px 10px;
- margin: 0;
-}
-.articleFeedbackv5-panel .articleFeedbackv5-tooltip .tooltip-repeat p {
- display: block;
-}
-.articleFeedbackv5-panel .articleFeedbackv5-tooltip .tooltip-bottom {
- background: url(images/bg-tooltip-bottom.png);
- height: 26px;
-}
->>>>>>> .r103389
.articleFeedbackv5-panel {
width: 598px;
background: #f5faff;
@@ -549,16 +518,19 @@
}
.articleFeedbackv5-panel .articleFeedbackv5-disclosure {
float: left;
- width: 280px;
- margin: 0 0 0 10px;
+ width: 335px;
+ margin: 10px 0 0;
}
+.articleFeedbackv5-panel .articleFeedbackv5-disclosure p {
+ margin: 0;
+}
.articleFeedbackv5-panel .articleFeedbackv5-submit {
float: right;
height: 25px;
- width: 200px;
+ width: 180px;
text-align: center;
background: url(images/bg-submit-disable.png) repeat-x !important;
- margin: 10px 53px 0 0 !important;
+ margin: 10px 30px 0 0 !important;
border: none !important;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
Modified:
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
===================================================================
---
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
2011-11-16 23:57:12 UTC (rev 103419)
+++
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
2011-11-17 00:04:56 UTC (rev 103420)
@@ -166,7 +166,8 @@
<textarea id="find-feedback"
class="feedback-text" name="comment"></textarea>\
</div>\
<div
class="articleFeedbackv5-disclosure">\
- <p></p>\
+ <p
class="articlefeedbackv5-shared-on-feedback"></p>\
+ <p
class="articlefeedbackv5-transparency-terms"></p>\
</div>\
<button
class="articleFeedbackv5-submit" type="submit" disabled="disabled"><html:msg
key="bucket1-form-submit" /></button>\
<div class="clear"></div>\
@@ -179,23 +180,25 @@
$block.find( '.articleFeedbackv5-tooltip'
).hide();
// Fill in the disclosure text
- $block.find( '.articleFeedbackv5-disclosure p' )
+ $block.find(
'.articlefeedbackv5-shared-on-feedback' )
.html( $.articleFeedbackv5.buildLink(
-
'articlefeedbackv5-bucket1-disclosure',
+
'articlefeedbackv5-shared-on-feedback',
{
href: mw.config.get(
'wgScript' ) + '?' + $.param( {
title:
mw.config.get( 'wgPageName' ),
action:
'feedback'
} ),
- text:
'articlefeedbackv5-bucket1-disclosure-shared-linktext',
+ text:
'articlefeedbackv5-shared-on-feedback-linktext',
target: '_blank'
- },
+ } ) );
+ $block.find(
'.articlefeedbackv5-transparency-terms' )
+ .html( $.articleFeedbackv5.buildLink(
+
'articlefeedbackv5-transparency-terms',
{
href:
mw.util.wikiGetlink( mw.config.get( 'wgArticleFeedbackv5TermsPage' ) ),
- text:
'articlefeedbackv5-bucket1-disclosure-privacy-policy-linktext',
+ text:
'articlefeedbackv5-transparency-terms-linktext',
target: '_blank'
- }
- ).replace( /\$0/, '<br />' ) );
+ } ) );
// Localize the block
$block.localize( { 'prefix':
'articlefeedbackv5-' } );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
