app/controllers/admin/.svn/dir-prop-base app/controllers/admin/.svn/text-base/logs_controller.rb.svn-base app/views/admin/categories/.svn/dir-prop-base app/views/admin/links/.svn/dir-prop-base app/views/admin/links/.svn/text-base/list.html.erb.svn-base app/views/admin/logs/.svn/entries app/views/admin/logs/.svn/format config/1stlog config/deploy.rb db/.svn/dir-prop-base db/migrate/.svn/dir-prop-base vendor/plugins/textile_editor_helper/.svn/text-base/Rakefile.netbeans-base vendor/plugins/textile_editor_helper/.svn/text-base/init.rb.netbeans-base vendor/plugins/textile_editor_helper/tasks/.svn/text-base/textile_editor_helper_tasks.rake.netbeans-base vendor/plugins/theme_support/generators/theme/.svn/text-base/USAGE.netbeans-base vendor/plugins/theme_support/generators/theme/.svn/text-base/theme_generator.rb.netbeans-base vendor/plugins/uuidtools-1.0.1/.svn/text-base/rakefile.netbeans-base @@ -8,3 +8,11 @@ require 'rake/testtask' require 'rake/rdoctask' require 'tasks/rails' + +begin + require '/opt/dev/vlad/lib/vlad' + Vlad.load :scm => "git" +rescue LoadError + # do nothing +end + Rakefile @@ -19,7 +19,7 @@ application.rb K 25 svn:wc:ra_dav:version-url V 53 -/svn/!svn/ver/75/trunk/app/controllers/application.rb +/svn/!svn/ver/77/trunk/app/controllers/application.rb END natures_controller.rb K 25 app/controllers/.svn/all-wcprops @@ -52,14 +52,14 @@ iceskysl * application.rb file -75 +77 -2008-05-24T02:34:13.000000Z -2dda541c012611f42737ab6a16c9e4c8 -2008-05-24T02:44:39.792441Z -75 +2008-05-24T18:14:41.000000Z +19ccb0c4c18294266a9ae771b29f4264 +2008-05-24T19:45:39.649205Z +77 iceskysl * natures_controller.rb app/controllers/.svn/entries @@ -92,10 +92,10 @@ class ApplicationController < ActionController::Base #侧边栏 def nav #分类 - @types = Type.find(:all) + @parent_categories = Category.get_all_parent_items @category_of_type = [] - for type in @types - @category_of_type << Category.find(:all,:conditions=>['type_id=?',type.id],:order => "position DESC") + for parent in @parent_categories + @category_of_type << Category.get_all_items_in_parent(parent.id) end #链接 app/controllers/.svn/text-base/application.rb.svn-base @@ -1,7 +1,11 @@ +K 26 +svn:wc:ra_dav:activity-url +V 14 +/svn/!svn/act/ K 25 svn:wc:ra_dav:version-url V 44 -/svn/!svn/ver/72/trunk/app/controllers/admin +/svn/!svn/ver/78/trunk/app/controllers/admin END attachments_controller.rb K 25 @@ -19,7 +23,7 @@ links_controller.rb K 25 svn:wc:ra_dav:version-url V 64 -/svn/!svn/ver/72/trunk/app/controllers/admin/links_controller.rb +/svn/!svn/ver/78/trunk/app/controllers/admin/links_controller.rb END plugins_controller.rb K 25 @@ -27,11 +31,11 @@ svn:wc:ra_dav:version-url V 66 /svn/!svn/ver/66/trunk/app/controllers/admin/plugins_controller.rb END -themes_controller.rb +categories_controller.rb K 25 svn:wc:ra_dav:version-url -V 65 -/svn/!svn/ver/66/trunk/app/controllers/admin/themes_controller.rb +V 69 +/svn/!svn/ver/78/trunk/app/controllers/admin/categories_controller.rb END comments_controller.rb K 25 @@ -39,11 +43,11 @@ svn:wc:ra_dav:version-url V 67 /svn/!svn/ver/72/trunk/app/controllers/admin/comments_controller.rb END -categories_controller.rb +themes_controller.rb K 25 svn:wc:ra_dav:version-url -V 69 -/svn/!svn/ver/72/trunk/app/controllers/admin/categories_controller.rb +V 65 +/svn/!svn/ver/66/trunk/app/controllers/admin/themes_controller.rb END caches_controller.rb K 25 @@ -69,23 +73,23 @@ svn:wc:ra_dav:version-url V 66 /svn/!svn/ver/72/trunk/app/controllers/admin/profile_controller.rb END -users_controller.rb -K 25 -svn:wc:ra_dav:version-url -V 64 -/svn/!svn/ver/72/trunk/app/controllers/admin/users_controller.rb -END topics_controller.rb K 25 svn:wc:ra_dav:version-url V 65 /svn/!svn/ver/72/trunk/app/controllers/admin/topics_controller.rb END -types_controller.rb +users_controller.rb K 25 svn:wc:ra_dav:version-url V 64 -/svn/!svn/ver/72/trunk/app/controllers/admin/types_controller.rb +/svn/!svn/ver/72/trunk/app/controllers/admin/users_controller.rb +END +logs_controller.rb +K 25 +svn:wc:ra_dav:version-url +V 63 +/svn/!svn/ver/78/trunk/app/controllers/admin/logs_controller.rb END index_controller.rb K 25 app/controllers/admin/.svn/all-wcprops @@ -1,17 +1,17 @@ 8 dir -74 +78 https://1stlog.googlecode.com/svn/trunk/app/controllers/admin https://1stlog.googlecode.com/svn -2008-05-20T10:31:11.870824Z -72 -wujunchen +2008-05-24T19:45:58.164440Z +78 +iceskysl has-props -has-prop-mods + svn:special svn:externals svn:needs-lock @@ -28,7 +28,7 @@ svn:special svn:externals svn:needs-lock * attachments_controller.rb file - +74 @@ -40,7 +40,7 @@ wujunchen * usergroups_controller.rb file - +74 @@ -56,15 +56,15 @@ file -2008-05-23T16:33:03.000000Z -f581bbeec3bc98a1703d1b5f1ca57273 -2008-05-20T10:31:11.870824Z -72 -wujunchen +2008-05-24T19:27:42.000000Z +cc00036e3ef74cd8d66da9afb392852f +2008-05-24T19:45:58.164440Z +78 +iceskysl * plugins_controller.rb file - +74 @@ -76,7 +76,7 @@ iceskysl * themes_controller.rb file - +74 @@ -88,7 +88,7 @@ iceskysl * comments_controller.rb file - +74 @@ -104,15 +104,15 @@ file -2008-05-23T16:33:03.000000Z -7d8bb2c85b134fda5d1842b3fe111c61 -2008-05-20T10:31:11.870824Z -72 -wujunchen +2008-05-24T19:00:39.000000Z +eb1707f888a72e0292d89dbd6ebf1d98 +2008-05-24T19:45:58.164440Z +78 +iceskysl * caches_controller.rb file - +74 @@ -124,7 +124,7 @@ iceskysl * configurations_controller.rb file - +74 @@ -136,7 +136,7 @@ wujunchen * tags_controller.rb file - +74 @@ -148,7 +148,7 @@ wujunchen * profile_controller.rb file - +74 @@ -160,7 +160,7 @@ wujunchen * users_controller.rb file - +74 @@ -172,7 +172,7 @@ wujunchen * topics_controller.rb file - +74 @@ -182,21 +182,21 @@ a8090b6bc0c3175cdd01b97b4523e785 72 wujunchen * -types_controller.rb +logs_controller.rb file -delete -2008-05-23T16:33:03.000000Z -00f4de9a1c34bd49623d3534819caf8e -2008-05-20T10:31:11.870824Z -72 -wujunchen + +2008-05-24T17:42:36.000000Z +5b324f364654c106208d6b81dc5accfc +2008-05-24T19:45:58.164440Z +78 +iceskysl * index_controller.rb file - +74 app/controllers/admin/.svn/entries @@ -7,11 +7,10 @@ class Admin::CategoriesController < Admin::IndexController end # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html) - verify :method => :post, :only => [ :destroy, :create, :update ], - :redirect_to => { :action => :list } + verify :method => :post, :only => [ :destroy, :create ], :redirect_to => { :action => :index } def list -# @category_pages, @categories = paginate :categories, :per_page => 10 + # @category_pages, @categories = paginate :categories, :per_page => 10 render :layout => false end @@ -20,39 +19,42 @@ class Admin::CategoriesController < Admin::IndexController end def new - @types = Type.find(:all) + @parent_categories = Category.get_all_parent_items @category = Category.new - render :layout => false + # render :layout => false end def create @category = Category.new(params[:category]) if @category.save flash[:notice] = 'Category was successfully created.' - redirect_to :action => 'list' + redirect_to :action => 'index' else render :action => 'new' end end def edit - @types = Type.find(:all) + @parent_categories = Category.get_all_parent_items @category = Category.find(params[:id]) - render :layout => false end + #更新分类 def update @category = Category.find(params[:id]) + logger.info("=============") if @category.update_attributes(params[:category]) - flash[:notice] = 'Category was successfully updated.' - redirect_to :action => 'show', :id => @category + flash[:notice] = '分类更新成功.' + redirect_to :action => 'index' else + flash[:notice] = '分类更新失败.' render :action => 'edit' end end + #删除分类 def destroy Category.find(params[:id]).destroy - redirect_to :action => 'list' + redirect_to :action => 'index' end end app/controllers/admin/.svn/text-base/categories_controller.rb.svn-base @@ -8,8 +8,7 @@ class Admin::LinksController < Admin::IndexController end # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html) - verify :method => :post, :only => [ :destroy, :create, :update ], - :redirect_to => { :action => :list } + verify :method => :post, :only => [ :destroy, :create ], :redirect_to => { :action => :index } def list visible =params[:visible] @@ -20,9 +19,7 @@ class Admin::LinksController < Admin::IndexController end end - def show - @link = Link.find(params[:id]) - end + def new @plink = Link.find(:all,:conditions => "parent_id = 0") @@ -32,8 +29,8 @@ class Admin::LinksController < Admin::IndexController def create @link = Link.new(params[:link]) if @link.save - flash[:notice] = 'Link was successfully created.' - redirect_to :action => 'list' + flash[:notice] = "链接'#{@link.title}'添加成功." + redirect_to :action => 'index' else render :action => 'new' end @@ -47,8 +44,8 @@ class Admin::LinksController < Admin::IndexController def update @link = Link.find(params[:id]) if @link.update_attributes(params[:link]) - flash[:notice] = 'Link was successfully updated.' - redirect_to :action => 'show', :id => @link + flash[:notice] = '链接更新成功.' + redirect_to :action => 'index' else render :action => 'edit' end @@ -58,4 +55,5 @@ class Admin::LinksController < Admin::IndexController Link.find(params[:id]).destroy redirect_to :action => 'list' end + end app/controllers/admin/.svn/text-base/links_controller.rb.svn-base @@ -62,14 +62,14 @@ file 66 iceskysl * -themes_helper.rb +categories_helper.rb file 2008-05-23T16:32:39.000000Z -8f7179c7fa8f8447711d61b1a26e12c3 +c500d7443bb43c47a7d8f7b5068f4850 2008-04-22T01:27:37.349214Z 66 iceskysl @@ -86,14 +86,14 @@ dc0b5165ba539c38424232a934904bf8 66 iceskysl * -categories_helper.rb +themes_helper.rb file 2008-05-23T16:32:39.000000Z -c500d7443bb43c47a7d8f7b5068f4850 +8f7179c7fa8f8447711d61b1a26e12c3 2008-04-22T01:27:37.349214Z 66 iceskysl @@ -146,26 +146,26 @@ file 66 iceskysl * -users_helper.rb +topics_helper.rb file 2008-05-23T16:32:39.000000Z -f2aa1d65d6ebfc59c4566d831f41ba62 +e5f417c9d7298dfbf4d35b31021b6889 2008-04-22T01:27:37.349214Z 66 iceskysl * -topics_helper.rb +users_helper.rb file 2008-05-23T16:32:39.000000Z -e5f417c9d7298dfbf4d35b31021b6889 +f2aa1d65d6ebfc59c4566d831f41ba62 2008-04-22T01:27:37.349214Z 66 iceskysl @@ -182,6 +182,13 @@ delete 66 iceskysl * +logs_helper.rb +file +0 + + +add +* index_helper.rb file app/helpers/admin/.svn/entries @@ -32,13 +32,13 @@ dir plugins dir * -categories +themes dir * comments dir * -themes +categories dir * caches @@ -53,15 +53,22 @@ dir profile dir * -topics +users dir * -users +topics dir * types dir * +logs +dir + + + +add +* index dir * app/views/admin/.svn/entries @@ -1,43 +1,35 @@ +K 26 +svn:wc:ra_dav:activity-url +V 14 +/svn/!svn/act/ K 25 svn:wc:ra_dav:version-url V 49 -/svn/!svn/ver/66/trunk/app/views/admin/categories -END -list.rhtml -K 25 -svn:wc:ra_dav:version-url -V 60 -/svn/!svn/ver/66/trunk/app/views/admin/categories/list.rhtml +/svn/!svn/ver/80/trunk/app/views/admin/categories END index.html.erb K 25 svn:wc:ra_dav:version-url V 64 -/svn/!svn/ver/66/trunk/app/views/admin/categories/index.html.erb -END -show.rhtml -K 25 -svn:wc:ra_dav:version-url -V 60 -/svn/!svn/ver/66/trunk/app/views/admin/categories/show.rhtml +/svn/!svn/ver/80/trunk/app/views/admin/categories/index.html.erb END _form.rhtml K 25 svn:wc:ra_dav:version-url V 61 -/svn/!svn/ver/66/trunk/app/views/admin/categories/_form.rhtml +/svn/!svn/ver/80/trunk/app/views/admin/categories/_form.rhtml END edit.rhtml K 25 svn:wc:ra_dav:version-url V 60 -/svn/!svn/ver/66/trunk/app/views/admin/categories/edit.rhtml +/svn/!svn/ver/80/trunk/app/views/admin/categories/edit.rhtml END _items.html.erb K 25 svn:wc:ra_dav:version-url V 65 -/svn/!svn/ver/66/trunk/app/views/admin/categories/_items.html.erb +/svn/!svn/ver/80/trunk/app/views/admin/categories/_items.html.erb END _slider.html.erb K 25 @@ -49,5 +41,5 @@ new.rhtml K 25 svn:wc:ra_dav:version-url V 59 -/svn/!svn/ver/66/trunk/app/views/admin/categories/new.rhtml +/svn/!svn/ver/80/trunk/app/views/admin/categories/new.rhtml END app/views/admin/categories/.svn/all-wcprops @@ -1,17 +1,17 @@ 8 dir -74 +80 https://1stlog.googlecode.com/svn/trunk/app/views/admin/categories https://1stlog.googlecode.com/svn -2008-04-22T01:27:37.349214Z -66 +2008-05-24T19:47:04.763924Z +80 iceskysl has-props -has-prop-mods + svn:special svn:externals svn:needs-lock @@ -26,40 +26,16 @@ svn:special svn:externals svn:needs-lock 01612b04-d432-0410-ac2e-49b30577d389 * -list.rhtml -file - - - -delete -2008-05-23T16:33:47.000000Z -ea9eaa208659512bbac178f3d1352d60 -2008-04-22T01:27:37.349214Z -66 -iceskysl -* index.html.erb file -2008-05-23T16:33:47.000000Z -8965211b661c2ce8aa3d072ebd984b32 -2008-04-22T01:27:37.349214Z -66 -iceskysl -* -show.rhtml -file - - - -delete -2008-05-23T16:33:47.000000Z -bb1befacee814f9e04ed6344c046fae5 -2008-04-22T01:27:37.349214Z -66 +2008-05-24T17:50:00.000000Z +7d8a80af273694abcf04c0a2df9104b5 +2008-05-24T19:47:04.763924Z +80 iceskysl * _form.rhtml @@ -68,10 +44,10 @@ file -2008-05-23T16:33:47.000000Z -aff54102d3070efd6f6b6cc51b8c2442 -2008-04-22T01:27:37.349214Z -66 +2008-05-24T18:40:35.000000Z +2feb57167a1e2b684aab7cebf5c8a4b2 +2008-05-24T19:47:04.763924Z +80 iceskysl * edit.rhtml @@ -80,10 +56,10 @@ file -2008-05-23T16:33:47.000000Z -43515bb607423eb4efcbc7866033cc69 -2008-04-22T01:27:37.349214Z -66 +2008-05-24T18:57:38.000000Z +1b7e2c1599bd3e564910ab2183fe813f +2008-05-24T19:47:04.763924Z +80 iceskysl * _items.html.erb @@ -92,15 +68,15 @@ file -2008-05-23T16:33:47.000000Z -bcc20688e594b1c288af491667a5908c -2008-04-22T01:27:37.349214Z -66 +2008-05-24T18:36:41.000000Z +06731f2a107a02d8c22efd132569d648 +2008-05-24T19:47:04.763924Z +80 iceskysl * _slider.html.erb file - +74 @@ -116,9 +92,9 @@ file -2008-05-23T16:33:47.000000Z -fd47cbb0336e58c7f223daf76360d227 -2008-04-22T01:27:37.349214Z -66 +2008-05-24T17:47:46.000000Z +41766d4c85040699d509de3b915538da +2008-05-24T19:47:04.763924Z +80 iceskysl * app/views/admin/categories/.svn/entries @@ -2,46 +2,45 @@ <!--[form:category]--> - <tr class="tablecell"> - <td width="50%"> - <b>选择父分类</b><br/> - 填写分类的名称,会显示在你的首页上</td> - <td> - <select name="category[type_id]"> - <% @types.each do |type| -%> - <option value="<%= type.id -%>"> - <%= type.title -%> - </option> - <% end %> - </select> - </td> - </tr> - - <tr class="tablecell"> - <td width="50%"> - <b>分类名称</b><br/> - 填写分类的名称,会显示在你的首页上</td> - <td> - <%= text_field 'category', 'title' ,{:value=>"",:size=>50, :class => 'formfield' } %> - </td> - </tr> - - <tr class="tablecell"> - <td width="50%"> - <b>分类描述</b><br/> - 填写你对该分类的描述以更好的标识这个分类的作用</td> - <td> - <%= text_field 'category', 'description' ,{:size=>50,:maxlength=>"50",:value=>"", :class => 'formfield'} %> - </td> - </tr> - - <tr class="tablecell"> - <td width="50%"> - <b>排列位置</b><br/> - 填写你想该分类的排列位置</td> - <td> - <%= text_field 'category', 'position' ,{:size=>50,:maxlength=>"50",:value=>"1", :class => 'formfield'} %> - </td> +<tr class="tablecell"> + <td width="50%"> + <b>选择父分类</b><br/> + 填写分类的名称,会显示在你的首页上</td> + <td> + <select name="category[parent_id]"> + <option value="0"> ==无== </option> + <% @parent_categories.each do |parent| -%> + <option value="<%= parent.id -%>"> <%= parent.title -%> </option> + <% end %> + </select> + </td> +</tr> + +<tr class="tablecell"> + <td width="50%"> + <b>分类名称</b><br/> + 填写分类的名称,会显示在你的首页上</td> + <td> + <%= text_field 'category', 'title' ,{:size=>20, :class => 'formfield' } %> + </td> +</tr> + +<tr class="tablecell"> + <td width="50%"> + <b>分类描述</b><br/> + 填写你对该分类的描述以更好的标识这个分类的作用</td> + <td> + <%= text_field 'category', 'desc' ,{:size=>20,:maxlength=>"20", :class => 'formfield'} %> + </td> +</tr> + +<tr class="tablecell"> + <td width="50%"> + <b>排列位置</b><br/> + 填写你想该分类的排列位置</td> + <td> + <%= text_field 'category', 'position' ,{:size=>20,:maxlength=>"20",:value=>"1", :class => 'formfield'} %> + </td> </tr> <!--[eoform:category]--> app/views/admin/categories/.svn/text-base/_form.rhtml.svn-base @@ -4,30 +4,36 @@ <table width="100%" align="center" border="0" cellspacing="0" cellpadding="0"> <tr class="tdbheader"> - <td nowrap width="16%">名称</td> - <td nowrap width="10%">分类</td> + <td nowrap width="5%">位置</td> + <td nowrap width="16%">分类名称</td> <td nowrap width="20%">父分类</td> + <td nowrap width="10%">文章数</td> <td nowrap width="40%">描述</td> + <td nowrap="nowrap" width="2%"> 编辑 </td> </tr> <%@categories.each do |cate|%> <tr class="tablecell"> <td nowrap><%=cate.position%></td> <td nowrap><%=cate.title%></td> - <td nowrap><%=cate.type.title%></td> - <td nowrap><%=cate.description%></td> + <td nowrap><%=cate.parent%></td> + <td nowrap><%=cate.topics_count%></td> + <td nowrap><%=cate.desc%></td> + <td nowrap="nowrap"> + <%=link_to image_tag("icos/edit.gif", :border=>"0",:size => "16x16", :alt => "编辑"),{:action=>"edit",:id=>cate.id}%> + </td> </tr> <%end%> - - + + <tr class="tablecell"> - <td colspan="8" nowrap="nowrap"> + <td colspan="6" nowrap="nowrap"> <div class="records">页:<%= @categories.current_page%>/<%=@categories.page_count %>,记录:<%=@categories.total_entries %></div> <div class="multipage"><%= will_paginate @categories %></div> </td> </tr> <tr> - <td class="tablebottom" colspan="4"></td> + <td class="tablebottom" colspan="6"></td> </tr> </table> </td> app/views/admin/categories/.svn/text-base/_items.html.erb.svn-base @@ -1,9 +1,51 @@ -<h1>Editing category</h1> -<% form_tag :action => 'update', :id => @category do %> - <%= render :partial => 'form' %> - <%= submit_tag 'Edit' %> -<% end %> -<%= link_to 'Show', :action => 'show', :id => @category %> | -<%= link_to 'Back', :action => 'list' %> + + + +<div class="mainbody"> + <div class="navlink"><a href="/admin/index">控制面版</a> » 分类管理</div> +</div> + + + +<div class="mainbody"> + <table border="0" cellspacing="0" cellpadding="0" style="width:100%;"> + + <tr> + <td valign="top" style="width:150px;"> + <%=render(:partial => "slider")%> + </td> + + <td valign="top" style="width:20px;"></td> + <td valign="top"> + + <% form_for(:category, :url => admin_category_path(:id => @category) ,:html => { :method => :put }) do |form| -%> + <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%"> + <tbody><tr> + <td class="rightmainbody"> + <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%"> + + <tbody> + <tr class="tdbheader"> + <td colspan="2">更新分类</td> + </tr> + <%= render :partial => 'form' ,:object => form%> + <tr class="tablecell"> + <td colspan="2" align="center"> + <%= submit_tag '更新', :class=>"formbutton" %> + <input value="重置" class="formbutton" type="reset"> + </td> + </tr> + <tr> + <td class="tablebottom" colspan="2"></td> + </tr> + </tbody></table></td> + </tr> + + </tbody></table> + <% end %> + </td> + </tr> + </table> + </div> app/views/admin/categories/.svn/text-base/edit.rhtml.svn-base @@ -1,5 +1,5 @@ <div class="mainbody"> - <div class="navlink"><a href="/admin/index">控制面版</a> » 附件管理</div> + <div class="navlink"><a href="/admin/index">控制面版</a> » 分类管理</div> </div> @@ -14,9 +14,8 @@ <td valign="top" style="width:20px;"></td> <td valign="top"> - <form action="admincp.php?job=comment" method="POST" name="form"> - <%=render(:partial => "items")%> - </form> + <%=render(:partial => "items")%> + </td> </tr> </table> app/views/admin/categories/.svn/text-base/index.html.erb.svn-base @@ -1,34 +1,49 @@ - <%= error_messages_for 'type' %> - <% form_tag :action => 'create' do %> +<div class="mainbody"> + <div class="navlink"><a href="/admin/index">控制面版</a> » 分类管理</div> +</div> + + + +<div class="mainbody"> + <table border="0" cellspacing="0" cellpadding="0" style="width:100%;"> + + <tr> + <td valign="top" style="width:150px;"> + <%=render(:partial => "slider")%> + </td> + + <td valign="top" style="width:20px;"></td> + <td valign="top"> + <% form_tag :action => 'create' do %> + + <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%"> + <tbody><tr> + <td class="rightmainbody"> + <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%"> + + <tbody> + <tr class="tdbheader"> + <td colspan="2">新建子分类</td> + </tr> + <%= render :partial => 'form' %> + <tr class="tablecell"> + <td colspan="2" align="center"> + <%= submit_tag '提交', :class=>"formbutton" %> + <input value="重置" class="formbutton" type="reset"> + </td> + </tr> + <tr> + <td class="tablebottom" colspan="2"></td> + </tr> + </tbody></table></td> + </tr> + + </tbody></table> + <% end %> + </td> + </tr> + </table> +</div> - <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%"> - <tbody><tr> - <td class="rightmainbody"> - <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%"> - <tbody> - <tr class="tdbheader"> - <td colspan="2">新建子分类</td> - </tr> - - - - <%= render :partial => 'form' %> - - - <tr class="tablecell"> - <td colspan="2" align="center"> - - <%= submit_tag '提交', :class=>"formbutton" %> - <input value="重置" class="formbutton" type="reset"> - </td> - </tr> - <tr> - <td class="tablebottom" colspan="2"></td> - </tr> - </tbody></table></td> - </tr> - - </tbody></table> -<% end %> app/views/admin/categories/.svn/text-base/new.rhtml.svn-base @@ -1,37 +1,35 @@ +K 26 +svn:wc:ra_dav:activity-url +V 14 +/svn/!svn/act/ K 25 svn:wc:ra_dav:version-url V 44 -/svn/!svn/ver/66/trunk/app/views/admin/links +/svn/!svn/ver/79/trunk/app/views/admin/links END -list.rhtml +list.html.erb K 25 svn:wc:ra_dav:version-url -V 55 -/svn/!svn/ver/66/trunk/app/views/admin/links/list.rhtml -END -show.rhtml -K 25 -svn:wc:ra_dav:version-url -V 55 -/svn/!svn/ver/66/trunk/app/views/admin/links/show.rhtml +V 58 +/svn/!svn/ver/79/trunk/app/views/admin/links/list.html.erb END _form.rhtml K 25 svn:wc:ra_dav:version-url V 56 -/svn/!svn/ver/66/trunk/app/views/admin/links/_form.rhtml +/svn/!svn/ver/79/trunk/app/views/admin/links/_form.rhtml END edit.rhtml K 25 svn:wc:ra_dav:version-url V 55 -/svn/!svn/ver/66/trunk/app/views/admin/links/edit.rhtml +/svn/!svn/ver/79/trunk/app/views/admin/links/edit.rhtml END _items.html.erb K 25 svn:wc:ra_dav:version-url V 60 -/svn/!svn/ver/66/trunk/app/views/admin/links/_items.html.erb +/svn/!svn/ver/79/trunk/app/views/admin/links/_items.html.erb END _slider.html.erb K 25 @@ -43,5 +41,5 @@ new.rhtml K 25 svn:wc:ra_dav:version-url V 54 -/svn/!svn/ver/66/trunk/app/views/admin/links/new.rhtml +/svn/!svn/ver/79/trunk/app/views/admin/links/new.rhtml END app/views/admin/links/.svn/all-wcprops @@ -1,17 +1,17 @@ 8 dir -74 +79 https://1stlog.googlecode.com/svn/trunk/app/views/admin/links https://1stlog.googlecode.com/svn -2008-04-22T01:27:37.349214Z -66 +2008-05-24T19:46:25.242301Z +79 iceskysl has-props -has-prop-mods + svn:special svn:externals svn:needs-lock @@ -26,28 +26,16 @@ svn:special svn:externals svn:needs-lock 01612b04-d432-0410-ac2e-49b30577d389 * -list.rhtml +list.html.erb file -delete -2008-05-23T16:33:36.000000Z -b779a0eea877305519bdf5998a3ce457 -2008-04-22T01:27:37.349214Z -66 -iceskysl -* -show.rhtml -file - - -delete -2008-05-23T16:33:36.000000Z -f29d937533b654617879233e3879070f -2008-04-22T01:27:37.349214Z -66 +2008-05-24T19:26:48.000000Z +629cb4787940b2c36226b94c0e293cc6 +2008-05-24T19:46:25.242301Z +79 iceskysl * _form.rhtml @@ -56,10 +44,10 @@ file -2008-05-23T16:33:36.000000Z -f4c0c9e85b60be018dda4f8f91de8cb9 -2008-04-22T01:27:37.349214Z -66 +2008-05-24T19:19:34.000000Z +41dbb385f0656490beebe47980542c44 +2008-05-24T19:46:25.242301Z +79 iceskysl * edit.rhtml @@ -68,10 +56,10 @@ file -2008-05-23T16:33:36.000000Z -6479470596b35f9b5ab47048c36f8cf4 -2008-04-22T01:27:37.349214Z -66 +2008-05-24T19:21:22.000000Z +000d642d001218f8302eda9987c145b5 +2008-05-24T19:46:25.242301Z +79 iceskysl * _items.html.erb @@ -80,15 +68,15 @@ file -2008-05-23T16:33:36.000000Z -8d6663abeb2c227792a44a54b5ab365a -2008-04-22T01:27:37.349214Z -66 +2008-05-24T19:07:17.000000Z +09fed82307478b9fdcd68a5299d5e179 +2008-05-24T19:46:25.242301Z +79 iceskysl * _slider.html.erb file - +74 @@ -104,9 +92,9 @@ file -2008-05-23T16:33:36.000000Z -e649fc2dd2f66cde9a9650a18fb4a8a2 -2008-04-22T01:27:37.349214Z -66 +2008-05-24T17:51:59.000000Z +49ac74798fc69e746488b07ea0cc0e10 +2008-05-24T19:46:25.242301Z +79 iceskysl * app/views/admin/links/.svn/entries @@ -7,12 +7,8 @@ <td colspan="2">添加链接</td> </tr> - <tr class="tablecell"> - <td>状态:</td> - <td><select name="visible"> - <option value="1" selected="selected">显示</option> - <option value="0">隐藏</option></select></td> - </tr> + + <tr class="tablecell"> <td>上级分类:</td> @@ -24,16 +20,22 @@ <tr class="tablecell"> <td>名称:</td> - <td><%= text_field 'link', 'title' %></td> + <td><%= text_field 'link', 'title' ,{:size=>20, :class => 'formfield' } %></td> </tr> <tr class="tablecell"> <td>地址:</td> - <td><%= text_field 'link', 'weburl' %></td> + <td><%= text_field 'link', 'weburl' ,{:size=>20, :class => 'formfield' } %></td> </tr> <tr class="tablecell"> <td>描述:</td> - <td><%= text_field 'link', 'description' %></td> + <td><%= text_field 'link', 'description' ,{ :class => 'formfield' } %></td> + </tr> + <tr class="tablecell"> + <td>状态:</td> + <td><select name="visible"> + <option value="1" selected="selected">显示</option> + <option value="0">隐藏</option></select></td> </tr> <tr class="tablecell"> <td colspan="2" align="center"><input value="提交" class="formbutton" type="submit"> <input value="重置" class="formbutton" type="reset"></td> app/views/admin/links/.svn/text-base/_form.rhtml.svn-base @@ -9,31 +9,36 @@ <td nowrap width="20%">地址</td> <td nowrap width="40%">描述</td> + <td nowrap="nowrap" width="2%"> 编辑 </td> + </tr> <%@links.each do |link|%> <tr class="tablecell"> <td nowrap><%=link.title%></td> - <td nowrap><%=link.type.name%></td> + <td nowrap><%=link.parent%></td> <td nowrap><%=link.weburl%></td> - <td nowrap><%=link.description%></td> - </tr> - <%end%> - - - <tr class="tablecell"> - <td colspan="8" nowrap="nowrap"><div class="records">页:<%= @links.current_page%>/<%=@links.page_count %>,记录:<%=@links.total_entries %></div> + <td><%=link.description%></td> + <td nowrap="nowrap"> + <%=link_to image_tag("icos/edit.gif", :border=>"0",:size => "16x16", :alt => "编辑"),{:action=>"edit",:id=>link.id}%> + </td> + </tr> + <%end%> + + + <tr class="tablecell"> + <td colspan="5" nowrap="nowrap"><div class="records">页:<%= @links.current_page%>/<%=@links.page_count %>,记录:<%=@links.total_entries %></div> - <div class="multipage"><%= will_paginate @links %></div></td> + <div class="multipage"><%= will_paginate @links %></div></td> - </tr> + </tr> - <tr> - <td class="tablebottom" colspan="9"></td> - </tr> - </table> - </td> + <tr> + <td class="tablebottom" colspan="5"></td> + </tr> + </table> + </td> - </tr> + </tr> - </table> \ No newline at end of file +</table> \ No newline at end of file app/views/admin/links/.svn/text-base/_items.html.erb.svn-base @@ -1,9 +1,25 @@ -<h1>Editing link</h1> -<% form_tag :action => 'update', :id => @link do %> - <%= render :partial => 'form' %> - <%= submit_tag 'Edit' %> -<% end %> -<%= link_to 'Show', :action => 'show', :id => @link %> | -<%= link_to 'Back', :action => 'list' %> +<div class="mainbody"> + <div class="navlink"><a href="/admin/index">控制面版</a> » 链接管理</div> +</div> + + + +<div class="mainbody"> + <table border="0" cellspacing="0" cellpadding="0" style="width:100%;"> + + <tr> + <td valign="top" style="width:150px;"> + <%=render(:partial => "slider")%> + </td> + + <td valign="top" style="width:20px;"></td> + <td valign="top"> + <% form_for(:link, :url => admin_link_path(:id => @link) ,:html => { :method => :put }) do |form| -%> + <%= render :partial => 'form' ,:object => form%> + <% end %> + </td> + </tr> + </table> +</div> app/views/admin/links/.svn/text-base/edit.rhtml.svn-base @@ -19,7 +19,7 @@ <td valign="top" style="width:20px;"></td> <td valign="top"> <% form_tag :action => 'create' do %> - <%= render :partial => 'form' %> + <%= render :partial => 'form' %> <% end %> </td> </tr> app/views/admin/links/.svn/text-base/new.rhtml.svn-base @@ -19,7 +19,7 @@ routes.rb K 25 svn:wc:ra_dav:version-url V 39 -/svn/!svn/ver/68/trunk/config/routes.rb +/svn/!svn/ver/82/trunk/config/routes.rb END database.yml K 25 @@ -37,7 +37,7 @@ appconfig.yml K 25 svn:wc:ra_dav:version-url V 43 -/svn/!svn/ver/66/trunk/config/appconfig.yml +/svn/!svn/ver/82/trunk/config/appconfig.yml END environment.rb K 25 config/.svn/all-wcprops @@ -52,15 +52,15 @@ iceskysl * routes.rb file -76 +82 -2008-05-23T16:41:08.000000Z -22964fc2b33e1d84f97baaefd2bff268 -2008-05-04T14:50:25.670763Z -68 -wujunchen +2008-05-24T18:51:33.000000Z +5487b7323a624ef183753b2c2f99d7e7 +2008-05-24T19:49:23.010407Z +82 +iceskysl * database.yml file @@ -91,14 +91,14 @@ dir * appconfig.yml file +82 - -2008-05-23T16:41:08.000000Z -22cdef0fc12701957012baeb96140688 -2008-04-22T01:27:37.349214Z -66 +2008-05-24T17:35:13.000000Z +f267140fa2e8707eb4a5c327352f5ec6 +2008-05-24T19:49:23.010407Z +82 iceskysl * environment.rb config/.svn/entries @@ -1,11 +1,19 @@ KEY: "trackback_key" visible: "1" -NAME: "1stlog" -VERSION: "Ver1.2.0.0" -RELEASE_TIME: "2008.04.20" -HOMEPAGE: "http://1stlog.1sters.com" - -AUTHOR: "IceskYsl@1sters!" -AUTHOR_EMAIL: "iceskysl@gmail.com" -AUTHOR_BLOG: "http://iceskysl.1sters.com" +APP: + NAME: "1stlog" + VERSION: "Ver2.0.0" + RELEASE_TIME: "2008.05.24" + HOMEPAGE: "http://1stlog.1sters.com" + + +AUTHOR: + NAME: "IceskYsl@1sters!" + EMAIL: "iceskysl@gmail.com" + BLOG: "http://iceskysl.1sters.com" + +COPYRIGHT: + NAME: 1sters! + HOMEPAGE: http://www.1sters.com + config/.svn/text-base/appconfig.yml.svn-base @@ -11,8 +11,7 @@ ActionController::Routing::Routes.draw do |map| #后台管理需要的URL map.namespace(:admin) do |admin| - admin.resources :categories, - :has_many => [ :topics, :comments ] + admin.resources :categories, :has_many => [ :topics, :comments ] ,:collection=>{:list => :get} admin.resources :natures, :has_one => [ :topics, :comments ] admin.resources :topics,:collection=>{:list => :get} @@ -26,6 +25,7 @@ ActionController::Routing::Routes.draw do |map| admin.resources :attachments admin.resources :plugins admin.resources :caches,:collection=>{:counts => :get} + admin.resources :logs,:collection=>{:counts => :get} end #前台 config/.svn/text-base/routes.rb.svn-base @@ -1,11 +1,15 @@ +K 26 +svn:wc:ra_dav:activity-url +V 14 +/svn/!svn/act/ K 25 svn:wc:ra_dav:version-url V 25 -/svn/!svn/ver/66/trunk/db +/svn/!svn/ver/81/trunk/db END schema.rb K 25 svn:wc:ra_dav:version-url V 35 -/svn/!svn/ver/66/trunk/db/schema.rb +/svn/!svn/ver/81/trunk/db/schema.rb END db/.svn/all-wcprops @@ -1,17 +1,17 @@ 8 dir -74 +81 https://1stlog.googlecode.com/svn/trunk/db https://1stlog.googlecode.com/svn -2008-04-22T01:27:37.349214Z -66 +2008-05-24T19:47:59.525361Z +81 iceskysl has-props -has-prop-mods + svn:special svn:externals svn:needs-lock @@ -32,10 +32,10 @@ file -2008-05-23T16:34:19.000000Z -8ac5117561e1ccd1f2a3efd3b7d20798 -2008-04-22T01:27:37.349214Z -66 +2008-05-24T18:05:17.000000Z +fd4dc721b38988fc2ac26bb658f22d5e +2008-05-24T19:47:59.525361Z +81 iceskysl * migrate db/.svn/entries @@ -9,6 +9,146 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 0) do +ActiveRecord::Schema.define(:version => 17) do + + create_table "attachments", :force => true do |t| + t.integer "topic_id" + t.string "filename" + t.string "filetype" + t.integer "filesize", :default => 0 + t.string "filepath", :default => "" + t.integer "downloads", :default => 0 + t.datetime "created_at" + t.datetime "updated_at" + t.integer "isimage", :default => 0 + end + + create_table "categories", :force => true do |t| + t.integer "parent_id", :default => 0 + t.string "title" + t.string "desc" + t.integer "position", :default => 0 + t.integer "topics_count", :default => 0 + end + + create_table "comments", :force => true do |t| + t.text "body" + t.integer "type_id" + t.integer "topic_id" + t.string "name" + t.string "email", :default => " @ " + t.string "website", :default => "http://" + t.datetime "created_at" + t.string "remote_ip" + end + + create_table "configurations", :force => true do |t| + t.string "name" + t.string "title" + t.string "description" + t.text "value" + t.string "group" + end + + create_table "links", :force => true do |t| + t.integer "parent_id", :default => 0 + t.string "title" + t.string "description" + t.string "weburl", :default => "http://" + t.integer "position" + t.integer "visible", :default => 1 + end + + create_table "natures", :force => true do |t| + t.string "title" + t.string "description" + t.integer "topics_count", :default => 0 + t.integer "position", :default => 0 + end + + create_table "statistics", :force => true do |t| + t.string "name" + t.string "value" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "tags", :force => true do |t| + t.string "title" + t.string "description" + t.integer "topics_count", :default => 0 + end + + create_table "themes", :force => true do |t| + t.string "name" + t.string "time" + t.string "author" + t.string "description" + t.string "homepage" + t.string "preview" + t.string "pwd" + t.string "useit", :default => "0" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "topics", :force => true do |t| + t.string "title" + t.text "body" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "type_id", :default => 0 + t.integer "category_id", :default => 0 + t.integer "tag_id", :default => 0 + t.string "attachment_id", :default => "" + t.integer "user_id", :default => 0 + t.integer "views_count", :default => 0 + t.integer "comments_count", :default => 0 + t.integer "istop", :default => 0 + t.string "remote_ip", :default => "" + t.string "keys", :default => "" + t.integer "visible", :default => 1 + t.integer "closecomment", :default => 0 + t.string "readpassword", :default => "" + t.integer "showsnippet", :default => 1 + t.integer "snippetcounts", :default => 200 + t.integer "track_backs_count", :default => 0 + t.integer "nature_id", :default => 1 + end + + create_table "track_backs", :force => true do |t| + t.integer "topic_id" + t.string "title", :default => "TrackBack Titel" + t.string "excerpt", :default => "TrackBack Excerpt" + t.string "blog_name", :default => "Blog Name" + t.string "url", :default => "url" + t.datetime "created_at" + t.datetime "updated_at" + t.string "remote_ip", :default => "" + t.integer "visible", :default => 0 + end + + create_table "user_groups", :force => true do |t| + t.string "title" + t.string "description" + t.integer "users_count", :default => 0 + end + + create_table "users", :force => true do |t| + t.string "login_name" + t.string "nickname" + t.string "hashed_pass" + t.string "email" + t.string "im" + t.text "personality" + t.binary "data" + t.string "content_type" + t.integer "user_group_id", :default => 1 + t.integer "topics_count", :default => 0 + t.integer "comments_count", :default => 0 + t.datetime "created_at", :default => '2008-05-25 02:05:16' + t.datetime "updated_at" + t.text "note" + end end db/.svn/text-base/schema.rb.svn-base @@ -1,7 +1,7 @@ K 25 svn:wc:ra_dav:version-url V 33 -/svn/!svn/ver/66/trunk/db/migrate +/svn/!svn/ver/81/trunk/db/migrate END 015_init_config.rb K 25 @@ -37,7 +37,7 @@ END K 25 svn:wc:ra_dav:version-url V 58 -/svn/!svn/ver/66/trunk/db/migrate/005_create_categories.rb +/svn/!svn/ver/81/trunk/db/migrate/005_create_categories.rb END 007_create_comments.rb K 25 @@ -61,7 +61,7 @@ END K 25 svn:wc:ra_dav:version-url V 58 -/svn/!svn/ver/66/trunk/db/migrate/016_create_statistics.rb +/svn/!svn/ver/81/trunk/db/migrate/016_create_statistics.rb END 001_create_topics.rb K 25 @@ -69,23 +69,17 @@ svn:wc:ra_dav:version-url V 54 /svn/!svn/ver/66/trunk/db/migrate/001_create_topics.rb END -002_create_users.rb -K 25 -svn:wc:ra_dav:version-url -V 53 -/svn/!svn/ver/66/trunk/db/migrate/002_create_users.rb -END 013_add_nature_id.rb K 25 svn:wc:ra_dav:version-url V 54 /svn/!svn/ver/66/trunk/db/migrate/013_add_nature_id.rb END -008_create_tags.rb +002_create_users.rb K 25 svn:wc:ra_dav:version-url -V 52 -/svn/!svn/ver/66/trunk/db/migrate/008_create_tags.rb +V 53 +/svn/!svn/ver/66/trunk/db/migrate/002_create_users.rb END 011_add_track_backs_count.rb K 25 @@ -93,15 +87,15 @@ svn:wc:ra_dav:version-url V 62 /svn/!svn/ver/66/trunk/db/migrate/011_add_track_backs_count.rb END -010_create_track_backs.rb +008_create_tags.rb K 25 svn:wc:ra_dav:version-url -V 59 -/svn/!svn/ver/66/trunk/db/migrate/010_create_track_backs.rb +V 52 +/svn/!svn/ver/66/trunk/db/migrate/008_create_tags.rb END -004_create_types.rb +010_create_track_backs.rb K 25 svn:wc:ra_dav:version-url -V 53 -/svn/!svn/ver/66/trunk/db/migrate/004_create_types.rb +V 59 +/svn/!svn/ver/66/trunk/db/migrate/010_create_track_backs.rb END db/migrate/.svn/all-wcprops @@ -1,17 +1,17 @@ 8 dir -74 +81 https://1stlog.googlecode.com/svn/trunk/db/migrate https://1stlog.googlecode.com/svn -2008-04-22T01:27:37.349214Z -66 +2008-05-24T19:47:59.525361Z +81 iceskysl has-props -has-prop-mods + svn:special svn:externals svn:needs-lock @@ -28,7 +28,7 @@ svn:special svn:externals svn:needs-lock * 015_init_config.rb file - +74 @@ -40,7 +40,7 @@ iceskysl * 003_create_user_groups.rb file - +74 @@ -52,7 +52,7 @@ iceskysl * 006_create_attachments.rb file - +74 @@ -64,7 +64,7 @@ iceskysl * 012_create_natures.rb file - +74 @@ -76,7 +76,7 @@ iceskysl * 009_create_links.rb file - +74 @@ -92,15 +92,15 @@ file -2008-05-23T16:34:19.000000Z -8e1b66f820fa3857492a4b104dd6d019 -2008-04-22T01:27:37.349214Z -66 +2008-05-24T18:01:44.000000Z +4148bcc935573a93efb630c6f5a1de48 +2008-05-24T19:47:59.525361Z +81 iceskysl * 007_create_comments.rb file - +74 @@ -112,7 +112,7 @@ iceskysl * 017_create_themes.rb file - +74 @@ -124,7 +124,7 @@ iceskysl * 014_create_configurations.rb file - +74 @@ -140,15 +140,15 @@ file -2008-05-23T16:34:19.000000Z -af715499acaba1d7dbe97da50c2e39b1 -2008-04-22T01:27:37.349214Z -66 +2008-05-24T18:04:29.000000Z +70f12b355cf440eeab53f3f7a542abdd +2008-05-24T19:47:59.525361Z +81 iceskysl * 001_create_topics.rb file - +74 @@ -158,21 +158,9 @@ file 66 iceskysl * -002_create_users.rb -file - - - - -2008-05-23T16:34:19.000000Z -72abf240e904f4600daa9c84dc06555f -2008-04-22T01:27:37.349214Z -66 -iceskysl -* 013_add_nature_id.rb file - +74 @@ -182,21 +170,21 @@ file 66 iceskysl * -008_create_tags.rb +002_create_users.rb file - +74 2008-05-23T16:34:19.000000Z -68cbb9aba3cf3bdaeb93c2bba155f193 +72abf240e904f4600daa9c84dc06555f 2008-04-22T01:27:37.349214Z 66 iceskysl * 011_add_track_backs_count.rb file - +74 @@ -206,26 +194,26 @@ dc1009eb0354ddc9e34f72d8fca0136e 66 iceskysl * -010_create_track_backs.rb +008_create_tags.rb file - +74 2008-05-23T16:34:19.000000Z -38a195b4455ac2e1f83f0b0f179a05c2 +68cbb9aba3cf3bdaeb93c2bba155f193 2008-04-22T01:27:37.349214Z 66 iceskysl * -004_create_types.rb +010_create_track_backs.rb file +74 -delete 2008-05-23T16:34:19.000000Z -f21cd53148d458346055965b9f4af600 +38a195b4455ac2e1f83f0b0f179a05c2 2008-04-22T01:27:37.349214Z 66 iceskysl db/migrate/.svn/entries @@ -1,14 +1,15 @@ class CreateCategories < ActiveRecord::Migration def self.up create_table :categories do |t| - t.column :type_id, :integer, :default => 0 #大类别 新闻 博客 文章 + t.column :parent_id, :integer, :default => 0 #大类别 新闻 博客 文章 t.column :title, :string #小类分类名 新闻 博客 公告的二级分类 - t.column :description, :string #小分类分类描述 + t.column :desc, :string #小分类分类描述 t.column :position, :integer ,:default => 0 #排列顺序 t.column :topics_count, :integer, :default => 0 #文章数 end - Category.new(:type_id=>1,:title=>'默认分类', :description=>'默认的分类',:position=>'0').save + Category.new(:parent_id => 0,:title=>'默认分类', :desc => '默认的分类',:position=>'0').save + Category.new(:parent_id => 1,:title=>'二级分类', :desc => '默认的二级分类',:position=>'0').save end def self.down db/migrate/.svn/text-base/005_create_categories.rb.svn-base @@ -20,10 +20,10 @@ class CreateStatistics < ActiveRecord::Migration Statistic.new(:name=>k,:value=>v).save end - #初始化版权信息等 - YAML::load(File.open("#{RAILS_ROOT}/config/appconfig.yml")).each do |k,v| - Statistic.new(:name=>k,:value=>v).save - end +# #初始化版权信息等 +# YAML::load(File.open("#{RAILS_ROOT}/config/appconfig.yml")).each do |k,v| +# Statistic.new(:name=>k,:value=>v).save +# end end db/migrate/.svn/text-base/016_create_statistics.rb.svn-base @@ -50,50 +50,50 @@ file 66 iceskysl * -user_controller_test.rb +topic_controller_test.rb file 2008-05-23T16:32:26.000000Z -8b66c4e29c3710db4c91bc303cc01bc8 +a3a2f845363ebfd883d5adf633e22afc 2008-04-22T01:27:37.349214Z 66 iceskysl * -topic_controller_test.rb +user_controller_test.rb file 2008-05-23T16:32:26.000000Z -a3a2f845363ebfd883d5adf633e22afc +8b66c4e29c3710db4c91bc303cc01bc8 2008-04-22T01:27:37.349214Z 66 iceskysl * -type_controller_test.rb +plugins_controller_test.rb file -delete + 2008-05-23T16:32:26.000000Z -04ef0fd3366fc039ebc2501d36e7159b +b8d9c58bf37595ace53d6475e943cfe8 2008-04-22T01:27:37.349214Z 66 iceskysl * -plugins_controller_test.rb +type_controller_test.rb file - +delete 2008-05-23T16:32:26.000000Z -b8d9c58bf37595ace53d6475e943cfe8 +04ef0fd3366fc039ebc2501d36e7159b 2008-04-22T01:27:37.349214Z 66 iceskysl @@ -182,26 +182,33 @@ file 66 iceskysl * -index_controller_test.rb +logs_controller_test.rb +file +0 + + +add +* +configuration_controller_test.rb file 2008-05-23T16:32:26.000000Z -954b75e1846480ec5c56302fd92b5318 +e30d3583760013ff555182b8c4538f84 2008-04-22T01:27:37.349214Z 66 iceskysl * -configuration_controller_test.rb +index_controller_test.rb file 2008-05-23T16:32:26.000000Z -e30d3583760013ff555182b8c4538f84 +954b75e1846480ec5c56302fd92b5318 2008-04-22T01:27:37.349214Z 66 iceskysl test/functional/admin/.svn/entries app/cells/.svn/text-base/youtube_cell.rb.netbeans-base app/controllers/.svn/text-base/application.rb.netbeans-base app/controllers/.svn/text-base/archives_controller.rb.netbeans-base app/controllers/.svn/text-base/categories_controller.rb.netbeans-base app/controllers/.svn/text-base/feed_controller.rb.netbeans-base app/controllers/.svn/text-base/index_controller.rb.netbeans-base app/controllers/.svn/text-base/natures_controller.rb.netbeans-base app/controllers/.svn/text-base/publish_controller.rb.netbeans-base app/controllers/.svn/text-base/tag_controller.rb.netbeans-base app/controllers/.svn/text-base/topic_controller.rb.netbeans-base app/controllers/admin/.svn/dir-props app/controllers/admin/.svn/text-base/caches_controller.rb.netbeans-base app/controllers/admin/.svn/text-base/categories_controller.rb.netbeans-base app/controllers/admin/.svn/text-base/index_controller.rb.netbeans-base app/controllers/admin/.svn/text-base/links_controller.rb.netbeans-base app/controllers/admin/.svn/text-base/types_controller.rb.netbeans-base app/controllers/admin/.svn/text-base/types_controller.rb.svn-base app/models/.svn/text-base/category.rb.netbeans-base app/models/.svn/text-base/link.rb.netbeans-base app/models/.svn/text-base/topic.rb.netbeans-base app/models/.svn/text-base/type.rb.netbeans-base app/views/admin/categories/.svn/dir-props app/views/admin/categories/.svn/text-base/_form.rhtml.netbeans-base app/views/admin/categories/.svn/text-base/_items.html.erb.netbeans-base app/views/admin/categories/.svn/text-base/edit.rhtml.netbeans-base app/views/admin/categories/.svn/text-base/index.html.erb.netbeans-base app/views/admin/categories/.svn/text-base/list.rhtml.netbeans-base app/views/admin/categories/.svn/text-base/list.rhtml.svn-base app/views/admin/categories/.svn/text-base/new.rhtml.netbeans-base app/views/admin/categories/.svn/text-base/show.rhtml.svn-base app/views/admin/index/.svn/text-base/_content.html.erb.netbeans-base app/views/admin/index/.svn/text-base/index.rhtml.netbeans-base app/views/admin/links/.svn/dir-props app/views/admin/links/.svn/text-base/_form.rhtml.netbeans-base app/views/admin/links/.svn/text-base/_items.html.erb.netbeans-base app/views/admin/links/.svn/text-base/edit.rhtml.netbeans-base app/views/admin/links/.svn/text-base/list.rhtml.netbeans-base app/views/admin/links/.svn/text-base/list.rhtml.svn-base app/views/admin/links/.svn/text-base/new.rhtml.netbeans-base app/views/admin/links/.svn/text-base/show.rhtml.svn-base app/views/index/.svn/text-base/login.rhtml.netbeans-base app/views/shared/admin/.svn/text-base/_copyright.html.erb.netbeans-base app/views/shared/admin/.svn/text-base/_nav.html.erb.netbeans-base app/views/shared/item/.svn/text-base/_types.rhtml.netbeans-base config/.svn/text-base/appconfig.yml.netbeans-base config/.svn/text-base/boot.rb.netbeans-base config/.svn/text-base/database.yml.netbeans-base config/.svn/text-base/database_p.yml.netbeans-base config/.svn/text-base/environment.rb.netbeans-base config/.svn/text-base/routes.rb.netbeans-base config/initializers/.svn/text-base/inflections.rb.netbeans-base config/initializers/.svn/text-base/load_configs.rb.netbeans-base config/initializers/.svn/text-base/mime_types.rb.netbeans-base db/.svn/dir-props db/migrate/.svn/dir-props db/migrate/.svn/text-base/002_create_users.rb.netbeans-base db/migrate/.svn/text-base/003_create_user_groups.rb.netbeans-base db/migrate/.svn/text-base/004_create_types.rb.netbeans-base db/migrate/.svn/text-base/004_create_types.rb.svn-base db/migrate/.svn/text-base/005_create_categories.rb.netbeans-base db/migrate/.svn/text-base/016_create_statistics.rb.netbeans-base public/stylesheets/.svn/text-base/cp.css.netbeans-base test/functional/admin/.svn/text-base/index_controller_test.rb.netbeans-base d899156975a4c20be6a5fefe74c5bc9733d82385 IcesksYsl@1sters! iceskysl@gmail.com http://github.com/IceskYsl/1stlog/commit/78d4d5c02fc89af74562265d021ba3073efe8248 78d4d5c02fc89af74562265d021ba3073efe8248 2008-05-25T08:35:22-07:00 2008-05-25T08:35:22-07:00 修改以前的代码，使得更加合理. 36ba1b7f805e870f90d81cf9cae150f0f4a26aa0 IcesksYsl@1sters! iceskysl@gmail.com