• R/O
  • SSH
  • HTTPS

tenarai: 提交


Commit MetaInfo

修訂90 (tree)
時間2008-04-28 00:12:53
作者junkikuchi

Log Message

updated.

Change Summary

差異

--- trunk/init_model.rb (revision 89)
+++ trunk/init_model.rb (revision 90)
@@ -256,15 +256,10 @@
256256 :class => 'Widget::YUI::ResetFontsGrids',
257257 :row => {},
258258 :relation => {'view' => 'view:index'},
259- :preference => {}
259+ :preference => {
260+ #'yui.src.uri' => 'http://localhost/pub/yui-2.4.1/build/reset-fonts-grids/reset-fonts-grids.css'
261+ }
260262 },
261- {
262- :name => 'index.user.content.view.html.jquery',
263- :class => 'Widget::JQuery',
264- :row => {},
265- :relation => {'view' => 'view:index'},
266- :preference => {}
267- },
268263
269264 {
270265 :name => 'user',
@@ -312,16 +307,11 @@
312307 :class => 'Widget::YUI::ResetFontsGrids',
313308 :row => {},
314309 :relation => {'view' => 'view:user'},
315- :preference => {}
310+ :preference => {
311+ #'yui.src.uri' => 'http://localhost/pub/yui-2.4.1/build/reset-fonts-grids/reset-fonts-grids.css'
312+ }
316313 },
317314 {
318- :name => 'user.user.content.view.html.jquery',
319- :class => 'Widget::JQuery',
320- :row => {},
321- :relation => {'view' => 'view:user'},
322- :preference => {}
323- },
324- {
325315 :name => 'user.user.content.view.html.login',
326316 :class => 'Widget',
327317 :row => {},
@@ -494,6 +484,15 @@
494484 }
495485 },
496486 {
487+ :name => 'user.user.content.view.html.user.doc.bd.client.jquery',
488+ :class => 'Widget::JQuery',
489+ :row => {},
490+ :relation => {'view' => 'view:user.content.view'},
491+ :preference => {
492+ #'jquery.src.uri' => 'http://localhost/pub/jquery-1.2.3.min.js'
493+ }
494+ },
495+ {
497496 :name => 'user.user.content.view.html.user.doc.bd.client.gmap',
498497 :class => 'Widget::Content::GMap',
499498 :row => {},
@@ -705,5 +704,12 @@
705704 :relation => {'view' => 'view:user.content.attached'},
706705 :preference => {}
707706 },
707+ {
708+ :name => 'user.user.content.view.html.user.doc.bd.client.delete',
709+ :class => 'Widget::Content::Delete',
710+ :row => {},
711+ :relation => {'view' => 'view:user.content.delete'},
712+ :preference => {}
713+ },
708714 ],
709715 }
--- trunk/lib/tenarai/db/tree.rb (revision 89)
+++ trunk/lib/tenarai/db/tree.rb (revision 90)
@@ -125,6 +125,8 @@
125125 column Reference.new('node', :multiple => true, :class => Multiple)
126126 column Integer.new('min', :unsigned => true)
127127 column Integer.new('max', :unsigned => true)
128+ index Index.new('min_idx', :cols => ['min'])
129+ index Index.new('max_idx', :cols => ['max'])
128130 index Index.new('min_max_idx', :cols => ['min', 'max'])
129131
130132 def save
--- trunk/main.rb (revision 89)
+++ trunk/main.rb (revision 90)
@@ -143,4 +143,6 @@
143143 Main.new(CONFIG).mongrel
144144 when 'webrick'
145145 Main.new(CONFIG).webrick
146+else
147+ Main.new(CONFIG).cgi
146148 end if __FILE__ == $0
--- trunk/webapp/User.rb (revision 89)
+++ trunk/webapp/User.rb (revision 90)
@@ -25,6 +25,7 @@
2525 column Tenarai::DB::String.new('_password', :length => 255)
2626 column Tenarai::DB::Reference.new('content')
2727 column Tenarai::DB::Reference.new('session', :multiple => true)
28+ index Tenarai::DB::Index.new('name_idx', :cols => ['name'])
2829
2930 def password=(val)
3031 self._password = self.class.digest(val)
--- trunk/webapp/Widget/JQuery.rb (revision 89)
+++ trunk/webapp/Widget/JQuery.rb (revision 90)
@@ -9,8 +9,8 @@
99 extend Tenarai::ClassLoader
1010
1111 preference 'jquery' do |jquery|
12- jquery.group 'js' do |js|
13- js.edit 'uri' do |uri|
12+ jquery.group 'src' do |src|
13+ src.edit 'uri' do |uri|
1414 uri.value = '/jquery-1.2.3.min.js'
1515 end
1616 end
@@ -20,7 +20,7 @@
2020 xml.tag(
2121 'script',
2222 'type' => 'text/javascript',
23- 'src' => preference.jquery.js.uri.value
23+ 'src' => preference.jquery.src.uri.value
2424 ).text('')
2525 end
2626 end
--- trunk/webapp/Widget/HTML.rb (revision 89)
+++ trunk/webapp/Widget/HTML.rb (revision 90)
@@ -68,6 +68,7 @@
6868 ) do |html|
6969 html.tag('head') do |head|
7070 render_html_head(head, builder)
71+=begin
7172 head.tag(
7273 'link',
7374 'rel' => 'stylesheet',
@@ -74,6 +75,10 @@
7475 'type' => 'text/css',
7576 'href' => uri('css')
7677 )
78+=end
79+ head.tag('style') do |style|
80+ style.code(resource.content.to_css)
81+ end
7782 end
7883 html.tag('body', 'id' => html_id) do |body|
7984 if builder.empty?(self)
--- trunk/webapp/Session.rb (revision 89)
+++ trunk/webapp/Session.rb (revision 90)
@@ -18,4 +18,5 @@
1818 column Tenarai::DB::String.new('ip', :length => 15)
1919 column Tenarai::DB::Serialize.new('data')
2020 column Tenarai::DB::Reference.new('user')
21+ index Tenarai::DB::Index.new('session_id_idx', :cols => ['session_id'])
2122 end
--- trunk/webapp/Widget.rb (revision 89)
+++ trunk/webapp/Widget.rb (revision 90)
@@ -155,6 +155,7 @@
155155
156156 column Tenarai::DB::Reference.new('view')
157157 column Tenarai::DB::Preference.new('preference')
158+ index Tenarai::DB::Index.new('build_idx', :cols => ['view', 'min'])
158159
159160 def resource
160161 self.class.fetch_resource(self)
--- trunk/webapp/ServiceTable.rb (revision 89)
+++ trunk/webapp/ServiceTable.rb (revision 90)
@@ -21,7 +21,15 @@
2121 end
2222
2323 def dispatch(model, request, response)
24- path_info = request['path_info'] || '/'
24+ path_info = if request['path_info'].nil?
25+ '/'
26+ else
27+ if request['path_info'].empty?
28+ request['script_name']
29+ else
30+ request['path_info']
31+ end
32+ end
2533
2634 _nil, name, *param = path_info.split('/')
2735
Show on old repository browser