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

diff --combined app/models/panel.rb
index 49e6dcf,0563f22..cc1dc82
--- 1/app/models/panel.rb
--- 2/app/models/panel.rb
+++ b/app/models/panel.rb
@@@ -15,9 -15,6 +15,6 @@@ class Panel < ActiveRecord::Bas
    validates :width, :presence => true, :numericality => true, :natural_number => true
    validates :height, :presence => true, :numericality => true, :natural_number => true
    validates :border, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
-   validates :x, :numericality => {:allow_blank => true}
-   validates :y, :numericality => {:allow_blank => true}
-   validates :z, :numericality => {:allow_blank => true, :greater_than => 0}
    validates :author_id, :presence => true, :numericality => true, :existence => {:both => false}
    validates :publish, :presence => true, :numericality => true
    
@@@ -74,7 -71,6 +71,7 @@@
        return false unless reader_role_check(roles)
      end
      return true if self.own?(roles)
 +    return true if self.new_record?
      self.publish?
    end
    
@@@ -86,8 -82,8 +83,8 @@@
      self.publish > 0
    end
    
-   def tag_id
-     'panel' + self.tag_panel_id
+   def tag_id c = nil
+     'panel' + self.tag_panel_id + c.to_s
    end
    
    def tag_panel_id
@@@ -98,6 -94,34 +95,34 @@@
      self.tag_id + f.to_s
    end
    
+   def tag_attributes column = nil, opt = {}
+     {
+       :id => self.field_tag_id(column), :panel_id => self.tag_panel_id
+     }.merge(opt)
+   end
+   
+   def select_tag_attributes(selected, column, opt = {})
+     [
+       :last, :first, 
+       {:html => {:selected => selected}}, 
+       self.field_tag_attributes(column, opt)
+     ]
+   end
+   
+   def field_tag_attributes column, opt = {}
+     self.tag_attributes(column).merge(
+       {:column => column}
+     ).merge(opt)
+   end
+   
+   def tag_attr column = nil, opt = {}
+     self.tag_attributes(column, opt).to_attr
+   end
+   
+   def field_tag_attr column, no_attr, opt = {}
+     self.field_tag_attributes(column, no_attr, opt).to_attr
+   end
+   
    def self.default_page_size
      25
    end

diff --combined 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 --combined app/views/sheets/_form.html.erb
index 35aeb0c,4975a23..fd3c9ef
--- 1/app/views/sheets/_form.html.erb
--- 2/app/views/sheets/_form.html.erb
+++ b/app/views/sheets/_form.html.erb
@@@ -14,6 -14,8 +14,8 @@@
          <%= f.label :caption %>
          <%= f.text_field :caption, :id => @sheet.field_tag_id(:caption), :sheet_id => @sheet.tag_sheet_id, :column => :caption -%>
        </div>
+       <div class="row_break">
+       </div>
        <div class="field">
          <%= f.label :width %>
          <%= f.number_field :width, :size => 5, :id => @sheet.field_tag_id(:width), :sheet_id => @sheet.tag_sheet_id, :column => :width %>
@@@ -22,10 -24,14 +24,14 @@@
          <%= f.number_field :height, :size => 5, :id => @sheet.field_tag_id(:height), :sheet_id => @sheet.tag_sheet_id, :column => :height %>
  
        </div>
+       <div class="row_break">
+       </div>
        <div class="field">
          <%= f.label :visible %>
          <%= f.collection_select :visible, t_select_items(MagicNumber['sheet_visible_items']), :last, :first, {:html => {:selected => @sheet.visible}}, {:id => @sheet.field_tag_id(:visible), :sheet_id => @sheet.tag_sheet_id, :column => :visible} %>
        </div>
+       <div class="row_break">
+       </div>
        <% unless @sheet.new_record?  %>
          <%= f.hidden_field :id, :id => @sheet.field_tag_id(:id), :sheet_id => @sheet.tag_sheet_id, :column => :id %>
        <% end %>
@@@ -90,6 -96,8 +96,6 @@@
    </div>
  </div>
  <%= form_for(@sheet, :html => {:jqform => 'pettanr-sheet-form'}) do |f| %>
 -  <%= render 'system/error_explanation', :obj => @sheet %>
 -
    <%= text_field_tag "json", '', :id => 'pettanr-sheet-json' %>
    <div>
      <%= submit_tag t('sheets.create_from_json'), :id => 'pettanr-sheet-submit' -%>