修訂 | 29 (tree) |
---|---|
時間 | 2007-11-29 23:45:20 |
作者 | junkikuchi |
updated widgets.
@@ -372,7 +372,7 @@ | ||
372 | 372 | :relations => {'view' => 'views:admin_root.admin'}, |
373 | 373 | :preference => { |
374 | 374 | 'box.background.background_color' => '#ffffff', |
375 | - 'box.border.border_bottom' => 'solid 1px #c3d9ff', | |
375 | + 'box.border.border_bottom' => 'solid 5px #c3d9ff', | |
376 | 376 | 'box.padding.padding_top' => '5px', |
377 | 377 | 'box.padding.padding_bottom' => '5px', |
378 | 378 | 'tab.border.border_top' => 'solid 1px #c3d9ff', |
@@ -381,9 +381,9 @@ | ||
381 | 381 | 'tab.background.background_color' => '#e8eef7', |
382 | 382 | 'tab.margin.margin_left' => '5px', |
383 | 383 | 'tab.padding.padding_top' => '5px', |
384 | - 'tab.padding.padding_right' => '5px', | |
384 | + 'tab.padding.padding_right' => '10px', | |
385 | 385 | 'tab.padding.padding_bottom' => '5px', |
386 | - 'tab.padding.padding_left' => '5px', | |
386 | + 'tab.padding.padding_left' => '10px', | |
387 | 387 | 'tab_selected.background.background_color' => '#c3d9ff', |
388 | 388 | 'tab_hover.background.background_color' => '#c3d9ff', |
389 | 389 | } |
@@ -408,9 +408,11 @@ | ||
408 | 408 | #'box.border.border_bottom' => 'solid 5px #c3d9ff', |
409 | 409 | 'box.border.border_left' => 'solid 5px #c3d9ff', |
410 | 410 | 'menu.padding.padding_top' => '5px', |
411 | - 'menu.padding.padding_right' => '5px', | |
411 | + 'menu.padding.padding_right' => '10px', | |
412 | 412 | 'menu.padding.padding_bottom' => '5px', |
413 | - 'menu.padding.padding_left' => '5px', | |
413 | + 'menu.padding.padding_left' => '10px', | |
414 | + 'menu_selected.background.background_color' => '#e8eef7', | |
415 | + 'menu_hover.background.background_color' => '#e8eef7', | |
414 | 416 | 'list' => :'views:admin_root.admin.content.list', |
415 | 417 | 'new' => :'views:admin_root.admin.content.new', |
416 | 418 | } |
@@ -10,25 +10,39 @@ | ||
10 | 10 | extend Tenarai::ClassLoader |
11 | 11 | |
12 | 12 | preference_css 'box' |
13 | - preference_css 'menu', 'span' | |
13 | + preference_css 'menu', 'a' | |
14 | + preference_css 'menu_selected', 'a.selected' | |
15 | + preference_css 'menu_hover', 'a:hover' | |
14 | 16 | |
15 | 17 | preference 'list' |
16 | 18 | preference 'new' |
17 | 19 | |
20 | + def render_css(css) | |
21 | + super | |
22 | + css.style(css_id + ' li') do |s| | |
23 | + s['list-style'] = 'none' | |
24 | + s['display'] = 'inline' | |
25 | + s['margin'] = '0' | |
26 | + end | |
27 | + end | |
28 | + | |
18 | 29 | def render_body(xml) |
19 | - xml.tag('div', 'id' => html_id) do |div| | |
20 | - div.tag('span').tag( | |
21 | - 'a', | |
22 | - 'href' => url( | |
23 | - :view => service.models['views'].fetch(preference.list.value) | |
24 | - ) | |
25 | - ).text('List') | |
26 | - div.tag('span').tag( | |
27 | - 'a', | |
28 | - 'href' => url( | |
29 | - :view => service.models['views'].fetch(preference.new.value) | |
30 | - ) | |
31 | - ).text('New') | |
30 | + xml.tag('ul', 'id' => html_id) do |ul| | |
31 | + list = service.models['views'].fetch(preference.list.value) | |
32 | + ul.tag('li') do |li| | |
33 | + li.tag('a') do |a| | |
34 | + a['href'] = url(:view => list) | |
35 | + a['class'] = 'selected' if service.view.equal?(list) | |
36 | + end.text('List') | |
37 | + end | |
38 | + | |
39 | + new = service.models['views'].fetch(preference.new.value) | |
40 | + ul.tag('li') do |li| | |
41 | + li.tag('a') do |a| | |
42 | + a['href'] = url(:view => new) | |
43 | + a['class'] = 'selected' if service.view.equal?(new) | |
44 | + end.text('New') | |
45 | + end | |
32 | 46 | end |
33 | 47 | end |
34 | 48 | end |
@@ -28,13 +28,15 @@ | ||
28 | 28 | c = service._content |
29 | 29 | xml.tag('ul', 'id' => html_id) do |ul| |
30 | 30 | ul.tag('li') do |li| |
31 | - li.tag('a', 'href' => url(:content => c)) do |a| | |
31 | + li.tag('a') do |a| | |
32 | + a['href'] = url(:content => c) | |
32 | 33 | a['class'] = 'selected' if model.content == c |
33 | 34 | end.text(c.title) |
34 | 35 | end |
35 | 36 | c.nodes.each do |val| |
36 | 37 | ul.tag('li') do |li| |
37 | - li.tag('a', 'href' => url(:content => val)) do |a| | |
38 | + li.tag('a') do |a| | |
39 | + a['href'] = url(:content => val) | |
38 | 40 | a['class'] = 'selected' if model.content == val |
39 | 41 | end.text(val.title) |
40 | 42 | end |