• R/O
  • SSH
  • HTTPS

tenarai: 提交


Commit MetaInfo

修訂75 (tree)
時間2008-04-10 20:06:28
作者junkikuchi

Log Message

updated.

Change Summary

差異

--- trunk/test/test_cgi_request.rb (revision 74)
+++ trunk/test/test_cgi_request.rb (revision 75)
@@ -18,7 +18,7 @@
1818 assert_equal('GET', req['request_method'])
1919 assert_equal(
2020 ['http_cookie', 'query_string', 'request_method'],
21- req.sort.map do |k, v| k end
21+ req.header.sort.map do |k, v| k end
2222 )
2323 assert_equal('123', req.query['a'])
2424 assert_equal('456', req.query['b'])
@@ -40,7 +40,7 @@
4040 assert_equal('POST', req['request_method'])
4141 assert_equal(
4242 ['content_length', 'content_type', 'query_string', 'request_method'],
43- req.sort.map do |k, v| k end
43+ req.header.sort.map do |k, v| k end
4444 )
4545 assert_equal('123', req.query['a'])
4646 assert_equal('456', req.query['b'])
@@ -97,7 +97,7 @@
9797 assert_equal('POST', req['request_method'])
9898 assert_equal(
9999 ['content_length', 'content_type', 'query_string', 'request_method'],
100- req.sort.map do |k, v| k end
100+ req.header.sort.map do |k, v| k end
101101 )
102102 assert_equal('111', req.query['a'])
103103 assert_equal('22222', req.query['b'])
--- trunk/init_model.rb (revision 74)
+++ trunk/init_model.rb (revision 75)
@@ -96,7 +96,12 @@
9696 :class => 'Widget::HTML',
9797 :row => {},
9898 :relation => {'view' => 'view:resource'},
99- :preference => {}
99+ :preference => {
100+ 'html.size.height' => '100%',
101+ #'body.font.font_size' => '122%',
102+ 'body.text.text_align' => 'left',
103+ 'body.size.height' => '100%',
104+ }
100105 },
101106 {
102107 :name => 'session.user.content.view.html.title',
@@ -103,59 +108,222 @@
103108 :class => 'Widget::Content::Title',
104109 :row => {},
105110 :relation => {'view' => 'view:resource.index'},
111+ :preference => {
112+ 'title.text.format' => 'Tenarai: %s'
113+ }
114+ },
115+ {
116+ :name => 'session.user.content.view.html.reset',
117+ :class => 'Widget::YUI::ResetFontsGrids',
118+ :row => {},
119+ :relation => {'view' => 'view:resource.index'},
120+ :preference => {
121+ 'yui.src.uri' => 'http://localhost/pub/yui-2.4.1/build/reset-fonts-grids/reset-fonts-grids.css'
122+ }
123+ },
124+ {
125+ :name => 'session.user.content.view.html.doc',
126+ :class => 'Widget::Panel',
127+ :row => {},
128+ :relation => {'view' => 'view:resource.index'},
129+ :preference => {
130+ 'box.size.width' => '900px',
131+ 'box.size.height' => '100%',
132+ 'box.margin.margin_left' => 'auto',
133+ 'box.margin.margin_right' => 'auto',
134+ }
135+ },
136+ {
137+ :name => 'session.user.content.view.html.doc.hd',
138+ :class => 'Widget::Panel',
139+ :row => {},
140+ :relation => {'view' => 'view:resource.index'},
106141 :preference => {}
107142 },
108143 {
109- :name => 'session.user.content.view.html.menu',
110- :class => 'Widget::View::List',
144+ :name => 'session.user.content.view.html.doc.bd',
145+ :class => 'Widget::Panel',
111146 :row => {},
112147 :relation => {'view' => 'view:resource.index'},
113148 :preference => {}
114149 },
115150 {
116- :name => 'session.user.content.view.html.header',
117- :class => 'Widget::Content::Header',
151+ :name => 'session.user.content.view.html.doc.ft',
152+ :class => 'Widget::Panel',
118153 :row => {},
119154 :relation => {'view' => 'view:resource.index'},
120155 :preference => {}
121156 },
122157 {
123- :name => 'session.user.content.view.html.path',
158+ :name => 'session.user.content.view.html.doc.hd.header',
159+ :class => 'Widget::Content::Header',
160+ :row => {},
161+ :relation => {'view' => 'view:resource.index'},
162+ :preference => {
163+ 'box.padding.padding_top' => '10px',
164+ 'box.font.font_size' => '197%',
165+ }
166+ },
167+ {
168+ :name => 'session.user.content.view.html.doc.hd.menu',
169+ :class => 'Widget::View::Menu',
170+ :row => {},
171+ :relation => {'view' => 'view:resource.index'},
172+ :preference => {
173+ 'ul.text.text_align' => 'right',
174+ 'ul.padding.padding_bottom' => '3px',
175+ 'ul.border.border_bottom' => '1px solid silver',
176+ 'li.layout.display' => 'inline',
177+ 'a.text.text_decoration' => 'none',
178+ 'a.padding.padding_top' => '3px',
179+ 'a.padding.padding_right' => '3px',
180+ 'a.padding.padding_bottom' => '3px',
181+ 'a.padding.padding_left' => '3px',
182+ 'a.border.border_top' => '1px solid silver',
183+ 'a.border.border_right' => '1px solid silver',
184+ 'a.border.border_bottom' => 'none',
185+ 'a.border.border_left' => '1px solid silver',
186+ }
187+ },
188+ {
189+ :name => 'session.user.content.view.html.doc.hd.path',
124190 :class => 'Widget::Content::Path',
125191 :row => {},
126192 :relation => {'view' => 'view:resource.index'},
127- :preference => {}
193+ :preference => {
194+ 'box.margin.margin_top' => '10px',
195+ 'box.margin.margin_bottom' => '10px',
196+ 'ul.layout.display' => 'inline',
197+ 'ul.padding.padding_top' => '10px',
198+ 'ul.padding.padding_bottom' => '10px',
199+ 'li.layout.display' => 'inline',
200+ 'a.text.text_decoration' => 'none',
201+ 'a.padding.padding_top' => '10px',
202+ 'a.padding.padding_right' => '10px',
203+ 'a.padding.padding_bottom' => '10px',
204+ }
128205 },
129206 {
130- :name => 'session.user.content.view.html.list',
207+ :name => 'session.user.content.view.html.doc.bd.sidebar',
208+ :class => 'Widget::Panel',
209+ :row => {},
210+ :relation => {'view' => 'view:resource.index'},
211+ :preference => {
212+ 'box.size.width' => '200px',
213+ 'box.layout.float' => 'left',
214+ }
215+ },
216+ {
217+ :name => 'session.user.content.view.html.doc.bd.client',
218+ :class => 'Widget::Panel',
219+ :row => {},
220+ :relation => {'view' => 'view:resource.index'},
221+ :preference => {
222+ 'box.size.width' => '700px',
223+ 'box.layout.float' => 'right',
224+ }
225+ },
226+ {
227+ :name => 'session.user.content.view.html.doc.bd.sidebar.list',
131228 :class => 'Widget::Content::List',
132229 :row => {},
133230 :relation => {'view' => 'view:resource.index'},
134- :preference => {}
231+ :preference => {
232+ 'box.size.width' => '100%',
233+ 'ul.margin.margin_bottom' => '10px',
234+ 'a.text.text_decoration' => 'none',
235+ 'a.margin.margin_right' => '10px',
236+ 'a.margin.margin_bottom' => '10px',
237+ }
135238 },
136239 {
137- :name => 'session.user.content.view.html.view',
240+ :name => 'session.user.content.view.html.doc.bd.client.view',
138241 :class => 'Widget::Content::Wiki',
139242 :row => {},
140243 :relation => {'view' => 'view:resource.index.view'},
141- :preference => {}
244+ :preference => {
245+ 'box.size.width' => '100%',
246+ 'h2.font.font_size' => '189%',
247+ 'h3.font.font_size' => '174%',
248+ 'h4.font.font_size' => '161.6%',
249+ 'h5.font.font_size' => '146.5%',
250+ 'h6.font.font_size' => '131%',
251+
252+ 'h2.padding.padding_top' => '5px',
253+ 'h3.padding.padding_top' => '5px',
254+ 'h4.padding.padding_top' => '5px',
255+ 'h5.padding.padding_top' => '5px',
256+ 'h6.padding.padding_top' => '5px',
257+
258+ 'h2.padding.padding_right' => '5px',
259+ 'h3.padding.padding_right' => '5px',
260+ 'h4.padding.padding_right' => '5px',
261+ 'h5.padding.padding_right' => '5px',
262+ 'h6.padding.padding_right' => '5px',
263+
264+ 'h2.padding.padding_bottom' => '5px',
265+ 'h3.padding.padding_bottom' => '5px',
266+ 'h4.padding.padding_bottom' => '5px',
267+ 'h5.padding.padding_bottom' => '5px',
268+ 'h6.padding.padding_bottom' => '5px',
269+
270+ 'h2.padding.padding_left' => '5px',
271+ 'h3.padding.padding_left' => '5px',
272+ 'h4.padding.padding_left' => '5px',
273+ 'h5.padding.padding_left' => '5px',
274+ 'h6.padding.padding_left' => '5px',
275+
276+ 'h2.border.border_left' => 'solid 10px red',
277+ 'h3.border.border_left' => 'solid 10px red',
278+ 'h4.border.border_left' => 'solid 10px red',
279+ 'h5.border.border_left' => 'solid 10px red',
280+ 'h6.border.border_left' => 'solid 10px red',
281+
282+ 'h2.border.border_bottom' => 'solid 1px silver',
283+ 'h3.border.border_bottom' => 'solid 1px silver',
284+ 'h4.border.border_bottom' => 'solid 1px silver',
285+ 'h5.border.border_bottom' => 'solid 1px silver',
286+ 'h6.border.border_bottom' => 'solid 1px silver',
287+
288+ 'h2.margin.margin_bottom' => '10px',
289+ 'h3.margin.margin_bottom' => '10px',
290+ 'h4.margin.margin_bottom' => '10px',
291+ 'h5.margin.margin_bottom' => '10px',
292+ 'h6.margin.margin_bottom' => '10px',
293+
294+ 'p.margin.margin_bottom' => '10px',
295+ }
142296 },
143297 {
144- :name => 'session.user.content.view.html.new',
298+ :name => 'session.user.content.view.html.doc.bd.client.new',
145299 :class => 'Widget::Content::Form',
146300 :row => {},
147301 :relation => {'view' => 'view:resource.index.new'},
148302 :preference => {
149- 'form.form.type' => 'new'
303+ 'form.form.type' => 'new',
304+ 'label.layout.display' => 'block',
305+ 'label.margin.margin_bottom' => '5px',
306+ 'title.size.width' => '100%',
307+ 'title.margin.margin_bottom' => '10px',
308+ 'content.size.width' => '100%',
309+ 'content.size.height' => '350px',
310+ 'content.margin.margin_bottom' => '10px',
150311 }
151312 },
152313 {
153- :name => 'session.user.content.view.html.edit',
314+ :name => 'session.user.content.view.html.doc.bd.client.edit',
154315 :class => 'Widget::Content::Form',
155316 :row => {},
156317 :relation => {'view' => 'view:resource.index.edit'},
157318 :preference => {
158- 'form.form.type' => 'edit'
319+ 'form.form.type' => 'edit',
320+ 'label.layout.display' => 'block',
321+ 'label.margin.margin_bottom' => '5px',
322+ 'title.size.width' => '100%',
323+ 'title.margin.margin_bottom' => '10px',
324+ 'content.size.width' => '100%',
325+ 'content.size.height' => '350px',
326+ 'content.margin.margin_bottom' => '10px',
159327 }
160328 },
161329 ],
--- trunk/lib/tenarai/xml.rb (revision 74)
+++ trunk/lib/tenarai/xml.rb (revision 75)
@@ -165,7 +165,7 @@
165165 }
166166
167167 ESC_STR = ESC.inject('') do |ret, (key, val)|
168- ret += key
168+ ret << key
169169 ret
170170 end
171171
--- trunk/lib/tenarai/cgi/response.rb (revision 74)
+++ trunk/lib/tenarai/cgi/response.rb (revision 75)
@@ -2,7 +2,6 @@
22 # Copyright (C) 2007, 2008 Jun Kikuchi <kikuchi@bonnou.com>
33 #
44
5-require 'enumerator'
65 require 'tenarai/cgi'
76 require 'tenarai/container'
87
@@ -95,8 +94,6 @@
9594 505 => 'HTTP Version Not Supported'
9695 }
9796
98- include Enumerable
99-
10097 attr_accessor :code
10198 attr_reader :header
10299 attr_reader :cookie
@@ -112,10 +109,6 @@
112109 @out = out
113110 end
114111
115- def fetch(key)
116- @header.fetch(key)
117- end
118-
119112 def [](key)
120113 @header[key]
121114 end
@@ -124,10 +117,6 @@
124117 @header[key] = val
125118 end
126119
127- def each(&block)
128- @header.each(&block)
129- end
130-
131120 def set_cookie(key, val, param={})
132121 cookie << Cookie.new(key, val, param)
133122 end
--- trunk/lib/tenarai/cgi/request.rb (revision 74)
+++ trunk/lib/tenarai/cgi/request.rb (revision 75)
@@ -2,7 +2,6 @@
22 # Copyright (C) 2007, 2008 Jun Kikuchi <kikuchi@bonnou.com>
33 #
44
5-require 'enumerator'
65 require 'stringio'
76 require 'tenarai/cgi'
87 require 'tenarai/cgi/parser'
@@ -54,8 +53,6 @@
5453 }
5554 HANDLER.default = NilHandler
5655
57- include Enumerable
58-
5956 attr_reader :method
6057 attr_reader :cookie
6158 attr_reader :query
@@ -91,17 +88,9 @@
9188 @content.freeze
9289 end
9390
94- def fetch(key)
95- @header.fetch(key)
96- end
97-
9891 def [](key)
9992 @header[key]
10093 end
101-
102- def each(&block)
103- @header.each(&block)
104- end
10594 end
10695 end
10796 end
--- trunk/lib/tenarai/wiki.rb (revision 74)
+++ trunk/lib/tenarai/wiki.rb (revision 75)
@@ -1,5 +1,5 @@
11 #
2-# Copyright (C) 2007 Jun Kikuchi <kikuchi@bonnou.com>
2+# Copyright (C) 2007, 2008 Jun Kikuchi <kikuchi@bonnou.com>
33 #
44
55 require 'tenarai/xml'
@@ -21,7 +21,7 @@
2121 end
2222
2323 def <<(md)
24- @buf.push(md)
24+ @buf << md
2525 end
2626
2727 def render(xml)
@@ -38,12 +38,12 @@
3838 end
3939
4040 def <<(md)
41- @buf.push(md[1])
41+ @buf << md[1]
4242 end
4343
4444 def render(xml)
4545 @buf.each do |hr|
46- xml.tag(:hr)
46+ xml.tag('hr')
4747 end
4848 @buf.clear
4949 end
@@ -57,7 +57,7 @@
5757 end
5858
5959 def <<(md)
60- @buf += md.post_match + @eol
60+ @buf << md.post_match + @eol
6161 end
6262
6363 def render(xml)
@@ -72,14 +72,14 @@
7272 end
7373
7474 def <<(md)
75- @buf.push(:term => md[1], :desc => md.post_match)
75+ @buf << {:term => md[1], :desc => md.post_match}
7676 end
7777
7878 def render(xml)
79- xml.tag(:dl) do |dl|
79+ xml.tag('dl') do |dl|
8080 @buf.each do |d|
81- dl.tag(:dt).text(d[:term])
82- dl.tag(:dd).text(d[:desc])
81+ dl.tag('dt').text(d[:term])
82+ dl.tag('dd').text(d[:desc])
8383 end
8484 end
8585 @buf.clear
@@ -95,7 +95,7 @@
9595 def <<(md)
9696 @op.each do |regexp, tag|
9797 if regexp.match(md[1])
98- @buf.push([tag, md[1].scan(regexp).size, md.post_match])
98+ @buf << [tag, md[1].scan(regexp).size, md.post_match]
9999 end
100100 end
101101 end
@@ -107,19 +107,19 @@
107107 @buf.each do |tag, level, text|
108108 if stack[level]
109109 if stack[level][:tag] == tag
110- li = stack[level][:list].tag(:li)
110+ li = stack[level][:list].tag('li')
111111 stack[level][:li] = li
112112 else
113113 stack.slice!(level, stack.size)
114114 list = stack[level -1][:li].tag(tag)
115- li = list.tag(:li)
115+ li = list.tag('li')
116116 stack[level] = {:tag => tag, :list => list, :li => li}
117117 end
118118 else
119119 until level < stack.size
120120 list = stack.last[:li].tag(tag)
121- li = list.tag(:li)
122- stack.push({:tag => tag, :list => list, :li => li})
121+ li = list.tag('li')
122+ stack << {:tag => tag, :list => list, :li => li}
123123 end
124124 end
125125 li.text(text)
@@ -132,11 +132,11 @@
132132
133133 h = Syntax::H.new
134134 hr = Syntax::HR.new
135- p = Syntax::Block.new(:p, "")
136- pre = Syntax::Block.new(:pre, "\n")
137- blockquote = Syntax::Block.new(:blockquote, "")
135+ p = Syntax::Block.new('p', "")
136+ pre = Syntax::Block.new('pre', "\n")
137+ blockquote = Syntax::Block.new('blockquote', "")
138138 deflist = Syntax::DefList.new
139- list = Syntax::List.new(%r#\-# => :ul, %r#\d+\.# => :ol)
139+ list = Syntax::List.new(%r#\-# => 'ul', %r#\d+\.# => 'ol')
140140 _nil = Syntax::Nil.new
141141
142142 SYNTAX = [
@@ -172,12 +172,9 @@
172172 end
173173 private :render_xml
174174
175- attr_reader :text
176-
177175 def initialize(text)
178176 super()
179- @text = text
180- render_xml(self, @text)
177+ render_xml(self, text)
181178 end
182179 end
183180 end
--- trunk/main.rb (revision 74)
+++ trunk/main.rb (revision 75)
@@ -122,6 +122,7 @@
122122 end if v[:relation]
123123
124124 v[:preference].each do |pk, pv|
125+ p [pk, pv]
125126 if pv.is_a? Symbol
126127 mk, mv = pv.to_s.split(':')
127128 pv = map[mk][mv].primary_key.to_s
--- trunk/webapp/Widget/YUI/ResetFontsGrids.rb (revision 74)
+++ trunk/webapp/Widget/YUI/ResetFontsGrids.rb (revision 75)
@@ -8,7 +8,7 @@
88 extend Tenarai::ClassLoader
99
1010 preference 'yui' do |yui|
11- yui.group 'reset_fonts_grids' do |rfg|
11+ yui.group 'src' do |rfg|
1212 rfg.edit 'uri' do |uri|
1313 uri.value = 'http://yui.yahooapis.com/2.5.1/build/reset-fonts-grids/reset-fonts-grids.css'
1414 end
@@ -20,7 +20,7 @@
2020 'link',
2121 'rel' => 'stylesheet',
2222 'type' => 'text/css',
23- 'href' => preference.yui.reset_fonts_grids.uri.value
23+ 'href' => preference.yui.src.uri.value
2424 )
2525 end
2626 end
--- trunk/webapp/Widget/HTML.rb (revision 74)
+++ trunk/webapp/Widget/HTML.rb (revision 75)
@@ -62,6 +62,7 @@
6262 'lang' => 'ja'
6363 ) do |html|
6464 html.tag('head') do |head|
65+ render_html_head(head, builder)
6566 head.tag(
6667 'link',
6768 'rel' => 'stylesheet',
@@ -68,7 +69,6 @@
6869 'type' => 'text/css',
6970 'href' => uri('css')
7071 )
71- render_html_head(head, builder)
7272 end
7373 html.tag('body', 'id' => html_id) do |body|
7474 if builder.empty?(self)
--- trunk/webapp/Widget/View/Menu.rb (nonexistent)
+++ trunk/webapp/Widget/View/Menu.rb (revision 75)
@@ -0,0 +1,38 @@
1+#
2+# Copyright (C) 2008 Jun Kikuchi <kikuchi@bonnou.com>
3+#
4+
5+Tenarai::ClassLoader.load_class('Widget::View')
6+
7+class Widget
8+ class View
9+ class Menu < ::Widget
10+ extend Tenarai::ClassLoader
11+
12+ preference_css 'box'
13+ preference_css 'ul', 'ul'
14+ preference_css 'li', 'li'
15+ preference_css 'a', 'a'
16+ preference_css 'a_selected', 'a.selected'
17+ preference_css 'a_hover', 'a:hover'
18+
19+ def render_html(xml, builder, content=nil)
20+ content = resource.content.parent if content.nil?
21+
22+ xml.tag('div', 'id' => html_id) do |div|
23+ div.tag('ul') do |ul|
24+ content.node.each do |c|
25+ ul.tag('li') do |li|
26+ li.tag('a') do |a|
27+ a['href'] = uri(c.id)
28+ a['class'] = 'selected' if resource.content.equal?(c)
29+ end.text(c.name)
30+ render_html(li, builder, c) unless c.node.empty?
31+ end
32+ end
33+ end
34+ end
35+ end
36+ end
37+ end
38+end
--- trunk/webapp/Widget/Content/Form.rb (revision 74)
+++ trunk/webapp/Widget/Content/Form.rb (revision 75)
@@ -44,10 +44,10 @@
4444 end
4545
4646 def render_html(xml, builder)
47- if form_type == :new
48- title, body = '', ''
47+ title, body, submit = if form_type == :new
48+ ['', '', '登録']
4949 else
50- title, body = resource.content.title, resource.content.body
50+ [resource.content.title, resource.content.body, '更新']
5151 end
5252
5353 xml.tag('div', 'id' => html_id) do |div|
@@ -57,27 +57,24 @@
5757 end if @msg
5858
5959 form.tag('div') do |div|
60- div.tag('label') do |label|
61- label.text('Title:')
62- label.tag(
63- 'input',
64- 'type' => 'text',
65- 'name' => html_id('title'),
66- 'value' => title
67- )
68- end
60+ div.tag('label').text('Title:')
61+ div.tag(
62+ 'input',
63+ 'type' => 'text',
64+ 'name' => html_id('title'),
65+ 'value' => title
66+ )
6967 div.tag('br')
7068
71- div.tag('label') do |label|
72- label.text('Content:')
73- label.tag('textarea', 'name' => html_id('body')).text(body)
74- end
69+ div.tag('label').text('Content:')
70+ div.tag('textarea', 'name' => html_id('body')).text(body)
7571 div.tag('br')
7672
7773 div.tag(
7874 'input',
79- 'type' => 'submit',
80- 'name' => html_id('submit')
75+ 'type' => 'submit',
76+ 'name' => html_id('submit'),
77+ 'value' => submit
8178 )
8279 end
8380 end
--- trunk/webapp/Widget/Content/Wiki.rb (revision 74)
+++ trunk/webapp/Widget/Content/Wiki.rb (revision 75)
@@ -11,6 +11,25 @@
1111 class Wiki < ::Widget
1212 extend Tenarai::ClassLoader
1313
14+ preference_css 'box'
15+
16+ preference_css 'h2', 'h2'
17+ preference_css 'h3', 'h3'
18+ preference_css 'h4', 'h4'
19+ preference_css 'h5', 'h5'
20+ preference_css 'h6', 'h6'
21+ preference_css 'hr', 'hr'
22+ preference_css 'p', 'p'
23+ preference_css 'pre', 'pre'
24+ preference_css 'blockquote', 'blockquote'
25+ preference_css 'dl', 'dl'
26+ preference_css 'dt', 'dt'
27+ preference_css 'dd', 'dd'
28+ preference_css 'ul', 'ul'
29+ preference_css 'ul_li', 'ul li'
30+ preference_css 'ol', 'ol'
31+ preference_css 'ol_li', 'ol li'
32+
1433 def render_html(xml, builder)
1534 xml.tag('div', 'id' => html_id) do |div|
1635 div << Tenarai::Wiki.new(resource.content.body)
--- trunk/webapp/Widget/Content/List.rb (revision 74)
+++ trunk/webapp/Widget/Content/List.rb (revision 75)
@@ -10,9 +10,11 @@
1010 extend Tenarai::ClassLoader
1111
1212 preference_css 'box'
13- preference_css 'list', 'a'
14- preference_css 'list_selected', 'a.selected'
15- preference_css 'list_hover', 'a:hover'
13+ preference_css 'ul', 'ul'
14+ preference_css 'li', 'li'
15+ preference_css 'a', 'a'
16+ preference_css 'a_selected', 'a.selected'
17+ preference_css 'a_hover', 'a:hover'
1618
1719 def render_html(xml, builder, content=nil)
1820 if content.nil?
--- trunk/webapp/Widget/Content/Path.rb (revision 74)
+++ trunk/webapp/Widget/Content/Path.rb (revision 75)
@@ -10,9 +10,11 @@
1010 extend Tenarai::ClassLoader
1111
1212 preference_css 'box'
13- preference_css 'path', 'a'
14- preference_css 'path_selected', 'a.selected'
15- preference_css 'path_hover', 'a:hover'
13+ preference_css 'ul', 'ul'
14+ preference_css 'li', 'li'
15+ preference_css 'a', 'a'
16+ preference_css 'a_selected', 'a.selected'
17+ preference_css 'a_hover', 'a:hover'
1618
1719 def render_html(xml, builder)
1820 xml.tag('div', 'id' => html_id) do |t|
--- trunk/webapp/View/Builder.rb (revision 74)
+++ trunk/webapp/View/Builder.rb (revision 75)
@@ -56,13 +56,13 @@
5656 def to_css
5757 Tenarai::CSS.new do |css|
5858 widget.render_css(css, self)
59- end.to_s(2)
59+ end.to_s
6060 end
6161
6262 def to_html
6363 Tenarai::XML.new do |xml|
6464 widget.render_html(xml, self)
65- end.to_s(2)
65+ end.to_s
6666 end
6767 end
6868 end
Show on old repository browser