From fe12e4650802d8f28136660fc9ce62c6a28f19e1 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Sun, 29 Apr 2012 18:26:37 -0500
Subject: Add source extract to detailed exception page

---
 .../action_dispatch/middleware/debug_exceptions.rb |  5 ++++-
 .../middleware/exception_wrapper.rb                | 22 +++++++++++++++++++++-
 .../middleware/templates/rescues/_source.erb       |  8 ++++++++
 .../middleware/templates/rescues/diagnostics.erb   |  1 +
 4 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 actionpack/lib/action_dispatch/middleware/templates/rescues/_source.erb

diff --git a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
index 6705e531cb..ac8f6af7fe 100644
--- a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
@@ -42,7 +42,10 @@ module ActionDispatch
           :application_trace => wrapper.application_trace,
           :framework_trace => wrapper.framework_trace,
           :full_trace => wrapper.full_trace,
-          :routes => formatted_routes(exception)
+          :routes => formatted_routes(exception),
+          :source_extract => wrapper.source_extract,
+          :line_number => wrapper.line_number,
+          :file => wrapper.file
         )
 
         file = "rescues/#{wrapper.rescue_template}"
diff --git a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
index ae38c56a67..d1cadbd082 100644
--- a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
+++ b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
@@ -25,7 +25,7 @@ module ActionDispatch
       'ActionView::Template::Error'         => 'template_error'
     )
 
-    attr_reader :env, :exception
+    attr_reader :env, :exception, :line_number, :file
 
     def initialize(env, exception)
       @env = env
@@ -56,6 +56,15 @@ module ActionDispatch
       Rack::Utils.status_code(@@rescue_responses[class_name])
     end
 
+    def source_extract
+      if trace = application_trace.first
+        file, line, _ = trace.split(":")
+        @file = file
+        @line_number = line.to_i
+        source_fragment(@file, @line_number)
+      end
+    end
+
     private
 
     def original_exception(exception)
@@ -81,5 +90,16 @@ module ActionDispatch
     def backtrace_cleaner
       @backtrace_cleaner ||= @env['action_dispatch.backtrace_cleaner']
     end
+
+    def source_fragment(path, line)
+      full_path = Rails.root.join(path)
+      if File.exists?(full_path)
+        File.open(full_path, "r") do |file|
+          start = [line - 3, 0].max
+          lines = file.lines.drop(start).take(6)
+          Hash[*(start+1..(lines.count+start)).zip(lines).flatten]
+        end
+      end
+    end
   end
 end
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/_source.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/_source.erb
new file mode 100644
index 0000000000..032705c01a
--- /dev/null
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/_source.erb
@@ -0,0 +1,8 @@
+<% if @source_extract %>
+Extracted source (around line <strong>#<%= @line_number %></strong>):
+<pre>
+<% @source_extract.each do |line, source| %>
+<%= "#{(@line_number == line) ? "> " : "  "}#{line}: #{source}" -%>
+<% end %>
+</pre>
+<% end %>
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb
index c5043c5e7b..5ad96cc657 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb
@@ -6,5 +6,6 @@
 </h1>
 <pre><%=h @exception.message %></pre>
 
+<%= render template: "rescues/_source" %>
 <%= render template: "rescues/_trace" %>
 <%= render template: "rescues/_request_and_response" %>
-- 
cgit v1.2.3


From 048cd254e6bb77cf223a714cd7cb86b309cd3c15 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Fri, 7 Sep 2012 20:20:09 -0500
Subject: Styling for exception page

---
 .../templates/rescues/_request_and_response.erb    | 15 ++--
 .../middleware/templates/rescues/_source.erb       | 25 +++++-
 .../middleware/templates/rescues/diagnostics.erb   | 25 +++---
 .../middleware/templates/rescues/layout.erb        | 97 ++++++++++++++++++++--
 .../templates/rescues/missing_template.erb         |  9 +-
 .../templates/rescues/unknown_action.erb           |  8 +-
 6 files changed, 150 insertions(+), 29 deletions(-)

diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
index 823f5d25b6..9688bf6a57 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
@@ -20,12 +20,15 @@
 <h2 style="margin-top: 30px">Request</h2>
 <p><b>Parameters</b>: <pre><%=h request_dump %></pre></p>
 
-<p><a href="#" onclick="document.getElementById('session_dump').style.display='block'; return false;">Show session dump</a></p>
-<div id="session_dump" style="display:none"><pre><%= debug_hash @request.session %></pre></div>
-
-<p><a href="#" onclick="document.getElementById('env_dump').style.display='block'; return false;">Show env dump</a></p>
-<div id="env_dump" style="display:none"><pre><%= debug_hash @request.env.slice(*@request.class::ENV_METHODS) %></pre></div>
-
+<details>
+<summary>Show session dump</summary>
+<p><pre><%= debug_hash @request.session %></pre></p>
+</details>
+
+<details>
+<summary>Show env dump</summary>
+<p><pre><%= debug_hash @request.env.slice(*@request.class::ENV_METHODS) %></pre></p>
+</details>
 
 <h2 style="margin-top: 30px">Response</h2>
 <p><b>Headers</b>: <pre><%=h defined?(@response) ? @response.headers.inspect.gsub(',', ",\n") : 'None' %></pre></p>
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/_source.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/_source.erb
index 032705c01a..38429cb78e 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/_source.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/_source.erb
@@ -1,8 +1,25 @@
 <% if @source_extract %>
-Extracted source (around line <strong>#<%= @line_number %></strong>):
+<div class="source">
+<div class="info">
+  Extracted source (around line <strong>#<%= @line_number %></strong>):
+</div>
+<div class="data">
+  <table cellpadding="0" cellspacing="0" class="lines">
+      <tr>
+        <td>
+          <pre class="line_numbers">
+            <% @source_extract.keys.each do |line_number| %>
+<span><%= line_number -%></span>
+            <% end %>
+          </pre>
+        </td>
+<td width="100%">
 <pre>
-<% @source_extract.each do |line, source| %>
-<%= "#{(@line_number == line) ? "> " : "  "}#{line}: #{source}" -%>
-<% end %>
+<% @source_extract.each do |line, source| -%><div class="line<%= " active" if line == @line_number -%>"><%= source -%></div><% end -%>
 </pre>
+</td>
+    </tr>
+  </table>
+</div>
+</div>
 <% end %>
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb
index 5ad96cc657..1c6b5010a3 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb
@@ -1,11 +1,16 @@
-<h1>
-  <%=h @exception.class.to_s %>
-  <% if @request.parameters['controller'] %>
-    in <%=h @request.parameters['controller'].camelize %>Controller<% if @request.parameters['action'] %>#<%=h @request.parameters['action'] %><% end %>
-  <% end %>
-</h1>
-<pre><%=h @exception.message %></pre>
+<header>
+  <h1>
+    <%=h @exception.class.to_s %>
+    <% if @request.parameters['controller'] %>
+      in <%=h @request.parameters['controller'].camelize %>Controller<% if @request.parameters['action'] %>#<%=h @request.parameters['action'] %><% end %>
+    <% end %>
+  </h1>
+</header>
 
-<%= render template: "rescues/_source" %>
-<%= render template: "rescues/_trace" %>
-<%= render template: "rescues/_request_and_response" %>
+<div id="container">
+  <h2><%=h @exception.message %></h2>
+
+  <%= render template: "rescues/_source" %>
+  <%= render template: "rescues/_trace" %>
+  <%= render template: "rescues/_request_and_response" %>
+</div>
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
index 1a308707d1..0aba130f05 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
@@ -4,7 +4,7 @@
   <meta charset="utf-8" />
   <title>Action Controller: Exception caught</title>
   <style>
-    body { background-color: #fff; color: #333; }
+    body { background-color: #fff; color: #333; margin: 0px}
 
     body, p, ol, ul, td {
       font-family: helvetica, verdana, arial, sans-serif;
@@ -13,15 +13,102 @@
     }
 
     pre {
-      background-color: #eee;
-      padding: 10px;
       font-size: 11px;
       white-space: pre-wrap;
     }
 
-    a { color: #000; }
+    pre.box {
+      border: #eee solid 1px;
+      padding: 10px;
+      margin: 0px;
+      width: 958px;
+    }
+
+    header {
+      background: whiteSmoke;
+      filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#980905',endColorstr='#c52f24');
+      background: -webkit-gradient(linear,0% 0,0% 100%,from(#980905),to(#C52F24));
+      background: -moz-linear-gradient(270deg,#980905,#C52F24);
+      color: #fff;
+      padding: 0.5em;
+    }
+
+    h2 {
+      color: #C52F24;
+      padding: 2px;
+    }
+
+    details {
+      border: 1px solid #E5E5E5;
+      -webkit-border-radius: 4px;
+      -moz-border-radius: 4px;
+      border-radius: 4px;
+      margin: 1em 0px;
+      display: block;
+      width: 978px;
+    }
+
+    summary {
+      padding: 8px 15px;
+      border-bottom: 1px solid #E5E5E5;
+      display: block;
+    }
+
+    details pre {
+      margin: 0px;
+      border: none;
+    }
+
+    #container {
+      margin: auto;
+      width: 98%;
+    }
+
+    .source * {
+      margin: 0px;
+      padding: 0px;
+    }
+
+    .source {
+      border: 1px solid #D9D9D9;
+      background: #ECECEC;
+      width: 978px;
+    }
+
+    .source pre {
+      padding: 10px 0px;
+      border: none;
+    }
+
+    .source .data {
+      font-size: 80%;
+      overflow: auto;
+      background-color: #fff;
+    }
+
+    .info {
+      padding: 0.5em;
+    }
+
+    .source .data .line_numbers {
+      background-color: #ECECEC;
+      color: #AAA;
+      padding: 1em .5em;
+      border-right: 1px solid #DDD;
+      text-align: right;
+    }
+
+    .line:hover {
+      background-color: #f6f6f6;
+    }
+
+    .line.active {
+      background-color: #FFCCCC;
+    }
+
+    a { color: #980905; }
     a:visited { color: #666; }
-    a:hover { color: #fff; background-color:#000; }
+    a:hover { color: #C52F24;}
   </style>
 </head>
 <body>
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/missing_template.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/missing_template.erb
index dbfdf76947..c5917b9acb 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/missing_template.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/missing_template.erb
@@ -1,2 +1,7 @@
-<h1>Template is missing</h1>
-<p><%=h @exception.message %></p>
+<header>
+  <h1>Template is missing</h1>
+</header>
+
+<div id="container">
+  <h2><%=h @exception.message %></h2>
+</div>
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/unknown_action.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/unknown_action.erb
index 683379da10..65fc34df90 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/unknown_action.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/unknown_action.erb
@@ -1,2 +1,6 @@
-<h1>Unknown action</h1>
-<p><%=h @exception.message %></p>
+<header>
+  <h1>Unknown action</h1>
+</header>
+<div id="container">
+  <h2><%=h @exception.message %></h2>
+ </div>
-- 
cgit v1.2.3


From 78a0d86b0a4e9ce791f684d424f8aca96ff6ff92 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Fri, 7 Sep 2012 23:22:17 -0500
Subject: Add new style to Routing Error page

---
 .../middleware/templates/rescues/routing_error.erb | 41 ++++++++++++----------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb
index 6c903d6a17..ca85e6d048 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb
@@ -1,24 +1,27 @@
-<h1>Routing Error</h1>
-<p><pre><%=h @exception.message %></pre></p>
-<% unless @exception.failures.empty? %>
-  <p>
-    <h2>Failure reasons:</h2>
-    <ol>
-    <% @exception.failures.each do |route, reason| %>
-      <li><code><%=h route.inspect.gsub('\\', '') %></code> failed because <%=h reason.downcase %></li>
-    <% end %>
-    </ol>
-  </p>
-<% end %>
-<%= render template: "rescues/_trace" %>
+<header>
+  <h1>Routing Error</h1>
+</header>
+<div id="container">
+  <h2><%=h @exception.message %></h2>
+  <% unless @exception.failures.empty? %>
+    <p>
+      <h2>Failure reasons:</h2>
+      <ol>
+      <% @exception.failures.each do |route, reason| %>
+        <li><code><%=h route.inspect.gsub('\\', '') %></code> failed because <%=h reason.downcase %></li>
+      <% end %>
+      </ol>
+    </p>
+  <% end %>
+  <%= render template: "rescues/_trace" %>
 
-<h2>
-  Routes
-</h2>
+  <h2>
+    Routes
+  </h2>
 
-<p>
-  Routes match in priority from top to bottom
-</p>
+  <p>
+    Routes match in priority from top to bottom
+  </p>
 
 <%= render layout: "routes/route_wrapper" do %>
   <%= render partial: "routes/route", collection: @routes %>
-- 
cgit v1.2.3


From 9b79bb469b02c9c51440960cfc33bd928c9fbd1d Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Sat, 8 Sep 2012 22:28:46 -0500
Subject: Improve line-height to have better line spacing in exception message

---
 actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
index 0aba130f05..12c4d98e19 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
@@ -36,6 +36,7 @@
     h2 {
       color: #C52F24;
       padding: 2px;
+      line-height: 25px;
     }
 
     details {
-- 
cgit v1.2.3


From 5a1b885dd620e6ab465c0f64b7cd0f025a46fb37 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Mon, 31 Dec 2012 14:36:23 -0500
Subject: Add style to AV::Template::Error exception page

---
 .../middleware/exception_wrapper.rb                |  3 +-
 .../templates/rescues/template_error.erb           | 53 ++++++++++++++++------
 actionpack/lib/action_view/template/error.rb       | 16 +++++--
 3 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
index d1cadbd082..ee69c8b49d 100644
--- a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
+++ b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
@@ -57,7 +57,7 @@ module ActionDispatch
     end
 
     def source_extract
-      if trace = application_trace.first
+      if application_trace && trace = application_trace.first
         file, line, _ = trace.split(":")
         @file = file
         @line_number = line.to_i
@@ -92,6 +92,7 @@ module ActionDispatch
     end
 
     def source_fragment(path, line)
+      return unless Rails.respond_to?(:root) && Rails.root
       full_path = Rails.root.join(path)
       if File.exists?(full_path)
         File.open(full_path, "r") do |file|
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/template_error.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/template_error.erb
index a1b377f68c..01faf5a475 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/template_error.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/template_error.erb
@@ -1,17 +1,44 @@
-<h1>
-  <%=h @exception.original_exception.class.to_s %> in
-  <%=h @request.parameters["controller"].capitalize if @request.parameters["controller"]%>#<%=h @request.parameters["action"] %>
-</h1>
+<% @source_extract = @exception.source_extract(0, :html) %>
+<header>
+  <h1>
+    <%=h @exception.original_exception.class.to_s %> in
+    <%=h @request.parameters["controller"].capitalize if @request.parameters["controller"]%>#<%=h @request.parameters["action"] %>
+  </h1>
+</header>
 
-<p>
-  Showing <i><%=h @exception.file_name %></i> where line <b>#<%=h @exception.line_number %></b> raised:
-  <pre><code><%=h @exception.message %></code></pre>
-</p>
+<div id="container">
+  <p>
+    Showing <i><%=h @exception.file_name %></i> where line <b>#<%=h @exception.line_number %></b> raised:
+    <pre><code><%=h @exception.message %></code></pre>
+    </p>
 
-<p>Extracted source (around line <b>#<%=h @exception.line_number %></b>):
-<pre><code><%=h @exception.source_extract %></code></pre></p>
+  <div class="source">
+    <div class="info">
+      <p>Extracted source (around line <strong>#<%=h @exception.line_number %></strong>):
+    </div>
+    <div class="data">
+    <table cellpadding="0" cellspacing="0" class="lines">
+      <tr>
+        <td>
+          <pre class="line_numbers">
+            <% @source_extract.keys.each do |line_number| %>
+<span><%= line_number -%></span>
+            <% end %>
+          </pre>
+        </td>
+<td width="100%">
+<pre>
+<% @source_extract.each do |line, source| -%><div class="line<%= " active" if line == @exception.line_number -%>"><%= source -%></div><% end -%>
+</pre>
+</td>
+    </tr>
+  </table>
+</div>
+</div>
 
-<p><%=h @exception.sub_template_message %></p>
+  <p><%=h @exception.sub_template_message %></p>
 
-<%= render template: "rescues/_trace" %>
-<%= render template: "rescues/_request_and_response" %>
+  <%= render template: "rescues/_trace" %>
+  <%= render template: "rescues/_request_and_response" %>
+  </div>
+</div>
diff --git a/actionpack/lib/action_view/template/error.rb b/actionpack/lib/action_view/template/error.rb
index e00056781d..662e1ac66b 100644
--- a/actionpack/lib/action_view/template/error.rb
+++ b/actionpack/lib/action_view/template/error.rb
@@ -78,7 +78,7 @@ module ActionView
         end
       end
 
-      def source_extract(indentation = 0)
+      def source_extract(indentation = 0, output = :console)
         return unless num = line_number
         num = num.to_i
 
@@ -88,12 +88,20 @@ module ActionView
         end_on_line   = [ num + SOURCE_CODE_RADIUS - 1, source_code.length].min
 
         indent = end_on_line.to_s.size + indentation
-        line_counter = start_on_line
         return unless source_code = source_code[start_on_line..end_on_line]
 
-        source_code.sum do |line|
+        formatted_code_for(source_code, start_on_line, indent, output)
+      end
+
+      def formatted_code_for(source_code, line_counter, indent, output)
+        start_value = (output == :html) ? {} : ""
+        source_code.inject(start_value) do |result, line|
           line_counter += 1
-          "%#{indent}s: %s\n" % [line_counter, line]
+          if output == :html
+            result.update(line_counter.to_s => "%#{indent}s %s\n" % ["", line])
+          else
+            result << "%#{indent}s: %s\n" % [line_counter, line]
+          end
         end
       end
 
-- 
cgit v1.2.3


From a27c4f6095e8f15adc4b1e06faf6d63828e94e6a Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Mon, 31 Dec 2012 16:48:10 -0500
Subject: Fix test for DebugExceptions due to template change

---
 actionpack/test/dispatch/debug_exceptions_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actionpack/test/dispatch/debug_exceptions_test.rb b/actionpack/test/dispatch/debug_exceptions_test.rb
index d236b14e02..39e791b4f4 100644
--- a/actionpack/test/dispatch/debug_exceptions_test.rb
+++ b/actionpack/test/dispatch/debug_exceptions_test.rb
@@ -135,7 +135,7 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
       }
     })
     assert_response 500
-    assert_match(/RuntimeError\n    in FeaturedTileController/, body)
+    assert_match(/RuntimeError\n\s+in FeaturedTileController/, body)
   end
 
   test "sets the HTTP charset parameter" do
-- 
cgit v1.2.3


From 8ecaf133f3adbda93ecae0af0ffbd29f5efbe7f0 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Mon, 31 Dec 2012 17:49:05 -0500
Subject: Summary and Details HTML elements aren't supported in all modern
 browsers

---
 .../templates/rescues/_request_and_response.erb          | 16 ++++++++--------
 .../middleware/templates/rescues/layout.erb              |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
index 9688bf6a57..55079848bd 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
@@ -20,15 +20,15 @@
 <h2 style="margin-top: 30px">Request</h2>
 <p><b>Parameters</b>: <pre><%=h request_dump %></pre></p>
 
-<details>
-<summary>Show session dump</summary>
-<p><pre><%= debug_hash @request.session %></pre></p>
-</details>
+<div class="details">
+  <div class="summary"><a href="#" onclick="document.getElementById('session_dump').style.display='block'; return false;">Show session dump</a></div>
+  <div id="session_dump" style="display:none"><p><pre><%= debug_hash @request.session %></pre></p></div>
+</div>
 
-<details>
-<summary>Show env dump</summary>
-<p><pre><%= debug_hash @request.env.slice(*@request.class::ENV_METHODS) %></pre></p>
-</details>
+<div class="details">
+  <div class="summary"><a href="#" onclick="document.getElementById('env_dump').style.display='block'; return false;">Show env dump</a></div>
+  <div id="env_dump" style="display:none"><p><pre><%= debug_hash @request.env.slice(*@request.class::ENV_METHODS) %></pre></p></div>
+</div>
 
 <h2 style="margin-top: 30px">Response</h2>
 <p><b>Headers</b>: <pre><%=h defined?(@response) ? @response.headers.inspect.gsub(',', ",\n") : 'None' %></pre></p>
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
index 12c4d98e19..bcab5959a0 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
@@ -39,7 +39,7 @@
       line-height: 25px;
     }
 
-    details {
+    .details {
       border: 1px solid #E5E5E5;
       -webkit-border-radius: 4px;
       -moz-border-radius: 4px;
@@ -49,14 +49,14 @@
       width: 978px;
     }
 
-    summary {
+    .summary {
       padding: 8px 15px;
       border-bottom: 1px solid #E5E5E5;
       display: block;
     }
 
-    details pre {
-      margin: 0px;
+    .details pre {
+      margin: 5px;
       border: none;
     }
 
-- 
cgit v1.2.3


From 25c8770a6cbbc4922446085addaa5a41d0e4e1b6 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Mon, 31 Dec 2012 18:07:21 -0500
Subject: formatted_code_for should be private

---
 actionpack/lib/action_view/template/error.rb | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/actionpack/lib/action_view/template/error.rb b/actionpack/lib/action_view/template/error.rb
index 662e1ac66b..b479f991bc 100644
--- a/actionpack/lib/action_view/template/error.rb
+++ b/actionpack/lib/action_view/template/error.rb
@@ -93,18 +93,6 @@ module ActionView
         formatted_code_for(source_code, start_on_line, indent, output)
       end
 
-      def formatted_code_for(source_code, line_counter, indent, output)
-        start_value = (output == :html) ? {} : ""
-        source_code.inject(start_value) do |result, line|
-          line_counter += 1
-          if output == :html
-            result.update(line_counter.to_s => "%#{indent}s %s\n" % ["", line])
-          else
-            result << "%#{indent}s: %s\n" % [line_counter, line]
-          end
-        end
-      end
-
       def sub_template_of(template_path)
         @sub_templates ||= []
         @sub_templates << template_path
@@ -131,6 +119,18 @@ module ActionView
             'in '
           end + file_name
         end
+
+        def formatted_code_for(source_code, line_counter, indent, output)
+          start_value = (output == :html) ? {} : ""
+          source_code.inject(start_value) do |result, line|
+            line_counter += 1
+            if output == :html
+              result.update(line_counter.to_s => "%#{indent}s %s\n" % ["", line])
+            else
+              result << "%#{indent}s: %s\n" % [line_counter, line]
+            end
+          end
+        end
     end
   end
 
-- 
cgit v1.2.3