X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fhome_controller.rb;h=38af1a30f96fc6bea899c21f8a17ae71f44c7977;hb=3503fb540493439939ef7f080e650a1a9fc79286;hp=c2981994873854ed27fcbbdc7111c60b66752942;hpb=a1fe2079b59985c5be1960c38b2c23f47d0a9577;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index c2981994..38af1a30 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,9 +1,16 @@
 class HomeController < ApplicationController
-layout 'test'
-  before_filter :authenticate_user!, :only => [
-    :index, :show, :profile, :configure, :create_token, :delete_token, :step2, :save_step2, :step3, :save_step3, 
-    :comic, :picture
+  before_filter :authenticate_user, :only => [
+    :index, :show, :profile, :configure, :create_token, :delete_token, 
+    :scrolls, :scroll_panels, :comics, :comic_stories, :stories, :story_sheets, 
+    :sheets, :sheet_panels, 
+    :panels, :panel_pictures, :speech_balloons, :balloons, :speeches, :ground_pictures, :ground_colors
   ]
+  before_filter :authenticate_author, :only => [
+    :scrolls, :scroll_panels, :comics, :comic_stories, :stories, :story_sheets, 
+    :sheets, :sheet_panels, 
+    :panels, :panel_pictures, :speech_balloons, :balloons, :speeches, :ground_pictures, :ground_colors
+  ]
+  before_filter :authenticate_artist, :only => [:resource_pictures]
   
   def index
   end
@@ -12,88 +19,108 @@ layout 'test'
   end
   
   def configure
+    @author = @operators.author
+    unless @author
+      @author = Author.new
+      @author.supply_default
+    end
+    @author.boosts 'post'
+    @author_form = Locmare::Bucket.factory @author.item_name, 'default', @author, true, true, @operators
+    @artist = @operators.artist
+    unless @artist
+      @artist = Artist.new
+      @artist.supply_default
+    end
+    @artist.boosts 'post'
+    @artist_form = Locmare::Bucket.factory @artist.item_name, 'default', @artist, true, true, @operators
   end
   
   def create_token
-    respond_to do |format|
-      if @user.create_token
-        format.html { redirect_to({:action => :configure}, {:notice => 'user token was successfully created.'}) }
-      else
-        format.html { render action: "auth_token" }
+    if @operators.user.create_token
+      respond_to do |format|
+        flash[:notice] = I18n.t('flash.notice.created', :model => User.human_attribute_name(:authentication_token))
+        format.html { redirect_to({:action => :configure}) }
       end
+    else
+      flash[:notice] = I18n.t('flash.notice.not_created', :model => User.human_attribute_name(:authentication_token))
+      format.html { render action: "configure" }
     end
   end
   
   def delete_token
-    @user.delete_token
-    respond_to do |format|
-      format.html { redirect_to :action => :configure}
+    if @operators.user.delete_token
+      respond_to do |format|
+        flash[:notice] = I18n.t('flash.notice.destroyed', :model => User.human_attribute_name(:authentication_token))
+        format.html { redirect_to :action => :configure}
+      end
+    else
+      flash[:notice] = I18n.t('flash.notice.not_destroyed', :model => User.human_attribute_name(:authentication_token))
+      format.html { render action: "configure" }
     end
   end
   
-  def step2
+  def scrolls
+    filer_list
   end
   
-  def save_step2
-    respond_to do |format|
-      if @author.step2(params[:author][:name])
-        a = if params[:step3].to_i == 1
-          :step3
-        else
-          :index
-        end
-        format.html { redirect_to({:action => a}, {:notice => 'your name was successfully updated.'}) }
-      else
-        format.html { render action: "step2" }
-      end
-    end
+  def scroll_panels
+    filer_list
   end
   
-  def step3
+  def comics
+    filer_list
   end
   
-  def save_step3
-    if @author.artist?
-      redirect_to :action => :index
-    else
-      @artist = Artist.new params[:artist]
-      respond_to do |format|
-        if @artist.save
-          format.html { redirect_to({:action => :index}, {:notice => 'artist was successfully registered.'}) }
-        else
-          format.html { render action: "step3" }
-        end
-      end
-    end
+  def comic_stories
+    filer_list
   end
   
-  def comic
-    @comics = Comic.find(:all, 
-      :include => :author, :conditions => ['author_id = ?', @author.id], 
-      :order => 'updated_at desc', :limit => 20
-    )
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render json: @comics }
-    end
+  def stories
+    filer_list
   end
   
-  def picture
-    if @author.artist?
-      @original_pictures = OriginalPicture.find(:all, 
-        :include => [:artist, :license, :resource_picture], :conditions => ['artist_id = ?', @author.artist.id], 
-        :order => 'updated_at', :limit => 20
-      )
-
-      respond_to do |format|
-        format.html # index.html.erb
-        format.json { render :json => @original_pictures.to_json(
-          :include => [:resource_picture, :artist, :license]
-        ) }
-      end
-    else
-    end
+  def story_sheets
+    filer_list
+  end
+  
+  def sheets
+    filer_list
+  end
+  
+  def sheet_panels
+    filer_list
+  end
+  
+  def panels
+    filer_list
+  end
+  
+  def panel_pictures
+    filer_list
+  end
+  
+  def speech_balloons
+    filer_list
+  end
+  
+  def balloons
+    filer_list
+  end
+  
+  def speeches
+    filer_list
+  end
+  
+  def ground_pictures
+    filer_list
+  end
+  
+  def ground_colors
+    filer_list
+  end
+  
+  def resource_pictures
+    filer_list
   end
   
 end