Index: trunk/extensions/UsabilityInitiative/css/wikiEditor.css |
— | — | @@ -25,7 +25,7 @@ |
26 | 26 | position: relative; |
27 | 27 | clear: both; |
28 | 28 | width: 100%; |
29 | | - background-color: #f3f3f3; |
| 29 | + background-color: #E0EEf7; |
30 | 30 | border: solid silver 1px; |
31 | 31 | } |
32 | 32 | body.rtl .wikiEditor-ui { |
Index: trunk/extensions/UsabilityInitiative/css/wikiEditor.dialogs.css |
— | — | @@ -31,32 +31,32 @@ |
32 | 32 | padding: 0.2em 0.6em 0.15em !important; |
33 | 33 | margin: 0.5em 0 0.5em 0.4em !important; |
34 | 34 | border: 1px solid #a6a6a6 !important; |
35 | | - background: #f2f2f2 url( ../images/wikiEditor/dialogs/button_off.png ) repeat-x scroll 50% 100% !important; |
| 35 | + background: #f2f2f2 url( ../images/wikiEditor/dialogs/button_off.png?1) repeat-x scroll 50% 100% !important; |
36 | 36 | } |
37 | 37 | .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:hover { |
38 | 38 | border-color: #6e7273; |
39 | | - background: #e1e1e1 url( ../images/wikiEditor/dialogs/button_over.png ) repeat-x scroll 50% 100% !important; |
| 39 | + background: #e1e1e1 url( ../images/wikiEditor/dialogs/button_over.png?1) repeat-x scroll 50% 100% !important; |
40 | 40 | } |
41 | 41 | .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:active, |
42 | 42 | .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:focus { |
43 | 43 | border-color: #707271; |
44 | | - background: #bfbfbf url( ../images/wikiEditor/dialogs/button_down.png ) repeat-x scroll 50% 100% !important; |
| 44 | + background: #bfbfbf url( ../images/wikiEditor/dialogs/button_down.png?1) repeat-x scroll 50% 100% !important; |
45 | 45 | } |
46 | 46 | .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button.disabled { |
47 | 47 | color: #7f7f7f; |
48 | 48 | border-color: #cccccc; |
49 | | - background: #f2f2f2 url( ../images/wikiEditor/dialogs/button_disabled.png ) repeat-x scroll 50% 100% !important; |
| 49 | + background: #f2f2f2 url( ../images/wikiEditor/dialogs/button_disabled.png?1) repeat-x scroll 50% 100% !important; |
50 | 50 | } |
51 | 51 | /* Disables the annoying dashed border Firefox puts on active buttons */ |
52 | 52 | .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button::-moz-focus-inner { |
53 | 53 | border: 0; |
54 | 54 | } |
55 | 55 | .wikiEditor-toolbar-dialog .ui-widget-header { |
56 | | - background: #f0f0f0 url( ../images/wikiEditor/dialogs/titlebar_fade.png ) repeat-x scroll 50% 100% !important; |
| 56 | + background: #f0f0f0 url( ../images/wikiEditor/dialogs/titlebar_fade.png?1) repeat-x scroll 50% 100% !important; |
57 | 57 | } |
58 | 58 | /* FIXME: Should just update the icon sprite if we're keeping this X */ |
59 | 59 | .wikiEditor-toolbar-dialog .ui-icon-closethick { |
60 | | - background: url( ../images/wikiEditor/dialogs/close_x.png ) no-repeat 50% 50% !important; |
| 60 | + background: url( ../images/wikiEditor/dialogs/close_x.png?1) no-repeat 50% 50% !important; |
61 | 61 | } |
62 | 62 | .wikiEditor-toolbar-dialog .ui-dialog-buttonpane { |
63 | 63 | margin-top: 0 !important; |
— | — | @@ -178,16 +178,16 @@ |
179 | 179 | background-repeat: no-repeat; |
180 | 180 | } |
181 | 181 | #wikieditor-toolbar-link-int-target-status-exists { |
182 | | - background-image: url( ../images/wikiEditor/dialogs/insert-link-exists.png ); |
| 182 | + background-image: url( ../images/wikiEditor/dialogs/insert-link-exists.png?1); |
183 | 183 | } |
184 | 184 | #wikieditor-toolbar-link-int-target-status-notexists { |
185 | | - background-image: url( ../images/wikiEditor/dialogs/insert-link-notexists.png ); |
| 185 | + background-image: url( ../images/wikiEditor/dialogs/insert-link-notexists.png?1); |
186 | 186 | } |
187 | 187 | #wikieditor-toolbar-link-int-target-status-invalid { |
188 | | - background-image: url( ../images/wikiEditor/dialogs/insert-link-invalid.png ); |
| 188 | + background-image: url( ../images/wikiEditor/dialogs/insert-link-invalid.png?1); |
189 | 189 | } |
190 | 190 | #wikieditor-toolbar-link-int-target-status-external { |
191 | | - background-image: url( ../images/wikiEditor/dialogs/insert-link-external.png ); |
| 191 | + background-image: url( ../images/wikiEditor/dialogs/insert-link-external.png?1); |
192 | 192 | } |
193 | 193 | |
194 | 194 | /* Reference Dialog */ |
— | — | @@ -230,7 +230,7 @@ |
231 | 231 | background-position: 100% 50%; |
232 | 232 | } |
233 | 233 | body.rtl #wikieditor-toolbar-link-int-target-status-external { |
234 | | - background-image: url( ../images/wikiEditor/dialogs/insert-link-external-rtl.png ); |
| 234 | + background-image: url( ../images/wikiEditor/dialogs/insert-link-external-rtl.png?1); |
235 | 235 | } |
236 | 236 | /* Template Editor Dialogs */ |
237 | 237 | .wikiEditor-template-dialog-fields label { |
Index: trunk/extensions/UsabilityInitiative/css/wikiEditor.toolbar.css |
— | — | @@ -23,35 +23,31 @@ |
24 | 24 | background-color: #E0EEf7; |
25 | 25 | } |
26 | 26 | .wikiEditor-ui-toolbar { |
27 | | - background-image: url(../images/wikiEditor/toolbar/base.png); |
| 27 | + background-image: url(../images/wikiEditor/toolbar/base.png?1); |
28 | 28 | background-position: left top; |
29 | 29 | background-repeat: repeat-x; |
30 | 30 | } |
31 | 31 | /* |
32 | 32 | .wikiEditor-ui-toolbar .toolbar { |
33 | | - background-image: url(../images/wikiEditor/toolbar/base.png); |
| 33 | + background-image: url(../images/wikiEditor/toolbar/base.png?1); |
34 | 34 | background-position: left top; |
35 | 35 | } |
36 | 36 | */ |
37 | 37 | body.rtl .wikiEditor-ui-toolbar .sections .section { |
38 | 38 | float: right; |
39 | 39 | } |
40 | | -.wikiEditor-ui-toolbar .sections .loading { |
41 | | - padding-top: 0.5em; |
42 | | - padding-bottom: 0.5em; |
43 | | -} |
44 | 40 | /* Gets overridden when the section div is in class loading - see below */ |
45 | 41 | .wikiEditor-ui-toolbar .sections div .spinner { |
46 | 42 | display: none; |
47 | 43 | } |
48 | 44 | .wikiEditor-ui-toolbar .sections .loading .spinner { |
49 | 45 | display: block; |
50 | | - background-image: url(../images/wikiEditor/toolbar/loading.gif); |
| 46 | + background-image: url(../images/wikiEditor/toolbar/loading.gif?1); |
51 | 47 | background-position: left center; |
52 | 48 | background-repeat: no-repeat; |
53 | 49 | padding-left: 32px; |
54 | | - margin-left: 1em; |
55 | | - height: 22px; |
| 50 | + margin-left: 0.5em; |
| 51 | + height: 32px; |
56 | 52 | float: left; |
57 | 53 | color: #666666; |
58 | 54 | } |
— | — | @@ -60,7 +56,7 @@ |
61 | 57 | padding-left: 0; |
62 | 58 | padding-right: 32px; |
63 | 59 | margin-left: 0; |
64 | | - margin-right: 1em; |
| 60 | + margin-right: 0.5em; |
65 | 61 | float: right; |
66 | 62 | } |
67 | 63 | /* Top Level Containers */ |
— | — | @@ -145,7 +141,7 @@ |
146 | 142 | height: 26px; |
147 | 143 | cursor: pointer; |
148 | 144 | color: #0645ad; |
149 | | - background-image: url(../images/wikiEditor/toolbar/arrow-right.png); |
| 145 | + background-image: url(../images/wikiEditor/toolbar/arrow-right.png?1); |
150 | 146 | background-position: left center; |
151 | 147 | background-repeat: no-repeat; |
152 | 148 | } |
— | — | @@ -153,7 +149,7 @@ |
154 | 150 | body.rtl .wikiEditor-ui-toolbar .tabs span.tab a:visited { |
155 | 151 | padding-left: 12px; |
156 | 152 | padding-right: 18px; |
157 | | - background-image: url(../images/wikiEditor/toolbar/arrow-left.png); |
| 153 | + background-image: url(../images/wikiEditor/toolbar/arrow-left.png?1); |
158 | 154 | background-position: right center; |
159 | 155 | } |
160 | 156 | /* IGNORED BY IE6 */ |
— | — | @@ -164,15 +160,18 @@ |
165 | 161 | .wikiEditor-ui-toolbar .tabs span.tab a.current, |
166 | 162 | .wikiEditor-ui-toolbar .tabs span.tab a.current:visited { |
167 | 163 | color: #333333; |
168 | | - background-image: url(../images/wikiEditor/toolbar/arrow-down.png); |
| 164 | + background-image: url(../images/wikiEditor/toolbar/arrow-down.png?1); |
169 | 165 | } |
170 | 166 | body.rtl .wikiEditor-ui-toolbar .tabs span.tab a.current, |
171 | 167 | body.rtl .wikiEditor-ui-toolbar .tabs span.tab a.current:visited { |
172 | | - background-image: url(../images/wikiEditor/toolbar/arrow-down.png); |
| 168 | + background-image: url(../images/wikiEditor/toolbar/arrow-down.png?1); |
173 | 169 | } |
174 | 170 | .wikiEditor-ui-toolbar .tabs span.tab a.current:hover { |
175 | 171 | text-decoration: none; |
176 | 172 | } |
| 173 | +.wikiEditor-ui-toolbar .tabs span.tab a.loading { |
| 174 | + background-image: url(../images/wikiEditor/toolbar/loading-small.gif?1) !important; |
| 175 | +} |
177 | 176 | /* Toolbar */ |
178 | 177 | .wikiEditor-ui-toolbar .group .label { |
179 | 178 | float: left; |
— | — | @@ -219,7 +218,7 @@ |
220 | 219 | float: right; |
221 | 220 | } |
222 | 221 | .wikiEditor-ui-toolbar .group .tool-select .label { |
223 | | - background-image: url(../images/wikiEditor/toolbar/arrow-down.png); |
| 222 | + background-image: url(../images/wikiEditor/toolbar/arrow-down.png?1); |
224 | 223 | background-position: center right; |
225 | 224 | background-repeat: no-repeat; |
226 | 225 | padding: 0; |
Index: trunk/extensions/UsabilityInitiative/css/wikiEditor.toc.css |
— | — | @@ -25,7 +25,7 @@ |
26 | 26 | } |
27 | 27 | .tab-toc { |
28 | 28 | /* Should match the toolbar */ |
29 | | - background-image: url(../images/wikiEditor/toolbar/base.png); |
| 29 | + background-image: url(../images/wikiEditor/toolbar/base.png?1); |
30 | 30 | background-position: left top; |
31 | 31 | background-repeat: repeat-x; |
32 | 32 | height: 26px; |
— | — | @@ -141,11 +141,11 @@ |
142 | 142 | left: 0; |
143 | 143 | } |
144 | 144 | .wikiEditor-ui-toc-collapse-open { |
145 | | - background: #f3f3f3 url(../images/wikiEditor/toc/close.png) 4px 50% no-repeat; |
| 145 | + background: #f3f3f3 url(../images/wikiEditor/toc/close.png?1) 4px 50% no-repeat; |
146 | 146 | border-left: 1px solid #DDDDDD; |
147 | 147 | } |
148 | 148 | .wikiEditor-ui-toc-collapse-closed { |
149 | | - background: #f3f3f3 url(../images/wikiEditor/toc/open.png) 4px 50% no-repeat; |
| 149 | + background: #f3f3f3 url(../images/wikiEditor/toc/open.png?1) 4px 50% no-repeat; |
150 | 150 | } |
151 | 151 | |
152 | 152 | /* Resizing Changes */ |
— | — | @@ -174,7 +174,7 @@ |
175 | 175 | top: 7px; |
176 | 176 | left: -12px !important; |
177 | 177 | cursor: ew-resize; |
178 | | - background: url(../images/wikiEditor/toc/grip.png) 50% 50% no-repeat; |
| 178 | + background: url(../images/wikiEditor/toc/grip.png?1) 50% 50% no-repeat; |
179 | 179 | z-index: 0; |
180 | 180 | } |
181 | 181 | body.rtl .wikiEditor-ui-right .wikiEditor-ui-toc-resize-grip { |
Index: trunk/extensions/UsabilityInitiative/css/vector.collapsibleNav.css |
— | — | @@ -1,6 +1,6 @@ |
2 | 2 | /* Prototype code to show collapsing left nav options */ |
3 | 3 | #panel.collapsible-nav div.portal { |
4 | | - background-image:url(../images/vector/collapsibleNav/portal-break.png); |
| 4 | + background-image:url(../images/vector/collapsibleNav/portal-break.png?1); |
5 | 5 | background-position:left top; |
6 | 6 | background-repeat:no-repeat; |
7 | 7 | padding: 0.25em 0 !important; |
— | — | @@ -13,21 +13,21 @@ |
14 | 14 | #panel.collapsible-nav div.portal h5 { |
15 | 15 | color: #4D4D4D; |
16 | 16 | font-weight: normal; |
17 | | - background: url(../images/vector/collapsibleNav/arrow-down.png) 0 50% no-repeat; |
| 17 | + background: url(../images/vector/collapsibleNav/arrow-down.png?1) 0 50% no-repeat; |
18 | 18 | padding: 4px 0 3px 1.5em; |
19 | 19 | margin-bottom: 0px; |
20 | 20 | } |
21 | 21 | body.rtl #panel.collapsible-nav div.portal h5 { |
22 | | - background: url(../images/vector/collapsibleNav/arrow-down.png) 100% 50% no-repeat; |
| 22 | + background: url(../images/vector/collapsibleNav/arrow-down.png?1) 100% 50% no-repeat; |
23 | 23 | padding: 4px 1.5em 3px 0; |
24 | 24 | } |
25 | 25 | #panel.collapsible-nav div.collapsed h5 { |
26 | 26 | color: #0645AD; |
27 | | - background: url(../images/vector/collapsibleNav/arrow-right.png) 0 50% no-repeat; |
| 27 | + background: url(../images/vector/collapsibleNav/arrow-right.png?1) 0 50% no-repeat; |
28 | 28 | margin-bottom: 0px; |
29 | 29 | } |
30 | 30 | body.rtl #panel.collapsible-nav div.collapsed h5 { |
31 | | - background: url(../images/vector/collapsibleNav/arrow-left.png) 100% 50% no-repeat; |
| 31 | + background: url(../images/vector/collapsibleNav/arrow-left.png?1) 100% 50% no-repeat; |
32 | 32 | } |
33 | 33 | #panel.collapsible-nav div h5:hover { |
34 | 34 | cursor: pointer; |
Index: trunk/extensions/UsabilityInitiative/css/combined.css |
— | — | @@ -66,7 +66,7 @@ |
67 | 67 | color: HighlightText; |
68 | 68 | }/* Prototype code to show collapsing left nav options */ |
69 | 69 | #panel.collapsible-nav div.portal { |
70 | | - background-image:url(../images/vector/collapsibleNav/portal-break.png); |
| 70 | + background-image:url(../images/vector/collapsibleNav/portal-break.png?1); |
71 | 71 | background-position:left top; |
72 | 72 | background-repeat:no-repeat; |
73 | 73 | padding: 0.25em 0 !important; |
— | — | @@ -79,21 +79,21 @@ |
80 | 80 | #panel.collapsible-nav div.portal h5 { |
81 | 81 | color: #4D4D4D; |
82 | 82 | font-weight: normal; |
83 | | - background: url(../images/vector/collapsibleNav/arrow-down.png) 0 50% no-repeat; |
| 83 | + background: url(../images/vector/collapsibleNav/arrow-down.png?1) 0 50% no-repeat; |
84 | 84 | padding: 4px 0 3px 1.5em; |
85 | 85 | margin-bottom: 0px; |
86 | 86 | } |
87 | 87 | body.rtl #panel.collapsible-nav div.portal h5 { |
88 | | - background: url(../images/vector/collapsibleNav/arrow-down.png) 100% 50% no-repeat; |
| 88 | + background: url(../images/vector/collapsibleNav/arrow-down.png?1) 100% 50% no-repeat; |
89 | 89 | padding: 4px 1.5em 3px 0; |
90 | 90 | } |
91 | 91 | #panel.collapsible-nav div.collapsed h5 { |
92 | 92 | color: #0645AD; |
93 | | - background: url(../images/vector/collapsibleNav/arrow-right.png) 0 50% no-repeat; |
| 93 | + background: url(../images/vector/collapsibleNav/arrow-right.png?1) 0 50% no-repeat; |
94 | 94 | margin-bottom: 0px; |
95 | 95 | } |
96 | 96 | body.rtl #panel.collapsible-nav div.collapsed h5 { |
97 | | - background: url(../images/vector/collapsibleNav/arrow-left.png) 100% 50% no-repeat; |
| 97 | + background: url(../images/vector/collapsibleNav/arrow-left.png?1) 100% 50% no-repeat; |
98 | 98 | } |
99 | 99 | #panel.collapsible-nav div h5:hover { |
100 | 100 | cursor: pointer; |
— | — | @@ -153,7 +153,7 @@ |
154 | 154 | position: relative; |
155 | 155 | clear: both; |
156 | 156 | width: 100%; |
157 | | - background-color: #f3f3f3; |
| 157 | + background-color: #E0EEf7; |
158 | 158 | border: solid silver 1px; |
159 | 159 | } |
160 | 160 | body.rtl .wikiEditor-ui { |
— | — | @@ -293,32 +293,32 @@ |
294 | 294 | padding: 0.2em 0.6em 0.15em !important; |
295 | 295 | margin: 0.5em 0 0.5em 0.4em !important; |
296 | 296 | border: 1px solid #a6a6a6 !important; |
297 | | - background: #f2f2f2 url( ../images/wikiEditor/dialogs/button_off.png ) repeat-x scroll 50% 100% !important; |
| 297 | + background: #f2f2f2 url( ../images/wikiEditor/dialogs/button_off.png?1) repeat-x scroll 50% 100% !important; |
298 | 298 | } |
299 | 299 | .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:hover { |
300 | 300 | border-color: #6e7273; |
301 | | - background: #e1e1e1 url( ../images/wikiEditor/dialogs/button_over.png ) repeat-x scroll 50% 100% !important; |
| 301 | + background: #e1e1e1 url( ../images/wikiEditor/dialogs/button_over.png?1) repeat-x scroll 50% 100% !important; |
302 | 302 | } |
303 | 303 | .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:active, |
304 | 304 | .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:focus { |
305 | 305 | border-color: #707271; |
306 | | - background: #bfbfbf url( ../images/wikiEditor/dialogs/button_down.png ) repeat-x scroll 50% 100% !important; |
| 306 | + background: #bfbfbf url( ../images/wikiEditor/dialogs/button_down.png?1) repeat-x scroll 50% 100% !important; |
307 | 307 | } |
308 | 308 | .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button.disabled { |
309 | 309 | color: #7f7f7f; |
310 | 310 | border-color: #cccccc; |
311 | | - background: #f2f2f2 url( ../images/wikiEditor/dialogs/button_disabled.png ) repeat-x scroll 50% 100% !important; |
| 311 | + background: #f2f2f2 url( ../images/wikiEditor/dialogs/button_disabled.png?1) repeat-x scroll 50% 100% !important; |
312 | 312 | } |
313 | 313 | /* Disables the annoying dashed border Firefox puts on active buttons */ |
314 | 314 | .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button::-moz-focus-inner { |
315 | 315 | border: 0; |
316 | 316 | } |
317 | 317 | .wikiEditor-toolbar-dialog .ui-widget-header { |
318 | | - background: #f0f0f0 url( ../images/wikiEditor/dialogs/titlebar_fade.png ) repeat-x scroll 50% 100% !important; |
| 318 | + background: #f0f0f0 url( ../images/wikiEditor/dialogs/titlebar_fade.png?1) repeat-x scroll 50% 100% !important; |
319 | 319 | } |
320 | 320 | /* FIXME: Should just update the icon sprite if we're keeping this X */ |
321 | 321 | .wikiEditor-toolbar-dialog .ui-icon-closethick { |
322 | | - background: url( ../images/wikiEditor/dialogs/close_x.png ) no-repeat 50% 50% !important; |
| 322 | + background: url( ../images/wikiEditor/dialogs/close_x.png?1) no-repeat 50% 50% !important; |
323 | 323 | } |
324 | 324 | .wikiEditor-toolbar-dialog .ui-dialog-buttonpane { |
325 | 325 | margin-top: 0 !important; |
— | — | @@ -440,16 +440,16 @@ |
441 | 441 | background-repeat: no-repeat; |
442 | 442 | } |
443 | 443 | #wikieditor-toolbar-link-int-target-status-exists { |
444 | | - background-image: url( ../images/wikiEditor/dialogs/insert-link-exists.png ); |
| 444 | + background-image: url( ../images/wikiEditor/dialogs/insert-link-exists.png?1); |
445 | 445 | } |
446 | 446 | #wikieditor-toolbar-link-int-target-status-notexists { |
447 | | - background-image: url( ../images/wikiEditor/dialogs/insert-link-notexists.png ); |
| 447 | + background-image: url( ../images/wikiEditor/dialogs/insert-link-notexists.png?1); |
448 | 448 | } |
449 | 449 | #wikieditor-toolbar-link-int-target-status-invalid { |
450 | | - background-image: url( ../images/wikiEditor/dialogs/insert-link-invalid.png ); |
| 450 | + background-image: url( ../images/wikiEditor/dialogs/insert-link-invalid.png?1); |
451 | 451 | } |
452 | 452 | #wikieditor-toolbar-link-int-target-status-external { |
453 | | - background-image: url( ../images/wikiEditor/dialogs/insert-link-external.png ); |
| 453 | + background-image: url( ../images/wikiEditor/dialogs/insert-link-external.png?1); |
454 | 454 | } |
455 | 455 | |
456 | 456 | /* Reference Dialog */ |
— | — | @@ -492,7 +492,7 @@ |
493 | 493 | background-position: 100% 50%; |
494 | 494 | } |
495 | 495 | body.rtl #wikieditor-toolbar-link-int-target-status-external { |
496 | | - background-image: url( ../images/wikiEditor/dialogs/insert-link-external-rtl.png ); |
| 496 | + background-image: url( ../images/wikiEditor/dialogs/insert-link-external-rtl.png?1); |
497 | 497 | } |
498 | 498 | /* Template Editor Dialogs */ |
499 | 499 | .wikiEditor-template-dialog-fields label { |
— | — | @@ -592,7 +592,7 @@ |
593 | 593 | } |
594 | 594 | .tab-toc { |
595 | 595 | /* Should match the toolbar */ |
596 | | - background-image: url(../images/wikiEditor/toolbar/base.png); |
| 596 | + background-image: url(../images/wikiEditor/toolbar/base.png?1); |
597 | 597 | background-position: left top; |
598 | 598 | background-repeat: repeat-x; |
599 | 599 | height: 26px; |
— | — | @@ -708,11 +708,11 @@ |
709 | 709 | left: 0; |
710 | 710 | } |
711 | 711 | .wikiEditor-ui-toc-collapse-open { |
712 | | - background: #f3f3f3 url(../images/wikiEditor/toc/close.png) 4px 50% no-repeat; |
| 712 | + background: #f3f3f3 url(../images/wikiEditor/toc/close.png?1) 4px 50% no-repeat; |
713 | 713 | border-left: 1px solid #DDDDDD; |
714 | 714 | } |
715 | 715 | .wikiEditor-ui-toc-collapse-closed { |
716 | | - background: #f3f3f3 url(../images/wikiEditor/toc/open.png) 4px 50% no-repeat; |
| 716 | + background: #f3f3f3 url(../images/wikiEditor/toc/open.png?1) 4px 50% no-repeat; |
717 | 717 | } |
718 | 718 | |
719 | 719 | /* Resizing Changes */ |
— | — | @@ -741,7 +741,7 @@ |
742 | 742 | top: 7px; |
743 | 743 | left: -12px !important; |
744 | 744 | cursor: ew-resize; |
745 | | - background: url(../images/wikiEditor/toc/grip.png) 50% 50% no-repeat; |
| 745 | + background: url(../images/wikiEditor/toc/grip.png?1) 50% 50% no-repeat; |
746 | 746 | z-index: 0; |
747 | 747 | } |
748 | 748 | body.rtl .wikiEditor-ui-right .wikiEditor-ui-toc-resize-grip { |
— | — | @@ -806,35 +806,31 @@ |
807 | 807 | background-color: #E0EEf7; |
808 | 808 | } |
809 | 809 | .wikiEditor-ui-toolbar { |
810 | | - background-image: url(../images/wikiEditor/toolbar/base.png); |
| 810 | + background-image: url(../images/wikiEditor/toolbar/base.png?1); |
811 | 811 | background-position: left top; |
812 | 812 | background-repeat: repeat-x; |
813 | 813 | } |
814 | 814 | /* |
815 | 815 | .wikiEditor-ui-toolbar .toolbar { |
816 | | - background-image: url(../images/wikiEditor/toolbar/base.png); |
| 816 | + background-image: url(../images/wikiEditor/toolbar/base.png?1); |
817 | 817 | background-position: left top; |
818 | 818 | } |
819 | 819 | */ |
820 | 820 | body.rtl .wikiEditor-ui-toolbar .sections .section { |
821 | 821 | float: right; |
822 | 822 | } |
823 | | -.wikiEditor-ui-toolbar .sections .loading { |
824 | | - padding-top: 0.5em; |
825 | | - padding-bottom: 0.5em; |
826 | | -} |
827 | 823 | /* Gets overridden when the section div is in class loading - see below */ |
828 | 824 | .wikiEditor-ui-toolbar .sections div .spinner { |
829 | 825 | display: none; |
830 | 826 | } |
831 | 827 | .wikiEditor-ui-toolbar .sections .loading .spinner { |
832 | 828 | display: block; |
833 | | - background-image: url(../images/wikiEditor/toolbar/loading.gif); |
| 829 | + background-image: url(../images/wikiEditor/toolbar/loading.gif?1); |
834 | 830 | background-position: left center; |
835 | 831 | background-repeat: no-repeat; |
836 | 832 | padding-left: 32px; |
837 | | - margin-left: 1em; |
838 | | - height: 22px; |
| 833 | + margin-left: 0.5em; |
| 834 | + height: 32px; |
839 | 835 | float: left; |
840 | 836 | color: #666666; |
841 | 837 | } |
— | — | @@ -843,7 +839,7 @@ |
844 | 840 | padding-left: 0; |
845 | 841 | padding-right: 32px; |
846 | 842 | margin-left: 0; |
847 | | - margin-right: 1em; |
| 843 | + margin-right: 0.5em; |
848 | 844 | float: right; |
849 | 845 | } |
850 | 846 | /* Top Level Containers */ |
— | — | @@ -928,7 +924,7 @@ |
929 | 925 | height: 26px; |
930 | 926 | cursor: pointer; |
931 | 927 | color: #0645ad; |
932 | | - background-image: url(../images/wikiEditor/toolbar/arrow-right.png); |
| 928 | + background-image: url(../images/wikiEditor/toolbar/arrow-right.png?1); |
933 | 929 | background-position: left center; |
934 | 930 | background-repeat: no-repeat; |
935 | 931 | } |
— | — | @@ -936,7 +932,7 @@ |
937 | 933 | body.rtl .wikiEditor-ui-toolbar .tabs span.tab a:visited { |
938 | 934 | padding-left: 12px; |
939 | 935 | padding-right: 18px; |
940 | | - background-image: url(../images/wikiEditor/toolbar/arrow-left.png); |
| 936 | + background-image: url(../images/wikiEditor/toolbar/arrow-left.png?1); |
941 | 937 | background-position: right center; |
942 | 938 | } |
943 | 939 | /* IGNORED BY IE6 */ |
— | — | @@ -947,15 +943,18 @@ |
948 | 944 | .wikiEditor-ui-toolbar .tabs span.tab a.current, |
949 | 945 | .wikiEditor-ui-toolbar .tabs span.tab a.current:visited { |
950 | 946 | color: #333333; |
951 | | - background-image: url(../images/wikiEditor/toolbar/arrow-down.png); |
| 947 | + background-image: url(../images/wikiEditor/toolbar/arrow-down.png?1); |
952 | 948 | } |
953 | 949 | body.rtl .wikiEditor-ui-toolbar .tabs span.tab a.current, |
954 | 950 | body.rtl .wikiEditor-ui-toolbar .tabs span.tab a.current:visited { |
955 | | - background-image: url(../images/wikiEditor/toolbar/arrow-down.png); |
| 951 | + background-image: url(../images/wikiEditor/toolbar/arrow-down.png?1); |
956 | 952 | } |
957 | 953 | .wikiEditor-ui-toolbar .tabs span.tab a.current:hover { |
958 | 954 | text-decoration: none; |
959 | 955 | } |
| 956 | +.wikiEditor-ui-toolbar .tabs span.tab a.loading { |
| 957 | + background-image: url(../images/wikiEditor/toolbar/loading-small.gif?1) !important; |
| 958 | +} |
960 | 959 | /* Toolbar */ |
961 | 960 | .wikiEditor-ui-toolbar .group .label { |
962 | 961 | float: left; |
— | — | @@ -1002,7 +1001,7 @@ |
1003 | 1002 | float: right; |
1004 | 1003 | } |
1005 | 1004 | .wikiEditor-ui-toolbar .group .tool-select .label { |
1006 | | - background-image: url(../images/wikiEditor/toolbar/arrow-down.png); |
| 1005 | + background-image: url(../images/wikiEditor/toolbar/arrow-down.png?1); |
1007 | 1006 | background-position: center right; |
1008 | 1007 | background-repeat: no-repeat; |
1009 | 1008 | padding: 0; |
Index: trunk/extensions/UsabilityInitiative/css/combined.min.css |
— | — | @@ -64,7 +64,7 @@ |
65 | 65 | color:HighlightText; |
66 | 66 | } |
67 | 67 | #panel.collapsible-nav div.portal{ |
68 | | -background-image:url(../images/vector/collapsibleNav/portal-break.png); |
| 68 | +background-image:url(../images/vector/collapsibleNav/portal-break.png?1); |
69 | 69 | background-position:left top; |
70 | 70 | background-repeat:no-repeat; |
71 | 71 | padding:0.25em 0 !important; |
— | — | @@ -77,21 +77,21 @@ |
78 | 78 | #panel.collapsible-nav div.portal h5{ |
79 | 79 | color:#4D4D4D; |
80 | 80 | font-weight:normal; |
81 | | -background:url(../images/vector/collapsibleNav/arrow-down.png) 0 50% no-repeat; |
| 81 | +background:url(../images/vector/collapsibleNav/arrow-down.png?1) 0 50% no-repeat; |
82 | 82 | padding:4px 0 3px 1.5em; |
83 | 83 | margin-bottom:0px; |
84 | 84 | } |
85 | 85 | body.rtl #panel.collapsible-nav div.portal h5{ |
86 | | -background:url(../images/vector/collapsibleNav/arrow-down.png) 100% 50% no-repeat; |
| 86 | +background:url(../images/vector/collapsibleNav/arrow-down.png?1) 100% 50% no-repeat; |
87 | 87 | padding:4px 1.5em 3px 0; |
88 | 88 | } |
89 | 89 | #panel.collapsible-nav div.collapsed h5{ |
90 | 90 | color:#0645AD; |
91 | | -background:url(../images/vector/collapsibleNav/arrow-right.png) 0 50% no-repeat; |
| 91 | +background:url(../images/vector/collapsibleNav/arrow-right.png?1) 0 50% no-repeat; |
92 | 92 | margin-bottom:0px; |
93 | 93 | } |
94 | 94 | body.rtl #panel.collapsible-nav div.collapsed h5{ |
95 | | -background:url(../images/vector/collapsibleNav/arrow-left.png) 100% 50% no-repeat; |
| 95 | +background:url(../images/vector/collapsibleNav/arrow-left.png?1) 100% 50% no-repeat; |
96 | 96 | } |
97 | 97 | #panel.collapsible-nav div h5:hover{ |
98 | 98 | cursor:pointer; |
— | — | @@ -146,7 +146,7 @@ |
147 | 147 | position:relative; |
148 | 148 | clear:both; |
149 | 149 | width:100%; |
150 | | -background-color:#f3f3f3; |
| 150 | +background-color:#E0EEf7; |
151 | 151 | border:solid silver 1px; |
152 | 152 | } |
153 | 153 | body.rtl .wikiEditor-ui{ |
— | — | @@ -282,30 +282,30 @@ |
283 | 283 | padding:0.2em 0.6em 0.15em !important; |
284 | 284 | margin:0.5em 0 0.5em 0.4em !important; |
285 | 285 | border:1px solid #a6a6a6 !important; |
286 | | -background:#f2f2f2 url( ../images/wikiEditor/dialogs/button_off.png ) repeat-x scroll 50% 100% !important; |
| 286 | +background:#f2f2f2 url( ../images/wikiEditor/dialogs/button_off.png?1) repeat-x scroll 50% 100% !important; |
287 | 287 | } |
288 | 288 | .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:hover{ |
289 | 289 | border-color:#6e7273; |
290 | | -background:#e1e1e1 url( ../images/wikiEditor/dialogs/button_over.png ) repeat-x scroll 50% 100% !important; |
| 290 | +background:#e1e1e1 url( ../images/wikiEditor/dialogs/button_over.png?1) repeat-x scroll 50% 100% !important; |
291 | 291 | } |
292 | 292 | .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:active, |
293 | 293 | .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:focus{ |
294 | 294 | border-color:#707271; |
295 | | -background:#bfbfbf url( ../images/wikiEditor/dialogs/button_down.png ) repeat-x scroll 50% 100% !important; |
| 295 | +background:#bfbfbf url( ../images/wikiEditor/dialogs/button_down.png?1) repeat-x scroll 50% 100% !important; |
296 | 296 | } |
297 | 297 | .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button.disabled{ |
298 | 298 | color:#7f7f7f; |
299 | 299 | border-color:#cccccc; |
300 | | -background:#f2f2f2 url( ../images/wikiEditor/dialogs/button_disabled.png ) repeat-x scroll 50% 100% !important; |
| 300 | +background:#f2f2f2 url( ../images/wikiEditor/dialogs/button_disabled.png?1) repeat-x scroll 50% 100% !important; |
301 | 301 | } |
302 | 302 | .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button::-moz-focus-inner{ |
303 | 303 | border:0; |
304 | 304 | } |
305 | 305 | .wikiEditor-toolbar-dialog .ui-widget-header{ |
306 | | -background:#f0f0f0 url( ../images/wikiEditor/dialogs/titlebar_fade.png ) repeat-x scroll 50% 100% !important; |
| 306 | +background:#f0f0f0 url( ../images/wikiEditor/dialogs/titlebar_fade.png?1) repeat-x scroll 50% 100% !important; |
307 | 307 | } |
308 | 308 | .wikiEditor-toolbar-dialog .ui-icon-closethick{ |
309 | | -background:url( ../images/wikiEditor/dialogs/close_x.png ) no-repeat 50% 50% !important; |
| 309 | +background:url( ../images/wikiEditor/dialogs/close_x.png?1) no-repeat 50% 50% !important; |
310 | 310 | } |
311 | 311 | .wikiEditor-toolbar-dialog .ui-dialog-buttonpane{ |
312 | 312 | margin-top:0 !important; |
— | — | @@ -421,16 +421,16 @@ |
422 | 422 | background-repeat:no-repeat; |
423 | 423 | } |
424 | 424 | #wikieditor-toolbar-link-int-target-status-exists{ |
425 | | -background-image:url( ../images/wikiEditor/dialogs/insert-link-exists.png ); |
| 425 | +background-image:url( ../images/wikiEditor/dialogs/insert-link-exists.png?1); |
426 | 426 | } |
427 | 427 | #wikieditor-toolbar-link-int-target-status-notexists{ |
428 | | -background-image:url( ../images/wikiEditor/dialogs/insert-link-notexists.png ); |
| 428 | +background-image:url( ../images/wikiEditor/dialogs/insert-link-notexists.png?1); |
429 | 429 | } |
430 | 430 | #wikieditor-toolbar-link-int-target-status-invalid{ |
431 | | -background-image:url( ../images/wikiEditor/dialogs/insert-link-invalid.png ); |
| 431 | +background-image:url( ../images/wikiEditor/dialogs/insert-link-invalid.png?1); |
432 | 432 | } |
433 | 433 | #wikieditor-toolbar-link-int-target-status-external{ |
434 | | -background-image:url( ../images/wikiEditor/dialogs/insert-link-external.png ); |
| 434 | +background-image:url( ../images/wikiEditor/dialogs/insert-link-external.png?1); |
435 | 435 | } |
436 | 436 | #wikieditor-toolbar-reference-dialog label{ |
437 | 437 | float:left; |
— | — | @@ -470,7 +470,7 @@ |
471 | 471 | background-position:100% 50%; |
472 | 472 | } |
473 | 473 | body.rtl #wikieditor-toolbar-link-int-target-status-external{ |
474 | | -background-image:url( ../images/wikiEditor/dialogs/insert-link-external-rtl.png ); |
| 474 | +background-image:url( ../images/wikiEditor/dialogs/insert-link-external-rtl.png?1); |
475 | 475 | } |
476 | 476 | .wikiEditor-template-dialog-fields label{ |
477 | 477 | text-transform:capitalize; |
— | — | @@ -556,7 +556,7 @@ |
557 | 557 | width:100%; |
558 | 558 | } |
559 | 559 | .tab-toc{ |
560 | | -background-image:url(../images/wikiEditor/toolbar/base.png); |
| 560 | +background-image:url(../images/wikiEditor/toolbar/base.png?1); |
561 | 561 | background-position:left top; |
562 | 562 | background-repeat:repeat-x; |
563 | 563 | height:26px; |
— | — | @@ -667,11 +667,11 @@ |
668 | 668 | left:0; |
669 | 669 | } |
670 | 670 | .wikiEditor-ui-toc-collapse-open{ |
671 | | -background:#f3f3f3 url(../images/wikiEditor/toc/close.png) 4px 50% no-repeat; |
| 671 | +background:#f3f3f3 url(../images/wikiEditor/toc/close.png?1) 4px 50% no-repeat; |
672 | 672 | border-left:1px solid #DDDDDD; |
673 | 673 | } |
674 | 674 | .wikiEditor-ui-toc-collapse-closed{ |
675 | | -background:#f3f3f3 url(../images/wikiEditor/toc/open.png) 4px 50% no-repeat; |
| 675 | +background:#f3f3f3 url(../images/wikiEditor/toc/open.png?1) 4px 50% no-repeat; |
676 | 676 | } |
677 | 677 | .wikiEditor-ui-toc-resize-vertical, |
678 | 678 | .ui-resizable-w{ |
— | — | @@ -697,7 +697,7 @@ |
698 | 698 | top:7px; |
699 | 699 | left:-12px !important; |
700 | 700 | cursor:ew-resize; |
701 | | -background:url(../images/wikiEditor/toc/grip.png) 50% 50% no-repeat; |
| 701 | +background:url(../images/wikiEditor/toc/grip.png?1) 50% 50% no-repeat; |
702 | 702 | z-index:0; |
703 | 703 | } |
704 | 704 | body.rtl .wikiEditor-ui-right .wikiEditor-ui-toc-resize-grip{ |
— | — | @@ -757,34 +757,30 @@ |
758 | 758 | background-color:#E0EEf7; |
759 | 759 | } |
760 | 760 | .wikiEditor-ui-toolbar{ |
761 | | -background-image:url(../images/wikiEditor/toolbar/base.png); |
| 761 | +background-image:url(../images/wikiEditor/toolbar/base.png?1); |
762 | 762 | background-position:left top; |
763 | 763 | background-repeat:repeat-x; |
764 | 764 | } |
765 | 765 | /* |
766 | 766 | .wikiEditor-ui-toolbar .toolbar{ |
767 | | -background-image:url(../images/wikiEditor/toolbar/base.png); |
| 767 | +background-image:url(../images/wikiEditor/toolbar/base.png?1); |
768 | 768 | background-position:left top; |
769 | 769 | } |
770 | 770 | */ |
771 | 771 | body.rtl .wikiEditor-ui-toolbar .sections .section{ |
772 | 772 | float:right; |
773 | 773 | } |
774 | | -.wikiEditor-ui-toolbar .sections .loading{ |
775 | | -padding-top:0.5em; |
776 | | -padding-bottom:0.5em; |
777 | | -} |
778 | 774 | .wikiEditor-ui-toolbar .sections div .spinner{ |
779 | 775 | display:none; |
780 | 776 | } |
781 | 777 | .wikiEditor-ui-toolbar .sections .loading .spinner{ |
782 | 778 | display:block; |
783 | | -background-image:url(../images/wikiEditor/toolbar/loading.gif); |
| 779 | +background-image:url(../images/wikiEditor/toolbar/loading.gif?1); |
784 | 780 | background-position:left center; |
785 | 781 | background-repeat:no-repeat; |
786 | 782 | padding-left:32px; |
787 | | -margin-left:1em; |
788 | | -height:22px; |
| 783 | +margin-left:0.5em; |
| 784 | +height:32px; |
789 | 785 | float:left; |
790 | 786 | color:#666666; |
791 | 787 | } |
— | — | @@ -793,7 +789,7 @@ |
794 | 790 | padding-left:0; |
795 | 791 | padding-right:32px; |
796 | 792 | margin-left:0; |
797 | | -margin-right:1em; |
| 793 | +margin-right:0.5em; |
798 | 794 | float:right; |
799 | 795 | } |
800 | 796 | .wikiEditor-ui-toolbar .tabs, |
— | — | @@ -872,7 +868,7 @@ |
873 | 869 | height:26px; |
874 | 870 | cursor:pointer; |
875 | 871 | color:#0645ad; |
876 | | -background-image:url(../images/wikiEditor/toolbar/arrow-right.png); |
| 872 | +background-image:url(../images/wikiEditor/toolbar/arrow-right.png?1); |
877 | 873 | background-position:left center; |
878 | 874 | background-repeat:no-repeat; |
879 | 875 | } |
— | — | @@ -880,7 +876,7 @@ |
881 | 877 | body.rtl .wikiEditor-ui-toolbar .tabs span.tab a:visited{ |
882 | 878 | padding-left:12px; |
883 | 879 | padding-right:18px; |
884 | | -background-image:url(../images/wikiEditor/toolbar/arrow-left.png); |
| 880 | +background-image:url(../images/wikiEditor/toolbar/arrow-left.png?1); |
885 | 881 | background-position:right center; |
886 | 882 | } |
887 | 883 | body.rtl .wikiEditor-ui-toolbar .tabs > span.tab > a, |
— | — | @@ -890,15 +886,18 @@ |
891 | 887 | .wikiEditor-ui-toolbar .tabs span.tab a.current, |
892 | 888 | .wikiEditor-ui-toolbar .tabs span.tab a.current:visited{ |
893 | 889 | color:#333333; |
894 | | -background-image:url(../images/wikiEditor/toolbar/arrow-down.png); |
| 890 | +background-image:url(../images/wikiEditor/toolbar/arrow-down.png?1); |
895 | 891 | } |
896 | 892 | body.rtl .wikiEditor-ui-toolbar .tabs span.tab a.current, |
897 | 893 | body.rtl .wikiEditor-ui-toolbar .tabs span.tab a.current:visited{ |
898 | | -background-image:url(../images/wikiEditor/toolbar/arrow-down.png); |
| 894 | +background-image:url(../images/wikiEditor/toolbar/arrow-down.png?1); |
899 | 895 | } |
900 | 896 | .wikiEditor-ui-toolbar .tabs span.tab a.current:hover{ |
901 | 897 | text-decoration:none; |
902 | 898 | } |
| 899 | +.wikiEditor-ui-toolbar .tabs span.tab a.loading{ |
| 900 | +background-image:url(../images/wikiEditor/toolbar/loading-small.gif?1) !important; |
| 901 | +} |
903 | 902 | .wikiEditor-ui-toolbar .group .label{ |
904 | 903 | float:left; |
905 | 904 | border:0px; |
— | — | @@ -941,7 +940,7 @@ |
942 | 941 | float:right; |
943 | 942 | } |
944 | 943 | .wikiEditor-ui-toolbar .group .tool-select .label{ |
945 | | -background-image:url(../images/wikiEditor/toolbar/arrow-down.png); |
| 944 | +background-image:url(../images/wikiEditor/toolbar/arrow-down.png?1); |
946 | 945 | background-position:center right; |
947 | 946 | background-repeat:no-repeat; |
948 | 947 | padding:0; |
Index: trunk/extensions/UsabilityInitiative/css/vector.footerCleanup.css |
— | — | @@ -25,12 +25,12 @@ |
26 | 26 | padding: 0 0 0 14px; |
27 | 27 | } |
28 | 28 | .collapsible-list.collapsed label { |
29 | | - background: url(../images/vector/collapsibleNav/arrow-down.png) 0 50% no-repeat; |
| 29 | + background: url(../images/vector/collapsibleNav/arrow-down.png?1) 0 50% no-repeat; |
30 | 30 | padding: 4px 0 3px 1.5em; |
31 | 31 | margin-bottom: 0px; |
32 | 32 | } |
33 | 33 | .collapsible-list.expanded label { |
34 | | - background: url(../images/vector/collapsibleNav/arrow-right.png) 0 50% no-repeat; |
| 34 | + background: url(../images/vector/collapsibleNav/arrow-right.png?1) 0 50% no-repeat; |
35 | 35 | padding: 4px 0 3px 1.5em; |
36 | 36 | margin-bottom: 0px; |
37 | 37 | } |
Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php |
— | — | @@ -19,21 +19,21 @@ |
20 | 20 | 'base_sets' => array( |
21 | 21 | 'raw' => array( |
22 | 22 | array( 'src' => 'css/suggestions.css', 'version' => 12 ), |
23 | | - array( 'src' => 'css/vector.collapsibleNav.css', 'version' => 8 ), |
24 | | - array( 'src' => 'css/vector.footerCleanup.css', 'version' => 1 ), |
25 | | - array( 'src' => 'css/wikiEditor.css', 'version' => 12 ), |
26 | | - array( 'src' => 'css/wikiEditor.dialogs.css', 'version' => 28 ), |
| 23 | + array( 'src' => 'css/vector.collapsibleNav.css', 'version' => 9 ), |
| 24 | + array( 'src' => 'css/vector.footerCleanup.css', 'version' => 2 ), |
| 25 | + array( 'src' => 'css/wikiEditor.css', 'version' => 13 ), |
| 26 | + array( 'src' => 'css/wikiEditor.dialogs.css', 'version' => 29 ), |
27 | 27 | array( 'src' => 'css/wikiEditor.preview.css', 'version' => 1 ), |
28 | | - array( 'src' => 'css/wikiEditor.toc.css', 'version' => 30 ), |
29 | | - array( 'src' => 'css/wikiEditor.toolbar.css', 'version' => 16 ), |
| 28 | + array( 'src' => 'css/wikiEditor.toc.css', 'version' => 31 ), |
| 29 | + array( 'src' => 'css/wikiEditor.toolbar.css', 'version' => 17 ), |
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' => 89 ), |
| 33 | + array( 'src' => 'css/combined.css', 'version' => 91 ), |
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' => 89 ), |
| 37 | + array( 'src' => 'css/combined.min.css', 'version' => 91 ), |
38 | 38 | array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ), |
39 | 39 | ), |
40 | 40 | ) |
— | — | @@ -74,7 +74,7 @@ |
75 | 75 | array( 'src' => 'js/plugins/jquery.textSelection.js', 'version' => 32 ), |
76 | 76 | array( 'src' => 'js/plugins/jquery.wikiEditor.js', 'version' => 187 ), |
77 | 77 | array( 'src' => 'js/plugins/jquery.wikiEditor.highlight.js', 'version' => 53 ), |
78 | | - array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 61 ), |
| 78 | + array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 62 ), |
79 | 79 | array( 'src' => 'js/plugins/jquery.wikiEditor.dialogs.js', 'version' => 24 ), |
80 | 80 | array( 'src' => 'js/plugins/jquery.wikiEditor.toc.js', 'version' => 98 ), |
81 | 81 | array( 'src' => 'js/plugins/jquery.wikiEditor.preview.js', 'version' => 11 ), |
— | — | @@ -83,10 +83,10 @@ |
84 | 84 | array( 'src' => 'js/plugins/jquery.wikiEditor.publish.js', 'version' => 5 ), |
85 | 85 | ), |
86 | 86 | 'combined' => array( |
87 | | - array( 'src' => 'js/plugins.combined.js', 'version' => 394 ), |
| 87 | + array( 'src' => 'js/plugins.combined.js', 'version' => 395 ), |
88 | 88 | ), |
89 | 89 | 'minified' => array( |
90 | | - array( 'src' => 'js/plugins.combined.min.js', 'version' => 394 ), |
| 90 | + array( 'src' => 'js/plugins.combined.min.js', 'version' => 395 ), |
91 | 91 | ), |
92 | 92 | ), |
93 | 93 | ); |
Index: trunk/extensions/UsabilityInitiative/images/wikiEditor/toolbar/loading.gif |
Cannot display: file marked as a binary type. |
svn:mime-type = image/gif |
Index: trunk/extensions/UsabilityInitiative/images/wikiEditor/toolbar/loading-small.gif |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes on: trunk/extensions/UsabilityInitiative/images/wikiEditor/toolbar/loading-small.gif |
___________________________________________________________________ |
Name: svn:mime-type |
94 | 94 | + application/octet-stream |
Index: trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js |
— | — | @@ -588,19 +588,29 @@ |
589 | 589 | $previousSections.fadeOut( 'fast', function() { $(this).css( 'position', 'relative' ); } ); |
590 | 590 | $(this).parent().parent().find( 'a' ).removeClass( 'current' ); |
591 | 591 | $sections.css( 'overflow', 'hidden' ); |
| 592 | + function animate( $this ) { |
| 593 | + $sections |
| 594 | + .css( 'display', 'block' ) |
| 595 | + .animate( { 'height': $section.outerHeight() }, $section.outerHeight() * 2, function() { |
| 596 | + $this.css( 'overflow', 'visible' ).css( 'height', 'auto' ); |
| 597 | + context.fn.trigger( 'resize' ); |
| 598 | + } ); |
| 599 | + } |
592 | 600 | if ( show ) { |
593 | 601 | $section.addClass( 'section-visible' ); |
594 | 602 | $section.fadeIn( 'fast' ); |
595 | | - $sections |
596 | | - .css( 'display', 'block' ) |
597 | | - .animate( { 'height': $section.outerHeight() }, $section.outerHeight() * 2, function() { |
598 | | - $(this).css( 'overflow', 'visible' ).css( 'height', 'auto' ); |
599 | | - context.fn.trigger( 'resize' ); |
600 | | - } ); |
601 | | - $(this).addClass( 'current' ); |
602 | 603 | if ( $section.hasClass( 'loading' ) ) { |
603 | 604 | // Loading of this section was deferred, load it now |
604 | | - setTimeout( function() { $section.trigger( 'loadSection' ); }, 0 ); |
| 605 | + $this = $(this); |
| 606 | + $this.addClass( 'current loading' ); |
| 607 | + setTimeout( function() { |
| 608 | + $section.trigger( 'loadSection' ); |
| 609 | + animate( $(this) ); |
| 610 | + $this.removeClass( 'loading' ); |
| 611 | + }, 1000 ); |
| 612 | + } else { |
| 613 | + animate( $(this) ); |
| 614 | + $(this).addClass( 'current' ); |
605 | 615 | } |
606 | 616 | } else { |
607 | 617 | $sections |
Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.js |
— | — | @@ -11438,19 +11438,29 @@ |
11439 | 11439 | $previousSections.fadeOut( 'fast', function() { $(this).css( 'position', 'relative' ); } ); |
11440 | 11440 | $(this).parent().parent().find( 'a' ).removeClass( 'current' ); |
11441 | 11441 | $sections.css( 'overflow', 'hidden' ); |
| 11442 | + function animate( $this ) { |
| 11443 | + $sections |
| 11444 | + .css( 'display', 'block' ) |
| 11445 | + .animate( { 'height': $section.outerHeight() }, $section.outerHeight() * 2, function() { |
| 11446 | + $this.css( 'overflow', 'visible' ).css( 'height', 'auto' ); |
| 11447 | + context.fn.trigger( 'resize' ); |
| 11448 | + } ); |
| 11449 | + } |
11442 | 11450 | if ( show ) { |
11443 | 11451 | $section.addClass( 'section-visible' ); |
11444 | 11452 | $section.fadeIn( 'fast' ); |
11445 | | - $sections |
11446 | | - .css( 'display', 'block' ) |
11447 | | - .animate( { 'height': $section.outerHeight() }, $section.outerHeight() * 2, function() { |
11448 | | - $(this).css( 'overflow', 'visible' ).css( 'height', 'auto' ); |
11449 | | - context.fn.trigger( 'resize' ); |
11450 | | - } ); |
11451 | | - $(this).addClass( 'current' ); |
11452 | 11453 | if ( $section.hasClass( 'loading' ) ) { |
11453 | 11454 | // Loading of this section was deferred, load it now |
11454 | | - setTimeout( function() { $section.trigger( 'loadSection' ); }, 0 ); |
| 11455 | + $this = $(this); |
| 11456 | + $this.addClass( 'current loading' ); |
| 11457 | + setTimeout( function() { |
| 11458 | + $section.trigger( 'loadSection' ); |
| 11459 | + animate( $(this) ); |
| 11460 | + $this.removeClass( 'loading' ); |
| 11461 | + }, 1000 ); |
| 11462 | + } else { |
| 11463 | + animate( $(this) ); |
| 11464 | + $(this).addClass( 'current' ); |
11455 | 11465 | } |
11456 | 11466 | } else { |
11457 | 11467 | $sections |
Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js |
— | — | @@ -778,7 +778,8 @@ |
779 | 779 | return html;},buildRow:function(context,row){var html='<tr>';for(cell in row){html+='<td class="cell cell-'+cell+'" valign="top"><span>'+ |
780 | 780 | $.wikiEditor.autoMsg(row[cell],['html','text'])+'</span></td>';} |
781 | 781 | html+='</tr>';return html;},buildCharacter:function(character,actions){if(typeof character=='string'){character={'label':character,'action':{'type':'encapsulate','options':{'pre':character}}};}else if(0 in character&&1 in character){character={'label':character[0],'action':{'type':'encapsulate','options':{'pre':character[1]}}};} |
782 | | -if('action'in character&&'label'in character){actions[character.label]=character.action;return'<span rel="'+character.label+'">'+character.label+'</span>';}},buildTab:function(context,id,section){var selected=$.cookie('wikiEditor-'+context.instance+'-toolbar-section');return $('<span />').attr({'class':'tab tab-'+id,'rel':id}).append($('<a />').addClass(selected==id?'current':null).attr('href','#').text($.wikiEditor.autoMsg(section,'label')).data('context',context).mouseup(function(e){$(this).blur();}).mousedown(function(e){e.preventDefault();return false;}).click(function(e){var $sections=$(this).data('context').$ui.find('.sections');var $section=$(this).data('context').$ui.find('.section-'+$(this).parent().attr('rel'));var show=$section.css('display')=='none';$previousSections=$section.parent().find('.section-visible');$previousSections.css('position','absolute');$previousSections.removeClass('section-visible');$previousSections.fadeOut('fast',function(){$(this).css('position','relative');});$(this).parent().parent().find('a').removeClass('current');$sections.css('overflow','hidden');if(show){$section.addClass('section-visible');$section.fadeIn('fast');$sections.css('display','block').animate({'height':$section.outerHeight()},$section.outerHeight()*2,function(){$(this).css('overflow','visible').css('height','auto');context.fn.trigger('resize');});$(this).addClass('current');if($section.hasClass('loading')){setTimeout(function(){$section.trigger('loadSection');},0);}}else{$sections.css('height',$section.outerHeight()).animate({'height':'hide'},$section.outerHeight()*2,function(){$(this).css({'overflow':'visible','height':0});context.fn.trigger('resize');});} |
| 782 | +if('action'in character&&'label'in character){actions[character.label]=character.action;return'<span rel="'+character.label+'">'+character.label+'</span>';}},buildTab:function(context,id,section){var selected=$.cookie('wikiEditor-'+context.instance+'-toolbar-section');return $('<span />').attr({'class':'tab tab-'+id,'rel':id}).append($('<a />').addClass(selected==id?'current':null).attr('href','#').text($.wikiEditor.autoMsg(section,'label')).data('context',context).mouseup(function(e){$(this).blur();}).mousedown(function(e){e.preventDefault();return false;}).click(function(e){var $sections=$(this).data('context').$ui.find('.sections');var $section=$(this).data('context').$ui.find('.section-'+$(this).parent().attr('rel'));var show=$section.css('display')=='none';$previousSections=$section.parent().find('.section-visible');$previousSections.css('position','absolute');$previousSections.removeClass('section-visible');$previousSections.fadeOut('fast',function(){$(this).css('position','relative');});$(this).parent().parent().find('a').removeClass('current');$sections.css('overflow','hidden');function animate($this){$sections.css('display','block').animate({'height':$section.outerHeight()},$section.outerHeight()*2,function(){$this.css('overflow','visible').css('height','auto');context.fn.trigger('resize');});} |
| 783 | +if(show){$section.addClass('section-visible');$section.fadeIn('fast');if($section.hasClass('loading')){$this=$(this);$this.addClass('current loading');setTimeout(function(){$section.trigger('loadSection');animate($(this));$this.removeClass('loading');},1000);}else{animate($(this));$(this).addClass('current');}}else{$sections.css('height',$section.outerHeight()).animate({'height':'hide'},$section.outerHeight()*2,function(){$(this).css({'overflow':'visible','height':0});context.fn.trigger('resize');});} |
783 | 784 | if($.trackAction!=undefined){$.trackAction($section.attr('rel')+'.'+(show?'show':'hide'));} |
784 | 785 | $.cookie('wikiEditor-'+$(this).data('context').instance+'-toolbar-section',show?$section.attr('rel'):null);e.preventDefault();return false;}));},buildSection:function(context,id,section){var $section=$('<div />').attr({'class':section.type+' section section-'+id,'rel':id});var selected=$.cookie('wikiEditor-'+context.instance+'-toolbar-section');var show=selected==id;if(typeof section.deferLoad!='undefined'&§ion.deferLoad&&id!=='main'&&!show){$section.addClass('loading').append($('<div />').addClass('spinner'));$section.bind('loadSection',function(){$.wikiEditor.modules.toolbar.fn.reallyBuildSection(context,section,$section);$section.removeClass('loading');});}else{$.wikiEditor.modules.toolbar.fn.reallyBuildSection(context,section,$section);} |
785 | 786 | if(id!=='main'){$section.css('display',show?'block':'none');if(show) |