X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fspeech_balloon_templates_controller.rb;h=96f337df54863da5ad3358b9471e95da44d2eb3e;hb=69b61b39006c1951fc8c08746e884e63e50233b3;hp=eddcf293fb0b338b029b6d5e1db50b5c11495f58;hpb=6e4ecd2a9d6e7b3c37a9f5a1609683eef7d95eee;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/speech_balloon_templates_controller.rb b/app/controllers/speech_balloon_templates_controller.rb
index eddcf293..96f337df 100644
--- a/app/controllers/speech_balloon_templates_controller.rb
+++ b/app/controllers/speech_balloon_templates_controller.rb
@@ -1,68 +1,67 @@
 class SpeechBalloonTemplatesController < ApplicationController
-  layout 'test' if MagicNumber['test_layout']
-  if MagicNumber['run_mode'] == 0
+  if Manifest.manifest.magic_numbers['run_mode'] == 0
     before_filter :authenticate_user, :only => []
   else
-    before_filter :authenticate_reader, :only => [:index, :show, :speech_balloons, :panels, :by_system_picture]
+    before_filter :authenticate_reader, :only => [
+      :index, :show, :by_panel, :by_system_picture, :count, :count_by_panel, :count_by_system_picture
+    ]
     before_filter :authenticate_user, :only => []
   end
-  before_filter :authenticate_admin!, :only => [:list, :browse, :destroy]
+  before_filter :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
 
   def self.model
     SpeechBalloonTemplate
   end
   
   def index
-    public_list
+    filer_list
   end
   
-  def speech_balloons
-    has_many_list
+  def by_panel
+    filer_list
   end
   
-  def panels
-    has_many_list
+  def by_system_picture
+    filer_list
   end
   
-  def by_system_picture
-    filter_list
+  def show_html_format format
+    format.html {
+    }
   end
   
   def show
-    @item = SpeechBalloonTemplate.show(params[:id], @operators)
-
+    set_show
     respond_to do |format|
-      format.html {
-        @speech_balloon_template = @item
-      }
-      format_prof format
-      format.json {
-        render :json => @item.to_json(SpeechBalloonTemplate.show_json_opt)
-      }
+      show_html_format format
+      show_prof_format format
+      show_json_format format
     end
   end
-
-  def list
-    @speech_balloon_templates = SpeechBalloonTemplate.all
-
-    respond_to do |format|
-      format.html { render layout: 'system' }
-      format.json { render json: @speech_balloon_templates }
-    end
+  
+  def count
+    list_count
   end
-
-  def browse
-    @speech_balloon_template = SpeechBalloonTemplate.find(params[:id])
-
-    respond_to do |format|
-      format.html { render layout: 'system' }
-      format.json { render json: @speech_balloon_template }
-    end
+  
+  def count_by_panel
+    list_count
   end
-
+  
+  def count_by_system_picture
+    list_count
+  end
+  
+  def new
+    form_new
+  end
+  
+  def edit
+    form_edit
+  end
+  
   def destroy
-    @speech_balloon_template = SpeechBalloonTemplate.find(params[:id])
-    @speech_balloon_template.destroy
+    @item = SpeechBalloonTemplate.find(params[:id])
+    @item.destroy
 
     respond_to do |format|
       format.html { redirect_to :action => :list }