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

diff --cc app/controllers/ground_pictures_controller.rb
Simple merge

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

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

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

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

diff --cc app/views/authors/ground_pictures.html.erb
index bfc84ce,c886ec1..726c337
--- 1/app/views/authors/ground_pictures.html.erb
--- 2/app/views/authors/ground_pictures.html.erb
+++ b/app/views/authors/ground_pictures.html.erb
@@@ -14,7 -12,26 +14,8 @@@
      <th><%= t_m 'GroundPicture.updated_at' -%></th>
    </tr>
  
 -  <% @ground_pictures.each do |ground_picture| %>
 -    <tr>
 -      <td><%= link_to ground_picture.panel_id, panel_path(ground_picture.panel_id) %></td>
 -      <% if ground_picture.picture.showable? @author %>
 -        <td><%= link_to(tag(:img, ground_picture.picture.tmb_opt_img_tag), ground_picture) -%></td>
 -        <td><%= render ground_picture.picture.credit_template, :picture => ground_picture.picture %></td>
 -      <% else %>
 -        <td>
 -          <%= link_to(tag(:img, ground_picture.picture.tail_tmb_opt_img_tag(asset_path('error.png'))), ground_picture) -%>
 -        </td>
 -        <td></td>
 -      <% end %>
 -      <td><%= ground_picture.z %></td>
 -      <td><%= ground_picture.repeat %><%= MagicNumber['ground_picture_repeat_items'][ground_picture.repeat] %></td>
 -      <td><%= ground_picture.x %></td>
 -      <td><%= ground_picture.y %></td>
 -      <td><%= distance_of_time_in_words_to_now ground_picture.created_at %></td>
 -      <td><%= distance_of_time_in_words_to_now ground_picture.updated_at %></td>
 -    </tr>
 +  <% @ground_pictures.each do |gp| %>
 +    <%= render 'ground_pictures/list_item', :ground_picture => gp %>
    <% end %>
  </table>
+ <%= paginate(@paginate) %>

diff --cc app/views/ground_pictures/index.html.erb
Simple merge

diff --cc app/views/home/ground_pictures.html.erb
index cb69f9c,a0c589d..adc460f
--- 1/app/views/home/ground_pictures.html.erb
--- 2/app/views/home/ground_pictures.html.erb
+++ b/app/views/home/ground_pictures.html.erb
@@@ -15,6 -14,7 +15,7 @@@
    </tr>
  
    <% @ground_pictures.each do |gp| %>
 -    <%= render 'list_item', :ground_picture => gp %>
 +    <%= render 'ground_pictures/list_item', :ground_picture => gp %>
    <% end -%>
  </table>
+ <%= paginate(@paginate) %>