Merge branch 'v06sheet' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06sheet

diff --cc app/models/panel.rb
Simple merge

diff --cc app/views/sheet_panels/_form.html.erb
index f1a438c,e534ca6..25dbd02
--- 1/app/views/sheet_panels/_form.html.erb
--- 2/app/views/sheet_panels/_form.html.erb
+++ b/app/views/sheet_panels/_form.html.erb
@@@ -2,51 -2,26 +2,55 @@@
    <%= render 'system/error_explanation', :obj => elm %>
  
    <div class="field">
 +    <%= f.label :sheet_id %>
 +    <% if elm.new_record? %>
 +      <%= f.number_field :sheet_id %>
 +    <% else %>
 +      <%= f.number_field :sheet_id, elm.field_tag_attributes(:sheet_id, no_attr) %>
 +    <% end %>
 +
 +    <%= f.label :panel_id %>
 +    <% if elm.new_record? %>
 +      <%= f.number_field :panel_id %>
 +    <% else %>
 +      <%= f.number_field :panel_id, elm.field_tag_attributes(:panel_id, no_attr) %>
 +    <% end %>
 +  </div>
 +  <div class="field">
      <%= f.label :x %>
 -    <%= f.number_field :x, elm.field_tag_attributes(:x, no_attr, :size => 5) %>
 +    <% if elm.new_record? %>
 +      <%= f.number_field :x %>
 +    <% else %>
 +      <%= f.number_field :x, elm.field_tag_attributes(:x, no_attr, :size => 5) %>
 +    <% end %>
  
      <%= f.label :y %>
 -    <%= f.number_field :y, elm.field_tag_attributes(:y, no_attr, :size => 5) %>
 +    <% if elm.new_record? %>
 +      <%= f.number_field :y %>
 +    <% else %>
 +      <%= f.number_field :y, elm.field_tag_attributes(:y, no_attr, :size => 5) %>
 +    <% end %>
    </div>
+   <div class="row_break">
+   </div>
    <div class="field">
      <%= f.label :z %>
 -    <%= f.number_field :z, elm.field_tag_attributes(:z, no_attr, :size => 5) %>
 +    <% if elm.new_record? %>
 +      <%= f.number_field :z %>
 +    <% else %>
 +      <%= f.number_field :z, elm.field_tag_attributes(:z, no_attr, :size => 5) %>
 +    <% end %>
  
      <%= f.label :t %>
 -    <%= f.number_field :t, elm.field_tag_attributes(:t, no_attr, :size => 5) %>
 +    <% if elm.new_record? %>
 +      <%= f.number_field :t %>
 +    <% else %>
 +      <%= f.number_field :t, elm.field_tag_attributes(:t, no_attr, :size => 5) %>
 +    <% end %>
    </div>
+   <div class="row_break">
+   </div>
  
 -  <%= f.hidden_field :panel_id, elm.field_tag_attributes(:panel_id, no_attr) %>
 -  <%= f.hidden_field :sheet_id, elm.field_tag_attributes(:sheet_id, no_attr) %>
    <% unless elm.new_record?  %>
      <%= f.hidden_field :id, elm.field_tag_attributes(:id, no_attr) %>
    <% end %>

diff --cc app/views/sheets/_form.html.erb
Simple merge