diet

diff --git a/app/controllers/stories_controller.rb b/app/controllers/stories_controller.rb
index 376536e..530a3eb 100644 (file)
--- a/app/controllers/stories_controller.rb
+++ b/app/controllers/stories_controller.rb
@@ -67,7 +67,6 @@ class StoriesController < ApplicationController
   end
 
   # POST /stories
-  # POST /stories.js
   # POST /stories.json
   def create
     @story = Story.new 
@@ -77,7 +76,6 @@ class StoriesController < ApplicationController
     respond_to do |format|
       if @story.store
         format.html { redirect_to action: :show, id: @story.comic_id }
-        format.js { redirect_to action: :show, id: @story.comic_id }
         format.json { render json: @story.to_json() }
       else
         format.html { render action: "new" }
@@ -87,7 +85,6 @@ class StoriesController < ApplicationController
   end
   
   # PUT /stories/1
-  # PUT /stories/1.js
   # PUT /stories/1.json
   def update
     @story = Story.show(params[:id], @author)
@@ -97,7 +94,6 @@ class StoriesController < ApplicationController
     respond_to do |format|
       if @story.store ot
         format.html { redirect_to action: :show, id: @story.comic_id }
-        format.js { redirect_to action: :show, id: @story.comic_id }
         format.json { head :ok }
       else
         format.html { render action: "edit" }

diff --git a/app/models/comic.rb b/app/models/comic.rb
index c036b78..7c937b1 100644 (file)
--- a/app/models/comic.rb
+++ b/app/models/comic.rb
@@ -57,21 +57,6 @@ class Comic < ActiveRecord::Base
     page_size
   end
   
-  def self.offset cnt, prm = nil
-    offset = prm.to_i
-    offset = cnt - 1 if offset >= cnt
-    offset = cnt - offset.abs if offset < 0
-    offset = 0 if offset < 0
-    offset
-  end
-  
-  def self.panel_count cnt, prm = self.default_panel_size
-    count = prm.to_i
-    count = self.max_panel_size if count > self.max_panel_size
-    count = self.default_panel_size if count < 1
-    count
-  end
-  
   def self.list opt = {}, page = 1, page_size = self.default_page_size
     opt.merge!(self.list_opt) unless opt[:include]
     opt.merge!({:conditions => ['visible > 0'], :order => 'updated_at desc', :limit => page_size, :offset => (page -1) * page_size})

diff --git a/app/views/stories/_editform.html.erb b/app/views/stories/_editform.html.erb
deleted file mode 100644 (file)
index 9cc6dd4..0000000
--- a/app/views/stories/_editform.html.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-<%= form_for(@story) do |f| %>
-  <% if @story.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize(@story.errors.count, "error") %> prohibited this comic from being saved:</h2>
-
-      <ul>
-      <% @story.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
-      </ul>
-    </div>
-  <% end %>
-
-  <div class="field">
-    <%= f.hidden_field :comic_id %>
-  </div>
-  <div class="field">
-    <%= f.number_field :t %>
-  </div>
-  <div class="field">
-    <%= f.hidden_field :panel_id %>
-  </div>
-
-  <div class="actions">
-    <%= f.submit %>
-  </div>
-<% end %>
-<%= button_to 'Destroy', @story.panel, confirm: 'Are you sure?', method: :delete %>

diff --git a/app/views/stories/_newform.html.erb b/app/views/stories/_newform.html.erb
deleted file mode 100644 (file)
index cc40113..0000000
--- a/app/views/stories/_newform.html.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<%= form_for(@story, @form_opt) do |f| %>
-  <% if @story.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize(@story.errors.count, "error") %> prohibited this comic from being saved:</h2>
-
-      <ul>
-      <% @story.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
-      </ul>
-    </div>
-  <% end %>
-
-  <div class="field">
-    <%= f.number_field :comic_id %>
-  </div>
-  <div class="field">
-    <%= f.number_field :t %>
-  </div>
-  <div class="field">
-    <%= f.number_field :panel_id %>
-  </div>
-
-  <div class="actions">
-    <%= f.submit %>
-  </div>
-<% end %>

diff --git a/app/views/stories/edit.html.erb b/app/views/stories/edit.html.erb
index 9f2b842..9cc6dd4 100644 (file)
--- a/app/views/stories/edit.html.erb
+++ b/app/views/stories/edit.html.erb
@@ -1 +1,28 @@
-<%= render 'editform' %>
+<%= form_for(@story) do |f| %>
+  <% if @story.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@story.errors.count, "error") %> prohibited this comic from being saved:</h2>
+
+      <ul>
+      <% @story.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.hidden_field :comic_id %>
+  </div>
+  <div class="field">
+    <%= f.number_field :t %>
+  </div>
+  <div class="field">
+    <%= f.hidden_field :panel_id %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>
+<%= button_to 'Destroy', @story.panel, confirm: 'Are you sure?', method: :delete %>

diff --git a/app/views/stories/edit.js.erb b/app/views/stories/edit.js.erb
deleted file mode 100644 (file)
index 29c687f..0000000
--- a/app/views/stories/edit.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-$("#story-update-<%= @story.id -%>").html("<%= escape_javascript(render('editform')) -%>");

diff --git a/app/views/stories/new.html.erb b/app/views/stories/new.html.erb
index 47cd6d9..f7b5749 100644 (file)
--- a/app/views/stories/new.html.erb
+++ b/app/views/stories/new.html.erb
@@ -1 +1,27 @@
-<%= render 'newform' %>
+<%= form_for(@story) do |f| %>
+  <% if @story.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@story.errors.count, "error") %> prohibited this comic from being saved:</h2>
+
+      <ul>
+      <% @story.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.number_field :comic_id %>
+  </div>
+  <div class="field">
+    <%= f.number_field :t %>
+  </div>
+  <div class="field">
+    <%= f.number_field :panel_id %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

diff --git a/app/views/stories/new.js.erb b/app/views/stories/new.js.erb
deleted file mode 100644 (file)
index e9f6487..0000000
--- a/app/views/stories/new.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-$("#story-create").html("<%= escape_javascript(render('newform')) -%>");