Index: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.css |
— | — | @@ -21,7 +21,12 @@ |
22 | 22 | border-bottom-width: 0; |
23 | 23 | background-color: #F3F3F3; |
24 | 24 | } |
25 | | -div#edittoolbar div.tabs, |
| 25 | +div#edittoolbar ul.tabs { |
| 26 | + list-style: none; |
| 27 | + margin: 0; |
| 28 | + padding: 0; |
| 29 | +} |
| 30 | +div#edittoolbar ul.tabs, |
26 | 31 | div#edittoolbar div.group { |
27 | 32 | float: left; |
28 | 33 | height: 26px; |
— | — | @@ -29,10 +34,7 @@ |
30 | 35 | padding-left: 3px; |
31 | 36 | border-left: solid 1px #DDDDDD; |
32 | 37 | } |
33 | | -div#edittoolbar div.group:first-child { |
34 | | - border-left: none; |
35 | | -} |
36 | | -body.rtl div#edittoolbar div.tabs, |
| 38 | +body.rtl div#edittoolbar ul.tabs, |
37 | 39 | body.rtl div#edittoolbar div.group { |
38 | 40 | float: right; |
39 | 41 | padding-left: 0; |
— | — | @@ -40,9 +42,6 @@ |
41 | 43 | border-left: none; |
42 | 44 | border-right: solid 1px #DDDDDD; |
43 | 45 | } |
44 | | -body.rtl div.group:first-child { |
45 | | - border-right: none; |
46 | | -} |
47 | 46 | div#edittoolbar div.sections { |
48 | 47 | float: left; |
49 | 48 | width: 100%; |
— | — | @@ -51,22 +50,22 @@ |
52 | 51 | body.rtl div#edittoolbar div.sections { |
53 | 52 | float: right; |
54 | 53 | } |
55 | | -div#edittoolbar div.sections > div.section { |
| 54 | +div#edittoolbar div.sections div.section { |
56 | 55 | display: none; |
57 | 56 | float: left; |
58 | 57 | width: 100%; |
59 | 58 | border-top: solid 1px #DDDDDD; |
60 | 59 | } |
61 | | -body.rtl div#edittoolbar div.sections > div.section { |
| 60 | +body.rtl div#edittoolbar div.sections div.section { |
62 | 61 | float: right; |
63 | 62 | } |
64 | | -div#edittoolbar div.sections > div.loading { |
| 63 | +div#edittoolbar div.sections div.loading { |
65 | 64 | padding: 10px; |
66 | 65 | } |
67 | | -div#edittoolbar div.sections > div > div.progress { |
| 66 | +div#edittoolbar div.sections div div.progress { |
68 | 67 | display: none; |
69 | 68 | } |
70 | | -div#edittoolbar div.sections > div.loading > div.progress { |
| 69 | +div#edittoolbar div.sections div.loading div.progress { |
71 | 70 | display: block; |
72 | 71 | background-image: url(images/loading.gif); |
73 | 72 | background-position: left center; |
— | — | @@ -75,13 +74,13 @@ |
76 | 75 | float: left; |
77 | 76 | color: #666666; |
78 | 77 | } |
79 | | -div#edittoolbar div.sections > div.loading > div.progress { |
| 78 | +div#edittoolbar div.sections div.loading div.progress { |
80 | 79 | background-position: right center; |
81 | 80 | padding-left: 0; |
82 | 81 | padding-right: 32px; |
83 | 82 | float: right; |
84 | 83 | } |
85 | | -div#edittoolbar div.group > div.label { |
| 84 | +div#edittoolbar div.group div.label { |
86 | 85 | float: left; |
87 | 86 | border: 0px; |
88 | 87 | height: 22px; |
— | — | @@ -92,12 +91,12 @@ |
93 | 92 | color: #777777; |
94 | 93 | cursor: default; |
95 | 94 | } |
96 | | -body.rtl div#edittoolbar div.group > div.label { |
| 95 | +body.rtl div#edittoolbar div.group div.label { |
97 | 96 | float: right; |
98 | 97 | margin-left: 8px; |
99 | 98 | margin-right: 5px; |
100 | 99 | } |
101 | | -div#edittoolbar div.group > img { |
| 100 | +div#edittoolbar div.group img.tool { |
102 | 101 | float: left; |
103 | 102 | border: 0px; |
104 | 103 | height: 22px; |
— | — | @@ -105,16 +104,16 @@ |
106 | 105 | padding: 2px; |
107 | 106 | cursor: pointer; |
108 | 107 | } |
109 | | -body.rtl div#edittoolbar div.group > img { |
| 108 | +body.rtl div#edittoolbar div.group img { |
110 | 109 | float: right; |
111 | 110 | } |
112 | | -div#edittoolbar div.group > select { |
| 111 | +div#edittoolbar div.group select { |
113 | 112 | float: left; |
114 | 113 | margin: 2px; |
115 | 114 | height: 22px; |
116 | 115 | cursor: pointer; |
117 | 116 | } |
118 | | -body.rtl div#edittoolbar div.group > select { |
| 117 | +body.rtl div#edittoolbar div.group select { |
119 | 118 | float: right; |
120 | 119 | font-size: 0.9em; |
121 | 120 | } |
— | — | @@ -127,22 +126,22 @@ |
128 | 127 | body.rtl div#edittoolbar div.index { |
129 | 128 | float: right; |
130 | 129 | } |
131 | | -div#edittoolbar div.index > div { |
| 130 | +div#edittoolbar div.index div { |
132 | 131 | padding: 4px; |
133 | 132 | padding-left: 6px; |
134 | 133 | cursor: pointer; |
135 | 134 | color: #0645ad; |
136 | 135 | } |
137 | | -body.rtl div#edittoolbar div.index > div { |
| 136 | +body.rtl div#edittoolbar div.index div { |
138 | 137 | padding-left: 4px; |
139 | 138 | padding-right: 6px; |
140 | 139 | } |
141 | | -div#edittoolbar div.index > div.current { |
| 140 | +div#edittoolbar div.index div.current { |
142 | 141 | background-color: #FAFAFA; |
143 | 142 | color: #333333; |
144 | 143 | cursor: default; |
145 | 144 | } |
146 | | -div#edittoolbar div.index > div:first-child { |
| 145 | +div#edittoolbar div.index div:first-child { |
147 | 146 | border-top: none; |
148 | 147 | } |
149 | 148 | div#edittoolbar div.pages { |
— | — | @@ -155,48 +154,48 @@ |
156 | 155 | body.rtl div#edittoolbar div.pages { |
157 | 156 | float: left; |
158 | 157 | } |
159 | | -div#edittoolbar div.pages > div.page { |
| 158 | +div#edittoolbar div.pages div.page { |
160 | 159 | display: none; |
161 | 160 | } |
162 | | -div#edittoolbar div.pages > div.page:first-child { |
| 161 | +div#edittoolbar div.pages div.page:first-child { |
163 | 162 | display: block; |
164 | 163 | } |
165 | | -div#edittoolbar div.pages > div.page > table { |
| 164 | +div#edittoolbar div.pages div.page table { |
166 | 165 | padding-left: 5px; |
167 | 166 | padding-right: 5px; |
168 | 167 | background: none; |
169 | 168 | } |
170 | | -div#edittoolbar div.pages > div.page > table th { |
| 169 | +div#edittoolbar div.pages div.page table th { |
171 | 170 | color: #999999; |
172 | 171 | } |
173 | | -div#edittoolbar div.pages > div.page > table td { |
| 172 | +div#edittoolbar div.pages div.page table td { |
174 | 173 | color: black; |
175 | 174 | border-top: solid 1px #EEEEEE; |
176 | 175 | } |
177 | | -div#edittoolbar div.pages > div.page > table tr:first-child > td { |
| 176 | +div#edittoolbar div.pages div.page table tr:first-child td { |
178 | 177 | border-top: solid 1px #DDDDDD; |
179 | 178 | } |
180 | | -div#edittoolbar div.pages > div.page > table th, |
181 | | -div#edittoolbar div.pages > div.page > table td { |
| 179 | +div#edittoolbar div.pages div.page table th, |
| 180 | +div#edittoolbar div.pages div.page table td { |
182 | 181 | text-align: left; |
183 | 182 | padding: 5px; |
184 | 183 | margin: 0px; |
185 | 184 | } |
186 | | -body.rtl div#edittoolbar div.pages > div.page > table th, |
187 | | -body.rtl div#edittoolbar div.pages > div.page > table td { |
| 185 | +body.rtl div#edittoolbar div.pages div.page table th, |
| 186 | +body.rtl div#edittoolbar div.pages div.page table td { |
188 | 187 | text-align: right; |
189 | 188 | } |
190 | | -div#edittoolbar div.pages > div.page > table td.syntax { |
| 189 | +div#edittoolbar div.pages div.page table td.syntax { |
191 | 190 | font-family: monospace; |
192 | 191 | } |
193 | | -div#edittoolbar-section-help div.page > table td.syntax, |
194 | | -div#edittoolbar-section-help div.page > table td.result { |
| 192 | +div#edittoolbar-section-help div.page table td.syntax, |
| 193 | +div#edittoolbar-section-help div.page table td.result { |
195 | 194 | width: 40%; |
196 | 195 | } |
197 | | -div#edittoolbar-section-help div.page > table td.description { |
| 196 | +div#edittoolbar-section-help div.page table td.description { |
198 | 197 | width: 20%; |
199 | 198 | } |
200 | | -div#edittoolbar-section-characters div.page > div > a { |
| 199 | +div#edittoolbar-section-characters div.page div a { |
201 | 200 | border: solid 1px #DDDDDD; |
202 | 201 | padding: 5px; |
203 | 202 | padding-left: 8px; |
— | — | @@ -209,26 +208,28 @@ |
210 | 209 | color: black; |
211 | 210 | text-decoration: none; |
212 | 211 | } |
213 | | -body.rtl div#edittoolbar-section-characters div.page > div > a { |
| 212 | +body.rtl div#edittoolbar-section-characters div.page div a { |
214 | 213 | direction: rtl; |
215 | 214 | float: right; |
216 | 215 | margin-left: 0; |
217 | 216 | margin-right: 5px; |
218 | 217 | } |
219 | | -div#edittoolbar-section-characters div.page > div > a:hover { |
| 218 | +div#edittoolbar-section-characters div.page div a:hover { |
220 | 219 | background-color: white; |
221 | 220 | text-decoration: none; |
222 | 221 | border-color: #a8d7f9; |
223 | 222 | } |
224 | | -div#edittoolbar div.tabs > div.tab { |
| 223 | +div#edittoolbar ul.tabs li.tab { |
| 224 | + display: inline-block; |
225 | 225 | float: left; |
226 | 226 | line-height: 26px; |
227 | 227 | } |
228 | | -body.rtl div#edittoolbar div.tabs > div.tab { |
| 228 | +body.rtl div#edittoolbar ul.tabs li.tab { |
229 | 229 | float: right; |
230 | 230 | } |
231 | | -div#edittoolbar div.tabs > div.tab > a, |
232 | | -div#edittoolbar div.tabs > div.tab > a:visited { |
| 231 | +div#edittoolbar ul.tabs li.tab a, |
| 232 | +div#edittoolbar ul.tabs li.tab a:visited { |
| 233 | + float: left; |
233 | 234 | padding-left: 18px; |
234 | 235 | padding-right: 12px; |
235 | 236 | display: block; |
— | — | @@ -239,22 +240,23 @@ |
240 | 241 | background-position: left center; |
241 | 242 | background-repeat: no-repeat; |
242 | 243 | } |
243 | | -body.rtl div#edittoolbar div.tabs > div.tab > a, |
244 | | -body.rtl div#edittoolbar div.tabs > div.tab > a:visited { |
| 244 | +body.rtl div#edittoolbar ul.tabs li.tab a, |
| 245 | +body.rtl div#edittoolbar ul.tabs li.tab a:visited { |
| 246 | + float: right; |
245 | 247 | padding-left: 12px; |
246 | 248 | padding-right: 18px; |
247 | 249 | background-image: url(images/arrow-left.png); |
248 | 250 | background-position: right center; |
249 | 251 | } |
250 | | -div#edittoolbar div.tabs > div.tab > a.current, |
251 | | -div#edittoolbar div.tabs > div.tab > a.current:visited { |
| 252 | +div#edittoolbar ul.tabs li.tab a.current, |
| 253 | +div#edittoolbar ul.tabs li.tab a.current:visited { |
252 | 254 | color: #333333; |
253 | 255 | background-image: url(images/arrow-down.png); |
254 | 256 | } |
255 | | -body.rtl div#edittoolbar div.tabs > div.tab > a.current, |
256 | | -body.rtl div#edittoolbar div.tabs > div.tab > a.current:visited { |
| 257 | +body.rtl div#edittoolbar ul.tabs li.tab a.current, |
| 258 | +body.rtl div#edittoolbar ul.tabs li.tab a.current:visited { |
257 | 259 | background-image: url(images/arrow-down.png); |
258 | 260 | } |
259 | | -div#edittoolbar div.tabs > div.tab > a.current:hover { |
| 261 | +div#edittoolbar div.ul li.tab a.current:hover { |
260 | 262 | text-decoration: none; |
261 | 263 | } |
\ No newline at end of file |
Index: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js |
— | — | @@ -21,7 +21,7 @@ |
22 | 22 | $(this).addToolbarSection( tools.main, textbox, 'main' ); |
23 | 23 | } |
24 | 24 | // Appends additional section tabs |
25 | | - var tabDiv = $( '<div />' ) |
| 25 | + var tabUl = $( '<ul />' ) |
26 | 26 | .attr( 'class', 'tabs' ) |
27 | 27 | .appendTo( $(this) ); |
28 | 28 | // Appends additional section |
— | — | @@ -64,8 +64,8 @@ |
65 | 65 | 'textbox': textbox |
66 | 66 | }; |
67 | 67 | // Appends section tab |
68 | | - tabDiv.append( |
69 | | - $( '<div />' ) |
| 68 | + tabUl.append( |
| 69 | + $( '<li />' ) |
70 | 70 | .attr( 'class', 'tab' ) |
71 | 71 | .append( |
72 | 72 | $( '<a />' ) |
— | — | @@ -77,10 +77,10 @@ |
78 | 78 | .click( function() { |
79 | 79 | $(this).blur(); |
80 | 80 | var show = ( $(this).data( 'sectionDiv' ).css( 'display' ) == 'none' ); |
81 | | - $(this).data( 'sectionDiv' ).parent().children().hide('fast'); |
| 81 | + $(this).data( 'sectionDiv' ).parent().children().hide(); |
82 | 82 | $(this).parent().parent().find( 'a' ).removeClass( 'current' ); |
83 | 83 | if ( show ) { |
84 | | - $(this).data( 'sectionDiv' ).show('fast'); |
| 84 | + $(this).data( 'sectionDiv' ).show(); |
85 | 85 | $(this).addClass( 'current' ); |
86 | 86 | } |
87 | 87 | // Sets or deletes cookie when sections are shown or hidden |
— | — | @@ -88,7 +88,7 @@ |
89 | 89 | $(this).data( 'sectionCookie' ), |
90 | 90 | show ? $(this).data( 'sectionDiv' ).attr( 'id' ) : null |
91 | 91 | ); |
92 | | - $(this).data( 'textbox' ).focus(); |
| 92 | + /*$(this).data( 'textbox' ).focus();*/ |
93 | 93 | return false; |
94 | 94 | }) |
95 | 95 | ) |
— | — | @@ -175,7 +175,8 @@ |
176 | 176 | .attr( { |
177 | 177 | src: imagePath + section.groups[group].tools[tool].icon, |
178 | 178 | alt: label, |
179 | | - title: label |
| 179 | + title: label, |
| 180 | + 'class': 'tool' |
180 | 181 | } ) |
181 | 182 | .data( 'context', context ) |
182 | 183 | .click( action ) |
Index: trunk/extensions/UsabilityInitiative/EditToolbar/images/arrow-down.png |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Index: trunk/extensions/UsabilityInitiative/EditToolbar/images/arrow-right.png |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Index: trunk/extensions/UsabilityInitiative/EditToolbar/images/arrow-left.png |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |