Moves @layout 'base'@ to ApplicationController.

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

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 1fe9900072780c120cdf1e34b15ca5c833375f5c..96a2fc9218d5d096b6de1e8cbdf77cf5ffe90844 100644 (file)
--- 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   
   

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index e002f3a27fd3da8d16559ad815724c4b0c9cc63a..a6df49dcdaf79200cc838647dfb345982e7d1e61 100644 (file)
--- 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

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index debe0216249d4b9a360f6c2704c61b265743e2a3..7a56e61f016b08d39b6828c449eaaa400c6a0faf 100644 (file)
--- 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
   

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 1e8f566e6cc95928e128223983653a7df2863111..788bab94dfbdc097e265606e4c7ef76b54762528 100644 (file)
--- 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

diff --git a/app/controllers/auth_sources_controller.rb b/app/controllers/auth_sources_controller.rb
index b830f19702a86497a03ca6af5221875fb4ee8778..981f29f03a63d41799860dd6086288a4e3aaf62c 100644 (file)
--- 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

diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index 5bf4499bdd723470d7b2dc2aaa3d02796737a8bf..4532a88feb346dc0d83f17d63bade8c7f98a6da8 100644 (file)
--- 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

diff --git a/app/controllers/custom_fields_controller.rb b/app/controllers/custom_fields_controller.rb
index d30e89493c6047e8cd5a74df11effa3579f801fb..4589996f1c98c6a1077e68a551d0a16feb3d95a7 100644 (file)
--- 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

diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
index 1f0784bb23dac62b0c895d1df9ca05ad2a7eb33f..dbf9cd8e5d7b1f2d91534f16f82c2af065bb3957 100644 (file)
--- 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

diff --git a/app/controllers/enumerations_controller.rb b/app/controllers/enumerations_controller.rb
index 788fa11b20f644cd6af743e0a41adfe5cf1d84c5..50521bab8b7b5fc70eaf8efa8d5ba185936ba0e9 100644 (file)
--- 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

diff --git a/app/controllers/issue_categories_controller.rb b/app/controllers/issue_categories_controller.rb
index a73935b4fc5d842db2fcb196ba1adae718122a56..8315d6eb8254e38feb66eb5995397230076e8119 100644 (file)
--- 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
   

diff --git a/app/controllers/issue_relations_controller.rb b/app/controllers/issue_relations_controller.rb
index cb0ad552a1cc8e75e0378a1e13a3379fbef33b55..2ca3f0d68eede7cfc618529978bc866f20dc8d6e 100644 (file)
--- 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

diff --git a/app/controllers/issue_statuses_controller.rb b/app/controllers/issue_statuses_controller.rb
index d0712e7c3c807090281fb705270f549d8e1ce509..69d9db965a5a9a64d31a6f28ad20ab39df8b51c9 100644 (file)
--- 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 ],

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index c8edd172669185b99c774191a00f2a5ad1534270..6e2de17c94afc9cffc2d34c77f7ddb3b0eba5386 100644 (file)
--- 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]

diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index 758b8507fcf715dd03ce5aff2ea40bdc993cdb98..6df54f09881868c39b646abf58605c0b44871e39 100644 (file)
--- 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

diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index a1706e601f2cdc7ce0ba3f7dd5013dbefbb78f56..1072090bc0f6aac5f315b9dbe0b5943411f7b288 100644 (file)
--- 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

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 97cb2c3bf74ec0c3309e096f061428b6abd7ce94..08c77d7d2774e9dda14859743bcede6ec2d2a4c9 100644 (file)
--- 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]

diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index ff3393e90ec551f5a244092008baaad40a95ee60..1cfa3e5310ab1f86a8ee0832424b1fd32ca98ee7 100644 (file)
--- 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,

diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index 8c1a03a5b748a0e35293c48f25bd5b39bd1bb1f2..b5f7ca1b2998037352a7512c8e95ce2078ba1943 100644 (file)
--- 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]

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index cfac01b9a7380b61a6c5034fb15dd07568131f8e..43d35cf4fedd590f9b3d35f3a712bade6f9c87fe 100644 (file)
--- 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

diff --git a/app/controllers/queries_controller.rb b/app/controllers/queries_controller.rb
index da2c4a2c8a610e8cd05fc417c52ecba5e9feae80..8500e853a4f18859d399a8a701530599f7f3f54a 100644 (file)
--- 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

diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index 338059a5068d1ab86d84b637879c8e72ce57135b..dd3ece9308e144d802059e79f9d0b28dde39b3ae 100644 (file)
--- 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
 

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 13bba62008286cb93bc438a6cb33c623a55586ce..2f96e2d66a5ff7de55dbaf8e5c38b9084773080f 100644 (file)
--- 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

diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
index 9fdd9701b2776dfbea6b76c9bd7762f15845b7ae..72555e5b06c157e5afd9c3d5bb989475125084e0 100644 (file)
--- 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 ],

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 50e42f08895ba961ff579b169d6b2f3f3fbcef5c..e6e66f05c2fcee77510242339aab648af5358ce6 100644 (file)
--- 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

diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index e20cb64b582ac68aacaac9780ba5771e1bea21a1..6482a35762f67c1be8824aa696932af8ad1ab183 100644 (file)
--- 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

diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index bf7b57d9d064ef2b136e3a8bfddb80986c0a6c23..f331cdbe4e850a9911b84610aae1dcbb34fd1505 100644 (file)
--- 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
 

diff --git a/app/controllers/trackers_controller.rb b/app/controllers/trackers_controller.rb
index 3d7dbd5c5247bb31a81f1bfe4c5c347432ad4c9f..8c02f9474d8c6dbff87b7f3880104916ff6147d9 100644 (file)
--- 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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index eb8aa7bac70741fba3e7e51a5c7fc359e16256d0..d2564c2cb536396f39c377dac4ce7153ae6bcee8 100644 (file)
--- 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

diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb
index 5d3393ed8602a3756d93f13c4993f4fde5b9ff8a..ab2ccb77368eff18a34c1bfefe8e5e8ce8a119ab 100644 (file)
--- 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
 

diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb
index a44686d3fd8c8ebd76654c173d5d9238a596b886..8e6ee3a9ed3fb3155e5afa124c98190a26a43413 100644 (file)
--- 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

diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index b4be7fb1cdbefcc9339ba060c03b50c3e886d97a..b8108e8acb748933489a4225a3ada5cb23be919a 100644 (file)
--- 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

diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 5a5f3949fefe290238c576be0f2785d81a38fa0c..46df2931e4905f59d0235c1da8d5cc556bca80bc 100644 (file)
--- 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 }

diff --git a/app/controllers/wikis_controller.rb b/app/controllers/wikis_controller.rb
index 6054abd9a7fac9850fe18f985f3055d1ce44f781..215d39f4b0c1a552e9b51d972e0436d90263e695 100644 (file)
--- 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