http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61300
Revision: 61300
Author: adam
Date: 2010-01-20 18:24:18 +0000 (Wed, 20 Jan 2010)
Log Message:
-----------
More dialog changes. TODO - Help IE7 with the table based dialogs
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/button_disabled.png
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_down.png
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_off.png
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_over.png
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/close_x.png
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/titlebar_fade.png
Modified: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
===================================================================
--- trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2010-01-20 17:27:23 UTC (rev 61299)
+++ trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2010-01-20 18:24:18 UTC (rev 61300)
@@ -22,7 +22,7 @@
array( 'src' =>
'css/vector.collapsibleNav.css', 'version' => 6 ),
array( 'src' => 'css/vector.footerCleanup.css',
'version' => 1 ),
array( 'src' => 'css/wikiEditor.css', 'version'
=> 7 ),
- array( 'src' => 'css/wikiEditor.dialogs.css',
'version' => 11 ),
+ array( 'src' => 'css/wikiEditor.dialogs.css',
'version' => 12 ),
array( 'src' => 'css/wikiEditor.preview.css',
'version' => 1 ),
array( 'src' =>
'css/wikiEditor.templateEditor.css', 'version' => 1 ),
array( 'src' => 'css/wikiEditor.toc.css',
'version' => 27 ),
@@ -30,11 +30,11 @@
array( 'src' =>
'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
),
'combined' => array(
- array( 'src' => 'css/combined.css', 'version'
=> 51 ),
+ array( 'src' => 'css/combined.css', 'version'
=> 52 ),
array( 'src' =>
'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
),
'minified' => array(
- array( 'src' => 'css/combined.min.css',
'version' => 51 ),
+ array( 'src' => 'css/combined.min.css',
'version' => 52 ),
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-01-20 17:27:23 UTC (rev 61299)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
2010-01-20 18:24:18 UTC (rev 61300)
@@ -1464,17 +1464,37 @@
'insert-table': {
titleMsg: 'wikieditor-toolbar-tool-table-title',
id: 'wikieditor-toolbar-table-dialog',
- // FIXME: All kinds of uglinesses and styling issues
- // FIXME: Rows are identical so sorting has no effect
// FIXME: Localize 'x'?
html: '\
- <fieldset><table><tr><td colspan="3">\
- <input type="checkbox"
id="wikieditor-toolbar-table-dimensions-header" checked />\
- <label
for="wikieditor-toolbar-table-dimensions-header"\
-
rel="wikieditor-toolbar-tool-table-dimensions-header"></label>\
- </td><td rowspan="4"
class="wikieditor-toolbar-table-preview-wrapper" >\
+ <fieldset><div class="wikieditor-toolbar-table-form">\
+ <div class="wikieditor-toolbar-field-wrapper">\
+ <input type="checkbox"
id="wikieditor-toolbar-table-dimensions-header" checked />\
+ <label
for="wikieditor-toolbar-table-dimensions-header"\
+
rel="wikieditor-toolbar-tool-table-dimensions-header"></label>\
+ </div>\
+ <div class="wikieditor-toolbar-field-wrapper">\
+ <input type="checkbox"
id="wikieditor-toolbar-table-wikitable" checked />\
+ <label
for="wikieditor-toolbar-table-wikitable"
rel="wikieditor-toolbar-tool-table-wikitable"></label>\
+ </div>\
+ <div class="wikieditor-toolbar-field-wrapper">\
+ <input type="checkbox"
id="wikieditor-toolbar-table-sortable" />\
+ <label
for="wikieditor-toolbar-table-sortable"
rel="wikieditor-toolbar-tool-table-sortable"></label>\
+ </div>\
+ <div
class="wikieditor-toolbar-table-dimension-fields">\
+ <div
class="wikieditor-toolbar-field-wrapper">\
+ <label
for="wikieditor-toolbar-table-dimensions-rows"\
+
rel="wikieditor-toolbar-tool-table-dimensions-rows"></label><br />\
+ <input type="text"
id="wikieditor-toolbar-table-dimensions-rows" size="4" />\
+ </div>\
+ <div
class="wikieditor-toolbar-field-wrapper">\
+ <label
for="wikieditor-toolbar-table-dimensions-columns"\
+
rel="wikieditor-toolbar-tool-table-dimensions-columns"></label><br />\
+ <input type="text"
id="wikieditor-toolbar-table-dimensions-columns" size="4" />\
+ </div>\
+ </div>\
+ </div></fieldset>\
+ <div class="wikieditor-toolbar-table-preview-wrapper" >\
<span
rel="wikieditor-toolbar-tool-table-example"></span>\
- <div
class="wikieditor-toolbar-table-preview-frame">\
<div
class="wikieditor-toolbar-table-preview-content">\
<table
id="wikieditor-toolbar-table-preview" class="wikieditor-toolbar-table-preview
wikitable">\
<tr
class="wikieditor-toolbar-table-preview-header">\
@@ -1500,24 +1520,7 @@
</tr>\
</table>\
</div>\
- </div>\
- </td></tr><tr><td colspan="3">\
- <input type="checkbox"
id="wikieditor-toolbar-table-wikitable" checked />\
- <label for="wikieditor-toolbar-table-wikitable"
rel="wikieditor-toolbar-tool-table-wikitable"></label>\
- </td></tr><tr><td colspan="3">\
- <input type="checkbox"
id="wikieditor-toolbar-table-sortable" />\
- <label for="wikieditor-toolbar-table-sortable"
rel="wikieditor-toolbar-tool-table-sortable"></label>\
- </td></tr><tr><td>\
- <label
for="wikieditor-toolbar-table-dimensions-rows"\
-
rel="wikieditor-toolbar-tool-table-dimensions-rows"></label><br />\
- <input type="text"
id="wikieditor-toolbar-table-dimensions-rows" size="4" />\
- </td><td>\
- <br />x\
- </td><td>\
- <label
for="wikieditor-toolbar-table-dimensions-columns"\
-
rel="wikieditor-toolbar-tool-table-dimensions-columns"></label><br />\
- <input type="text"
id="wikieditor-toolbar-table-dimensions-columns" size="4" />\
- </td></tr></table></fieldset>',
+ </div>',
init: function() {
$j(this).find( '[rel]' ).each( function() {
$j(this).text( gM( $j(this).attr( 'rel' ) ) );
@@ -1569,6 +1572,7 @@
},
dialog: {
resizable: false,
+ width: 500,
buttons: {
'wikieditor-toolbar-tool-table-insert':
function() {
var rowsVal = $j(
'#wikieditor-toolbar-table-dimensions-rows' ).val();
Modified: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
2010-01-20 17:27:23 UTC (rev 61299)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
2010-01-20 18:24:18 UTC (rev 61300)
@@ -1545,17 +1545,37 @@
'insert-table': {
titleMsg: 'wikieditor-toolbar-tool-table-title',
id: 'wikieditor-toolbar-table-dialog',
- // FIXME: All kinds of uglinesses and styling issues
- // FIXME: Rows are identical so sorting has no effect
// FIXME: Localize 'x'?
html: '\
- <fieldset><table><tr><td colspan="3">\
- <input type="checkbox"
id="wikieditor-toolbar-table-dimensions-header" checked />\
- <label
for="wikieditor-toolbar-table-dimensions-header"\
-
rel="wikieditor-toolbar-tool-table-dimensions-header"></label>\
- </td><td rowspan="4"
class="wikieditor-toolbar-table-preview-wrapper" >\
+ <fieldset><div class="wikieditor-toolbar-table-form">\
+ <div class="wikieditor-toolbar-field-wrapper">\
+ <input type="checkbox"
id="wikieditor-toolbar-table-dimensions-header" checked />\
+ <label
for="wikieditor-toolbar-table-dimensions-header"\
+
rel="wikieditor-toolbar-tool-table-dimensions-header"></label>\
+ </div>\
+ <div class="wikieditor-toolbar-field-wrapper">\
+ <input type="checkbox"
id="wikieditor-toolbar-table-wikitable" checked />\
+ <label
for="wikieditor-toolbar-table-wikitable"
rel="wikieditor-toolbar-tool-table-wikitable"></label>\
+ </div>\
+ <div class="wikieditor-toolbar-field-wrapper">\
+ <input type="checkbox"
id="wikieditor-toolbar-table-sortable" />\
+ <label
for="wikieditor-toolbar-table-sortable"
rel="wikieditor-toolbar-tool-table-sortable"></label>\
+ </div>\
+ <div
class="wikieditor-toolbar-table-dimension-fields">\
+ <div
class="wikieditor-toolbar-field-wrapper">\
+ <label
for="wikieditor-toolbar-table-dimensions-rows"\
+
rel="wikieditor-toolbar-tool-table-dimensions-rows"></label><br />\
+ <input type="text"
id="wikieditor-toolbar-table-dimensions-rows" size="4" />\
+ </div>\
+ <div
class="wikieditor-toolbar-field-wrapper">\
+ <label
for="wikieditor-toolbar-table-dimensions-columns"\
+
rel="wikieditor-toolbar-tool-table-dimensions-columns"></label><br />\
+ <input type="text"
id="wikieditor-toolbar-table-dimensions-columns" size="4" />\
+ </div>\
+ </div>\
+ </div></fieldset>\
+ <div class="wikieditor-toolbar-table-preview-wrapper" >\
<span
rel="wikieditor-toolbar-tool-table-example"></span>\
- <div
class="wikieditor-toolbar-table-preview-frame">\
<div
class="wikieditor-toolbar-table-preview-content">\
<table
id="wikieditor-toolbar-table-preview" class="wikieditor-toolbar-table-preview
wikitable">\
<tr
class="wikieditor-toolbar-table-preview-header">\
@@ -1581,24 +1601,7 @@
</tr>\
</table>\
</div>\
- </div>\
- </td></tr><tr><td colspan="3">\
- <input type="checkbox"
id="wikieditor-toolbar-table-wikitable" checked />\
- <label for="wikieditor-toolbar-table-wikitable"
rel="wikieditor-toolbar-tool-table-wikitable"></label>\
- </td></tr><tr><td colspan="3">\
- <input type="checkbox"
id="wikieditor-toolbar-table-sortable" />\
- <label for="wikieditor-toolbar-table-sortable"
rel="wikieditor-toolbar-tool-table-sortable"></label>\
- </td></tr><tr><td>\
- <label
for="wikieditor-toolbar-table-dimensions-rows"\
-
rel="wikieditor-toolbar-tool-table-dimensions-rows"></label><br />\
- <input type="text"
id="wikieditor-toolbar-table-dimensions-rows" size="4" />\
- </td><td>\
- <br />x\
- </td><td>\
- <label
for="wikieditor-toolbar-table-dimensions-columns"\
-
rel="wikieditor-toolbar-tool-table-dimensions-columns"></label><br />\
- <input type="text"
id="wikieditor-toolbar-table-dimensions-columns" size="4" />\
- </td></tr></table></fieldset>',
+ </div>',
init: function() {
$j(this).find( '[rel]' ).each( function() {
$j(this).text( gM( $j(this).attr( 'rel' ) ) );
@@ -1650,6 +1653,7 @@
},
dialog: {
resizable: false,
+ width: 500,
buttons: {
'wikieditor-toolbar-tool-table-insert':
function() {
var rowsVal = $j(
'#wikieditor-toolbar-table-dimensions-rows' ).val();
Modified:
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
2010-01-20 17:27:23 UTC (rev 61299)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
2010-01-20 18:24:18 UTC (rev 61300)
@@ -75,13 +75,35 @@
$j('#wikieditor-toolbar-link-'+type).attr('checked','checked');}
$j('#wikieditor-toolbar-link-int-text').data('untouched',$j('#wikieditor-toolbar-link-int-text').val()==$j('#wikieditor-toolbar-link-int-target').val());$j('#wikieditor-toolbar-link-int-target').suggestions();$j('#wikieditor-toolbar-link-int-text,
#wikiedit-toolbar-link-int-target').each(function(){if($j(this).val()=='')
$j(this).parent().find('label').show();});if(!($j(this).data('dialogkeypressset'))){$j(this).data('dialogkeypressset',true);$j(this).closest('.ui-dialog').keypress(function(e){if((e.keyCode||e.which)==13){$j(this).find('button:first').click();e.preventDefault();}});}}}},'insert-table':{titleMsg:'wikieditor-toolbar-tool-table-title',id:'wikieditor-toolbar-table-dialog',html:'\
- <fieldset><table><tr><td colspan="3">\
- <input type="checkbox" id="wikieditor-toolbar-table-dimensions-header"
checked />\
- <label for="wikieditor-toolbar-table-dimensions-header"\
- rel="wikieditor-toolbar-tool-table-dimensions-header"></label>\
- </td><td rowspan="4" class="wikieditor-toolbar-table-preview-wrapper" >\
+ <fieldset><div class="wikieditor-toolbar-table-form">\
+ <div class="wikieditor-toolbar-field-wrapper">\
+ <input type="checkbox" id="wikieditor-toolbar-table-dimensions-header"
checked />\
+ <label for="wikieditor-toolbar-table-dimensions-header"\
+ rel="wikieditor-toolbar-tool-table-dimensions-header"></label>\
+ </div>\
+ <div class="wikieditor-toolbar-field-wrapper">\
+ <input type="checkbox" id="wikieditor-toolbar-table-wikitable" checked />\
+ <label for="wikieditor-toolbar-table-wikitable"
rel="wikieditor-toolbar-tool-table-wikitable"></label>\
+ </div>\
+ <div class="wikieditor-toolbar-field-wrapper">\
+ <input type="checkbox" id="wikieditor-toolbar-table-sortable" />\
+ <label for="wikieditor-toolbar-table-sortable"
rel="wikieditor-toolbar-tool-table-sortable"></label>\
+ </div>\
+ <div class="wikieditor-toolbar-table-dimension-fields">\
+ <div class="wikieditor-toolbar-field-wrapper">\
+ <label for="wikieditor-toolbar-table-dimensions-rows"\
+ rel="wikieditor-toolbar-tool-table-dimensions-rows"></label><br />\
+ <input type="text" id="wikieditor-toolbar-table-dimensions-rows"
size="4" />\
+ </div>\
+ <div class="wikieditor-toolbar-field-wrapper">\
+ <label for="wikieditor-toolbar-table-dimensions-columns"\
+ rel="wikieditor-toolbar-tool-table-dimensions-columns"></label><br />\
+ <input type="text" id="wikieditor-toolbar-table-dimensions-columns"
size="4" />\
+ </div>\
+ </div>\
+ </div></fieldset>\
+ <div class="wikieditor-toolbar-table-preview-wrapper" >\
<span rel="wikieditor-toolbar-tool-table-example"></span>\
- <div class="wikieditor-toolbar-table-preview-frame">\
<div class="wikieditor-toolbar-table-preview-content">\
<table id="wikieditor-toolbar-table-preview"
class="wikieditor-toolbar-table-preview wikitable">\
<tr class="wikieditor-toolbar-table-preview-header">\
@@ -107,26 +129,9 @@
</tr>\
</table>\
</div>\
- </div>\
- </td></tr><tr><td colspan="3">\
- <input type="checkbox" id="wikieditor-toolbar-table-wikitable" checked />\
- <label for="wikieditor-toolbar-table-wikitable"
rel="wikieditor-toolbar-tool-table-wikitable"></label>\
- </td></tr><tr><td colspan="3">\
- <input type="checkbox" id="wikieditor-toolbar-table-sortable" />\
- <label for="wikieditor-toolbar-table-sortable"
rel="wikieditor-toolbar-tool-table-sortable"></label>\
- </td></tr><tr><td>\
- <label for="wikieditor-toolbar-table-dimensions-rows"\
- rel="wikieditor-toolbar-tool-table-dimensions-rows"></label><br />\
- <input type="text" id="wikieditor-toolbar-table-dimensions-rows" size="4"
/>\
- </td><td>\
- <br />x\
- </td><td>\
- <label for="wikieditor-toolbar-table-dimensions-columns"\
- rel="wikieditor-toolbar-tool-table-dimensions-columns"></label><br />\
- <input type="text" id="wikieditor-toolbar-table-dimensions-columns"
size="4" />\
-
</td></tr></table></fieldset>',init:function(){$j(this).find('[rel]').each(function(){$j(this).text(gM($j(this).attr('rel')));});$j('#wikieditor-toolbar-table-dimensions-rows').val(4);$j('#wikieditor-toolbar-table-dimensions-columns').val(3);$j('#wikieditor-toolbar-table-wikitable').click(function(){$j('.wikieditor-toolbar-table-preview').toggleClass('wikitable');});$j('#wikieditor-toolbar-table-preview').clone().attr('id','wikieditor-toolbar-table-preview2').addClass('sortable').insertAfter($j('#wikieditor-toolbar-table-preview')).hide();if(typeof
ts_makeSortable=='function')
+
</div>',init:function(){$j(this).find('[rel]').each(function(){$j(this).text(gM($j(this).attr('rel')));});$j('#wikieditor-toolbar-table-dimensions-rows').val(4);$j('#wikieditor-toolbar-table-dimensions-columns').val(3);$j('#wikieditor-toolbar-table-wikitable').click(function(){$j('.wikieditor-toolbar-table-preview').toggleClass('wikitable');});$j('#wikieditor-toolbar-table-preview').clone().attr('id','wikieditor-toolbar-table-preview2').addClass('sortable').insertAfter($j('#wikieditor-toolbar-table-preview')).hide();if(typeof
ts_makeSortable=='function')
ts_makeSortable($j('#wikieditor-toolbar-table-preview2').get(0));$j('#wikieditor-toolbar-table-sortable').click(function(){$j('#wikieditor-toolbar-table-preview').hide().attr('id','wikieditor-toolbar-table-preview3');$j('#wikieditor-toolbar-table-preview2').attr('id','wikieditor-toolbar-table-preview').show();$j('#wikieditor-toolbar-table-preview3').attr('id','wikieditor-toolbar-table-preview2');});$j('#wikieditor-toolbar-table-dimensions-header').click(function(){var
headerHTML=$j('.wikieditor-toolbar-table-preview-header').html();var
hiddenHTML=$j('.wikieditor-toolbar-table-preview-hidden').html();$j('.wikieditor-toolbar-table-preview-header').html(hiddenHTML);$j('.wikieditor-toolbar-table-preview-hidden').html(headerHTML);if(typeof
ts_makeSortable=='function')
-ts_makeSortable($j('#wikieditor-toolbar-table-preview,
#wikieditor-toolbar-table-preview2').filter('.sortable').get(0));});},dialog:{resizable:false,buttons:{'wikieditor-toolbar-tool-table-insert':function(){var
rowsVal=$j('#wikieditor-toolbar-table-dimensions-rows').val();var
colsVal=$j('#wikieditor-toolbar-table-dimensions-columns').val();var
rows=parseInt(rowsVal,10);var cols=parseInt(colsVal,10);var
header=Math.min(1,$j('#wikieditor-toolbar-table-dimensions-header:checked').size());if(isNaN(rows)||isNaN(cols)||rows!=rowsVal||cols!=colsVal){alert(gM('wikieditor-toolbar-tool-table-invalidnumber'));return;}
+ts_makeSortable($j('#wikieditor-toolbar-table-preview,
#wikieditor-toolbar-table-preview2').filter('.sortable').get(0));});},dialog:{resizable:false,width:500,buttons:{'wikieditor-toolbar-tool-table-insert':function(){var
rowsVal=$j('#wikieditor-toolbar-table-dimensions-rows').val();var
colsVal=$j('#wikieditor-toolbar-table-dimensions-columns').val();var
rows=parseInt(rowsVal,10);var cols=parseInt(colsVal,10);var
header=Math.min(1,$j('#wikieditor-toolbar-table-dimensions-header:checked').size());if(isNaN(rows)||isNaN(cols)||rows!=rowsVal||cols!=colsVal){alert(gM('wikieditor-toolbar-tool-table-invalidnumber'));return;}
if(rows+header==0||cols==0){alert(gM('wikieditor-toolbar-tool-table-zero'));return;}
if(rows*cols>1000){alert(gM('wikieditor-toolbar-tool-table-toomany',1000));return;}
var headerText=gM('wikieditor-toolbar-tool-table-example-header');var
normalText=gM('wikieditor-toolbar-tool-table-example');var table="";for(var
r=0;r<rows+header;r++){table+="|-\n";for(var c=0;c<cols;c++){var
isHeader=(r+1==header);var delim=isHeader?'!':'|';if(c>0){delim+=delim;}
Modified: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
2010-01-20 17:27:23 UTC (rev 61299)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
2010-01-20 18:24:18 UTC (rev 61300)
@@ -35,7 +35,7 @@
array(
'src' => 'Modules/Toolbar/Toolbar.js',
'class' => 'wikiEditor.config.toolbar',
- 'version' => 20
+ 'version' => 21
),
array(
'src' =>
'Modules/TemplateEditor/TemplateEditor.js',
@@ -44,10 +44,10 @@
),
),
'combined' => array(
- array( 'src' => 'WikiEditor.combined.js', 'version' =>
21 ),
+ array( 'src' => 'WikiEditor.combined.js', 'version' =>
22 ),
),
'minified' => array(
- array( 'src' => 'WikiEditor.combined.min.js', 'version'
=> 21 ),
+ array( 'src' => 'WikiEditor.combined.min.js', 'version'
=> 22 ),
),
);
static $messages = array(
Modified: trunk/extensions/UsabilityInitiative/css/combined.css
===================================================================
--- trunk/extensions/UsabilityInitiative/css/combined.css 2010-01-20
17:27:23 UTC (rev 61299)
+++ trunk/extensions/UsabilityInitiative/css/combined.css 2010-01-20
18:24:18 UTC (rev 61300)
@@ -218,6 +218,8 @@
overflow: visible;
}
+
+
/* Put suggestions (default z-index 99) on top of dialogs (z-index 1002) */
div.suggestions {
z-index: 1099;
@@ -238,35 +240,101 @@
.ui-widget table td {
padding: 0 !important;
}
+.ui-dialog .ui-dialog-buttonpane button {
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ padding: 0.2em 0.6em 0.15em !important;
+ margin: 0.5em 0 0.5em 0.4em !important;
+ border: 1px solid #a6a6a6 !important;
+ background: #f2f2f2 url( ../images/wikiEditor/dialogs/button_off.png )
repeat-x scroll 50% 100% !important;
+}
+.ui-dialog .ui-dialog-buttonpane button:hover {
+ background: #ebf2f9 url( ../images/wikiEditor/dialogs/button_over.png )
repeat-x scroll 50% 100% !important;
+}
+.ui-dialog .ui-dialog-buttonpane button:active,
+.ui-dialog .ui-dialog-buttonpane button:focus {
+
+ background: #bfbfbf url( ../images/wikiEditor/dialogs/button_down.png )
repeat-x scroll 50% 100% !important;
+}
.ui-dialog .ui-dialog-buttonpane button.disabled {
color: #7f7f7f;
- background: #f2f2f2;
border-color: #cccccc;
+ background: #f2f2f2 url(
../images/wikiEditor/dialogs/button_disabled.png ) repeat-x scroll 50% 100%
!important;
}
+/* Disables the annoying dashed border Firefox puts on active buttons */
+.ui-dialog .ui-dialog-buttonpane button::-moz-focus-inner {
+ border: 0;
+}
+.ui-widget-header {
+ background: #f0f0f0 url( ../images/wikiEditor/dialogs/titlebar_fade.png
) repeat-x scroll 50% 100% !important;
+}
+/* FIXME: Should just update the icon sprite if we're keeping this X */
+.ui-icon-closethick {
+ background: url( ../images/wikiEditor/dialogs/close_x.png ) no-repeat
50% 50% !important;
+}
.ui-dialog .ui-dialog-buttonpane {
margin-top: 0 !important;
padding:0.3em 1em 0.5em 1em !important;
}
-body.rtl .ui-dialog .ui-dialog-buttonpane button {
- float: left;
-}
+
.ui-dialog-content fieldset{
border: none !important;
margin: 0 !important;
}
+
+.ui-widget-header {
+ border-bottom:1px solid #6bc8f3 !important;
+}
+.wikieditor-toolbar-field-wrapper {
+ padding: 0 0 25px 0;
+}
+.ui-widget-content {
+ border: none !important;
+}
+/* Table Dialog */
+#wikieditor-toolbar-table-dialog fieldset {
+ width: 200px;
+ padding: 30px 0 0;
+ float: left;
+}
+.wikieditor-toolbar-table-preview-wrapper {
+ padding: 30px 0 0;
+ width: 280px;
+ float: right;
+}
.wikieditor-toolbar-table-preview-content * {
cursor: default;
}
+.ui-widget .wikieditor-toolbar-table-preview-wrapper table {
+ width: 100% !important;
+}
+.ui-widget .wikieditor-toolbar-table-preview-content table td {
+ padding: 10px 4px !important;
+}
+.ui-widget .wikieditor-toolbar-table-preview-content table th {
+ padding: 7px 3px !important;
+}
+.wikieditor-toolbar-table-dimension-fields {
+ overflow: visible;
+ width: 100%;
+ margin: 0 4px;
+}
+.wikieditor-toolbar-table-dimension-fields .wikieditor-toolbar-field-wrapper {
+ float: left;
+ margin-right: 20px;
+ vertical-align: bottom;
+}
+/* RTL Changes */
+body.rtl .ui-dialog .ui-dialog-buttonpane button {
+ float: left;
+ margin: 0.5em 0.4 0.5em 0em !important;
+}
body.rtl .ui-dialog .ui-dialog-titlebar-close {
left: 0.75em;
right: auto;
}
body.rtl .ui-dialog .ui-dialog-title {
float:right;
-}
-
-.ui-widget-header {
- border-bottom:1px solid #6bc8f3 !important;
}/* wikiEditor toc module */
.wikiEditor-ui-toc {
/* height and width are set dynamically */
Modified: trunk/extensions/UsabilityInitiative/css/combined.min.css
===================================================================
--- trunk/extensions/UsabilityInitiative/css/combined.min.css 2010-01-20
17:27:23 UTC (rev 61299)
+++ trunk/extensions/UsabilityInitiative/css/combined.min.css 2010-01-20
18:24:18 UTC (rev 61300)
@@ -222,25 +222,88 @@
.ui-widget table td{
padding:0 !important;
}
+.ui-dialog .ui-dialog-buttonpane button{
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+padding:0.2em 0.6em 0.15em !important;
+margin:0.5em 0 0.5em 0.4em !important;
+border:1px solid #a6a6a6 !important;
+background:#f2f2f2 url( ../images/wikiEditor/dialogs/button_off.png ) repeat-x
scroll 50% 100% !important;
+}
+.ui-dialog .ui-dialog-buttonpane button:hover{
+background:#ebf2f9 url( ../images/wikiEditor/dialogs/button_over.png )
repeat-x scroll 50% 100% !important;
+}
+.ui-dialog .ui-dialog-buttonpane button:active,
+.ui-dialog .ui-dialog-buttonpane button:focus{
+background:#bfbfbf url( ../images/wikiEditor/dialogs/button_down.png )
repeat-x scroll 50% 100% !important;
+}
.ui-dialog .ui-dialog-buttonpane button.disabled{
color:#7f7f7f;
-background:#f2f2f2;
border-color:#cccccc;
+background:#f2f2f2 url( ../images/wikiEditor/dialogs/button_disabled.png )
repeat-x scroll 50% 100% !important;
}
+.ui-dialog .ui-dialog-buttonpane button::-moz-focus-inner{
+border:0;
+}
+.ui-widget-header{
+background:#f0f0f0 url( ../images/wikiEditor/dialogs/titlebar_fade.png )
repeat-x scroll 50% 100% !important;
+}
+.ui-icon-closethick{
+background:url( ../images/wikiEditor/dialogs/close_x.png ) no-repeat 50% 50%
!important;
+}
.ui-dialog .ui-dialog-buttonpane{
margin-top:0 !important;
padding:0.3em 1em 0.5em 1em !important;
}
-body.rtl .ui-dialog .ui-dialog-buttonpane button{
-float:left;
-}
.ui-dialog-content fieldset{
border:none !important;
margin:0 !important;
}
+.ui-widget-header{
+border-bottom:1px solid #6bc8f3 !important;
+}
+.wikieditor-toolbar-field-wrapper{
+padding:0 0 25px 0;
+}
+.ui-widget-content{
+border:none !important;
+}
+#wikieditor-toolbar-table-dialog fieldset{
+width:200px;
+padding:30px 0 0;
+float:left;
+}
+.wikieditor-toolbar-table-preview-wrapper{
+padding:30px 0 0;
+width:280px;
+float:right;
+}
.wikieditor-toolbar-table-preview-content *{
cursor:default;
}
+.ui-widget .wikieditor-toolbar-table-preview-wrapper table{
+width:100% !important;
+}
+.ui-widget .wikieditor-toolbar-table-preview-content table td{
+padding:10px 4px !important;
+}
+.ui-widget .wikieditor-toolbar-table-preview-content table th{
+padding:7px 3px !important;
+}
+.wikieditor-toolbar-table-dimension-fields{
+overflow:visible;
+width:100%;
+margin:0 4px;
+}
+.wikieditor-toolbar-table-dimension-fields .wikieditor-toolbar-field-wrapper{
+float:left;
+margin-right:20px;
+vertical-align:bottom;
+}
+body.rtl .ui-dialog .ui-dialog-buttonpane button{
+float:left;
+margin:0.5em 0.4 0.5em 0em !important;
+}
body.rtl .ui-dialog .ui-dialog-titlebar-close{
left:0.75em;
right:auto;
@@ -248,9 +311,6 @@
body.rtl .ui-dialog .ui-dialog-title{
float:right;
}
-.ui-widget-header{
-border-bottom:1px solid #6bc8f3 !important;
-}
.wikiEditor-ui-toc{
padding:0;
overflow:auto;
Modified: trunk/extensions/UsabilityInitiative/css/wikiEditor.dialogs.css
===================================================================
--- trunk/extensions/UsabilityInitiative/css/wikiEditor.dialogs.css
2010-01-20 17:27:23 UTC (rev 61299)
+++ trunk/extensions/UsabilityInitiative/css/wikiEditor.dialogs.css
2010-01-20 18:24:18 UTC (rev 61300)
@@ -9,6 +9,8 @@
overflow: visible;
}
+
+
/* Put suggestions (default z-index 99) on top of dialogs (z-index 1002) */
div.suggestions {
z-index: 1099;
@@ -29,33 +31,99 @@
.ui-widget table td {
padding: 0 !important;
}
+.ui-dialog .ui-dialog-buttonpane button {
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ padding: 0.2em 0.6em 0.15em !important;
+ margin: 0.5em 0 0.5em 0.4em !important;
+ border: 1px solid #a6a6a6 !important;
+ background: #f2f2f2 url( ../images/wikiEditor/dialogs/button_off.png )
repeat-x scroll 50% 100% !important;
+}
+.ui-dialog .ui-dialog-buttonpane button:hover {
+ background: #ebf2f9 url( ../images/wikiEditor/dialogs/button_over.png )
repeat-x scroll 50% 100% !important;
+}
+.ui-dialog .ui-dialog-buttonpane button:active,
+.ui-dialog .ui-dialog-buttonpane button:focus {
+
+ background: #bfbfbf url( ../images/wikiEditor/dialogs/button_down.png )
repeat-x scroll 50% 100% !important;
+}
.ui-dialog .ui-dialog-buttonpane button.disabled {
color: #7f7f7f;
- background: #f2f2f2;
border-color: #cccccc;
+ background: #f2f2f2 url(
../images/wikiEditor/dialogs/button_disabled.png ) repeat-x scroll 50% 100%
!important;
}
+/* Disables the annoying dashed border Firefox puts on active buttons */
+.ui-dialog .ui-dialog-buttonpane button::-moz-focus-inner {
+ border: 0;
+}
+.ui-widget-header {
+ background: #f0f0f0 url( ../images/wikiEditor/dialogs/titlebar_fade.png
) repeat-x scroll 50% 100% !important;
+}
+/* FIXME: Should just update the icon sprite if we're keeping this X */
+.ui-icon-closethick {
+ background: url( ../images/wikiEditor/dialogs/close_x.png ) no-repeat
50% 50% !important;
+}
.ui-dialog .ui-dialog-buttonpane {
margin-top: 0 !important;
padding:0.3em 1em 0.5em 1em !important;
}
-body.rtl .ui-dialog .ui-dialog-buttonpane button {
- float: left;
-}
+
.ui-dialog-content fieldset{
border: none !important;
margin: 0 !important;
}
+
+.ui-widget-header {
+ border-bottom:1px solid #6bc8f3 !important;
+}
+.wikieditor-toolbar-field-wrapper {
+ padding: 0 0 25px 0;
+}
+.ui-widget-content {
+ border: none !important;
+}
+/* Table Dialog */
+#wikieditor-toolbar-table-dialog fieldset {
+ width: 200px;
+ padding: 30px 0 0;
+ float: left;
+}
+.wikieditor-toolbar-table-preview-wrapper {
+ padding: 30px 0 0;
+ width: 280px;
+ float: right;
+}
.wikieditor-toolbar-table-preview-content * {
cursor: default;
}
+.ui-widget .wikieditor-toolbar-table-preview-wrapper table {
+ width: 100% !important;
+}
+.ui-widget .wikieditor-toolbar-table-preview-content table td {
+ padding: 10px 4px !important;
+}
+.ui-widget .wikieditor-toolbar-table-preview-content table th {
+ padding: 7px 3px !important;
+}
+.wikieditor-toolbar-table-dimension-fields {
+ overflow: visible;
+ width: 100%;
+ margin: 0 4px;
+}
+.wikieditor-toolbar-table-dimension-fields .wikieditor-toolbar-field-wrapper {
+ float: left;
+ margin-right: 20px;
+ vertical-align: bottom;
+}
+/* RTL Changes */
+body.rtl .ui-dialog .ui-dialog-buttonpane button {
+ float: left;
+ margin: 0.5em 0.4 0.5em 0em !important;
+}
body.rtl .ui-dialog .ui-dialog-titlebar-close {
left: 0.75em;
right: auto;
}
body.rtl .ui-dialog .ui-dialog-title {
float:right;
-}
-
-.ui-widget-header {
- border-bottom:1px solid #6bc8f3 !important;
}
\ No newline at end of file
Added:
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_disabled.png
===================================================================
(Binary files differ)
Property changes on:
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_disabled.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_down.png
===================================================================
(Binary files differ)
Property changes on:
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_down.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_off.png
===================================================================
(Binary files differ)
Property changes on:
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_off.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_over.png
===================================================================
(Binary files differ)
Property changes on:
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_over.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/close_x.png
===================================================================
(Binary files differ)
Property changes on:
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/close_x.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/titlebar_fade.png
===================================================================
(Binary files differ)
Property changes on:
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/titlebar_fade.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
