• R/O
  • HTTP
  • SSH
  • HTTPS

pettanr: コミット

サーバ側、Railsシステム本体


コミットメタ情報

リビジョン45a58ac4d97dfadb2be2a5cb697e7ce2bbf8169a (tree)
日時2012-01-06 17:46:06
作者yasushiito <yas@pen-...>
コミッターyasushiito

ログメッセージ

added views add to field

変更サマリ

差分

--- a/app/views/balloons/index.html.erb
+++ b/app/views/balloons/index.html.erb
@@ -7,9 +7,10 @@
77 <th>system_picture</th>
88 <th>Tail</th>
99 <th>size</th>
10+ <th>x</th>
11+ <th>y</th>
1012 <th>z</th>
11- <th>Top offset</th>
12- <th>Left offset</th>
13+ <th>t</th>
1314 <th>Width</th>
1415 <th>Height</th>
1516 </tr>
@@ -21,9 +22,9 @@
2122 <td><%= balloon.system_picture_id %></td>
2223 <td><%= balloon.tail %></td>
2324 <td><%= balloon.size %></td>
24- <td><%= balloon.z %></td>
25- <td><%= balloon.y %></td>
2625 <td><%= balloon.x %></td>
26+ <td><%= balloon.y %></td>
27+ <td><%= balloon.z %></td>
2728 <td><%= balloon.width %></td>
2829 <td><%= balloon.height %></td>
2930 </tr>
--- a/app/views/comics/index.html.erb
+++ b/app/views/comics/index.html.erb
@@ -6,10 +6,10 @@
66 <th>Title</th>
77 <th>width</th>
88 <th>height</th>
9- <th>author_id</th>
10- <th>updated_at</th>
119 <th>visible</th>
1210 <th>editable</th>
11+ <th>author_id</th>
12+ <th>updated_at</th>
1313 <th></th>
1414 <th></th>
1515 <th></th>
--- a/app/views/comics/show.html.erb
+++ b/app/views/comics/show.html.erb
@@ -25,4 +25,14 @@
2525 <%= @comic.editable %>
2626 </p>
2727
28+<p>
29+ <b>author_id:</b>
30+ <%= @comic.author_id %>
31+</p>
32+
33+<p>
34+ <b>updated_at:</b>
35+ <%= @comic.updated_at %>
36+</p>
37+
2838 <%= link_to 'Back', comics_path %>
--- a/app/views/panel_pictures/index.html.erb
+++ b/app/views/panel_pictures/index.html.erb
@@ -5,7 +5,7 @@
55 <th>id</th>
66 <th>panel</th>
77 <th>resource_picture</th>
8- <th>url</th>
8+ <th>link</th>
99 <th>Width</th>
1010 <th>Height</th>
1111 <th>x</th>
@@ -21,7 +21,7 @@
2121 <td><%= panel_picture.id %></td>
2222 <td><%= panel_picture.panel_id %></td>
2323 <td><%= panel_picture.resource_picture_id %></td>
24- <td><%= h panel_picture.url %></td>
24+ <td><%= h panel_picture.link %></td>
2525 <td><%= panel_picture.x %></td>
2626 <td><%= panel_picture.y %></td>
2727 <td><%= panel_picture.z %></td>
--- a/app/views/speach_balloons/index.html.erb
+++ b/app/views/speach_balloons/index.html.erb
@@ -2,8 +2,8 @@
22 <table>
33 <tr>
44 <th>Name</th>
5- <th>Tail limit</th>
6- <th>size limit</th>
5+ <th>Tail count</th>
6+ <th>size count</th>
77 <th>t</th>
88 <th></th>
99 <th></th>
--- a/app/views/speach_balloons/show.html.erb
+++ b/app/views/speach_balloons/show.html.erb
@@ -6,12 +6,12 @@
66 </p>
77
88 <p>
9- <b>Tail limit:</b>
9+ <b>Tail count:</b>
1010 <%= @speach_balloon.tail_count %>
1111 </p>
1212
1313 <p>
14- <b>size limit:</b>
14+ <b>size count:</b>
1515 <%= @speach_balloon.size_count %>
1616 </p>
1717
--- a/app/views/speach_templates/index.html.erb
+++ b/app/views/speach_templates/index.html.erb
@@ -3,8 +3,8 @@
33 <table>
44 <tr>
55 <th>balloon template</th>
6- <th>Top offset</th>
7- <th>Left offset</th>
6+ <th>x</th>
7+ <th>y</th>
88 <th>Width</th>
99 <th>Height</th>
1010 </tr>
@@ -12,8 +12,8 @@
1212 <% @speach_templates.each do |speach_template| %>
1313 <tr>
1414 <td><%= speach_template.balloon_template_id %></td>
15- <td><%= speach_template.y %></td>
1615 <td><%= speach_template.x %></td>
16+ <td><%= speach_template.y %></td>
1717 <td><%= speach_template.width %></td>
1818 <td><%= speach_template.height %></td>
1919 </tr>
--- a/app/views/speaches/index.html.erb
+++ b/app/views/speaches/index.html.erb
@@ -4,8 +4,9 @@
44 <tr>
55 <th>balloon</th>
66 <th>content</th>
7- <th>Top offset</th>
8- <th>Left offset</th>
7+ <th>x</th>
8+ <th>y</th>
9+ <th>t</th>
910 <th>Width</th>
1011 <th>Height</th>
1112 </tr>
@@ -14,8 +15,9 @@
1415 <tr>
1516 <td><%= speach.balloon_id %></td>
1617 <td><%= h speach.content %></td>
17- <td><%= speach.y %></td>
1818 <td><%= speach.x %></td>
19+ <td><%= speach.y %></td>
20+ <td><%= speach.t %></td>
1921 <td><%= speach.width %></td>
2022 <td><%= speach.height %></td>
2123 </tr>
旧リポジトリブラウザで表示