Mercurial > piecrust2

changeset 125:c77062233ba5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update system messages.
author Ludovic Chabant <ludovic@chabant.com>
date Fri, 14 Nov 2014 22:45:12 +0100
parents f49fcf9448df
children e5cba2622d26
files piecrust/resources/messages/critical.html piecrust/resources/messages/error.html piecrust/resources/messages/error404.html
diffstat 3 files changed, 37 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/piecrust/resources/messages/critical.html	Fri Nov 14 22:44:59 2014 +0100
+++ b/piecrust/resources/messages/critical.html	Fri Nov 14 22:45:12 2014 +0100
@@ -41,6 +41,9 @@
         #content {
             margin: 2em 1em;
         }
+        .error-details {
+            color: #d11;
+        }
 		.note {
 			margin: 3em;
 			color: #888;
@@ -56,12 +59,16 @@
 		</div>
         <hr />
         <div id="content">
-            			<p>Something critically bad happened, and <strong>PieCrust</strong> needs to shut down. It's probably our fault.</p>
+            <p>Something critically bad happened, and <strong>PieCrust</strong> needs to shut down. It&#8217;s probably our fault.</p>
 
-<div id="error-details">{{ details }}</div>
 
-            		</div>
+{% if details %}
+<div class="error-details">
+    {{ details|safe }}
+</div>
+{% endif %}
+		</div>
         <hr />
-        	<p class="note">You&#8217;re seeing this because something wrong happend. To see detailed errors with callstacks, run chef with the <code>--debug</code> parameter, append <code>?!debug</code> to the <span class="caps">URL</span>, or initialize the <code>PieCrust</code> object with <code>{&#39;debug&#39;=&#62;true}</code>. On the other hand, to see you custom error pages, set the <code>site/display_errors</code> setting  to <code>false</code>.</p>	</div>
+        	<p class="note">You&#8217;re seeing this because something wrong happend. To see detailed errors with callstacks, run chef with the <code>--debug</code> parameter, append <code>?!debug</code> to the <span class="caps">URL</span>, or initialize the <code>PieCrust</code> object with <code>{'debug'=&gt;true}</code>. On the other hand, to see you custom error pages, set the <code>site/display_errors</code> setting  to <code>false</code>.</p>	</div>
 </body>
 </html>
\ No newline at end of file
--- a/piecrust/resources/messages/error.html	Fri Nov 14 22:44:59 2014 +0100
+++ b/piecrust/resources/messages/error.html	Fri Nov 14 22:45:12 2014 +0100
@@ -41,6 +41,9 @@
         #content {
             margin: 2em 1em;
         }
+        .error-details {
+            color: #d11;
+        }
 		.note {
 			margin: 3em;
 			color: #888;
@@ -56,10 +59,16 @@
 		</div>
         <hr />
         <div id="content">
-            			<div id="error-details">{{ details }}</div>
+            
+
 
-            		</div>
+{% if details %}
+<div class="error-details">
+    {{ details|safe }}
+</div>
+{% endif %}
+		</div>
         <hr />
-        	<p class="note">You&#8217;re seeing this because something wrong happend. To see detailed errors with callstacks, run chef with the <code>--debug</code> parameter, append <code>?!debug</code> to the <span class="caps">URL</span>, or initialize the <code>PieCrust</code> object with <code>{&#39;debug&#39;=&#62;true}</code>. On the other hand, to see you custom error pages, set the <code>site/display_errors</code> setting  to <code>false</code>.</p>	</div>
+        	<p class="note">You&#8217;re seeing this because something wrong happend. To see detailed errors with callstacks, run chef with the <code>--debug</code> parameter, append <code>?!debug</code> to the <span class="caps">URL</span>, or initialize the <code>PieCrust</code> object with <code>{'debug'=&gt;true}</code>. On the other hand, to see you custom error pages, set the <code>site/display_errors</code> setting  to <code>false</code>.</p>	</div>
 </body>
 </html>
\ No newline at end of file
--- a/piecrust/resources/messages/error404.html	Fri Nov 14 22:44:59 2014 +0100
+++ b/piecrust/resources/messages/error404.html	Fri Nov 14 22:45:12 2014 +0100
@@ -1,7 +1,7 @@
 <!doctype html>
 <html>
 <head>
-    <title>Can&#039;t find the sugar!</title>
+    <title>Can't find the sugar!</title>
     <meta name="generator" content="PieCrust" />
 	<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Lobster">
 	<style>
@@ -41,6 +41,9 @@
         #content {
             margin: 2em 1em;
         }
+        .error-details {
+            color: #d11;
+        }
 		.note {
 			margin: 3em;
 			color: #888;
@@ -52,14 +55,20 @@
     <div id="container">
         <div id="header">
             <p id="preamble">A Message From The Kitchen:</p>
-			<h1>Can&#039;t find the sugar!</h1>
+			<h1>Can't find the sugar!</h1>
 		</div>
         <hr />
         <div id="content">
-            			<p>It looks like the page you were trying to access does not exist around here. Try going somewhere else.</p>
+            <p>It looks like the page you were trying to access does not exist around here. Try going somewhere else.</p>
+
 
-            		</div>
+{% if details %}
+<div class="error-details">
+    {{ details|safe }}
+</div>
+{% endif %}
+		</div>
         <hr />
-        	</div>
+        	<p class="note">You&#8217;re seeing this because something wrong happend. To see detailed errors with callstacks, run chef with the <code>--debug</code> parameter, append <code>?!debug</code> to the <span class="caps">URL</span>, or initialize the <code>PieCrust</code> object with <code>{'debug'=&gt;true}</code>. On the other hand, to see you custom error pages, set the <code>site/display_errors</code> setting  to <code>false</code>.</p>	</div>
 </body>
 </html>
\ No newline at end of file