Added:
trunk/donrails/app/views/login/shared/
trunk/donrails/app/views/login/shared/add_banlist.rhtml
- copied unchanged from r210, /trunk/donrails/app/views/shared/add_banlist.rhtml
trunk/donrails/app/views/login/shared/edit_author.rhtml
- copied unchanged from r210, /trunk/donrails/app/views/shared/edit_author.rhtml
trunk/donrails/app/views/login/shared/edit_category.rhtml
- copied unchanged from r210, /trunk/donrails/app/views/shared/edit_category.rhtml
trunk/donrails/app/views/login/shared/edit_don_env.rhtml
- copied unchanged from r210, /trunk/donrails/app/views/shared/edit_don_env.rhtml
trunk/donrails/app/views/login/shared/edit_don_rbl.rhtml
- copied unchanged from r210, /trunk/donrails/app/views/shared/edit_don_rbl.rhtml
trunk/donrails/app/views/login/shared/table_comment.rhtml
- copied unchanged from r210, /trunk/donrails/app/views/shared/table_comment.rhtml
trunk/donrails/app/views/login/shared/table_trackback.rhtml
- copied unchanged from r210, /trunk/donrails/app/views/shared/table_trackback.rhtml
Removed:
trunk/donrails/app/views/shared/add_banlist.rhtml
trunk/donrails/app/views/shared/edit_author.rhtml
trunk/donrails/app/views/shared/edit_category.rhtml
trunk/donrails/app/views/shared/edit_don_env.rhtml
trunk/donrails/app/views/shared/edit_don_rbl.rhtml
trunk/donrails/app/views/shared/table_comment.rhtml
trunk/donrails/app/views/shared/table_trackback.rhtml
Modified:
trunk/ChangeLog
trunk/donrails/app/views/login/manage_author.rhtml
trunk/donrails/app/views/login/manage_banlist.rhtml
trunk/donrails/app/views/login/manage_category.rhtml
trunk/donrails/app/views/login/manage_comment.rhtml
trunk/donrails/app/views/login/manage_don_env.rhtml
trunk/donrails/app/views/login/manage_don_rbl.rhtml
trunk/donrails/app/views/login/manage_trackback.rhtml
trunk/donrails/app/views/login/new_article.rhtml
Log:
2007-04-15 ARAKI Yasuhiro <ya...@debian.or.jp>
* donrails/app/views/login/shared/table_trackback.rhtml: move file.
* donrails/app/views/login/manage_trackback.rhtml: Change to use it.
* donrails/app/views/login/shared/edit_don_rbl.rhtml: move file.
* donrails/app/views/login/manage_don_rbl.rhtml: Change to use it.
* donrails/app/views/login/manage_comment.rhtml: Change to use it.
* donrails/app/views/login/shared/table_comment.rhtml: move file.
* donrails/app/views/login/shared/edit_don_env.rhtml: move file.
* donrails/app/views/login/manage_don_env.rhtml: Change to use it.
* donrails/app/views/login/shared/edit_category.rhtml: move file.
* donrails/app/views/login/manage_category.rhtml: Change to use it.
* donrails/app/views/login/shared/add_banlist.rhtml: move file.
* donrails/app/views/login/manage_comment.rhtml: Change to use it.
* donrails/app/views/login/manage_trackback.rhtml: Change to use it.
* donrails/app/views/login/manage_banlist.rhtml: Change to use it.
* donrails/app/views/login/shared/edit_author.rhtml: move file.
* donrails/app/views/login/manage_author.rhtml: Chage to use it.
* donrails/app/views/login/shared/upload_picture.rhtml: New file.
* donrails/app/views/login/new_article.rhtml: Change to use it.
Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Sat Apr 14 08:16:06 2007
@@ -1,5 +1,33 @@
-2007-04-14 ARAKI Yasuhiro <ya...@debian.or.jp>
+2007-04-15 ARAKI Yasuhiro <ya...@debian.or.jp>
+
+ * donrails/app/views/login/shared/table_trackback.rhtml: move file.
+ * donrails/app/views/login/manage_trackback.rhtml: Change to use it.
+
+ * donrails/app/views/login/shared/edit_don_rbl.rhtml: move file.
+ * donrails/app/views/login/manage_don_rbl.rhtml: Change to use it.
+
+ * donrails/app/views/login/manage_comment.rhtml: Change to use it.
+ * donrails/app/views/login/shared/table_comment.rhtml: move file.
+
+ * donrails/app/views/login/shared/edit_don_env.rhtml: move file.
+ * donrails/app/views/login/manage_don_env.rhtml: Change to use it.
+ * donrails/app/views/login/shared/edit_category.rhtml: move file.
+ * donrails/app/views/login/manage_category.rhtml: Change to use it.
+
+ * donrails/app/views/login/shared/add_banlist.rhtml: move file.
+ * donrails/app/views/login/manage_comment.rhtml: Change to use it.
+ * donrails/app/views/login/manage_trackback.rhtml: Change to use it.
+ * donrails/app/views/login/manage_banlist.rhtml: Change to use it.
+
+ * donrails/app/views/login/shared/edit_author.rhtml: move file.
+ * donrails/app/views/login/manage_author.rhtml: Chage to use it.
+
+ * donrails/app/views/login/shared/upload_picture.rhtml: New file.
+ * donrails/app/views/login/new_article.rhtml: Change to use it.
+
+2007-04-14 ARAKI Yasuhiro <ya...@debian.or.jp>
+
* donrails/app/views/login/new_article.rhtml: Change to include 'login/form_article' view.
* donrails/app/views/login/form_article.rhtml: Change to apply it.
Modified: trunk/donrails/app/views/login/manage_author.rhtml
==============================================================================
--- trunk/donrails/app/views/login/manage_author.rhtml (original)
+++ trunk/donrails/app/views/login/manage_author.rhtml Sat Apr 14 08:16:06 2007
@@ -4,7 +4,7 @@
<hr>
新規著者の追加
<p>
-<%= render("shared/edit_author") %>
+<%= render("login/shared/edit_author") %>
<hr>
著者の管理
<% if @authors %>
Modified: trunk/donrails/app/views/login/manage_banlist.rhtml
==============================================================================
--- trunk/donrails/app/views/login/manage_banlist.rhtml (original)
+++ trunk/donrails/app/views/login/manage_banlist.rhtml Sat Apr 14 08:16:06 2007
@@ -1,6 +1,6 @@
<h1>banlist management</h1>
-<%= render('shared/add_banlist') %>
+<%= render('login/shared/add_banlist') %>
<hr>
ブラックリストの管理
<% if @banlists %>
Modified: trunk/donrails/app/views/login/manage_category.rhtml
==============================================================================
--- trunk/donrails/app/views/login/manage_category.rhtml (original)
+++ trunk/donrails/app/views/login/manage_category.rhtml Sat Apr 14 08:16:06 2007
@@ -7,7 +7,7 @@
<div id="content">
<h1>category management</h1>
<h2>カテゴリの追加またはカテゴリ情報の更新</h2>
-<%= render("shared/edit_category") %>
+<%= render('login/shared/edit_category') %>
<hr>
<h2>カテゴリの管理</h2>
<div class="notice">
Modified: trunk/donrails/app/views/login/manage_comment.rhtml
==============================================================================
--- trunk/donrails/app/views/login/manage_comment.rhtml (original)
+++ trunk/donrails/app/views/login/manage_comment.rhtml Sat Apr 14 08:16:06 2007
@@ -7,7 +7,7 @@
<% end %>
<h1><%= @heading %></h1>
-<%= render('shared/add_banlist') %>
+<%= render('login/shared/add_banlist') %>
<hr>
<% form_tag :action => "delete_comment" do hidden_field_tag("session_id_validation", security_token) -%>
<div class="kakomi">
@@ -16,7 +16,7 @@
</div>
</div>
<%= submit_tag %>
-<%= render('shared/table_comment') %>
+<%= render('login/shared/table_comment') %>
<%= submit_tag %>
<% end %>
<% end %>
Modified: trunk/donrails/app/views/login/manage_don_env.rhtml
==============================================================================
--- trunk/donrails/app/views/login/manage_don_env.rhtml (original)
+++ trunk/donrails/app/views/login/manage_don_env.rhtml Sat Apr 14 08:16:06 2007
@@ -7,7 +7,7 @@
<hr>
新規設定の追加
<p>
-<%= render("shared/edit_don_env") %>
+<%= render('login/shared/edit_don_env') %>
<hr>
設定の管理
<% if @don_envs %>
Modified: trunk/donrails/app/views/login/manage_don_rbl.rhtml
==============================================================================
--- trunk/donrails/app/views/login/manage_don_rbl.rhtml (original)
+++ trunk/donrails/app/views/login/manage_don_rbl.rhtml Sat Apr 14 08:16:06 2007
@@ -4,7 +4,7 @@
<hr>
新規設定の追加
<p>
-<%= render("shared/edit_don_rbl") %>
+<%= render('login/shared/edit_don_rbl') %>
<hr>
設定の管理
<% if @don_rbls %>
Modified: trunk/donrails/app/views/login/manage_trackback.rhtml
==============================================================================
--- trunk/donrails/app/views/login/manage_trackback.rhtml (original)
+++ trunk/donrails/app/views/login/manage_trackback.rhtml Sat Apr 14 08:16:06 2007
@@ -3,7 +3,7 @@
<h1><%= @heading %></h1>
<% if @trackbacks %>
-<%= render('shared/add_banlist') %>
+<%= render('login/shared/add_banlist') %>
<hr>
<% if @trackbacks_pages %>
<%= pagination_links @trackbacks_pages %>
@@ -18,7 +18,7 @@
<hr>
<%= submit_tag %>
-<%= render('shared/table_trackback') %>
+<%= render('login/shared/table_trackback') %>
<%= submit_tag %>
<% end %>
<% end %>
Modified: trunk/donrails/app/views/login/new_article.rhtml
==============================================================================
--- trunk/donrails/app/views/login/new_article.rhtml (original)
+++ trunk/donrails/app/views/login/new_article.rhtml Sat Apr 14 08:16:06 2007
@@ -3,12 +3,7 @@
<%= render('login/form_article') %>
<hr>
ファイルのアップロード
-<% form_tag({:action => "picture_save"},:multipart => 'true') do hidden_field_tag("session_id_validation", security_token) -%>
-<input id="picture_picture" name="picture[picture]" size="30" type="file" />
-<input name="commit" type="submit" value="Upload file" />
-<% end %>
-
-
+<%= render('login/shared/upload_picture') %>
<hr>
<a href="http://www.h14m.org/docs/hnf-j.html">hnf の記述方法</a>
/