Mercurial > piecrust2

changeset 123:b6f79f23904a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upgrade system messages to the new folder structure.
author Ludovic Chabant <ludovic@chabant.com>
date Fri, 14 Nov 2014 22:43:29 +0100
parents 04e3da2dd969
children f49fcf9448df
files build/messages/_content/config.yml build/messages/_content/pages/_index.html build/messages/_content/pages/critical.html build/messages/_content/pages/error.html build/messages/_content/pages/error404.html build/messages/_content/pages/requirements.html build/messages/_content/templates/default.html build/messages/_content/templates/error.html build/messages/config.yml build/messages/pages/_index.html build/messages/pages/critical.html build/messages/pages/error.html build/messages/pages/error404.html build/messages/templates/default.html build/messages/templates/error.html piecrust/resources/messages/requirements.html
diffstat 16 files changed, 120 insertions(+), 191 deletions(-) [+]
line wrap: on
line diff
--- a/build/messages/_content/config.yml	Fri Nov 14 22:41:33 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-site:
-    title: PieCrust System Messages
--- a/build/messages/_content/pages/_index.html	Fri Nov 14 22:41:33 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
----
-title: PieCrust System Messages
----
-
-Here are the **PieCrust** system message pages:
-
-* [Requirements Not Met]({{ pcurl('requirements') }})
-* [Error]({{ pcurl('error') }})
-* [Not Found]({{ pcurl('error404') }})
-* [Critical Error]({{ pcurl('critical') }})
-
-This very page you're reading, however, is only here for convenience.
--- a/build/messages/_content/pages/critical.html	Fri Nov 14 22:41:33 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
----
-title: The Whole Kitchen Burned Down!
-layout: error
----
-Something critically bad happened, and **PieCrust** needs to shut down. It's probably our fault.
-
-{% raw %}
-<div id="error-details">{{ details }}</div>
-{% endraw %}
--- a/build/messages/_content/pages/error.html	Fri Nov 14 22:41:33 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
----
-title: The Cake Just Burned!
-layout: error
----
-
-{% raw %}
-<div id="error-details">{{ details }}</div>
-{% endraw %}
-
--- a/build/messages/_content/pages/error404.html	Fri Nov 14 22:41:33 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
----
-title: Can't find the sugar!
----
-
-It looks like the page you were trying to access does not exist around here. Try going somewhere else.
--- a/build/messages/_content/pages/requirements.html	Fri Nov 14 22:41:33 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
----
-title: You're Missing A Few Things
----
-
-It looks like you're not meeting some of the requirements for running **PieCrust**:
-
-* PHP 5.3+
-
-For more information, be sure to check out the [documentation](http://bolt80.com/piecrust/doc).
--- a/build/messages/_content/templates/default.html	Fri Nov 14 22:41:33 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-<!doctype html>
-<html>
-<head>
-    <title>{{ page.title }}</title>
-    <meta name="generator" content="PieCrust" />
-	<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Lobster">
-	<style>
-		body {
-			margin: 0;
-			padding: 1em;
-			background: #eee;
-			color: #000;
-			font-family: Georgia, serif;
-		}
-		h1 {
-			font-size: 4.5em;
-			font-family: Lobster, 'Trebuchet MS', Verdana, sans-serif;
-			text-align: center;
-			font-weight: bold;
-            margin-top: 0;
-			color: #333;
-			text-shadow: 0px 2px 5px rgba(0,0,0,0.3);
-		}
-		h2 {
-			font-size: 2.5em;
-            font-family: 'Lobster', 'Trebuchet MS', Verdana, sans-serif;
-		}
-		code {
-			background: #ddd;
-			padding: 0 0.2em;
-		}
-        #preamble {
-            font-size: 1.2em;
-            font-style: italic;
-            text-align: center;
-            margin-bottom: 0;
-        }
-		#container {
-			margin: 0 20%;
-		}
-        #content {
-            margin: 2em 1em;
-        }
-		.note {
-			margin: 3em;
-			color: #888;
-			font-style: italic;
-		}
-	</style>
-</head>
-<body>
-    <div id="container">
-        <div id="header">
-            <p id="preamble">A Message From The Kitchen:</p>
-			<h1>{{ page.title }}</h1>
-		</div>
-        <hr />
-        <div id="content">
-            {% block content %}
-			{{ content|raw }}
-            {% endblock %}
-		</div>
-        <hr />
-        {% block footer %}{% endblock %}
-	</div>
-</body>
-</html>
\ No newline at end of file
--- a/build/messages/_content/templates/error.html	Fri Nov 14 22:41:33 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-{% extends "default.html" %}
-
-{% block footer %}
-{% pcformat textile %}
-p(note). You're seeing this because something wrong happend. To see detailed errors with callstacks, run chef with the @--debug@ parameter, append @?!debug@ to the URL, or initialize the @PieCrust@ object with @{'debug'=>true}@. On the other hand, to see you custom error pages, set the @site/display_errors@ setting  to @false@.
-{% endpcformat %}
-{% endblock %}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build/messages/config.yml	Fri Nov 14 22:43:29 2014 +0100
@@ -0,0 +1,2 @@
+site:
+    title: PieCrust System Messages
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build/messages/pages/_index.html	Fri Nov 14 22:43:29 2014 +0100
@@ -0,0 +1,12 @@
+---
+title: PieCrust System Messages
+---
+
+Here are the **PieCrust** system message pages:
+
+* [Requirements Not Met]({{ pcurl('requirements') }})
+* [Error]({{ pcurl('error') }})
+* [Not Found]({{ pcurl('error404') }})
+* [Critical Error]({{ pcurl('critical') }})
+
+This very page you're reading, however, is only here for convenience.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build/messages/pages/critical.html	Fri Nov 14 22:43:29 2014 +0100
@@ -0,0 +1,6 @@
+---
+title: The Whole Kitchen Burned Down!
+layout: error
+---
+Something critically bad happened, and **PieCrust** needs to shut down. It's probably our fault.
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build/messages/pages/error.html	Fri Nov 14 22:43:29 2014 +0100
@@ -0,0 +1,5 @@
+---
+title: The Cake Just Burned!
+layout: error
+---
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build/messages/pages/error404.html	Fri Nov 14 22:43:29 2014 +0100
@@ -0,0 +1,6 @@
+---
+title: Can't find the sugar!
+layout: error
+---
+It looks like the page you were trying to access does not exist around here. Try going somewhere else.
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build/messages/templates/default.html	Fri Nov 14 22:43:29 2014 +0100
@@ -0,0 +1,70 @@
+<!doctype html>
+<html>
+<head>
+    <title>{{ page.title }}</title>
+    <meta name="generator" content="PieCrust" />
+	<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Lobster">
+	<style>
+		body {
+			margin: 0;
+			padding: 1em;
+			background: #eee;
+			color: #000;
+			font-family: Georgia, serif;
+		}
+		h1 {
+			font-size: 4.5em;
+			font-family: Lobster, 'Trebuchet MS', Verdana, sans-serif;
+			text-align: center;
+			font-weight: bold;
+            margin-top: 0;
+			color: #333;
+			text-shadow: 0px 2px 5px rgba(0,0,0,0.3);
+		}
+		h2 {
+			font-size: 2.5em;
+            font-family: 'Lobster', 'Trebuchet MS', Verdana, sans-serif;
+		}
+		code {
+			background: #ddd;
+			padding: 0 0.2em;
+		}
+        #preamble {
+            font-size: 1.2em;
+            font-style: italic;
+            text-align: center;
+            margin-bottom: 0;
+        }
+		#container {
+			margin: 0 20%;
+		}
+        #content {
+            margin: 2em 1em;
+        }
+        .error-details {
+            color: #d11;
+        }
+		.note {
+			margin: 3em;
+			color: #888;
+			font-style: italic;
+		}
+	</style>
+</head>
+<body>
+    <div id="container">
+        <div id="header">
+            <p id="preamble">A Message From The Kitchen:</p>
+			<h1>{{ page.title }}</h1>
+		</div>
+        <hr />
+        <div id="content">
+            {% block content %}
+			{{ content|safe }}
+            {% endblock %}
+		</div>
+        <hr />
+        {% block footer %}{% endblock %}
+	</div>
+</body>
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build/messages/templates/error.html	Fri Nov 14 22:43:29 2014 +0100
@@ -0,0 +1,19 @@
+{% extends "default.html" %}
+
+{% block content %}
+{{content|safe}}
+
+{% raw %}
+{% if details %}
+<div class="error-details">
+    {{ details|safe }}
+</div>
+{% endif %}
+{% endraw %}
+{% endblock %}
+
+{% block footer %}
+{% pcformat 'textile' %}
+p(note). You're seeing this because something wrong happend. To see detailed errors with callstacks, run chef with the @--debug@ parameter, append @?!debug@ to the URL, or initialize the @PieCrust@ object with @{'debug'=>true}@. On the other hand, to see you custom error pages, set the @site/display_errors@ setting  to @false@.
+{% endpcformat %}
+{% endblock %}
--- a/piecrust/resources/messages/requirements.html	Fri Nov 14 22:41:33 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-<!doctype html>
-<html>
-<head>
-    <title>You&#039;re Missing A Few Things</title>
-    <meta name="generator" content="PieCrust" />
-	<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Lobster">
-	<style>
-		body {
-			margin: 0;
-			padding: 1em;
-			background: #eee;
-			color: #000;
-			font-family: Georgia, serif;
-		}
-		h1 {
-			font-size: 4.5em;
-			font-family: Lobster, 'Trebuchet MS', Verdana, sans-serif;
-			text-align: center;
-			font-weight: bold;
-            margin-top: 0;
-			color: #333;
-			text-shadow: 0px 2px 5px rgba(0,0,0,0.3);
-		}
-		h2 {
-			font-size: 2.5em;
-            font-family: 'Lobster', 'Trebuchet MS', Verdana, sans-serif;
-		}
-		code {
-			background: #ddd;
-			padding: 0 0.2em;
-		}
-        #preamble {
-            font-size: 1.2em;
-            font-style: italic;
-            text-align: center;
-            margin-bottom: 0;
-        }
-		#container {
-			margin: 0 20%;
-		}
-        #content {
-            margin: 2em 1em;
-        }
-		.note {
-			margin: 3em;
-			color: #888;
-			font-style: italic;
-		}
-	</style>
-</head>
-<body>
-    <div id="container">
-        <div id="header">
-            <p id="preamble">A Message From The Kitchen:</p>
-			<h1>You&#039;re Missing A Few Things</h1>
-		</div>
-        <hr />
-        <div id="content">
-            			<p>It looks like you're not meeting some of the requirements for running <strong>PieCrust</strong>:</p>
-
-<ul>
-<li>PHP 5.3+</li>
-</ul>
-
-<p>For more information, be sure to check out the <a href="http://bolt80.com/piecrust/doc">documentation</a>.</p>
-
-            		</div>
-        <hr />
-        	</div>
-</body>
-</html>
\ No newline at end of file