r61300 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r61299‎ \| r61300 \| r61301 >
Date:	18:24, 20 January 2010
Author:	adam
Status:	deferred (Comments)
Tags:
Comment:	More dialog changes. TODO - Help IE7 with the table based dialogs
Modified paths:	/trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php (modified) (history) /trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js (modified) (history) /trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js (modified) (history) /trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js (modified) (history) /trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php (modified) (history) /trunk/extensions/UsabilityInitiative/css/combined.css (modified) (history) /trunk/extensions/UsabilityInitiative/css/combined.min.css (modified) (history) /trunk/extensions/UsabilityInitiative/css/wikiEditor.dialogs.css (modified) (history) /trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_disabled.png (added) (history) /trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_down.png (added) (history) /trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_off.png (added) (history) /trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_over.png (added) (history) /trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/close_x.png (added) (history) /trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/titlebar_fade.png (added) (history)

Diff [purge]

Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
—	—	@@ -22,7 +22,7 @@
23	23	array( 'src' => 'css/vector.collapsibleNav.css', 'version' => 6 ),
24	24	array( 'src' => 'css/vector.footerCleanup.css', 'version' => 1 ),
25	25	array( 'src' => 'css/wikiEditor.css', 'version' => 7 ),
26		~~- array( 'src' => 'css/wikiEditor.dialogs.css', 'version' => 11 ),~~
	26	+ array( 'src' => 'css/wikiEditor.dialogs.css', 'version' => 12 ),
27	27	array( 'src' => 'css/wikiEditor.preview.css', 'version' => 1 ),
28	28	array( 'src' => 'css/wikiEditor.templateEditor.css', 'version' => 1 ),
29	29	array( 'src' => 'css/wikiEditor.toc.css', 'version' => 27 ),
—	—	@@ -30,11 +30,11 @@
31	31	array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
32	32	),
33	33	'combined' => array(
34		~~- array( 'src' => 'css/combined.css', 'version' => 51 ),~~
	34	+ array( 'src' => 'css/combined.css', 'version' => 52 ),
35	35	array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
36	36	),
37	37	'minified' => array(
38		~~- array( 'src' => 'css/combined.min.css', 'version' => 51 ),~~
	38	+ array( 'src' => 'css/combined.min.css', 'version' => 52 ),
39	39	array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
40	40	),
41	41	)
Index: trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/close_x.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/close_x.png
___________________________________________________________________
Name: svn:mime-type
42	42	+ application/octet-stream
Index: trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_disabled.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_disabled.png
___________________________________________________________________
Name: svn:mime-type
43	43	+ application/octet-stream
Index: trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_down.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_down.png
___________________________________________________________________
Name: svn:mime-type
44	44	+ application/octet-stream
Index: trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_off.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_off.png
___________________________________________________________________
Name: svn:mime-type
45	45	+ application/octet-stream
Index: trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/titlebar_fade.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/titlebar_fade.png
___________________________________________________________________
Name: svn:mime-type
46	46	+ application/octet-stream
Index: trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_over.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_over.png
___________________________________________________________________
Name: svn:mime-type
47	47	+ application/octet-stream
Index: trunk/extensions/UsabilityInitiative/css/wikiEditor.dialogs.css
—	—	@@ -9,6 +9,8 @@
10	10	overflow: visible;
11	11	}
12	12
	13	+
	14	+
13	15	/* Put suggestions (default z-index 99) on top of dialogs (z-index 1002) */
14	16	div.suggestions {
15	17	z-index: 1099;
—	—	@@ -29,33 +31,99 @@
30	32	.ui-widget table td {
31	33	padding: 0 !important;
32	34	}
	35	+.ui-dialog .ui-dialog-buttonpane button {
	36	+ -moz-border-radius: 4px;
	37	+ -webkit-border-radius: 4px;
	38	+ padding: 0.2em 0.6em 0.15em !important;
	39	+ margin: 0.5em 0 0.5em 0.4em !important;
	40	+ border: 1px solid #a6a6a6 !important;
	41	+ background: #f2f2f2 url( ../images/wikiEditor/dialogs/button_off.png ) repeat-x scroll 50% 100% !important;
	42	+}
	43	+.ui-dialog .ui-dialog-buttonpane button:hover {
	44	+ background: #ebf2f9 url( ../images/wikiEditor/dialogs/button_over.png ) repeat-x scroll 50% 100% !important;
	45	+}
	46	+.ui-dialog .ui-dialog-buttonpane button:active,
	47	+.ui-dialog .ui-dialog-buttonpane button:focus {
	48	+
	49	+ background: #bfbfbf url( ../images/wikiEditor/dialogs/button_down.png ) repeat-x scroll 50% 100% !important;
	50	+}
33	51	.ui-dialog .ui-dialog-buttonpane button.disabled {
34	52	color: #7f7f7f;
35		~~- background: #f2f2f2;~~
36	53	border-color: #cccccc;
	54	+ background: #f2f2f2 url( ../images/wikiEditor/dialogs/button_disabled.png ) repeat-x scroll 50% 100% !important;
37	55	}
	56	+/* Disables the annoying dashed border Firefox puts on active buttons */
	57	+.ui-dialog .ui-dialog-buttonpane button::-moz-focus-inner {
	58	+ border: 0;
	59	+}
	60	+.ui-widget-header {
	61	+ background: #f0f0f0 url( ../images/wikiEditor/dialogs/titlebar_fade.png ) repeat-x scroll 50% 100% !important;
	62	+}
	63	+/* FIXME: Should just update the icon sprite if we're keeping this X */
	64	+.ui-icon-closethick {
	65	+ background: url( ../images/wikiEditor/dialogs/close_x.png ) no-repeat 50% 50% !important;
	66	+}
38	67	.ui-dialog .ui-dialog-buttonpane {
39	68	margin-top: 0 !important;
40	69	padding:0.3em 1em 0.5em 1em !important;
41	70	}
42		~~-body.rtl .ui-dialog .ui-dialog-buttonpane button {~~
43		~~- float: left;~~
44		-}
	71	+
45	72	.ui-dialog-content fieldset{
46	73	border: none !important;
47	74	margin: 0 !important;
48	75	}
	76	+
	77	+.ui-widget-header {
	78	+ border-bottom:1px solid #6bc8f3 !important;
	79	+}
	80	+.wikieditor-toolbar-field-wrapper {
	81	+ padding: 0 0 25px 0;
	82	+}
	83	+.ui-widget-content {
	84	+ border: none !important;
	85	+}
	86	+/* Table Dialog */
	87	+#wikieditor-toolbar-table-dialog fieldset {
	88	+ width: 200px;
	89	+ padding: 30px 0 0;
	90	+ float: left;
	91	+}
	92	+.wikieditor-toolbar-table-preview-wrapper {
	93	+ padding: 30px 0 0;
	94	+ width: 280px;
	95	+ float: right;
	96	+}
49	97	.wikieditor-toolbar-table-preview-content * {
50	98	cursor: default;
51	99	}
	100	+.ui-widget .wikieditor-toolbar-table-preview-wrapper table {
	101	+ width: 100% !important;
	102	+}
	103	+.ui-widget .wikieditor-toolbar-table-preview-content table td {
	104	+ padding: 10px 4px !important;
	105	+}
	106	+.ui-widget .wikieditor-toolbar-table-preview-content table th {
	107	+ padding: 7px 3px !important;
	108	+}
	109	+.wikieditor-toolbar-table-dimension-fields {
	110	+ overflow: visible;
	111	+ width: 100%;
	112	+ margin: 0 4px;
	113	+}
	114	+.wikieditor-toolbar-table-dimension-fields .wikieditor-toolbar-field-wrapper {
	115	+ float: left;
	116	+ margin-right: 20px;
	117	+ vertical-align: bottom;
	118	+}
	119	+/* RTL Changes */
	120	+body.rtl .ui-dialog .ui-dialog-buttonpane button {
	121	+ float: left;
	122	+ margin: 0.5em 0.4 0.5em 0em !important;
	123	+}
52	124	body.rtl .ui-dialog .ui-dialog-titlebar-close {
53	125	left: 0.75em;
54	126	right: auto;
55	127	}
56	128	body.rtl .ui-dialog .ui-dialog-title {
57	129	float:right;
58		-}
59		-
60		~~-.ui-widget-header {~~
61		~~- border-bottom:1px solid #6bc8f3 !important;~~
62	130	}
\ No newline at end of file
Index: trunk/extensions/UsabilityInitiative/css/combined.css
—	—	@@ -218,6 +218,8 @@
219	219	overflow: visible;
220	220	}
221	221
	222	+
	223	+
222	224	/* Put suggestions (default z-index 99) on top of dialogs (z-index 1002) */
223	225	div.suggestions {
224	226	z-index: 1099;
—	—	@@ -238,35 +240,101 @@
239	241	.ui-widget table td {
240	242	padding: 0 !important;
241	243	}
	244	+.ui-dialog .ui-dialog-buttonpane button {
	245	+ -moz-border-radius: 4px;
	246	+ -webkit-border-radius: 4px;
	247	+ padding: 0.2em 0.6em 0.15em !important;
	248	+ margin: 0.5em 0 0.5em 0.4em !important;
	249	+ border: 1px solid #a6a6a6 !important;
	250	+ background: #f2f2f2 url( ../images/wikiEditor/dialogs/button_off.png ) repeat-x scroll 50% 100% !important;
	251	+}
	252	+.ui-dialog .ui-dialog-buttonpane button:hover {
	253	+ background: #ebf2f9 url( ../images/wikiEditor/dialogs/button_over.png ) repeat-x scroll 50% 100% !important;
	254	+}
	255	+.ui-dialog .ui-dialog-buttonpane button:active,
	256	+.ui-dialog .ui-dialog-buttonpane button:focus {
	257	+
	258	+ background: #bfbfbf url( ../images/wikiEditor/dialogs/button_down.png ) repeat-x scroll 50% 100% !important;
	259	+}
242	260	.ui-dialog .ui-dialog-buttonpane button.disabled {
243	261	color: #7f7f7f;
244		~~- background: #f2f2f2;~~
245	262	border-color: #cccccc;
	263	+ background: #f2f2f2 url( ../images/wikiEditor/dialogs/button_disabled.png ) repeat-x scroll 50% 100% !important;
246	264	}
	265	+/* Disables the annoying dashed border Firefox puts on active buttons */
	266	+.ui-dialog .ui-dialog-buttonpane button::-moz-focus-inner {
	267	+ border: 0;
	268	+}
	269	+.ui-widget-header {
	270	+ background: #f0f0f0 url( ../images/wikiEditor/dialogs/titlebar_fade.png ) repeat-x scroll 50% 100% !important;
	271	+}
	272	+/* FIXME: Should just update the icon sprite if we're keeping this X */
	273	+.ui-icon-closethick {
	274	+ background: url( ../images/wikiEditor/dialogs/close_x.png ) no-repeat 50% 50% !important;
	275	+}
247	276	.ui-dialog .ui-dialog-buttonpane {
248	277	margin-top: 0 !important;
249	278	padding:0.3em 1em 0.5em 1em !important;
250	279	}
251		~~-body.rtl .ui-dialog .ui-dialog-buttonpane button {~~
252		~~- float: left;~~
253		-}
	280	+
254	281	.ui-dialog-content fieldset{
255	282	border: none !important;
256	283	margin: 0 !important;
257	284	}
	285	+
	286	+.ui-widget-header {
	287	+ border-bottom:1px solid #6bc8f3 !important;
	288	+}
	289	+.wikieditor-toolbar-field-wrapper {
	290	+ padding: 0 0 25px 0;
	291	+}
	292	+.ui-widget-content {
	293	+ border: none !important;
	294	+}
	295	+/* Table Dialog */
	296	+#wikieditor-toolbar-table-dialog fieldset {
	297	+ width: 200px;
	298	+ padding: 30px 0 0;
	299	+ float: left;
	300	+}
	301	+.wikieditor-toolbar-table-preview-wrapper {
	302	+ padding: 30px 0 0;
	303	+ width: 280px;
	304	+ float: right;
	305	+}
258	306	.wikieditor-toolbar-table-preview-content * {
259	307	cursor: default;
260	308	}
	309	+.ui-widget .wikieditor-toolbar-table-preview-wrapper table {
	310	+ width: 100% !important;
	311	+}
	312	+.ui-widget .wikieditor-toolbar-table-preview-content table td {
	313	+ padding: 10px 4px !important;
	314	+}
	315	+.ui-widget .wikieditor-toolbar-table-preview-content table th {
	316	+ padding: 7px 3px !important;
	317	+}
	318	+.wikieditor-toolbar-table-dimension-fields {
	319	+ overflow: visible;
	320	+ width: 100%;
	321	+ margin: 0 4px;
	322	+}
	323	+.wikieditor-toolbar-table-dimension-fields .wikieditor-toolbar-field-wrapper {
	324	+ float: left;
	325	+ margin-right: 20px;
	326	+ vertical-align: bottom;
	327	+}
	328	+/* RTL Changes */
	329	+body.rtl .ui-dialog .ui-dialog-buttonpane button {
	330	+ float: left;
	331	+ margin: 0.5em 0.4 0.5em 0em !important;
	332	+}
261	333	body.rtl .ui-dialog .ui-dialog-titlebar-close {
262	334	left: 0.75em;
263	335	right: auto;
264	336	}
265	337	body.rtl .ui-dialog .ui-dialog-title {
266	338	float:right;
267		-}
268		-
269		~~-.ui-widget-header {~~
270		~~- border-bottom:1px solid #6bc8f3 !important;~~
271	339	}/* wikiEditor toc module */
272	340	.wikiEditor-ui-toc {
273	341	/* height and width are set dynamically */
Index: trunk/extensions/UsabilityInitiative/css/combined.min.css
—	—	@@ -222,25 +222,88 @@
223	223	.ui-widget table td{
224	224	padding:0 !important;
225	225	}
	226	+.ui-dialog .ui-dialog-buttonpane button{
	227	+-moz-border-radius:4px;
	228	+-webkit-border-radius:4px;
	229	+padding:0.2em 0.6em 0.15em !important;
	230	+margin:0.5em 0 0.5em 0.4em !important;
	231	+border:1px solid #a6a6a6 !important;
	232	+background:#f2f2f2 url( ../images/wikiEditor/dialogs/button_off.png ) repeat-x scroll 50% 100% !important;
	233	+}
	234	+.ui-dialog .ui-dialog-buttonpane button:hover{
	235	+background:#ebf2f9 url( ../images/wikiEditor/dialogs/button_over.png ) repeat-x scroll 50% 100% !important;
	236	+}
	237	+.ui-dialog .ui-dialog-buttonpane button:active,
	238	+.ui-dialog .ui-dialog-buttonpane button:focus{
	239	+background:#bfbfbf url( ../images/wikiEditor/dialogs/button_down.png ) repeat-x scroll 50% 100% !important;
	240	+}
226	241	.ui-dialog .ui-dialog-buttonpane button.disabled{
227	242	color:#7f7f7f;
228		~~-background:#f2f2f2;~~
229	243	border-color:#cccccc;
	244	+background:#f2f2f2 url( ../images/wikiEditor/dialogs/button_disabled.png ) repeat-x scroll 50% 100% !important;
230	245	}
	246	+.ui-dialog .ui-dialog-buttonpane button::-moz-focus-inner{
	247	+border:0;
	248	+}
	249	+.ui-widget-header{
	250	+background:#f0f0f0 url( ../images/wikiEditor/dialogs/titlebar_fade.png ) repeat-x scroll 50% 100% !important;
	251	+}
	252	+.ui-icon-closethick{
	253	+background:url( ../images/wikiEditor/dialogs/close_x.png ) no-repeat 50% 50% !important;
	254	+}
231	255	.ui-dialog .ui-dialog-buttonpane{
232	256	margin-top:0 !important;
233	257	padding:0.3em 1em 0.5em 1em !important;
234	258	}
235		~~-body.rtl .ui-dialog .ui-dialog-buttonpane button{~~
236		~~-float:left;~~
237		-}
238	259	.ui-dialog-content fieldset{
239	260	border:none !important;
240	261	margin:0 !important;
241	262	}
	263	+.ui-widget-header{
	264	+border-bottom:1px solid #6bc8f3 !important;
	265	+}
	266	+.wikieditor-toolbar-field-wrapper{
	267	+padding:0 0 25px 0;
	268	+}
	269	+.ui-widget-content{
	270	+border:none !important;
	271	+}
	272	+#wikieditor-toolbar-table-dialog fieldset{
	273	+width:200px;
	274	+padding:30px 0 0;
	275	+float:left;
	276	+}
	277	+.wikieditor-toolbar-table-preview-wrapper{
	278	+padding:30px 0 0;
	279	+width:280px;
	280	+float:right;
	281	+}
242	282	.wikieditor-toolbar-table-preview-content *{
243	283	cursor:default;
244	284	}
	285	+.ui-widget .wikieditor-toolbar-table-preview-wrapper table{
	286	+width:100% !important;
	287	+}
	288	+.ui-widget .wikieditor-toolbar-table-preview-content table td{
	289	+padding:10px 4px !important;
	290	+}
	291	+.ui-widget .wikieditor-toolbar-table-preview-content table th{
	292	+padding:7px 3px !important;
	293	+}
	294	+.wikieditor-toolbar-table-dimension-fields{
	295	+overflow:visible;
	296	+width:100%;
	297	+margin:0 4px;
	298	+}
	299	+.wikieditor-toolbar-table-dimension-fields .wikieditor-toolbar-field-wrapper{
	300	+float:left;
	301	+margin-right:20px;
	302	+vertical-align:bottom;
	303	+}
	304	+body.rtl .ui-dialog .ui-dialog-buttonpane button{
	305	+float:left;
	306	+margin:0.5em 0.4 0.5em 0em !important;
	307	+}
245	308	body.rtl .ui-dialog .ui-dialog-titlebar-close{
246	309	left:0.75em;
247	310	right:auto;
—	—	@@ -248,9 +311,6 @@
249	312	body.rtl .ui-dialog .ui-dialog-title{
250	313	float:right;
251	314	}
252		~~-.ui-widget-header{~~
253		~~-border-bottom:1px solid #6bc8f3 !important;~~
254		-}
255	315	.wikiEditor-ui-toc{
256	316	padding:0;
257	317	overflow:auto;
Index: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
—	—	@@ -35,7 +35,7 @@
36	36	array(
37	37	'src' => 'Modules/Toolbar/Toolbar.js',
38	38	'class' => 'wikiEditor.config.toolbar',
39		~~- 'version' => 20~~
	39	+ 'version' => 21
40	40	),
41	41	array(
42	42	'src' => 'Modules/TemplateEditor/TemplateEditor.js',
—	—	@@ -44,10 +44,10 @@
45	45	),
46	46	),
47	47	'combined' => array(
48		~~- array( 'src' => 'WikiEditor.combined.js', 'version' => 21 ),~~
	48	+ array( 'src' => 'WikiEditor.combined.js', 'version' => 22 ),
49	49	),
50	50	'minified' => array(
51		~~- array( 'src' => 'WikiEditor.combined.min.js', 'version' => 21 ),~~
	51	+ array( 'src' => 'WikiEditor.combined.min.js', 'version' => 22 ),
52	52	),
53	53	);
54	54	static $messages = array(
Index: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
—	—	@@ -1545,17 +1545,37 @@
1546	1546	'insert-table': {
1547	1547	titleMsg: 'wikieditor-toolbar-tool-table-title',
1548	1548	id: 'wikieditor-toolbar-table-dialog',
1549		~~- // FIXME: All kinds of uglinesses and styling issues~~
1550		~~- // FIXME: Rows are identical so sorting has no effect~~
1551	1549	// FIXME: Localize 'x'?
1552	1550	html: '\
1553		~~- <fieldset><table><tr><td colspan="3">\~~
1554		~~- <input type="checkbox" id="wikieditor-toolbar-table-dimensions-header" checked />\~~
1555		~~- <label for="wikieditor-toolbar-table-dimensions-header"\~~
1556		~~- rel="wikieditor-toolbar-tool-table-dimensions-header"></label>\~~
1557		~~- </td><td rowspan="4" class="wikieditor-toolbar-table-preview-wrapper" >\~~
	1551	+ <fieldset><div class="wikieditor-toolbar-table-form">\
	1552	+ <div class="wikieditor-toolbar-field-wrapper">\
	1553	+ <input type="checkbox" id="wikieditor-toolbar-table-dimensions-header" checked />\
	1554	+ <label for="wikieditor-toolbar-table-dimensions-header"\
	1555	+ rel="wikieditor-toolbar-tool-table-dimensions-header"></label>\
	1556	+ </div>\
	1557	+ <div class="wikieditor-toolbar-field-wrapper">\
	1558	+ <input type="checkbox" id="wikieditor-toolbar-table-wikitable" checked />\
	1559	+ <label for="wikieditor-toolbar-table-wikitable" rel="wikieditor-toolbar-tool-table-wikitable"></label>\
	1560	+ </div>\
	1561	+ <div class="wikieditor-toolbar-field-wrapper">\
	1562	+ <input type="checkbox" id="wikieditor-toolbar-table-sortable" />\
	1563	+ <label for="wikieditor-toolbar-table-sortable" rel="wikieditor-toolbar-tool-table-sortable"></label>\
	1564	+ </div>\
	1565	+ <div class="wikieditor-toolbar-table-dimension-fields">\
	1566	+ <div class="wikieditor-toolbar-field-wrapper">\
	1567	+ <label for="wikieditor-toolbar-table-dimensions-rows"\
	1568	+ rel="wikieditor-toolbar-tool-table-dimensions-rows"></label><br />\
	1569	+ <input type="text" id="wikieditor-toolbar-table-dimensions-rows" size="4" />\
	1570	+ </div>\
	1571	+ <div class="wikieditor-toolbar-field-wrapper">\
	1572	+ <label for="wikieditor-toolbar-table-dimensions-columns"\
	1573	+ rel="wikieditor-toolbar-tool-table-dimensions-columns"></label><br />\
	1574	+ <input type="text" id="wikieditor-toolbar-table-dimensions-columns" size="4" />\
	1575	+ </div>\
	1576	+ </div>\
	1577	+ </div></fieldset>\
	1578	+ <div class="wikieditor-toolbar-table-preview-wrapper" >\
1558	1579	<span rel="wikieditor-toolbar-tool-table-example"></span>\
1559		~~- <div class="wikieditor-toolbar-table-preview-frame">\~~
1560	1580	<div class="wikieditor-toolbar-table-preview-content">\
1561	1581	<table id="wikieditor-toolbar-table-preview" class="wikieditor-toolbar-table-preview wikitable">\
1562	1582	<tr class="wikieditor-toolbar-table-preview-header">\
—	—	@@ -1581,24 +1601,7 @@
1582	1602	</tr>\
1583	1603	</table>\
1584	1604	</div>\
1585		~~- </div>\~~
1586		~~- </td></tr><tr><td colspan="3">\~~
1587		~~- <input type="checkbox" id="wikieditor-toolbar-table-wikitable" checked />\~~
1588		~~- <label for="wikieditor-toolbar-table-wikitable" rel="wikieditor-toolbar-tool-table-wikitable"></label>\~~
1589		~~- </td></tr><tr><td colspan="3">\~~
1590		~~- <input type="checkbox" id="wikieditor-toolbar-table-sortable" />\~~
1591		~~- <label for="wikieditor-toolbar-table-sortable" rel="wikieditor-toolbar-tool-table-sortable"></label>\~~
1592		~~- </td></tr><tr><td>\~~
1593		~~- <label for="wikieditor-toolbar-table-dimensions-rows"\~~
1594		~~- rel="wikieditor-toolbar-tool-table-dimensions-rows"></label><br />\~~
1595		~~- <input type="text" id="wikieditor-toolbar-table-dimensions-rows" size="4" />\~~
1596		~~- </td><td>\~~
1597		~~- <br />x\~~
1598		~~- </td><td>\~~
1599		~~- <label for="wikieditor-toolbar-table-dimensions-columns"\~~
1600		~~- rel="wikieditor-toolbar-tool-table-dimensions-columns"></label><br />\~~
1601		~~- <input type="text" id="wikieditor-toolbar-table-dimensions-columns" size="4" />\~~
1602		~~- </td></tr></table></fieldset>',~~
	1605	+ </div>',
1603	1606	init: function() {
1604	1607	$j(this).find( '[rel]' ).each( function() {
1605	1608	$j(this).text( gM( $j(this).attr( 'rel' ) ) );
—	—	@@ -1650,6 +1653,7 @@
1651	1654	},
1652	1655	dialog: {
1653	1656	resizable: false,
	1657	+ width: 500,
1654	1658	buttons: {
1655	1659	'wikieditor-toolbar-tool-table-insert': function() {
1656	1660	var rowsVal = $j( '#wikieditor-toolbar-table-dimensions-rows' ).val();
Index: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
—	—	@@ -75,13 +75,35 @@
76	76	$j('#wikieditor-toolbar-link-'+type).attr('checked','checked');}
77	77	$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()=='')
78	78	$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:'\
79		~~- <fieldset><table><tr><td colspan="3">\~~
80		~~- <input type="checkbox" id="wikieditor-toolbar-table-dimensions-header" checked />\~~
81		~~- <label for="wikieditor-toolbar-table-dimensions-header"\~~
82		~~- rel="wikieditor-toolbar-tool-table-dimensions-header"></label>\~~
83		~~- </td><td rowspan="4" class="wikieditor-toolbar-table-preview-wrapper" >\~~
	79	+ <fieldset><div class="wikieditor-toolbar-table-form">\
	80	+ <div class="wikieditor-toolbar-field-wrapper">\
	81	+ <input type="checkbox" id="wikieditor-toolbar-table-dimensions-header" checked />\
	82	+ <label for="wikieditor-toolbar-table-dimensions-header"\
	83	+ rel="wikieditor-toolbar-tool-table-dimensions-header"></label>\
	84	+ </div>\
	85	+ <div class="wikieditor-toolbar-field-wrapper">\
	86	+ <input type="checkbox" id="wikieditor-toolbar-table-wikitable" checked />\
	87	+ <label for="wikieditor-toolbar-table-wikitable" rel="wikieditor-toolbar-tool-table-wikitable"></label>\
	88	+ </div>\
	89	+ <div class="wikieditor-toolbar-field-wrapper">\
	90	+ <input type="checkbox" id="wikieditor-toolbar-table-sortable" />\
	91	+ <label for="wikieditor-toolbar-table-sortable" rel="wikieditor-toolbar-tool-table-sortable"></label>\
	92	+ </div>\
	93	+ <div class="wikieditor-toolbar-table-dimension-fields">\
	94	+ <div class="wikieditor-toolbar-field-wrapper">\
	95	+ <label for="wikieditor-toolbar-table-dimensions-rows"\
	96	+ rel="wikieditor-toolbar-tool-table-dimensions-rows"></label><br />\
	97	+ <input type="text" id="wikieditor-toolbar-table-dimensions-rows" size="4" />\
	98	+ </div>\
	99	+ <div class="wikieditor-toolbar-field-wrapper">\
	100	+ <label for="wikieditor-toolbar-table-dimensions-columns"\
	101	+ rel="wikieditor-toolbar-tool-table-dimensions-columns"></label><br />\
	102	+ <input type="text" id="wikieditor-toolbar-table-dimensions-columns" size="4" />\
	103	+ </div>\
	104	+ </div>\
	105	+ </div></fieldset>\
	106	+ <div class="wikieditor-toolbar-table-preview-wrapper" >\
84	107	<span rel="wikieditor-toolbar-tool-table-example"></span>\
85		~~- <div class="wikieditor-toolbar-table-preview-frame">\~~
86	108	<div class="wikieditor-toolbar-table-preview-content">\
87	109	<table id="wikieditor-toolbar-table-preview" class="wikieditor-toolbar-table-preview wikitable">\
88	110	<tr class="wikieditor-toolbar-table-preview-header">\
—	—	@@ -107,26 +129,9 @@
108	130	</tr>\
109	131	</table>\
110	132	</div>\
111		~~- </div>\~~
112		~~- </td></tr><tr><td colspan="3">\~~
113		~~- <input type="checkbox" id="wikieditor-toolbar-table-wikitable" checked />\~~
114		~~- <label for="wikieditor-toolbar-table-wikitable" rel="wikieditor-toolbar-tool-table-wikitable"></label>\~~
115		~~- </td></tr><tr><td colspan="3">\~~
116		~~- <input type="checkbox" id="wikieditor-toolbar-table-sortable" />\~~
117		~~- <label for="wikieditor-toolbar-table-sortable" rel="wikieditor-toolbar-tool-table-sortable"></label>\~~
118		~~- </td></tr><tr><td>\~~
119		~~- <label for="wikieditor-toolbar-table-dimensions-rows"\~~
120		~~- rel="wikieditor-toolbar-tool-table-dimensions-rows"></label><br />\~~
121		~~- <input type="text" id="wikieditor-toolbar-table-dimensions-rows" size="4" />\~~
122		~~- </td><td>\~~
123		~~- <br />x\~~
124		~~- </td><td>\~~
125		~~- <label for="wikieditor-toolbar-table-dimensions-columns"\~~
126		~~- rel="wikieditor-toolbar-tool-table-dimensions-columns"></label><br />\~~
127		~~- <input type="text" id="wikieditor-toolbar-table-dimensions-columns" size="4" />\~~
128		- </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')
	133	+ </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')
129	134	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')
130		-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;}
	135	+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;}
131	136	if(rows+header==0\|\|cols==0){alert(gM('wikieditor-toolbar-tool-table-zero'));return;}
132	137	if(rows*cols>1000){alert(gM('wikieditor-toolbar-tool-table-toomany',1000));return;}
133	138	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;}
Index: trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
—	—	@@ -1464,17 +1464,37 @@
1465	1465	'insert-table': {
1466	1466	titleMsg: 'wikieditor-toolbar-tool-table-title',
1467	1467	id: 'wikieditor-toolbar-table-dialog',
1468		~~- // FIXME: All kinds of uglinesses and styling issues~~
1469		~~- // FIXME: Rows are identical so sorting has no effect~~
1470	1468	// FIXME: Localize 'x'?
1471	1469	html: '\
1472		~~- <fieldset><table><tr><td colspan="3">\~~
1473		~~- <input type="checkbox" id="wikieditor-toolbar-table-dimensions-header" checked />\~~
1474		~~- <label for="wikieditor-toolbar-table-dimensions-header"\~~
1475		~~- rel="wikieditor-toolbar-tool-table-dimensions-header"></label>\~~
1476		~~- </td><td rowspan="4" class="wikieditor-toolbar-table-preview-wrapper" >\~~
	1470	+ <fieldset><div class="wikieditor-toolbar-table-form">\
	1471	+ <div class="wikieditor-toolbar-field-wrapper">\
	1472	+ <input type="checkbox" id="wikieditor-toolbar-table-dimensions-header" checked />\
	1473	+ <label for="wikieditor-toolbar-table-dimensions-header"\
	1474	+ rel="wikieditor-toolbar-tool-table-dimensions-header"></label>\
	1475	+ </div>\
	1476	+ <div class="wikieditor-toolbar-field-wrapper">\
	1477	+ <input type="checkbox" id="wikieditor-toolbar-table-wikitable" checked />\
	1478	+ <label for="wikieditor-toolbar-table-wikitable" rel="wikieditor-toolbar-tool-table-wikitable"></label>\
	1479	+ </div>\
	1480	+ <div class="wikieditor-toolbar-field-wrapper">\
	1481	+ <input type="checkbox" id="wikieditor-toolbar-table-sortable" />\
	1482	+ <label for="wikieditor-toolbar-table-sortable" rel="wikieditor-toolbar-tool-table-sortable"></label>\
	1483	+ </div>\
	1484	+ <div class="wikieditor-toolbar-table-dimension-fields">\
	1485	+ <div class="wikieditor-toolbar-field-wrapper">\
	1486	+ <label for="wikieditor-toolbar-table-dimensions-rows"\
	1487	+ rel="wikieditor-toolbar-tool-table-dimensions-rows"></label><br />\
	1488	+ <input type="text" id="wikieditor-toolbar-table-dimensions-rows" size="4" />\
	1489	+ </div>\
	1490	+ <div class="wikieditor-toolbar-field-wrapper">\
	1491	+ <label for="wikieditor-toolbar-table-dimensions-columns"\
	1492	+ rel="wikieditor-toolbar-tool-table-dimensions-columns"></label><br />\
	1493	+ <input type="text" id="wikieditor-toolbar-table-dimensions-columns" size="4" />\
	1494	+ </div>\
	1495	+ </div>\
	1496	+ </div></fieldset>\
	1497	+ <div class="wikieditor-toolbar-table-preview-wrapper" >\
1477	1498	<span rel="wikieditor-toolbar-tool-table-example"></span>\
1478		~~- <div class="wikieditor-toolbar-table-preview-frame">\~~
1479	1499	<div class="wikieditor-toolbar-table-preview-content">\
1480	1500	<table id="wikieditor-toolbar-table-preview" class="wikieditor-toolbar-table-preview wikitable">\
1481	1501	<tr class="wikieditor-toolbar-table-preview-header">\
—	—	@@ -1500,24 +1520,7 @@
1501	1521	</tr>\
1502	1522	</table>\
1503	1523	</div>\
1504		~~- </div>\~~
1505		~~- </td></tr><tr><td colspan="3">\~~
1506		~~- <input type="checkbox" id="wikieditor-toolbar-table-wikitable" checked />\~~
1507		~~- <label for="wikieditor-toolbar-table-wikitable" rel="wikieditor-toolbar-tool-table-wikitable"></label>\~~
1508		~~- </td></tr><tr><td colspan="3">\~~
1509		~~- <input type="checkbox" id="wikieditor-toolbar-table-sortable" />\~~
1510		~~- <label for="wikieditor-toolbar-table-sortable" rel="wikieditor-toolbar-tool-table-sortable"></label>\~~
1511		~~- </td></tr><tr><td>\~~
1512		~~- <label for="wikieditor-toolbar-table-dimensions-rows"\~~
1513		~~- rel="wikieditor-toolbar-tool-table-dimensions-rows"></label><br />\~~
1514		~~- <input type="text" id="wikieditor-toolbar-table-dimensions-rows" size="4" />\~~
1515		~~- </td><td>\~~
1516		~~- <br />x\~~
1517		~~- </td><td>\~~
1518		~~- <label for="wikieditor-toolbar-table-dimensions-columns"\~~
1519		~~- rel="wikieditor-toolbar-tool-table-dimensions-columns"></label><br />\~~
1520		~~- <input type="text" id="wikieditor-toolbar-table-dimensions-columns" size="4" />\~~
1521		~~- </td></tr></table></fieldset>',~~
	1524	+ </div>',
1522	1525	init: function() {
1523	1526	$j(this).find( '[rel]' ).each( function() {
1524	1527	$j(this).text( gM( $j(this).attr( 'rel' ) ) );
—	—	@@ -1569,6 +1572,7 @@
1570	1573	},
1571	1574	dialog: {
1572	1575	resizable: false,
	1576	+ width: 500,
1573	1577	buttons: {
1574	1578	'wikieditor-toolbar-tool-table-insert': function() {
1575	1579	var rowsVal = $j( '#wikieditor-toolbar-table-dimensions-rows' ).val();

Follow-up revisions

Revision	Commit summary	Author	Date
r61606	Namespacing css for wikieditor dialogs in response to Mdale's comment on r613...	adam	21:12, 27 January 2010

Comments

#Comment by Mdale (talk | contribs) 18:23, 27 January 2010

I would request that in css updates: 61549, 61523, 61308, 61300 if possible the classes could be a bit more specific and try and avoid the "!important" usage. Also if we could check how it affects the add-media-wizard when we make these changes that would be good.

Status & tagging log

11:12, 22 February 2010 Tim Starling (talk | contribs) changed the status of r61300 [removed: new added: deferred]