t#31740:join copy elt form

diff --git a/app/views/ground_colors/show.html.erb b/app/views/ground_colors/show.html.erb
index 0adcbec..e7fec19 100644 (file)
--- a/app/views/ground_colors/show.html.erb
+++ b/app/views/ground_colors/show.html.erb
@@ -36,4 +36,4 @@
 <%= link_to t('link.edit'), edit_ground_color_path(@ground_color) %>
 <%= link_to t('link.destroy'), ground_color_path(@ground_color), :method => :delete %>
 
-<%= render 'copy', :ground_color => @ground_color, :author => @author %>
+<%= render 'panels/element_copy', :element => @ground_color, :author => @author %>

diff --git a/app/views/ground_pictures/_copy.html.erb b/app/views/ground_pictures/_copy.html.erb
deleted file mode 100644 (file)
index 6122449..0000000
--- a/app/views/ground_pictures/_copy.html.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% if author and author.working? -%>
-  <h2><%= t('ground_pictures.show.copy') -%></h2>
-  <h3><%= t('home.index.catch') -%></h3>
-  <%= link_to panel_icon(:object => author.working_panel, :size => 25), panel_path(author.working_panel) %>
-  <%= link_to author.working_panel.caption, main_app.panel_path(author.working_panel) %>
-
-  <%= form_for(author.working_panel) do |f| %>
-    <%= hidden_field_tag "json", ground_picture.copy(author.working_panel).to_json %>
-    <div>
-      <%= submit_tag t('ground_pictures.show.inspire') -%>
-    </div>
-  <% end %>
-<% end -%>

diff --git a/app/views/ground_pictures/show.html.erb b/app/views/ground_pictures/show.html.erb
index 626da72..47c19f7 100644 (file)
--- a/app/views/ground_pictures/show.html.erb
+++ b/app/views/ground_pictures/show.html.erb
@@ -41,4 +41,4 @@
 <%= link_to t('link.edit'), edit_ground_picture_path(@ground_picture) %>
 <%= link_to t('link.destroy'), ground_picture_path(@ground_picture), :method => :delete %>
 
-<%= render 'copy', :ground_picture => @ground_picture, :author => @author %>
+<%= render 'panels/element_copy', :element => @ground_picture, :author => @author %>

diff --git a/app/views/panel_pictures/_copy.html.erb b/app/views/panel_pictures/_copy.html.erb
deleted file mode 100644 (file)
index 661dfdd..0000000
--- a/app/views/panel_pictures/_copy.html.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% if author and author.working? -%>
-  <h2><%= t('panel_pictures.show.copy') -%></h2>
-  <h3><%= t('home.index.catch') -%></h3>
-  <%= link_to panel_icon(:object => author.working_panel, :size => 25), panel_path(author.working_panel) %>
-  <%= link_to author.working_panel.caption, main_app.panel_path(author.working_panel) %>
-
-  <%= form_for(author.working_panel) do |f| %>
-    <%= hidden_field_tag "json", panel_picture.copy(author.working_panel).to_json %>
-    <div>
-      <%= submit_tag t('panel_pictures.show.inspire') -%>
-    </div>
-  <% end %>
-<% end -%>

diff --git a/app/views/panel_pictures/show.html.erb b/app/views/panel_pictures/show.html.erb
index 933abc0..8b2894d 100644 (file)
--- a/app/views/panel_pictures/show.html.erb
+++ b/app/views/panel_pictures/show.html.erb
@@ -56,4 +56,4 @@
 <%= link_to t('link.edit'), edit_panel_picture_path(@panel_picture) %>
 <%= link_to t('link.destroy'), panel_picture_path(@panel_picture), :method => :delete %>
 
-<%= render 'copy', :panel_picture => @panel_picture, :author => @author %>
+<%= render 'panels/element_copy', :element => @panel_picture, :author => @author %>

diff --git a/app/views/ground_colors/_copy.html.erb b/app/views/panels/_element_copy.html.erb
similarity index 66%
rename from app/views/ground_colors/_copy.html.erb
rename to app/views/panels/_element_copy.html.erb
index 0b2ff6f..837054d 100644 (file)
--- a/app/views/ground_colors/_copy.html.erb
+++ b/app/views/panels/_element_copy.html.erb
@@ -1,13 +1,13 @@
 <% if author and author.working? -%>
-  <h2><%= t('ground_colors.show.copy') -%></h2>
+  <h2><%= t('panels.element_copy') -%></h2>
   <h3><%= t('home.index.catch') -%></h3>
   <%= link_to panel_icon(:object => author.working_panel, :size => 25), panel_path(author.working_panel) %>
   <%= link_to author.working_panel.caption, main_app.panel_path(author.working_panel) %>
 
   <%= form_for(author.working_panel) do |f| %>
-    <%= hidden_field_tag "json", ground_color.copy(author.working_panel).to_json %>
+    <%= hidden_field_tag "json", element.copy(author.working_panel).to_json %>
     <div>
-      <%= submit_tag t('ground_colors.show.inspire') -%>
+      <%= submit_tag t('panels.inspire') -%>
     </div>
   <% end %>
 <% end -%>

diff --git a/app/views/speech_balloons/_copy.html.erb b/app/views/speech_balloons/_copy.html.erb
deleted file mode 100644 (file)
index 63852c2..0000000
--- a/app/views/speech_balloons/_copy.html.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% if author and author.working? -%>
-  <h2><%= t('speech_balloons.show.copy') -%></h2>
-  <h3><%= t('home.index.catch') -%></h3>
-  <%= link_to panel_icon(:object => author.working_panel, :size => 25), panel_path(author.working_panel) %>
-  <%= link_to author.working_panel.caption, main_app.panel_path(author.working_panel) %>
-
-  <%= form_for(author.working_panel) do |f| %>
-    <%= hidden_field_tag "json", speech_balloon.copy(author.working_panel).to_json %>
-    <div>
-      <%= submit_tag t('speech_balloons.show.inspire') -%>
-    </div>
-  <% end %>
-<% end -%>

diff --git a/app/views/speech_balloons/show.html.erb b/app/views/speech_balloons/show.html.erb
index e5e0b5a..998ee30 100644 (file)
--- a/app/views/speech_balloons/show.html.erb
+++ b/app/views/speech_balloons/show.html.erb
@@ -95,4 +95,4 @@
 <%= link_to t('link.edit'), edit_speech_balloon_path(@speech_balloon) %>
 <%= link_to t('link.destroy'), speech_balloon_path(@speech_balloon), :method => :delete %>
 
-<%= render 'copy', :speech_balloon => @speech_balloon, :author => @author %>
+<%= render 'panels/element_copy', :element => @speech_balloon, :author => @author %>

diff --git a/config/locales/pettanr.ja.yml b/config/locales/pettanr.ja.yml
index 8353150..3e3f016 100644 (file)
--- a/config/locales/pettanr.ja.yml
+++ b/config/locales/pettanr.ja.yml
@@ -499,13 +499,13 @@ ja:
       title: コマ 生単票
     submit: コマ作成する
     create_from_json: jsonデータからコマ作成する
+    element_copy: つかんでいるコマにコピーしたい
+    inspire: インスパイヤ
   panel_pictures:
     index:
       title: コマ絵一覧
     show:
       title: コマ絵詳細
-      copy: コマ絵をつかんでいるコマにコピーしたい
-      inspire: インスパイヤ
     new:
       title: コマ絵作成
     edit:
@@ -528,8 +528,6 @@ ja:
       title: フキダシ一覧
     show:
       title: フキダシ詳細
-      copy: セリフをつかんでいるコマにコピーしたい
-      inspire: インスパイヤ
     new:
       title: フキダシ作成
     edit:
@@ -570,8 +568,6 @@ ja:
       title: 絵地一覧
     show:
       title: 絵地詳細
-      copy: 絵地をつかんでいるコマにコピーしたい
-      inspire: インスパイヤ
     new:
       title: 絵地作成
     edit:
@@ -594,8 +590,6 @@ ja:
       title: 色地一覧
     show:
       title: 色地詳細
-      copy: 色地をつかんでいるコマにコピーしたい
-      inspire: インスパイヤ
     new:
       title: 色地作成
     edit: