summaryrefslogtreecommitdiffstats
path: root/app/views/common
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2010-10-23 11:07:04 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2010-10-23 11:07:04 +0000
commit7824eca77561dea52960b3d094389bd4e85eeccf (patch)
treeb19e031644b9d9f67db379b20ff2eae9b08ff8e4 /app/views/common
parenteea456ed84d159289bdc8826439923d365816fa8 (diff)
downloadredmine-7824eca77561dea52960b3d094389bd4e85eeccf.tar.gz
redmine-7824eca77561dea52960b3d094389bd4e85eeccf.zip
Refactor: merged error rendering methods.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4286 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/common')
-rw-r--r--app/views/common/403.rhtml6
-rw-r--r--app/views/common/404.rhtml6
-rw-r--r--app/views/common/error.html.erb6
3 files changed, 6 insertions, 12 deletions
diff --git a/app/views/common/403.rhtml b/app/views/common/403.rhtml
deleted file mode 100644
index 43f487d10..000000000
--- a/app/views/common/403.rhtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<h2>403</h2>
-
-<p><%=h @message %></p>
-<p><a href="javascript:history.back()">Back</a></p>
-
-<% html_title '403' %>
diff --git a/app/views/common/404.rhtml b/app/views/common/404.rhtml
deleted file mode 100644
index 753e716c6..000000000
--- a/app/views/common/404.rhtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<h2>404</h2>
-
-<p><%= l(:notice_file_not_found) %></p>
-<p><a href="javascript:history.back()">Back</a></p>
-
-<% html_title '404' %>
diff --git a/app/views/common/error.html.erb b/app/views/common/error.html.erb
new file mode 100644
index 000000000..35d908645
--- /dev/null
+++ b/app/views/common/error.html.erb
@@ -0,0 +1,6 @@
+<h2><%=h @status %></h2>
+
+<p id="errorExplanation"><%=h @message %></p>
+<p><a href="javascript:history.back()">Back</a></p>
+
+<% html_title @status %>