| 修訂 | 53 (tree) |
|---|---|
| 時間 | 2008-02-27 22:30:09 |
| 作者 | junkikuchi |
updated.
trunk/Rakefile (diff) trunk/lib/tenarai/preference.rb (diff) trunk/lib/tenarai/xml.rb (diff) trunk/webapp/Service.rb (diff) trunk/webapp/Widget/Content/Form.rb (diff) trunk/webapp/Widget/User/Form.rb (diff) trunk/webapp/Widget/User/Login.rb (diff) trunk/webapp/Widget.rb (diff)| @@ -37,7 +37,7 @@ | ||
| 37 | 37 | }, |
| 38 | 38 | |
| 39 | 39 | :relation => [ |
| 40 | - ['service.widget', 'widget' ], | |
| 40 | + ['service.widget', 'widget' ], | |
| 41 | 41 | ['user.content', 'content' ], |
| 42 | 42 | ['user.session', 'session.user' ], |
| 43 | 43 | ['content.parent', 'content.node' ], |
| @@ -226,7 +226,7 @@ | ||
| 226 | 226 | :row => {}, |
| 227 | 227 | :relation => {'view' => 'view:resource'}, |
| 228 | 228 | :preference => { |
| 229 | - 'box.background.background_color' => 'silver' | |
| 229 | + 'box.text.text_align' => 'left', | |
| 230 | 230 | } |
| 231 | 231 | }, |
| 232 | 232 |
| @@ -244,22 +244,32 @@ | ||
| 244 | 244 | :row => {}, |
| 245 | 245 | :relation => {'view' => 'view:resource.login'}, |
| 246 | 246 | }, |
| 247 | -=begin | |
| 248 | 247 | { |
| 249 | - :name => 'session.user.content.view.widget.login.reset_style', | |
| 248 | + :name => 'session.user.content.view.html.login.reset_style', | |
| 250 | 249 | :class => 'Widget::YUI::ResetFontsGrids', |
| 251 | 250 | :row => {}, |
| 252 | 251 | :relation => {'view' => 'view:resource.login'}, |
| 253 | 252 | :preference => { |
| 254 | - 'yui.reset_fonts_grids.url' => 'http://localhost/pub/yui-2.4.1/build/reset-fonts-grids/reset-fonts-grids.css', | |
| 253 | + #'yui.reset_fonts_grids.url' => 'http://localhost/pub/yui-2.4.1/build/reset-fonts-grids/reset-fonts-grids.css', | |
| 255 | 254 | } |
| 256 | 255 | }, |
| 257 | -=end | |
| 258 | 256 | { |
| 259 | 257 | :name => 'session.user.content.view.html.login.header', |
| 260 | 258 | :class => 'Widget::Content::Header', |
| 261 | 259 | :row => {}, |
| 262 | 260 | :relation => {'view' => 'view:resource.login'}, |
| 261 | + :preference => { | |
| 262 | + 'box.font.font_size' => '197%', | |
| 263 | + 'box.margin.margin_top' => '10px', | |
| 264 | + 'box.margin.margin_right' => '10px', | |
| 265 | + 'box.margin.margin_bottom' => '10px', | |
| 266 | + 'box.margin.margin_left' => '10px', | |
| 267 | + 'box.padding.padding_top' => '10px', | |
| 268 | + 'box.padding.padding_right' => '10px', | |
| 269 | + 'box.padding.padding_bottom' => '10px', | |
| 270 | + 'box.padding.padding_left' => '10px', | |
| 271 | + 'box.border.border_bottom' => 'solid 3px blue', | |
| 272 | + } | |
| 263 | 273 | }, |
| 264 | 274 | |
| 265 | 275 | { |
| @@ -267,6 +277,13 @@ | ||
| 267 | 277 | :class => 'Widget::User::Login', |
| 268 | 278 | :row => {}, |
| 269 | 279 | :relation => {'view' => 'view:resource.login'}, |
| 280 | + :preference => { | |
| 281 | + 'box.font.font_size' => '152%', | |
| 282 | + 'box.margin.margin_top' => '25px', | |
| 283 | + 'box.margin.margin_right' => 'auto', | |
| 284 | + 'box.margin.margin_left' => 'auto', | |
| 285 | + 'box.size.width' => '500px', | |
| 286 | + } | |
| 270 | 287 | }, |
| 271 | 288 | |
| 272 | 289 | { |
| @@ -216,7 +216,7 @@ | ||
| 216 | 216 | def preference(name, param={}, &block) |
| 217 | 217 | if pref = self.meta[:preference][name] |
| 218 | 218 | pref.param.merge!(param) |
| 219 | - block.call(pref) | |
| 219 | + block.call(pref) if block_given? | |
| 220 | 220 | pref |
| 221 | 221 | else |
| 222 | 222 | self.meta[:preference] << Preference.new(name, param, &block) |
| @@ -159,7 +159,8 @@ | ||
| 159 | 159 | '"' => '"', |
| 160 | 160 | "'" => ''', |
| 161 | 161 | '>' => '>', |
| 162 | - '<' => '<' | |
| 162 | + '<' => '<', | |
| 163 | + ' ' => ' ' | |
| 163 | 164 | } |
| 164 | 165 | |
| 165 | 166 | ESC_STR = ESC.inject('') do |ret, (key, val)| |
| @@ -92,7 +92,10 @@ | ||
| 92 | 92 | end.sort do |(aw, aval), (bw, bval)| |
| 93 | 93 | aw.min <=> bw.min |
| 94 | 94 | end.each do |w, val| |
| 95 | - w.init(self, *val.split(',')) | |
| 95 | + query = val.split(',').map do |v| | |
| 96 | + Tenarai::CGI.decode(v) | |
| 97 | + end | |
| 98 | + w.init(self, *query) | |
| 96 | 99 | end |
| 97 | 100 | |
| 98 | 101 | ws.each do |wid, query| |
| @@ -10,11 +10,11 @@ | ||
| 10 | 10 | extend Tenarai::ClassLoader |
| 11 | 11 | |
| 12 | 12 | preference_css 'box' |
| 13 | - preference_css 'msg', 'p' | |
| 14 | - preference_css 'form_label', 'label' | |
| 15 | - preference_css 'form_title', 'input' | |
| 16 | - preference_css 'form_content', 'textarea' | |
| 17 | - preference_css 'form_submit', 'input[type="submit"]' | |
| 13 | + preference_css 'msg', 'p' | |
| 14 | + preference_css 'label', 'label' | |
| 15 | + preference_css 'title', 'input[type="text"]' | |
| 16 | + preference_css 'content', 'textarea' | |
| 17 | + preference_css 'submit', 'input[type="submit"]' | |
| 18 | 18 | |
| 19 | 19 | preference 'preference' do |pref| |
| 20 | 20 | pref.group('form') do |form| |
| @@ -10,11 +10,10 @@ | ||
| 10 | 10 | extend Tenarai::ClassLoader |
| 11 | 11 | |
| 12 | 12 | preference_css 'box' |
| 13 | - preference_css 'msg', 'p' | |
| 14 | - preference_css 'form_label', 'label' | |
| 15 | - preference_css 'form_title', 'input' | |
| 16 | - preference_css 'form_content', 'textarea' | |
| 17 | - preference_css 'form_submit', 'input[type="submit"]' | |
| 13 | + preference_css 'msg', 'p' | |
| 14 | + preference_css 'label', 'label' | |
| 15 | + preference_css 'input', 'input[type="text"]', 'input[type="password"]' | |
| 16 | + preference_css 'submit', 'input[type="submit"]' | |
| 18 | 17 | |
| 19 | 18 | preference 'preference' do |pref| |
| 20 | 19 | pref.group('form') do |form| |
| @@ -13,8 +13,27 @@ | ||
| 13 | 13 | preference_css 'error', 'p' |
| 14 | 14 | preference_css 'label', 'label' |
| 15 | 15 | preference_css 'input', 'input[type="text"]', 'input[type="password"]' |
| 16 | + preference_css 'br', 'br' | |
| 16 | 17 | preference_css 'submit', 'input[type="submit"]' |
| 17 | 18 | |
| 19 | + preference('label')['margin']['margin_top'].value = '10px' | |
| 20 | + preference('label')['margin']['margin_bottom'].value = '10px' | |
| 21 | + preference('label')['layout']['display'].value = 'block' | |
| 22 | + preference('label')['layout']['float'].value = 'left' | |
| 23 | + preference('label')['text']['text_align'].value = 'right' | |
| 24 | + preference('label')['size']['width'].value = '10em' | |
| 25 | + | |
| 26 | + preference('input')['margin']['margin_top'].value = '10px' | |
| 27 | + preference('input')['margin']['margin_bottom'].value = '10px' | |
| 28 | + preference('input')['layout']['display'].value = 'block' | |
| 29 | + preference('input')['layout']['float'].value = 'left' | |
| 30 | + preference('input')['size']['width'].value = '10em' | |
| 31 | + | |
| 32 | + preference('br')['layout']['display'].value = 'block' | |
| 33 | + preference('br')['layout']['clear'].value = 'both' | |
| 34 | + | |
| 35 | + preference('submit')['margin']['margin_left'].value = '10em' | |
| 36 | + | |
| 18 | 37 | def post(service, query={}) |
| 19 | 38 | resource.login(query['username'], query['password']) |
| 20 | 39 | end |
| @@ -32,7 +51,7 @@ | ||
| 32 | 51 | |
| 33 | 52 | form.tag('div') do |div| |
| 34 | 53 | _id = html_id('username') |
| 35 | - div.tag('label', 'for' => _id).text('UserName:') | |
| 54 | + div.tag('label', 'for' => _id).text('UserName: ') | |
| 36 | 55 | div.tag( |
| 37 | 56 | 'input', |
| 38 | 57 | 'id' => _id, |
| @@ -43,7 +62,7 @@ | ||
| 43 | 62 | div.tag('br') |
| 44 | 63 | |
| 45 | 64 | _id = html_id('password') |
| 46 | - div.tag('label', 'for' => _id).text('Password:') | |
| 65 | + div.tag('label', 'for' => _id).text('Password: ') | |
| 47 | 66 | div.tag( |
| 48 | 67 | 'input', |
| 49 | 68 | 'id' => _id, |
| @@ -83,6 +83,7 @@ | ||
| 83 | 83 | 'clip', |
| 84 | 84 | 'visibility', |
| 85 | 85 | 'z_index', |
| 86 | + 'display', | |
| 86 | 87 | ] |
| 87 | 88 | } |
| 88 | 89 |
| @@ -152,8 +153,12 @@ | ||
| 152 | 153 | def post(service, query={}) |
| 153 | 154 | end |
| 154 | 155 | |
| 155 | - def css_id | |
| 156 | - '#id' + primary_key.to_s | |
| 156 | + def css_id(val=nil) | |
| 157 | + if val.nil? | |
| 158 | + '#id' + primary_key.to_s | |
| 159 | + else | |
| 160 | + '#id' + primary_key.to_s + ' ' + val.to_s | |
| 161 | + end | |
| 157 | 162 | end |
| 158 | 163 | |
| 159 | 164 | def html_id(val=nil) |
