Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php |
— | — | @@ -22,18 +22,18 @@ |
23 | 23 | array( 'src' => 'css/vector.collapsibleNav.css', 'version' => 7 ), |
24 | 24 | array( 'src' => 'css/vector.footerCleanup.css', 'version' => 1 ), |
25 | 25 | array( 'src' => 'css/wikiEditor.css', 'version' => 9 ), |
26 | | - array( 'src' => 'css/wikiEditor.dialogs.css', 'version' => 17 ), |
| 26 | + array( 'src' => 'css/wikiEditor.dialogs.css', 'version' => 18 ), |
27 | 27 | array( 'src' => 'css/wikiEditor.preview.css', 'version' => 1 ), |
28 | 28 | array( 'src' => 'css/wikiEditor.toc.css', 'version' => 28 ), |
29 | 29 | array( 'src' => 'css/wikiEditor.toolbar.css', 'version' => 10 ), |
30 | 30 | array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ), |
31 | 31 | ), |
32 | 32 | 'combined' => array( |
33 | | - array( 'src' => 'css/combined.css', 'version' => 61 ), |
| 33 | + array( 'src' => 'css/combined.css', 'version' => 62 ), |
34 | 34 | array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ), |
35 | 35 | ), |
36 | 36 | 'minified' => array( |
37 | | - array( 'src' => 'css/combined.min.css', 'version' => 61 ), |
| 37 | + array( 'src' => 'css/combined.min.css', 'version' => 62 ), |
38 | 38 | array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ), |
39 | 39 | ), |
40 | 40 | ) |
Index: trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/insert-link-external-rtl.png |
Cannot display: file marked as a binary type. |
svn:mime-type = image/png |
Property changes on: trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/insert-link-external-rtl.png |
___________________________________________________________________ |
Name: svn:mime-type |
41 | 41 | + image/png |
Index: trunk/extensions/UsabilityInitiative/css/wikiEditor.dialogs.css |
— | — | @@ -161,6 +161,27 @@ |
162 | 162 | #wikieditor-toolbar-tool-link-int-target-label { |
163 | 163 | float: left; |
164 | 164 | } |
| 165 | +#wikieditor-toolbar-link-int-target-status-exists, |
| 166 | +#wikieditor-toolbar-link-int-target-status-notexists, |
| 167 | +#wikieditor-toolbar-link-int-target-status-invalid, |
| 168 | +#wikieditor-toolbar-link-int-target-status-external { |
| 169 | + padding-left: 30px; |
| 170 | + background-position: 0 50%; |
| 171 | + background-repeat: no-repeat; |
| 172 | +} |
| 173 | +#wikieditor-toolbar-link-int-target-status-exists { |
| 174 | + background-image: url( ../images/wikiEditor/dialogs/insert-link-exists.png ); |
| 175 | +} |
| 176 | +#wikieditor-toolbar-link-int-target-status-notexists { |
| 177 | + background-image: url( ../images/wikiEditor/dialogs/insert-link-notexists.png ); |
| 178 | +} |
| 179 | +#wikieditor-toolbar-link-int-target-status-invalid { |
| 180 | + background-image: url( ../images/wikiEditor/dialogs/insert-link-invalid.png ); |
| 181 | +} |
| 182 | +#wikieditor-toolbar-link-int-target-status-external { |
| 183 | + background-image: url( ../images/wikiEditor/dialogs/insert-link-external.png ); |
| 184 | +} |
| 185 | + |
165 | 186 | /* RTL Changes */ |
166 | 187 | body.rtl .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button { |
167 | 188 | float: left; |
— | — | @@ -184,6 +205,17 @@ |
185 | 206 | margin-right: 0; |
186 | 207 | margin-left: 2em; |
187 | 208 | } |
| 209 | +body.rtl #wikieditor-toolbar-link-int-target-status-exists, |
| 210 | +body.rtl #wikieditor-toolbar-link-int-target-status-notexists, |
| 211 | +body.rtl #wikieditor-toolbar-link-int-target-status-invalid, |
| 212 | +body.rtl #wikieditor-toolbar-link-int-target-status-external { |
| 213 | + padding-left: 0; |
| 214 | + padding-right: 30px; |
| 215 | + background-position: 100% 50%; |
| 216 | +} |
| 217 | +body.rtl #wikieditor-toolbar-link-int-target-status-external { |
| 218 | + background-image: url( ../images/wikiEditor/dialogs/insert-link-external-rtl.png ); |
| 219 | +} |
188 | 220 | /* Self Clearing Floats */ |
189 | 221 | .wikieditor-toolbar-table-dimension-fields:after, |
190 | 222 | .wikieditor-toolbar-dialog-wrapper:after { |
Index: trunk/extensions/UsabilityInitiative/css/combined.css |
— | — | @@ -388,6 +388,27 @@ |
389 | 389 | #wikieditor-toolbar-tool-link-int-target-label { |
390 | 390 | float: left; |
391 | 391 | } |
| 392 | +#wikieditor-toolbar-link-int-target-status-exists, |
| 393 | +#wikieditor-toolbar-link-int-target-status-notexists, |
| 394 | +#wikieditor-toolbar-link-int-target-status-invalid, |
| 395 | +#wikieditor-toolbar-link-int-target-status-external { |
| 396 | + padding-left: 30px; |
| 397 | + background-position: 0 50%; |
| 398 | + background-repeat: no-repeat; |
| 399 | +} |
| 400 | +#wikieditor-toolbar-link-int-target-status-exists { |
| 401 | + background-image: url( ../images/wikiEditor/dialogs/insert-link-exists.png ); |
| 402 | +} |
| 403 | +#wikieditor-toolbar-link-int-target-status-notexists { |
| 404 | + background-image: url( ../images/wikiEditor/dialogs/insert-link-notexists.png ); |
| 405 | +} |
| 406 | +#wikieditor-toolbar-link-int-target-status-invalid { |
| 407 | + background-image: url( ../images/wikiEditor/dialogs/insert-link-invalid.png ); |
| 408 | +} |
| 409 | +#wikieditor-toolbar-link-int-target-status-external { |
| 410 | + background-image: url( ../images/wikiEditor/dialogs/insert-link-external.png ); |
| 411 | +} |
| 412 | + |
392 | 413 | /* RTL Changes */ |
393 | 414 | body.rtl .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button { |
394 | 415 | float: left; |
— | — | @@ -411,6 +432,17 @@ |
412 | 433 | margin-right: 0; |
413 | 434 | margin-left: 2em; |
414 | 435 | } |
| 436 | +body.rtl #wikieditor-toolbar-link-int-target-status-exists, |
| 437 | +body.rtl #wikieditor-toolbar-link-int-target-status-notexists, |
| 438 | +body.rtl #wikieditor-toolbar-link-int-target-status-invalid, |
| 439 | +body.rtl #wikieditor-toolbar-link-int-target-status-external { |
| 440 | + padding-left: 0; |
| 441 | + padding-right: 30px; |
| 442 | + background-position: 100% 50%; |
| 443 | +} |
| 444 | +body.rtl #wikieditor-toolbar-link-int-target-status-external { |
| 445 | + background-image: url( ../images/wikiEditor/dialogs/insert-link-external-rtl.png ); |
| 446 | +} |
415 | 447 | /* Self Clearing Floats */ |
416 | 448 | .wikieditor-toolbar-table-dimension-fields:after, |
417 | 449 | .wikieditor-toolbar-dialog-wrapper:after { |
Index: trunk/extensions/UsabilityInitiative/css/combined.min.css |
— | — | @@ -367,6 +367,26 @@ |
368 | 368 | #wikieditor-toolbar-tool-link-int-target-label{ |
369 | 369 | float:left; |
370 | 370 | } |
| 371 | +#wikieditor-toolbar-link-int-target-status-exists, |
| 372 | +#wikieditor-toolbar-link-int-target-status-notexists, |
| 373 | +#wikieditor-toolbar-link-int-target-status-invalid, |
| 374 | +#wikieditor-toolbar-link-int-target-status-external{ |
| 375 | +padding-left:30px; |
| 376 | +background-position:0 50%; |
| 377 | +background-repeat:no-repeat; |
| 378 | +} |
| 379 | +#wikieditor-toolbar-link-int-target-status-exists{ |
| 380 | +background-image:url( ../images/wikiEditor/dialogs/insert-link-exists.png ); |
| 381 | +} |
| 382 | +#wikieditor-toolbar-link-int-target-status-notexists{ |
| 383 | +background-image:url( ../images/wikiEditor/dialogs/insert-link-notexists.png ); |
| 384 | +} |
| 385 | +#wikieditor-toolbar-link-int-target-status-invalid{ |
| 386 | +background-image:url( ../images/wikiEditor/dialogs/insert-link-invalid.png ); |
| 387 | +} |
| 388 | +#wikieditor-toolbar-link-int-target-status-external{ |
| 389 | +background-image:url( ../images/wikiEditor/dialogs/insert-link-external.png ); |
| 390 | +} |
371 | 391 | body.rtl .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button{ |
372 | 392 | float:left; |
373 | 393 | margin:0.5em 0.4em 0.5em 0 !important; |
— | — | @@ -389,6 +409,17 @@ |
390 | 410 | margin-right:0; |
391 | 411 | margin-left:2em; |
392 | 412 | } |
| 413 | +body.rtl #wikieditor-toolbar-link-int-target-status-exists, |
| 414 | +body.rtl #wikieditor-toolbar-link-int-target-status-notexists, |
| 415 | +body.rtl #wikieditor-toolbar-link-int-target-status-invalid, |
| 416 | +body.rtl #wikieditor-toolbar-link-int-target-status-external{ |
| 417 | +padding-left:0; |
| 418 | +padding-right:30px; |
| 419 | +background-position:100% 50%; |
| 420 | +} |
| 421 | +body.rtl #wikieditor-toolbar-link-int-target-status-external{ |
| 422 | +background-image:url( ../images/wikiEditor/dialogs/insert-link-external-rtl.png ); |
| 423 | +} |
393 | 424 | .wikieditor-toolbar-table-dimension-fields:after, |
394 | 425 | .wikieditor-toolbar-dialog-wrapper:after{ |
395 | 426 | visibility:hidden; |
Index: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php |
— | — | @@ -16,14 +16,14 @@ |
17 | 17 | array( 'src' => 'Modules/Preview/Preview.js', 'version' => 6 ), |
18 | 18 | array( 'src' => 'Modules/Publish/Publish.js', 'version' => 6 ), |
19 | 19 | array( 'src' => 'Modules/Toc/Toc.js', 'version' => 7 ), |
20 | | - array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version' => 44 ), |
| 20 | + array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version' => 45 ), |
21 | 21 | array( 'src' => 'Modules/TemplateEditor/TemplateEditor.js', 'version' => 4 ), |
22 | 22 | ), |
23 | 23 | 'combined' => array( |
24 | | - array( 'src' => 'WikiEditor.combined.js', 'version' => 46 ), |
| 24 | + array( 'src' => 'WikiEditor.combined.js', 'version' => 47 ), |
25 | 25 | ), |
26 | 26 | 'minified' => array( |
27 | | - array( 'src' => 'WikiEditor.combined.min.js', 'version' => 46 ), |
| 27 | + array( 'src' => 'WikiEditor.combined.min.js', 'version' => 47 ), |
28 | 28 | ), |
29 | 29 | ); |
30 | 30 | static $messages = array( |
Index: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js |
— | — | @@ -1085,26 +1085,18 @@ |
1086 | 1086 | $j( '#wikieditor-toolbar-link-int-target-status' ) |
1087 | 1087 | .append( $j( '<div />' ) |
1088 | 1088 | .attr( 'id', 'wikieditor-toolbar-link-int-target-status-exists' ) |
1089 | | - .append( $j( '<img />' ).attr( 'src', |
1090 | | - $j.wikiEditor.imgPath + 'dialogs/' + 'insert-link-exists.png' ) ) |
1091 | 1089 | .append( existsMsg ) |
1092 | 1090 | ) |
1093 | 1091 | .append( $j( '<div />' ) |
1094 | 1092 | .attr( 'id', 'wikieditor-toolbar-link-int-target-status-notexists' ) |
1095 | | - .append( $j( '<img />' ).attr( 'src', |
1096 | | - $j.wikiEditor.imgPath + 'dialogs/' + 'insert-link-notexists.png' ) ) |
1097 | 1093 | .append( notexistsMsg ) |
1098 | 1094 | ) |
1099 | 1095 | .append( $j( '<div />' ) |
1100 | 1096 | .attr( 'id', 'wikieditor-toolbar-link-int-target-status-invalid' ) |
1101 | | - .append( $j( '<img />' ).attr( 'src', |
1102 | | - $j.wikiEditor.imgPath + 'dialogs/' + 'insert-link-invalid.png' ) ) |
1103 | 1097 | .append( invalidMsg ) |
1104 | 1098 | ) |
1105 | 1099 | .append( $j( '<div />' ) |
1106 | 1100 | .attr( 'id', 'wikieditor-toolbar-link-int-target-status-external' ) |
1107 | | - .append( $j( '<img />' ).attr( 'src', |
1108 | | - $j.wikiEditor.imgPath + 'dialogs/' + 'insert-link-external.png' ) ) |
1109 | 1101 | .append( externalMsg ) |
1110 | 1102 | ) |
1111 | 1103 | .append( $j( '<div />' ) |
Index: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js |
— | — | @@ -49,7 +49,7 @@ |
50 | 50 | $j('#wikieditor-toolbar-link-type-ext').attr('checked','checked');else |
51 | 51 | $j('#wikieditor-toolbar-link-type-int').attr('checked','checked');if($j('#wikieditor-toolbar-link-int-text').data('untouched')) |
52 | 52 | $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) |
53 | | -$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'));} |
| 53 | +$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'));} |
54 | 54 | var timerID=setTimeout(updateExistence,120);$j(this).data('timerID',timerID);}).change(function(){if(typeof $j(this).data('timerID')!='undefined'){clearTimeout($j(this).data('timerID'));} |
55 | 55 | 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;} |
56 | 56 | var cache=$j(this).data('suggcache');if(typeof cache[title]!='undefined'){$j(this).suggestions('suggestions',cache[title]);return;} |
Index: trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js |
— | — | @@ -1036,26 +1036,18 @@ |
1037 | 1037 | $j( '#wikieditor-toolbar-link-int-target-status' ) |
1038 | 1038 | .append( $j( '<div />' ) |
1039 | 1039 | .attr( 'id', 'wikieditor-toolbar-link-int-target-status-exists' ) |
1040 | | - .append( $j( '<img />' ).attr( 'src', |
1041 | | - $j.wikiEditor.imgPath + 'dialogs/' + 'insert-link-exists.png' ) ) |
1042 | 1040 | .append( existsMsg ) |
1043 | 1041 | ) |
1044 | 1042 | .append( $j( '<div />' ) |
1045 | 1043 | .attr( 'id', 'wikieditor-toolbar-link-int-target-status-notexists' ) |
1046 | | - .append( $j( '<img />' ).attr( 'src', |
1047 | | - $j.wikiEditor.imgPath + 'dialogs/' + 'insert-link-notexists.png' ) ) |
1048 | 1044 | .append( notexistsMsg ) |
1049 | 1045 | ) |
1050 | 1046 | .append( $j( '<div />' ) |
1051 | 1047 | .attr( 'id', 'wikieditor-toolbar-link-int-target-status-invalid' ) |
1052 | | - .append( $j( '<img />' ).attr( 'src', |
1053 | | - $j.wikiEditor.imgPath + 'dialogs/' + 'insert-link-invalid.png' ) ) |
1054 | 1048 | .append( invalidMsg ) |
1055 | 1049 | ) |
1056 | 1050 | .append( $j( '<div />' ) |
1057 | 1051 | .attr( 'id', 'wikieditor-toolbar-link-int-target-status-external' ) |
1058 | | - .append( $j( '<img />' ).attr( 'src', |
1059 | | - $j.wikiEditor.imgPath + 'dialogs/' + 'insert-link-external.png' ) ) |
1060 | 1052 | .append( externalMsg ) |
1061 | 1053 | ) |
1062 | 1054 | .append( $j( '<div />' ) |