Merge lp:~quam-plures-core/quam-plures/admin_look_and_feel into lp:quam-plures
- admin_look_and_feel
- Merge into trunk
Status: | Merged |
---|---|
Merged at revision: | 7570 |
Proposed branch: | lp:~quam-plures-core/quam-plures/admin_look_and_feel |
Merge into: | lp:quam-plures |
Diff against target: |
313 lines (+68/-48) 2 files modified
qp_rsc/css/blog_widgets.css (+7/-7) qp_view_admin/chicago/chicago.css (+61/-41) |
To merge this branch: | bzr merge lp:~quam-plures-core/quam-plures/admin_look_and_feel |
Related bugs: | |
Related blueprints: |
Toning down the admin console
(Undefined)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
EdB | Approve | ||
Quam Plures Core Team | Pending | ||
Review via email: mp+40184@code.launchpad.net |
Commit message
Description of the change
http://
Main chicago admin template updated to make all the dark grey easier on the eye (well, my eyes anyway). I have also removed what I think is the last remaining blue from the admin. This required changes to a css file that wasn't in the chicago directory.
- 7570. By Lee Turner <email address hidden>
-
Toned down the menus and imporved contrast of section headers
Yabs (yabs) wrote : | # |
Lee Turner (leeturner) wrote : | # |
See here to vote: http://
Approved. Lets wrap this up eh?
Note for the future: we really should make an easy back-door method for any installation owner to dial in their own look. Not a template selector for admin, just a way to over-ride the 'official' look. Anyway that's not for now. For now let's get 'er done.
Kimberly (kimberly-netweb360) wrote : | # |
> Approved. Lets wrap this up eh?
>
> Note for the future: we really should make an easy back-door method for any
> installation owner to dial in their own look. Not a template selector for
> admin, just a way to over-ride the 'official' look. Anyway that's not for
> now. For now let's get 'er done.
I noticed in the backend under users, then the particular user profile, then to that user preferences there is a section to select the Admin template: for the user. Defaults to chicago since that is the only one available.
Ah okay. Sorta forgot about that place. We should rip it out if we're not going to have multiple templates for admin.
Technically speaking BTW the selector on the gray navbar is still there. But with only one option it doesn't bother to show up. I think. I seem to recall it still being there. Could be wrong. Anyway bottom line is we ditch the selector if we won't do multiple admin templates (and still offer a way for the IO to tweak it without screwing upgrading), or we keep it and encourage style sheets as alternative admin templates (which sort of covers customizing per installation).
Kimberly (kimberly-netweb360) wrote : | # |
Actually, the selector does not really serve much of a purpose. I don't really see the need for different admin template for each user unless the template is used in some way to limited access to certain sections of the admin and that would be better served by permission levels. Therefore, I agree that we can just remove that selector and tidy up the back end.
Most of the backend layout can easily be changed by just dropping in a different style sheet. We could include a style sheet editor so it would be easier to make changes in the style sheet without having to do a back and forth ftp to the site; however, I would leave that for a future release.
I don't see a need to ship different admin themes with the first release. Admin themes can be an add-on thing later on.
Lee Turner (leeturner) wrote : | # |
Maybe I am in a minority but I don't see why we should remove the selector. Just because we don't plan to do multiple admin templates it doesn't mean others won't. Why restrict it? The feature is already there and it works. Why create work for ourselves to ultimately take something out that is working.
I think as a the core developers we should only deliver one admin template that we guarantee to work with every new feature and every new update but I don't think we should restrict others from making their own.
I might like to release the red one that I did and getting rid of the selector makes this a whole lot harder.
Yabs (yabs) wrote : | # |
Dunno if I'm in the minority or the majority but :
a) is this approved or not, I'm easily confused
b) if it's still being debated : can we at least support 2 * looks, one the pastel thing we have now and the other a dark version like the good old crt days? ... just askin' O:-)
Knew I should have just merged it when I first approved it :-S
¥
Lee Turner (leeturner) wrote : | # |
As far as I know I think the admin look and feel is approved so it can be merged. The debate here (which we should probably take onto the forum) is whether to get rid of the admin template selector in the user profile.
As you are asking for two admin templates to be supported I guess you would be saying that we should keep the admin template selector?
I think the one we have now and a darker version would be a good base to work from.
L
Preview Diff
1 | === modified file 'qp_rsc/css/blog_widgets.css' | |||
2 | --- qp_rsc/css/blog_widgets.css 2010-05-24 01:31:31 +0000 | |||
3 | +++ qp_rsc/css/blog_widgets.css 2010-11-05 18:59:44 +0000 | |||
4 | @@ -44,22 +44,22 @@ | |||
5 | 44 | } | 44 | } |
6 | 45 | 45 | ||
7 | 46 | .odd{ | 46 | .odd{ |
9 | 47 | background-color:#F1F6F8; | 47 | background-color:#F0F0F0; |
10 | 48 | color:#444; | 48 | color:#444; |
11 | 49 | } | 49 | } |
12 | 50 | 50 | ||
13 | 51 | .even{ | 51 | .even{ |
15 | 52 | background-color:#fff; | 52 | background-color:#FCFCFC; |
16 | 53 | color:#444; | 53 | color:#444; |
17 | 54 | } | 54 | } |
18 | 55 | 55 | ||
19 | 56 | .odd:hover{ | 56 | .odd:hover{ |
21 | 57 | background-color:#eef; | 57 | background-color:#DBDBDB; |
22 | 58 | color:#444; | 58 | color:#444; |
23 | 59 | } | 59 | } |
24 | 60 | 60 | ||
25 | 61 | .even:hover{ | 61 | .even:hover{ |
27 | 62 | background-color:#dde; | 62 | background-color:#DBDBDB; |
28 | 63 | color:#444; | 63 | color:#444; |
29 | 64 | } | 64 | } |
30 | 65 | 65 | ||
31 | @@ -97,7 +97,7 @@ | |||
32 | 97 | .available_widgets{ | 97 | .available_widgets{ |
33 | 98 | width:44em; | 98 | width:44em; |
34 | 99 | position:absolute; | 99 | position:absolute; |
36 | 100 | background:#f1f6ff; | 100 | background:#fff; |
37 | 101 | display:none; | 101 | display:none; |
38 | 102 | border: 1px solid #9DB0BC; | 102 | border: 1px solid #9DB0BC; |
39 | 103 | margin:0; | 103 | margin:0; |
40 | @@ -109,7 +109,7 @@ | |||
41 | 109 | } | 109 | } |
42 | 110 | 110 | ||
43 | 111 | .available_widgets_toolbar{ | 111 | .available_widgets_toolbar{ |
45 | 112 | background:#B7CBDA; | 112 | background:#e6e6e0; |
46 | 113 | font-weight: bold; | 113 | font-weight: bold; |
47 | 114 | padding: 2px 1ex; | 114 | padding: 2px 1ex; |
48 | 115 | border-bottom: 1px solid #9DB0BC; | 115 | border-bottom: 1px solid #9DB0BC; |
49 | @@ -159,7 +159,7 @@ | |||
50 | 159 | width:90%; | 159 | width:90%; |
51 | 160 | overflow:auto; | 160 | overflow:auto; |
52 | 161 | z-index:999; | 161 | z-index:999; |
54 | 162 | background:#f1f6f8; | 162 | background:#f9f9f9; |
55 | 163 | border:1px solid #ccc; | 163 | border:1px solid #ccc; |
56 | 164 | display:block; | 164 | display:block; |
57 | 165 | } | 165 | } |
58 | 166 | 166 | ||
59 | === modified file 'qp_view_admin/chicago/chicago.css' | |||
60 | --- qp_view_admin/chicago/chicago.css 2010-08-13 16:13:00 +0000 | |||
61 | +++ qp_view_admin/chicago/chicago.css 2010-11-05 18:59:44 +0000 | |||
62 | @@ -43,20 +43,20 @@ | |||
63 | 43 | /* Main & bloglist & options menus */ | 43 | /* Main & bloglist & options menus */ |
64 | 44 | #mainmenu, #coll_list, #options { | 44 | #mainmenu, #coll_list, #options { |
65 | 45 | clear: both; | 45 | clear: both; |
67 | 46 | background-color: #EEEEEE; | 46 | background-color: #d3d3d3; |
68 | 47 | margin: 0 0 4px 0; | 47 | margin: 0 0 4px 0; |
71 | 48 | border-top: 1px solid red; | 48 | border-top: 1px solid #C6C6C6; |
72 | 49 | border-bottom: 1px solid red; | 49 | border-bottom: 1px solid #C6C6C6; |
73 | 50 | padding: 0; | 50 | padding: 0; |
74 | 51 | font-size: 84%; | 51 | font-size: 84%; |
75 | 52 | } | 52 | } |
76 | 53 | #coll_list { | 53 | #coll_list { |
79 | 54 | border-top: 1px solid green; | 54 | border-top: 1px solid #C6C6C6; |
80 | 55 | border-bottom: 1px solid green; | 55 | border-bottom: 1px solid #C6C6C6; |
81 | 56 | } | 56 | } |
82 | 57 | #options { | 57 | #options { |
85 | 58 | border-top: 1px solid blue; | 58 | border-top: 1px solid #C6C6C6; |
86 | 59 | border-bottom: 1px solid blue; | 59 | border-bottom: 1px solid #C6C6C6; |
87 | 60 | } | 60 | } |
88 | 61 | 61 | ||
89 | 62 | #mainmenu ul, #coll_list ul, #options ul { | 62 | #mainmenu ul, #coll_list ul, #options ul { |
90 | @@ -76,7 +76,7 @@ | |||
91 | 76 | display: block; | 76 | display: block; |
92 | 77 | height: 15px; | 77 | height: 15px; |
93 | 78 | padding: 3px 9px; | 78 | padding: 3px 9px; |
95 | 79 | color: black; | 79 | color: #534646; |
96 | 80 | font-weight: bold; | 80 | font-weight: bold; |
97 | 81 | } | 81 | } |
98 | 82 | #options li a { | 82 | #options li a { |
99 | @@ -86,15 +86,15 @@ | |||
100 | 86 | #mainmenu li a:active, #coll_list li a:active, #options li a:active, | 86 | #mainmenu li a:active, #coll_list li a:active, #options li a:active, |
101 | 87 | #mainmenu li.current a, #coll_list li.current a, #options li.current a { | 87 | #mainmenu li.current a, #coll_list li.current a, #options li.current a { |
102 | 88 | padding: 2px 8px; | 88 | padding: 2px 8px; |
106 | 89 | background-color: #777777; | 89 | background-color: #C6C6C6; |
107 | 90 | border: 1px solid red; | 90 | border: 1px solid #AAAAAA; |
108 | 91 | color: white; | 91 | color: #000; |
109 | 92 | } | 92 | } |
110 | 93 | #coll_list li a:hover, #coll_list li a:active, #coll_list li.current a { | 93 | #coll_list li a:hover, #coll_list li a:active, #coll_list li.current a { |
112 | 94 | border: 1px solid green; | 94 | border: 1px solid #AAAAAA; |
113 | 95 | } | 95 | } |
114 | 96 | #options li a:hover, #options li a:active, #options li.current a { | 96 | #options li a:hover, #options li a:active, #options li.current a { |
116 | 97 | border: 1px solid blue; | 97 | border: 1px solid #AAAAAA; |
117 | 98 | } | 98 | } |
118 | 99 | 99 | ||
119 | 100 | 100 | ||
120 | @@ -166,8 +166,7 @@ | |||
121 | 166 | } | 166 | } |
122 | 167 | 167 | ||
123 | 168 | div.panelblock, div.tabbedpanelblock { | 168 | div.panelblock, div.tabbedpanelblock { |
126 | 169 | border: 1px solid #9DB0BC; | 169 | background: #f9f9f9; |
125 | 170 | background: #f1f6f8; | ||
127 | 171 | padding: 4px; | 170 | padding: 4px; |
128 | 172 | } | 171 | } |
129 | 173 | 172 | ||
130 | @@ -183,22 +182,35 @@ | |||
131 | 183 | border: 1px solid #d99; | 182 | border: 1px solid #d99; |
132 | 184 | } | 183 | } |
133 | 185 | .fieldset_title { | 184 | .fieldset_title { |
140 | 186 | background-color: gray; | 185 | background-color: #d3d3d3; |
141 | 187 | color: white; | 186 | color: black; |
142 | 188 | margin: 1ex 0 0 0; | 187 | padding: 4px 6px 4px 6px; |
143 | 189 | border: 1px solid gray; | 188 | font-weight: normal; |
144 | 190 | padding: 4px 6px 0 6px; | 189 | border-top-left-radius: 5px; |
145 | 191 | font-weight: bold; | 190 | border-top-right-radius: 5px; |
146 | 191 | -moz-border-radius-topleft: 5px; | ||
147 | 192 | -moz-border-radius-topright: 5px; | ||
148 | 192 | } | 193 | } |
149 | 193 | .fieldset_title .action_icon { | 194 | .fieldset_title .action_icon { |
151 | 194 | font-size: 84%; | 195 | font-size: 80%; |
152 | 195 | } | 196 | } |
153 | 196 | 197 | ||
154 | 197 | .fform fieldset, .left_col fieldset, .right_col fieldset { | 198 | .fform fieldset, .left_col fieldset, .right_col fieldset { |
156 | 198 | border: 1px solid gray; | 199 | border: none; |
157 | 199 | margin: 0 0 10px 0; | 200 | margin: 0 0 10px 0; |
158 | 200 | } | 201 | } |
159 | 201 | 202 | ||
160 | 203 | .fieldset_wrapper { | ||
161 | 204 | background-color: white; | ||
162 | 205 | margin: 1ex 0 0 0; | ||
163 | 206 | border: 1px solid #d3d3d3; | ||
164 | 207 | -moz-border-radius: 5px; | ||
165 | 208 | border-radius: 5px; | ||
166 | 209 | } | ||
167 | 210 | |||
168 | 211 | .label { | ||
169 | 212 | color: #464646; | ||
170 | 213 | } | ||
171 | 202 | 214 | ||
172 | 203 | /* Result tables: */ | 215 | /* Result tables: */ |
173 | 204 | ul.grouped { | 216 | ul.grouped { |
174 | @@ -233,12 +245,12 @@ | |||
175 | 233 | border-color: #9F9F9F; | 245 | border-color: #9F9F9F; |
176 | 234 | } | 246 | } |
177 | 235 | table.grouped th, table.filelist th { | 247 | table.grouped th, table.filelist th { |
180 | 236 | background-color: #777777; | 248 | background-color: #D3D3D3; |
181 | 237 | color: white; | 249 | color: #333333; |
182 | 238 | border-color: #9F9F9F; | 250 | border-color: #9F9F9F; |
183 | 239 | } | 251 | } |
184 | 240 | table.grouped th a, table.filelist th a { | 252 | table.grouped th a, table.filelist th a { |
186 | 241 | color: white; | 253 | color: #333333; |
187 | 242 | } | 254 | } |
188 | 243 | table.grouped tr.clickable_headers th, table.filelist th { | 255 | table.grouped tr.clickable_headers th, table.filelist th { |
189 | 244 | padding: 0; | 256 | padding: 0; |
190 | @@ -255,9 +267,9 @@ | |||
191 | 255 | } | 267 | } |
192 | 256 | table.grouped th a.basic_current, | 268 | table.grouped th a.basic_current, |
193 | 257 | table.filelist th a.basic_current { | 269 | table.filelist th a.basic_current { |
195 | 258 | background-color: #A9A9A9; | 270 | background-color: #D3D3D3; |
196 | 271 | color: #333333; | ||
197 | 259 | padding: 2px 8px; | 272 | padding: 2px 8px; |
198 | 260 | color: #0000AA; | ||
199 | 261 | } | 273 | } |
200 | 262 | 274 | ||
201 | 263 | ul.grouped li.even, table.grouped tr.even, table.filelist tr.even { | 275 | ul.grouped li.even, table.grouped tr.even, table.filelist tr.even { |
202 | @@ -279,7 +291,7 @@ | |||
203 | 279 | } | 291 | } |
204 | 280 | table.grouped tr.group td { | 292 | table.grouped tr.group td { |
205 | 281 | border-color: gray; | 293 | border-color: gray; |
207 | 282 | background-color: #A9A9A9; /* darkgray */ | 294 | background-color: #D3D3D3; |
208 | 283 | } | 295 | } |
209 | 284 | table.grouped tr.total td { | 296 | table.grouped tr.total td { |
210 | 285 | border-top: 1px solid gray; | 297 | border-top: 1px solid gray; |
211 | @@ -356,7 +368,6 @@ | |||
212 | 356 | color: #c00; | 368 | color: #c00; |
213 | 357 | } | 369 | } |
214 | 358 | 370 | ||
215 | 359 | |||
216 | 360 | /* browse Screen: */ | 371 | /* browse Screen: */ |
217 | 361 | td.browse_left_col { | 372 | td.browse_left_col { |
218 | 362 | } | 373 | } |
219 | @@ -365,19 +376,25 @@ | |||
220 | 365 | } | 376 | } |
221 | 366 | .block_item_wrap { | 377 | .block_item_wrap { |
222 | 367 | margin: 0 0 1em 0; | 378 | margin: 0 0 1em 0; |
223 | 379 | -moz-border-radius: 5px; | ||
224 | 380 | border-radius: 5px; | ||
225 | 368 | } | 381 | } |
226 | 369 | .browse_side_item_wrap { | 382 | .browse_side_item_wrap { |
227 | 370 | margin: 0 0 1em 1em; | 383 | margin: 0 0 1em 1em; |
228 | 371 | } | 384 | } |
229 | 372 | .block_item, | 385 | .block_item, |
230 | 373 | .browse_side_item { | 386 | .browse_side_item { |
232 | 374 | border: 1px solid #9DB0BC; | 387 | border: 1px solid #e6e6e6; |
233 | 375 | background-color: #fff; | 388 | background-color: #fff; |
234 | 376 | padding: 1ex; | 389 | padding: 1ex; |
235 | 390 | border-bottom-left-radius: 5px; | ||
236 | 391 | border-bottom-right-radius: 5px; | ||
237 | 392 | -moz-border-radius-bottomleft: 5px; | ||
238 | 393 | -moz-border-radius-bottomright: 5px; | ||
239 | 377 | } | 394 | } |
240 | 378 | 395 | ||
241 | 379 | div.full_nav { | 396 | div.full_nav { |
243 | 380 | background-color: #F1F6F8; | 397 | background-color: #e6e6e6; |
244 | 381 | border: 1px solid #becdd6; | 398 | border: 1px solid #becdd6; |
245 | 382 | padding: 1ex; | 399 | padding: 1ex; |
246 | 383 | margin: 0 0 1ex 0; | 400 | margin: 0 0 1ex 0; |
247 | @@ -388,9 +405,6 @@ | |||
248 | 388 | div.PostActionsArea, | 405 | div.PostActionsArea, |
249 | 389 | div.CommentActionsArea { | 406 | div.CommentActionsArea { |
250 | 390 | clear: both; | 407 | clear: both; |
251 | 391 | background-color: #F1F6F8; | ||
252 | 392 | border-top: 1px solid #becdd6; | ||
253 | 393 | border-bottom: 1px solid #becdd6; | ||
254 | 394 | padding: 1ex; | 408 | padding: 1ex; |
255 | 395 | margin: 0; | 409 | margin: 0; |
256 | 396 | } | 410 | } |
257 | @@ -582,7 +596,7 @@ | |||
258 | 582 | border-color: #9DB0BC; | 596 | border-color: #9DB0BC; |
259 | 583 | } | 597 | } |
260 | 584 | table.catselect th { | 598 | table.catselect th { |
262 | 585 | background-color: #A9A9A9; /* darkgray */ | 599 | background-color: #D3D3D3; |
263 | 586 | border-color: #9DB0BC; | 600 | border-color: #9DB0BC; |
264 | 587 | } | 601 | } |
265 | 588 | table.catselect tr.group td { /* UNKNOWN PURPOSE - NEEDS FIXIN! */ | 602 | table.catselect tr.group td { /* UNKNOWN PURPOSE - NEEDS FIXIN! */ |
266 | @@ -602,6 +616,10 @@ | |||
267 | 602 | border-color: #9DB0BC; | 616 | border-color: #9DB0BC; |
268 | 603 | } | 617 | } |
269 | 604 | 618 | ||
270 | 619 | .catselect table thead tr th { | ||
271 | 620 | background-color: red; | ||
272 | 621 | } | ||
273 | 622 | |||
274 | 605 | .extracatnote { | 623 | .extracatnote { |
275 | 606 | font-size: 84%; | 624 | font-size: 84%; |
276 | 607 | margin: 1ex; | 625 | margin: 1ex; |
277 | @@ -642,8 +660,7 @@ | |||
278 | 642 | } | 660 | } |
279 | 643 | 661 | ||
280 | 644 | div.edit_actions { | 662 | div.edit_actions { |
283 | 645 | background-color: #f1f6f8; | 663 | background-color: white; |
282 | 646 | border: 1px solid #becdd6; | ||
284 | 647 | padding: 2px; | 664 | padding: 2px; |
285 | 648 | margin: 1ex auto; | 665 | margin: 1ex auto; |
286 | 649 | width: 98%; | 666 | width: 98%; |
287 | @@ -655,8 +672,7 @@ | |||
288 | 655 | } | 672 | } |
289 | 656 | 673 | ||
290 | 657 | 674 | ||
293 | 658 | /* File manager: | 675 | /* File manager */ |
292 | 659 | */ | ||
294 | 660 | #fm_dirtree { /* this is the left side of the upload page, which is kinda obvious by name... */ | 676 | #fm_dirtree { /* this is the left side of the upload page, which is kinda obvious by name... */ |
295 | 661 | border-color: #9DB0BC; | 677 | border-color: #9DB0BC; |
296 | 662 | background-color: white; /* BORING but that's life */ | 678 | background-color: white; /* BORING but that's life */ |
297 | @@ -687,7 +703,7 @@ | |||
298 | 687 | color: #777; | 703 | color: #777; |
299 | 688 | } | 704 | } |
300 | 689 | 705 | ||
302 | 690 | /* Permissions: */ | 706 | /* Permissions */ |
303 | 691 | span.checkall, | 707 | span.checkall, |
304 | 692 | th.checkright { | 708 | th.checkright { |
305 | 693 | font-size: 84%; | 709 | font-size: 84%; |
306 | @@ -718,3 +734,7 @@ | |||
307 | 718 | padding: 16px 0 0 28px; | 734 | padding: 16px 0 0 28px; |
308 | 719 | font-size: 74%; | 735 | font-size: 74%; |
309 | 720 | } | 736 | } |
310 | 737 | |||
311 | 738 | ul.widget_container { | ||
312 | 739 | margin-bottom: 1ex; | ||
313 | 740 | } |
Have we actually come to a decision about changing the admin yet? Was sure there was meant to be a poll somewhere.
¥