OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7594d60
)
added views add to field
rename
author
yasushiito
<yas@pen-chan.jp>
Fri, 6 Jan 2012 08:46:06 +0000
(17:46 +0900)
committer
yasushiito
<yas@pen-chan.jp>
Fri, 6 Jan 2012 08:46:06 +0000
(17:46 +0900)
app/views/balloons/index.html.erb
patch
|
blob
|
history
app/views/comics/index.html.erb
patch
|
blob
|
history
app/views/comics/show.html.erb
patch
|
blob
|
history
app/views/panel_pictures/index.html.erb
patch
|
blob
|
history
app/views/speach_balloons/index.html.erb
patch
|
blob
|
history
app/views/speach_balloons/show.html.erb
patch
|
blob
|
history
app/views/speach_templates/index.html.erb
patch
|
blob
|
history
app/views/speaches/index.html.erb
patch
|
blob
|
history
diff --git
a/app/views/balloons/index.html.erb
b/app/views/balloons/index.html.erb
index
48994b7
..
8856ac1
100644
(file)
--- a/
app/views/balloons/index.html.erb
+++ b/
app/views/balloons/index.html.erb
@@
-7,9
+7,10
@@
<th>system_picture</th>
<th>Tail</th>
<th>size</th>
<th>system_picture</th>
<th>Tail</th>
<th>size</th>
+ <th>x</th>
+ <th>y</th>
<th>z</th>
<th>z</th>
- <th>Top offset</th>
- <th>Left offset</th>
+ <th>t</th>
<th>Width</th>
<th>Height</th>
</tr>
<th>Width</th>
<th>Height</th>
</tr>
@@
-21,9
+22,9
@@
<td><%= balloon.system_picture_id %></td>
<td><%= balloon.tail %></td>
<td><%= balloon.size %></td>
<td><%= balloon.system_picture_id %></td>
<td><%= balloon.tail %></td>
<td><%= balloon.size %></td>
- <td><%= balloon.z %></td>
- <td><%= balloon.y %></td>
<td><%= balloon.x %></td>
<td><%= balloon.x %></td>
+ <td><%= balloon.y %></td>
+ <td><%= balloon.z %></td>
<td><%= balloon.width %></td>
<td><%= balloon.height %></td>
</tr>
<td><%= balloon.width %></td>
<td><%= balloon.height %></td>
</tr>
diff --git
a/app/views/comics/index.html.erb
b/app/views/comics/index.html.erb
index
21909c0
..
b562d4a
100644
(file)
--- a/
app/views/comics/index.html.erb
+++ b/
app/views/comics/index.html.erb
@@
-6,10
+6,10
@@
<th>Title</th>
<th>width</th>
<th>height</th>
<th>Title</th>
<th>width</th>
<th>height</th>
- <th>author_id</th>
- <th>updated_at</th>
<th>visible</th>
<th>editable</th>
<th>visible</th>
<th>editable</th>
+ <th>author_id</th>
+ <th>updated_at</th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
diff --git
a/app/views/comics/show.html.erb
b/app/views/comics/show.html.erb
index
e238a2f
..
fb358d2
100644
(file)
--- a/
app/views/comics/show.html.erb
+++ b/
app/views/comics/show.html.erb
@@
-25,4
+25,14
@@
<%= @comic.editable %>
</p>
<%= @comic.editable %>
</p>
+<p>
+ <b>author_id:</b>
+ <%= @comic.author_id %>
+</p>
+
+<p>
+ <b>updated_at:</b>
+ <%= @comic.updated_at %>
+</p>
+
<%= link_to 'Back', comics_path %>
<%= link_to 'Back', comics_path %>
diff --git
a/app/views/panel_pictures/index.html.erb
b/app/views/panel_pictures/index.html.erb
index
5a54844
..
9f44380
100644
(file)
--- a/
app/views/panel_pictures/index.html.erb
+++ b/
app/views/panel_pictures/index.html.erb
@@
-5,7
+5,7
@@
<th>id</th>
<th>panel</th>
<th>resource_picture</th>
<th>id</th>
<th>panel</th>
<th>resource_picture</th>
- <th>
url
</th>
+ <th>
link
</th>
<th>Width</th>
<th>Height</th>
<th>x</th>
<th>Width</th>
<th>Height</th>
<th>x</th>
@@
-21,7
+21,7
@@
<td><%= panel_picture.id %></td>
<td><%= panel_picture.panel_id %></td>
<td><%= panel_picture.resource_picture_id %></td>
<td><%= panel_picture.id %></td>
<td><%= panel_picture.panel_id %></td>
<td><%= panel_picture.resource_picture_id %></td>
- <td><%= h panel_picture.
url
%></td>
+ <td><%= h panel_picture.
link
%></td>
<td><%= panel_picture.x %></td>
<td><%= panel_picture.y %></td>
<td><%= panel_picture.z %></td>
<td><%= panel_picture.x %></td>
<td><%= panel_picture.y %></td>
<td><%= panel_picture.z %></td>
diff --git
a/app/views/speach_balloons/index.html.erb
b/app/views/speach_balloons/index.html.erb
index
09ba60b
..
d9aa256
100644
(file)
--- a/
app/views/speach_balloons/index.html.erb
+++ b/
app/views/speach_balloons/index.html.erb
@@
-2,8
+2,8
@@
<table>
<tr>
<th>Name</th>
<table>
<tr>
<th>Name</th>
- <th>Tail
limi
t</th>
- <th>size
limi
t</th>
+ <th>Tail
coun
t</th>
+ <th>size
coun
t</th>
<th>t</th>
<th></th>
<th></th>
<th>t</th>
<th></th>
<th></th>
diff --git
a/app/views/speach_balloons/show.html.erb
b/app/views/speach_balloons/show.html.erb
index
d59af76
..
12b2e8e
100644
(file)
--- a/
app/views/speach_balloons/show.html.erb
+++ b/
app/views/speach_balloons/show.html.erb
@@
-6,12
+6,12
@@
</p>
<p>
</p>
<p>
- <b>Tail
limi
t:</b>
+ <b>Tail
coun
t:</b>
<%= @speach_balloon.tail_count %>
</p>
<p>
<%= @speach_balloon.tail_count %>
</p>
<p>
- <b>size
limi
t:</b>
+ <b>size
coun
t:</b>
<%= @speach_balloon.size_count %>
</p>
<%= @speach_balloon.size_count %>
</p>
diff --git
a/app/views/speach_templates/index.html.erb
b/app/views/speach_templates/index.html.erb
index
6d6f2d3
..
e1b1972
100644
(file)
--- a/
app/views/speach_templates/index.html.erb
+++ b/
app/views/speach_templates/index.html.erb
@@
-3,8
+3,8
@@
<table>
<tr>
<th>balloon template</th>
<table>
<tr>
<th>balloon template</th>
- <th>
Top offset
</th>
- <th>
Left offset
</th>
+ <th>
x
</th>
+ <th>
y
</th>
<th>Width</th>
<th>Height</th>
</tr>
<th>Width</th>
<th>Height</th>
</tr>
@@
-12,8
+12,8
@@
<% @speach_templates.each do |speach_template| %>
<tr>
<td><%= speach_template.balloon_template_id %></td>
<% @speach_templates.each do |speach_template| %>
<tr>
<td><%= speach_template.balloon_template_id %></td>
- <td><%= speach_template.y %></td>
<td><%= speach_template.x %></td>
<td><%= speach_template.x %></td>
+ <td><%= speach_template.y %></td>
<td><%= speach_template.width %></td>
<td><%= speach_template.height %></td>
</tr>
<td><%= speach_template.width %></td>
<td><%= speach_template.height %></td>
</tr>
diff --git
a/app/views/speaches/index.html.erb
b/app/views/speaches/index.html.erb
index
9a51fd6
..
3eb59d8
100644
(file)
--- a/
app/views/speaches/index.html.erb
+++ b/
app/views/speaches/index.html.erb
@@
-4,8
+4,9
@@
<tr>
<th>balloon</th>
<th>content</th>
<tr>
<th>balloon</th>
<th>content</th>
- <th>Top offset</th>
- <th>Left offset</th>
+ <th>x</th>
+ <th>y</th>
+ <th>t</th>
<th>Width</th>
<th>Height</th>
</tr>
<th>Width</th>
<th>Height</th>
</tr>
@@
-14,8
+15,9
@@
<tr>
<td><%= speach.balloon_id %></td>
<td><%= h speach.content %></td>
<tr>
<td><%= speach.balloon_id %></td>
<td><%= h speach.content %></td>
- <td><%= speach.y %></td>
<td><%= speach.x %></td>
<td><%= speach.x %></td>
+ <td><%= speach.y %></td>
+ <td><%= speach.t %></td>
<td><%= speach.width %></td>
<td><%= speach.height %></td>
</tr>
<td><%= speach.width %></td>
<td><%= speach.height %></td>
</tr>