Moves @layout 'base'@ to ApplicationController.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1727 e93f8b46-1217-0410-a6f0-8f06a7374b81

Moves @layout 'base'@ to ApplicationController.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1727 e93f8b46-1217-0410-a6f0-8f06a7374b81
2fdf4426 · Jean-Philippe Lang · 361138e1 · 2fdf4426 · 2fdf4426 · 2fdf4426
Commit 2fdf4426 authored Aug 10, 2008 by Jean-Philippe Lang
33 changed files
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class AccountController < ApplicationController
-  layout 'base'	
  helper :custom_fields
  include CustomFieldsHelper   

--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class AdminController < ApplicationController
-  layout 'base'	
  before_filter :require_admin
  helper :sort

--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -18,6 +18,8 @@
 require 'uri'
 class ApplicationController < ActionController::Base
+  layout 'base'
  before_filter :user_setup, :check_if_login_required, :set_localization
  filter_parameter_logging :password

--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class AttachmentsController < ApplicationController
-  layout 'base'
  before_filter :find_project
  def show

--- a/app/controllers/auth_sources_controller.rb
+++ b/app/controllers/auth_sources_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class AuthSourcesController < ApplicationController
-  layout 'base'	
  before_filter :require_admin
  def index

--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class BoardsController < ApplicationController
-  layout 'base'
  before_filter :find_project, :authorize
  helper :messages

--- a/app/controllers/custom_fields_controller.rb
+++ b/app/controllers/custom_fields_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class CustomFieldsController < ApplicationController
-  layout 'base'		
  before_filter :require_admin
  def index

--- a/app/controllers/documents_controller.rb
+++ b/app/controllers/documents_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class DocumentsController < ApplicationController
-  layout 'base'
  before_filter :find_project, :only => [:index, :new]
  before_filter :find_document, :except => [:index, :new]
  before_filter :authorize

--- a/app/controllers/enumerations_controller.rb
+++ b/app/controllers/enumerations_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class EnumerationsController < ApplicationController
-  layout 'base'
  before_filter :require_admin
  def index

--- a/app/controllers/issue_categories_controller.rb
+++ b/app/controllers/issue_categories_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class IssueCategoriesController < ApplicationController
-  layout 'base'
  menu_item :settings
  before_filter :find_project, :authorize

--- a/app/controllers/issue_relations_controller.rb
+++ b/app/controllers/issue_relations_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class IssueRelationsController < ApplicationController
-  layout 'base'
  before_filter :find_project, :authorize
  def new

--- a/app/controllers/issue_statuses_controller.rb
+++ b/app/controllers/issue_statuses_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class IssueStatusesController < ApplicationController
-  layout 'base'	
  before_filter :require_admin
  verify :method => :post, :only => [ :destroy, :create, :update, :move ],

--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class IssuesController < ApplicationController
-  layout 'base'
  menu_item :new_issue, :only => :new
  before_filter :find_issue, :only => [:show, :edit, :reply, :destroy_attachment]

--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class JournalsController < ApplicationController
-  layout 'base'
  before_filter :find_journal
  def edit

--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class MembersController < ApplicationController
-  layout 'base'
  before_filter :find_member, :except => :new
  before_filter :find_project, :only => :new
  before_filter :authorize

--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class MessagesController < ApplicationController
-  layout 'base'
  menu_item :boards
  before_filter :find_board, :only => [:new, :preview]
  before_filter :find_message, :except => [:new, :preview]

--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -16,11 +16,10 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class MyController < ApplicationController
-  helper :issues
-  layout 'base'
  before_filter :require_login
+  helper :issues
  BLOCKS = { 'issuesassignedtome' => :label_assigned_to_me_issues,
             'issuesreportedbyme' => :label_reported_issues,
             'issueswatched' => :label_watched_issues,

--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class NewsController < ApplicationController
-  layout 'base'
  before_filter :find_news, :except => [:new, :index, :preview]
  before_filter :find_project, :only => [:new, :preview]
  before_filter :authorize, :except => [:index, :preview]

--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class ProjectsController < ApplicationController
-  layout 'base'
  menu_item :overview
  menu_item :activity, :only => :activity
  menu_item :roadmap, :only => :roadmap

--- a/app/controllers/queries_controller.rb
+++ b/app/controllers/queries_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class QueriesController < ApplicationController
-  layout 'base'
  menu_item :issues
  before_filter :find_query, :except => :new
  before_filter :find_optional_project, :only => :new

--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class ReportsController < ApplicationController
-  layout 'base'
  menu_item :issues
  before_filter :find_project, :authorize

--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -23,7 +23,6 @@ class ChangesetNotFound < Exception; end
 class InvalidRevisionParam < Exception; end
 class RepositoriesController < ApplicationController
-  layout 'base'
  menu_item :repository
  before_filter :find_repository, :except => :edit
  before_filter :find_project, :only => :edit

--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class RolesController < ApplicationController
-  layout 'base'	
  before_filter :require_admin
  verify :method => :post, :only => [ :destroy, :move ],

--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -16,8 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class SearchController < ApplicationController
-  layout 'base'
  before_filter :find_optional_project
  helper :messages

--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class SettingsController < ApplicationController
-  layout 'base'	
  before_filter :require_admin
  def index

--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class TimelogController < ApplicationController
-  layout 'base'
  menu_item :issues
  before_filter :find_project, :authorize

--- a/app/controllers/trackers_controller.rb
+++ b/app/controllers/trackers_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class TrackersController < ApplicationController
-  layout 'base'
  before_filter :require_admin
  def index

--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class UsersController < ApplicationController
-  layout 'base'	
  before_filter :require_admin
  helper :sort

--- a/app/controllers/versions_controller.rb
+++ b/app/controllers/versions_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class VersionsController < ApplicationController
-  layout 'base'
  menu_item :roadmap
  before_filter :find_project, :authorize

--- a/app/controllers/watchers_controller.rb
+++ b/app/controllers/watchers_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class WatchersController < ApplicationController
-  layout 'base'
  before_filter :find_project
  before_filter :require_login, :check_project_privacy, :only => [:watch, :unwatch]
  before_filter :authorize, :only => :new

--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class WelcomeController < ApplicationController
-  layout 'base'
  def index
    @news = News.latest User.current

--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -18,7 +18,6 @@
 require 'diff'
 class WikiController < ApplicationController
-  layout 'base'
  before_filter :find_wiki, :authorize
  verify :method => :post, :only => [:destroy, :destroy_attachment, :protect], :redirect_to => { :action => :index }

--- a/app/controllers/wikis_controller.rb
+++ b/app/controllers/wikis_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class WikisController < ApplicationController
-  layout 'base'
  menu_item :settings
  before_filter :find_project, :authorize