http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61977
Revision: 61977
Author: adam
Date: 2010-02-04 16:50:59 +0000 (Thu, 04 Feb 2010)
Log Message:
-----------
Insert Link Dialog - Moving the link status icons out of img tags and applying
them as backgrounds. Adding a RTL version of the external link status icon
Modified Paths:
--------------
trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
trunk/extensions/UsabilityInitiative/css/combined.css
trunk/extensions/UsabilityInitiative/css/combined.min.css
trunk/extensions/UsabilityInitiative/css/wikiEditor.dialogs.css
Added Paths:
-----------
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/insert-link-external-rtl.png
Modified: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
===================================================================
--- trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2010-02-04 14:55:53 UTC (rev 61976)
+++ trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2010-02-04 16:50:59 UTC (rev 61977)
@@ -22,18 +22,18 @@
array( 'src' =>
'css/vector.collapsibleNav.css', 'version' => 7 ),
array( 'src' => 'css/vector.footerCleanup.css',
'version' => 1 ),
array( 'src' => 'css/wikiEditor.css', 'version'
=> 9 ),
- array( 'src' => 'css/wikiEditor.dialogs.css',
'version' => 17 ),
+ array( 'src' => 'css/wikiEditor.dialogs.css',
'version' => 18 ),
array( 'src' => 'css/wikiEditor.preview.css',
'version' => 1 ),
array( 'src' => 'css/wikiEditor.toc.css',
'version' => 28 ),
array( 'src' => 'css/wikiEditor.toolbar.css',
'version' => 10 ),
array( 'src' =>
'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
),
'combined' => array(
- array( 'src' => 'css/combined.css', 'version'
=> 61 ),
+ array( 'src' => 'css/combined.css', 'version'
=> 62 ),
array( 'src' =>
'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
),
'minified' => array(
- array( 'src' => 'css/combined.min.css',
'version' => 61 ),
+ array( 'src' => 'css/combined.min.css',
'version' => 62 ),
array( 'src' =>
'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
),
)
Modified:
trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
2010-02-04 14:55:53 UTC (rev 61976)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
2010-02-04 16:50:59 UTC (rev 61977)
@@ -1036,26 +1036,18 @@
$j( '#wikieditor-toolbar-link-int-target-status' )
.append( $j( '<div />' )
.attr( 'id',
'wikieditor-toolbar-link-int-target-status-exists' )
- .append( $j( '<img />' ).attr( 'src',
- $j.wikiEditor.imgPath +
'dialogs/' + 'insert-link-exists.png' ) )
.append( existsMsg )
)
.append( $j( '<div />' )
.attr( 'id',
'wikieditor-toolbar-link-int-target-status-notexists' )
- .append( $j( '<img />' ).attr( 'src',
- $j.wikiEditor.imgPath +
'dialogs/' + 'insert-link-notexists.png' ) )
.append( notexistsMsg )
)
.append( $j( '<div />' )
.attr( 'id',
'wikieditor-toolbar-link-int-target-status-invalid' )
- .append( $j( '<img />' ).attr( 'src',
- $j.wikiEditor.imgPath +
'dialogs/' + 'insert-link-invalid.png' ) )
.append( invalidMsg )
)
.append( $j( '<div />' )
.attr( 'id',
'wikieditor-toolbar-link-int-target-status-external' )
- .append( $j( '<img />' ).attr( 'src',
- $j.wikiEditor.imgPath +
'dialogs/' + 'insert-link-external.png' ) )
.append( externalMsg )
)
.append( $j( '<div />' )
Modified: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
2010-02-04 14:55:53 UTC (rev 61976)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
2010-02-04 16:50:59 UTC (rev 61977)
@@ -1085,26 +1085,18 @@
$j( '#wikieditor-toolbar-link-int-target-status' )
.append( $j( '<div />' )
.attr( 'id',
'wikieditor-toolbar-link-int-target-status-exists' )
- .append( $j( '<img />' ).attr( 'src',
- $j.wikiEditor.imgPath +
'dialogs/' + 'insert-link-exists.png' ) )
.append( existsMsg )
)
.append( $j( '<div />' )
.attr( 'id',
'wikieditor-toolbar-link-int-target-status-notexists' )
- .append( $j( '<img />' ).attr( 'src',
- $j.wikiEditor.imgPath +
'dialogs/' + 'insert-link-notexists.png' ) )
.append( notexistsMsg )
)
.append( $j( '<div />' )
.attr( 'id',
'wikieditor-toolbar-link-int-target-status-invalid' )
- .append( $j( '<img />' ).attr( 'src',
- $j.wikiEditor.imgPath +
'dialogs/' + 'insert-link-invalid.png' ) )
.append( invalidMsg )
)
.append( $j( '<div />' )
.attr( 'id',
'wikieditor-toolbar-link-int-target-status-external' )
- .append( $j( '<img />' ).attr( 'src',
- $j.wikiEditor.imgPath +
'dialogs/' + 'insert-link-external.png' ) )
.append( externalMsg )
)
.append( $j( '<div />' )
Modified:
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
2010-02-04 14:55:53 UTC (rev 61976)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
2010-02-04 16:50:59 UTC (rev 61977)
@@ -49,7 +49,7 @@
$j('#wikieditor-toolbar-link-type-ext').attr('checked','checked');else
$j('#wikieditor-toolbar-link-type-int').attr('checked','checked');if($j('#wikieditor-toolbar-link-int-text').data('untouched'))
$j('#wikieditor-toolbar-link-int-text').val($j('#wikieditor-toolbar-link-int-target').val()).change();},0);});$j('#wikieditor-toolbar-link-int-text').bind('change
keydown paste cut',function(){var oldVal=$j(this).val();var
that=this;setTimeout(function(){if($j(that).val()!=oldVal)
-$j(that).data('untouched',false);},0);});var
existsMsg=u.getMsg('wikieditor-toolbar-tool-link-int-target-status-exists');var
notexistsMsg=u.getMsg('wikieditor-toolbar-tool-link-int-target-status-notexists');var
invalidMsg=u.getMsg('wikieditor-toolbar-tool-link-int-target-status-invalid');var
externalMsg=u.getMsg('wikieditor-toolbar-tool-link-int-target-status-external');var
loadingMsg=u.getMsg('wikieditor-toolbar-tool-link-int-target-status-loading');$j('#wikieditor-toolbar-link-int-target-status').append($j('<div
/>').attr('id','wikieditor-toolbar-link-int-target-status-exists').append($j('<img
/>').attr('src',$j.wikiEditor.imgPath+'dialogs/'+'insert-link-exists.png')).append(existsMsg)).append($j('<div
/>').attr('id','wikieditor-toolbar-link-int-target-status-notexists').append($j('<img
/>').attr('src',$j.wikiEditor.imgPath+'dialogs/'+'insert-link-notexists.png')).append(notexistsMsg)).append($j('<div
/>').attr('id','wikieditor-toolbar-link-int-target-status-invalid').append($j('<img
/>').attr('src',$j.wikiEditor.imgPath+'dialogs/'+'insert-link-invalid.png')).append(invalidMsg)).append($j('<div
/>').attr('id','wikieditor-toolbar-link-int-target-status-external').append($j('<img
/>').attr('src',$j.wikiEditor.imgPath+'dialogs/'+'insert-link-external.png')).append(externalMsg)).append($j('<div
/>').attr('id','wikieditor-toolbar-link-int-target-status-loading').append($j('<img
/>').attr({'src':$j.wikiEditor.imgPath+'dialogs/'+'loading.gif','alt':loadingMsg,'title':loadingMsg}))).data('existencecache',{}).children().hide();$j('#wikieditor-toolbar-link-int-target').bind('keyup
paste cut',function(){if(typeof
$j(this).data('timerID')!='undefined'){clearTimeout($j(this).data('timerID'));}
+$j(that).data('untouched',false);},0);});var
existsMsg=u.getMsg('wikieditor-toolbar-tool-link-int-target-status-exists');var
notexistsMsg=u.getMsg('wikieditor-toolbar-tool-link-int-target-status-notexists');var
invalidMsg=u.getMsg('wikieditor-toolbar-tool-link-int-target-status-invalid');var
externalMsg=u.getMsg('wikieditor-toolbar-tool-link-int-target-status-external');var
loadingMsg=u.getMsg('wikieditor-toolbar-tool-link-int-target-status-loading');$j('#wikieditor-toolbar-link-int-target-status').append($j('<div
/>').attr('id','wikieditor-toolbar-link-int-target-status-exists').append(existsMsg)).append($j('<div
/>').attr('id','wikieditor-toolbar-link-int-target-status-notexists').append(notexistsMsg)).append($j('<div
/>').attr('id','wikieditor-toolbar-link-int-target-status-invalid').append(invalidMsg)).append($j('<div
/>').attr('id','wikieditor-toolbar-link-int-target-status-external').append(externalMsg)).append($j('<div
/>').attr('id','wikieditor-toolbar-link-int-target-status-loading').append($j('<img
/>').attr({'src':$j.wikiEditor.imgPath+'dialogs/'+'loading.gif','alt':loadingMsg,'title':loadingMsg}))).data('existencecache',{}).children().hide();$j('#wikieditor-toolbar-link-int-target').bind('keyup
paste cut',function(){if(typeof
$j(this).data('timerID')!='undefined'){clearTimeout($j(this).data('timerID'));}
var
timerID=setTimeout(updateExistence,120);$j(this).data('timerID',timerID);}).change(function(){if(typeof
$j(this).data('timerID')!='undefined'){clearTimeout($j(this).data('timerID'));}
updateExistence();});$j('#wikieditor-toolbar-link-int-target').data('suggcache',{}).suggestions({fetch:function(query){var
that=this;var
title=$j(this).val();if(isExternalLink(title)||title.indexOf('|')!=-1||title==''){$j(this).suggestions('suggestions',[]);return;}
var cache=$j(this).data('suggcache');if(typeof
cache[title]!='undefined'){$j(this).suggestions('suggestions',cache[title]);return;}
Modified: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
2010-02-04 14:55:53 UTC (rev 61976)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
2010-02-04 16:50:59 UTC (rev 61977)
@@ -16,14 +16,14 @@
array( 'src' => 'Modules/Preview/Preview.js', 'version'
=> 6 ),
array( 'src' => 'Modules/Publish/Publish.js', 'version'
=> 6 ),
array( 'src' => 'Modules/Toc/Toc.js', 'version' => 7 ),
- array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version'
=> 44 ),
+ array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version'
=> 45 ),
array( 'src' =>
'Modules/TemplateEditor/TemplateEditor.js', 'version' => 4 ),
),
'combined' => array(
- array( 'src' => 'WikiEditor.combined.js', 'version' =>
46 ),
+ array( 'src' => 'WikiEditor.combined.js', 'version' =>
47 ),
),
'minified' => array(
- array( 'src' => 'WikiEditor.combined.min.js', 'version'
=> 46 ),
+ array( 'src' => 'WikiEditor.combined.min.js', 'version'
=> 47 ),
),
);
static $messages = array(
Modified: trunk/extensions/UsabilityInitiative/css/combined.css
===================================================================
--- trunk/extensions/UsabilityInitiative/css/combined.css 2010-02-04
14:55:53 UTC (rev 61976)
+++ trunk/extensions/UsabilityInitiative/css/combined.css 2010-02-04
16:50:59 UTC (rev 61977)
@@ -388,6 +388,27 @@
#wikieditor-toolbar-tool-link-int-target-label {
float: left;
}
+#wikieditor-toolbar-link-int-target-status-exists,
+#wikieditor-toolbar-link-int-target-status-notexists,
+#wikieditor-toolbar-link-int-target-status-invalid,
+#wikieditor-toolbar-link-int-target-status-external {
+ padding-left: 30px;
+ background-position: 0 50%;
+ background-repeat: no-repeat;
+}
+#wikieditor-toolbar-link-int-target-status-exists {
+ background-image: url(
../images/wikiEditor/dialogs/insert-link-exists.png );
+}
+#wikieditor-toolbar-link-int-target-status-notexists {
+ background-image: url(
../images/wikiEditor/dialogs/insert-link-notexists.png );
+}
+#wikieditor-toolbar-link-int-target-status-invalid {
+ background-image: url(
../images/wikiEditor/dialogs/insert-link-invalid.png );
+}
+#wikieditor-toolbar-link-int-target-status-external {
+ background-image: url(
../images/wikiEditor/dialogs/insert-link-external.png );
+}
+
/* RTL Changes */
body.rtl .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button {
float: left;
@@ -411,6 +432,17 @@
margin-right: 0;
margin-left: 2em;
}
+body.rtl #wikieditor-toolbar-link-int-target-status-exists,
+body.rtl #wikieditor-toolbar-link-int-target-status-notexists,
+body.rtl #wikieditor-toolbar-link-int-target-status-invalid,
+body.rtl #wikieditor-toolbar-link-int-target-status-external {
+ padding-left: 0;
+ padding-right: 30px;
+ background-position: 100% 50%;
+}
+body.rtl #wikieditor-toolbar-link-int-target-status-external {
+ background-image: url(
../images/wikiEditor/dialogs/insert-link-external-rtl.png );
+}
/* Self Clearing Floats */
.wikieditor-toolbar-table-dimension-fields:after,
.wikieditor-toolbar-dialog-wrapper:after {
Modified: trunk/extensions/UsabilityInitiative/css/combined.min.css
===================================================================
--- trunk/extensions/UsabilityInitiative/css/combined.min.css 2010-02-04
14:55:53 UTC (rev 61976)
+++ trunk/extensions/UsabilityInitiative/css/combined.min.css 2010-02-04
16:50:59 UTC (rev 61977)
@@ -367,6 +367,26 @@
#wikieditor-toolbar-tool-link-int-target-label{
float:left;
}
+#wikieditor-toolbar-link-int-target-status-exists,
+#wikieditor-toolbar-link-int-target-status-notexists,
+#wikieditor-toolbar-link-int-target-status-invalid,
+#wikieditor-toolbar-link-int-target-status-external{
+padding-left:30px;
+background-position:0 50%;
+background-repeat:no-repeat;
+}
+#wikieditor-toolbar-link-int-target-status-exists{
+background-image:url( ../images/wikiEditor/dialogs/insert-link-exists.png );
+}
+#wikieditor-toolbar-link-int-target-status-notexists{
+background-image:url( ../images/wikiEditor/dialogs/insert-link-notexists.png );
+}
+#wikieditor-toolbar-link-int-target-status-invalid{
+background-image:url( ../images/wikiEditor/dialogs/insert-link-invalid.png );
+}
+#wikieditor-toolbar-link-int-target-status-external{
+background-image:url( ../images/wikiEditor/dialogs/insert-link-external.png );
+}
body.rtl .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button{
float:left;
margin:0.5em 0.4em 0.5em 0 !important;
@@ -389,6 +409,17 @@
margin-right:0;
margin-left:2em;
}
+body.rtl #wikieditor-toolbar-link-int-target-status-exists,
+body.rtl #wikieditor-toolbar-link-int-target-status-notexists,
+body.rtl #wikieditor-toolbar-link-int-target-status-invalid,
+body.rtl #wikieditor-toolbar-link-int-target-status-external{
+padding-left:0;
+padding-right:30px;
+background-position:100% 50%;
+}
+body.rtl #wikieditor-toolbar-link-int-target-status-external{
+background-image:url(
../images/wikiEditor/dialogs/insert-link-external-rtl.png );
+}
.wikieditor-toolbar-table-dimension-fields:after,
.wikieditor-toolbar-dialog-wrapper:after{
visibility:hidden;
Modified: trunk/extensions/UsabilityInitiative/css/wikiEditor.dialogs.css
===================================================================
--- trunk/extensions/UsabilityInitiative/css/wikiEditor.dialogs.css
2010-02-04 14:55:53 UTC (rev 61976)
+++ trunk/extensions/UsabilityInitiative/css/wikiEditor.dialogs.css
2010-02-04 16:50:59 UTC (rev 61977)
@@ -161,6 +161,27 @@
#wikieditor-toolbar-tool-link-int-target-label {
float: left;
}
+#wikieditor-toolbar-link-int-target-status-exists,
+#wikieditor-toolbar-link-int-target-status-notexists,
+#wikieditor-toolbar-link-int-target-status-invalid,
+#wikieditor-toolbar-link-int-target-status-external {
+ padding-left: 30px;
+ background-position: 0 50%;
+ background-repeat: no-repeat;
+}
+#wikieditor-toolbar-link-int-target-status-exists {
+ background-image: url(
../images/wikiEditor/dialogs/insert-link-exists.png );
+}
+#wikieditor-toolbar-link-int-target-status-notexists {
+ background-image: url(
../images/wikiEditor/dialogs/insert-link-notexists.png );
+}
+#wikieditor-toolbar-link-int-target-status-invalid {
+ background-image: url(
../images/wikiEditor/dialogs/insert-link-invalid.png );
+}
+#wikieditor-toolbar-link-int-target-status-external {
+ background-image: url(
../images/wikiEditor/dialogs/insert-link-external.png );
+}
+
/* RTL Changes */
body.rtl .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button {
float: left;
@@ -184,6 +205,17 @@
margin-right: 0;
margin-left: 2em;
}
+body.rtl #wikieditor-toolbar-link-int-target-status-exists,
+body.rtl #wikieditor-toolbar-link-int-target-status-notexists,
+body.rtl #wikieditor-toolbar-link-int-target-status-invalid,
+body.rtl #wikieditor-toolbar-link-int-target-status-external {
+ padding-left: 0;
+ padding-right: 30px;
+ background-position: 100% 50%;
+}
+body.rtl #wikieditor-toolbar-link-int-target-status-external {
+ background-image: url(
../images/wikiEditor/dialogs/insert-link-external-rtl.png );
+}
/* Self Clearing Floats */
.wikieditor-toolbar-table-dimension-fields:after,
.wikieditor-toolbar-dialog-wrapper:after {
Added:
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/insert-link-external-rtl.png
===================================================================
(Binary files differ)
Property changes on:
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/insert-link-external-rtl.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
