| 修訂 | 62 (tree) |
|---|---|
| 時間 | 2008-03-27 20:47:13 |
| 作者 | junkikuchi |
updated.
trunk/test/test_css.rb (diff) trunk/Rakefile (diff) trunk/lib/tenarai/css.rb (diff) trunk/webapp/Widget.rb (diff) trunk/webapp/Resource.rb (diff)| @@ -8,13 +8,13 @@ | ||
| 8 | 8 | class CSSTest < Test::Unit::TestCase |
| 9 | 9 | def setup |
| 10 | 10 | @css = Tenarai::CSS.new |
| 11 | - @css.style('#id10', 'margin' => '5px') do |s| | |
| 11 | + @css.selector('#id10', 'margin' => '5px') do |s| | |
| 12 | 12 | s['padding'] = '10px' |
| 13 | 13 | end |
| 14 | - @css.style('#id5') do |s| | |
| 14 | + @css.selector('#id5') do |s| | |
| 15 | 15 | s['padding'] = '20px' |
| 16 | 16 | end |
| 17 | - @css.style('#id10') do |s| | |
| 17 | + @css.selector('#id10') do |s| | |
| 18 | 18 | s['padding'] = '6px' |
| 19 | 19 | end |
| 20 | 20 | end |
| @@ -84,7 +84,7 @@ | ||
| 84 | 84 | :relation => {'view' => 'view:resource.admin.user.new'}, |
| 85 | 85 | }, |
| 86 | 86 | { |
| 87 | - :name => 'admin.list', | |
| 87 | + :name => 'admin.user_list', | |
| 88 | 88 | :class => 'Content', |
| 89 | 89 | :row => { |
| 90 | 90 | 'title' => 'user list', |
| @@ -93,13 +93,13 @@ | ||
| 93 | 93 | :relation => {'view' => 'view:resource.admin.user.list'}, |
| 94 | 94 | }, |
| 95 | 95 | { |
| 96 | - :name => 'admin.list.user', | |
| 96 | + :name => 'admin.user_list.user_home', | |
| 97 | 97 | :class => 'Content', |
| 98 | 98 | :row => { |
| 99 | 99 | 'title' => 'user detail', |
| 100 | 100 | 'body' => '', |
| 101 | 101 | }, |
| 102 | - :relation => {'view' => 'view:resource.admin.user.detail'}, | |
| 102 | + :relation => {'view' => 'view:resource.admin.user.home'}, | |
| 103 | 103 | }, |
| 104 | 104 | |
| 105 | 105 | { |
| @@ -148,7 +148,7 @@ | ||
| 148 | 148 | :row => {'name' => 'user'}, |
| 149 | 149 | }, |
| 150 | 150 | { |
| 151 | - :name => 'resource.admin.user.detail', | |
| 151 | + :name => 'resource.admin.user.home', | |
| 152 | 152 | :class => 'View', |
| 153 | 153 | :row => {'name' => 'user'}, |
| 154 | 154 | }, |
| @@ -375,10 +375,10 @@ | ||
| 375 | 375 | } |
| 376 | 376 | }, |
| 377 | 377 | { |
| 378 | - :name => 'session.user.content.view.html.admin.bd.user.detail', | |
| 378 | + :name => 'session.user.content.view.html.admin.bd.user.home', | |
| 379 | 379 | :class => 'Widget::UserAdmin::Form', |
| 380 | 380 | :row => {}, |
| 381 | - :relation => {'view' => 'view:resource.admin.user.detail'}, | |
| 381 | + :relation => {'view' => 'view:resource.admin.user.home'}, | |
| 382 | 382 | :preference => { |
| 383 | 383 | 'box.size.width' => '900px', |
| 384 | 384 | 'preference.form.type' => 'edit', |
| @@ -6,7 +6,7 @@ | ||
| 6 | 6 | |
| 7 | 7 | module Tenarai |
| 8 | 8 | class CSS < Container |
| 9 | - class Selecter < Hash | |
| 9 | + class Selector < Hash | |
| 10 | 10 | attr_reader :name |
| 11 | 11 | |
| 12 | 12 | def initialize(name) |
| @@ -32,14 +32,14 @@ | ||
| 32 | 32 | block.call(self) if block_given? |
| 33 | 33 | end |
| 34 | 34 | |
| 35 | - def style(selecter, style={}, &block) | |
| 36 | - obj = if key?(selecter) | |
| 37 | - fetch(selecter) | |
| 35 | + def selector(name, property={}, &block) | |
| 36 | + obj = if key?(name) | |
| 37 | + fetch(name) | |
| 38 | 38 | else |
| 39 | - self << Selecter.new(selecter) | |
| 39 | + self << Selector.new(name) | |
| 40 | 40 | end |
| 41 | 41 | |
| 42 | - style.each do |key, val| | |
| 42 | + property.each do |key, val| | |
| 43 | 43 | obj[key] = val |
| 44 | 44 | end |
| 45 | 45 |
| @@ -120,9 +120,9 @@ | ||
| 120 | 120 | end |
| 121 | 121 | end |
| 122 | 122 | |
| 123 | - def preference_css(name, *selecter) | |
| 124 | - selecter << '' if selecter.empty? | |
| 125 | - meta[:preference_css] << {:name => name, :selecter => selecter} | |
| 123 | + def preference_css(name, *selector) | |
| 124 | + selector << '' if selector.empty? | |
| 125 | + meta[:preference_css] << {:name => name, :selector => selector} | |
| 126 | 126 | |
| 127 | 127 | preference name do |css| |
| 128 | 128 | PREF_CSS.each do |key, val| |
| @@ -178,8 +178,8 @@ | ||
| 178 | 178 | self.class.meta[:preference_css].each do |prefcss| |
| 179 | 179 | preference[prefcss[:name]].each do |val| |
| 180 | 180 | val.each do |v| |
| 181 | - prefcss[:selecter].each do |selecter| | |
| 182 | - css.style(css_id + ' ' + selecter) do |style| | |
| 181 | + prefcss[:selector].each do |selector| | |
| 182 | + css.selector(css_id + ' ' + selector) do |style| | |
| 183 | 183 | style[v.name.gsub('_', '-')] = v.value unless v.value.to_s.empty? |
| 184 | 184 | end |
| 185 | 185 | end |
| @@ -13,18 +13,6 @@ | ||
| 13 | 13 | @content = service.model[self.class.name.split('::').pop.downcase].fetch(id) |
| 14 | 14 | end |
| 15 | 15 | |
| 16 | - def build_url(param) | |
| 17 | - if param.empty? | |
| 18 | - if @content | |
| 19 | - @content.id | |
| 20 | - else | |
| 21 | - nil | |
| 22 | - end | |
| 23 | - else | |
| 24 | - param | |
| 25 | - end | |
| 26 | - end | |
| 27 | - | |
| 28 | 16 | def _build_url(param, _resource, _query) |
| 29 | 17 | if view.path.size == 1 |
| 30 | 18 | _resource.unshift([build_url(param)].join(',')) |
| @@ -39,6 +27,18 @@ | ||
| 39 | 27 | end._build_url([], _resource, _query) |
| 40 | 28 | end |
| 41 | 29 | |
| 30 | + def build_url(param) | |
| 31 | + if param.empty? | |
| 32 | + if @content | |
| 33 | + @content.id | |
| 34 | + else | |
| 35 | + nil | |
| 36 | + end | |
| 37 | + else | |
| 38 | + param | |
| 39 | + end | |
| 40 | + end | |
| 41 | + | |
| 42 | 42 | def url(*param, &block) |
| 43 | 43 | query = Tenarai::CGI::Query.new |
| 44 | 44 | block.call(query) if block_given? |
