Skip to content
Permalink
Browse files

Initial consolidation

  • Loading branch information...
davidmerfield committed Mar 14, 2019
1 parent 1c0d36d commit 8367bb59e8b1b25e3ca059133d42dbfa1fcc43a4

This file was deleted.

Oops, something went wrong.
@@ -54,8 +54,6 @@ brochure.get("/sitemap.xml", require("./sitemap"));

brochure.use("/developers", require("./developers"));

brochure.use("/formatting", require("./formatting"));

// brochure.use("/templates", require("./templates"));

brochure.use("/news", require("./news"));
@@ -92,6 +90,10 @@ brochure.get("/", function(req, res) {
res.render("index");
});

var tex = require('./tools/tex');

brochure.use('/publishing/formatting', tex);

brochure.get("/:section", function(req, res, next) {
// This check is designed to prevent an error polluting
// the logs which happens for requests like /images/foo.png
@@ -120,6 +122,22 @@ brochure.get("/:section/:subsection", function(req, res, next) {
res.render(req.params.section + "/" + req.params.subsection);
});

brochure.get("/:section/:subsection/:subsubsection", function(req, res, next) {
// This check is designed to prevent an error polluting
// the logs which happens for requests like /images/foo.png
// Express doesn't have a renderer for '.png' so there is an error
if (
req.params.section.indexOf(".") > -1 ||
req.params.subsection.indexOf(".") > -1
) {
return next();
}

res.locals.title =
"Blot – " + req.params.subsubsection + "" + req.params.section;
res.render(req.params.section + "/" + req.params.subsection + '/' + req.params.subsubsection);
});

brochure.use(function(err, req, res, next) {
if (config.environment === "development") console.log(err);
next();

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
@@ -45,6 +45,31 @@
<li class="{{selected.metadata}}">
<a href="{{{base}}}/publishing/metadata">Metadata</a>
</li>
<li class="{{selected.configuring}}">
<a href="{{{base}}}/publishing/configuring">Configuring your blog</a>
</li>
<li class="{{selected.redirects}}">
<a href="{{{base}}}/publishing/clients">Clients</a>
</li>
<li class="{{selected.domain}}">
<a href="{{{base}}}/publishing/domain">Use your own domain</a>
</li>
<li class="{{selected.import}}">
<a href="{{{base}}}/publishing/import">Importing posts</a>
</li>
<li class="{{selected.redirects}}">
<a href="{{{base}}}/publishing/redirects">Redirects</a>
</li>
<li class="{{selected.urls}}">
<a href="{{{base}}}/publishing/urls">URLs</a>
</li>
<li>
<a href="/publishing/formatting">Formatting guide</a>
</li>

<li class="{{selected.services}}">
<a href="{{{base}}}/publishing/services">External services</a>
</li>
<br>
</ul>
</li>
@@ -92,41 +117,7 @@
</ul>
</li>

<li class="has-list {{selected.configuring}}">
<input type="checkbox" name="configuring" id="configuring" {{#selected.configuring}} checked{{/selected.configuring}}> <a href="{{{base}}}/configuring">Configuring
<!-- your blog --><label for="configuring"></label></a>
<ul>
<li class="{{selected.domain}}">
<a href="{{{base}}}/configuring/domain">Use your own domain</a>
</li>
<li class="{{selected.import}}">
<a href="{{{base}}}/configuring/import">Importing posts</a>
</li>
<li class="{{selected.redirects}}">
<a href="{{{base}}}/configuring/redirects">Redirects</a>
</li>
<li class="{{selected.urls}}">
<a href="{{{base}}}/configuring/urls">URLs</a>
</li>
<li class="{{selected.services}}">
<a href="{{{base}}}/configuring/services">External services</a>
</li>
<br>
</ul>
</li>

<li class="has-list {{selected.clients}}">
<input type="checkbox" name="clients" id="clients" {{#selected.clients}} checked{{/selected.clients}}> <a href="{{{base}}}/clients">Clients<label for="clients"></label></a>
<ul>
<li class="{{selected.dropbox}}">
<a href="{{{base}}}/clients/dropbox">Dropbox</a>
</li>
<li class="{{selected.git}}">
<a href="{{{base}}}/clients/git">Git</a>
</li>
<br>
</ul>
</li>


<li class="{{selected.account-billing}}">
<a href="{{{base}}}/account-billing">Account and billing</a>
@@ -138,21 +129,22 @@
<a href="/support">Support</a>
</li>

<li>
<a href="/formatting">Formatting guide</a>
</li>

<li>
<a href="/news">News and updates</a>
<a href="/about">About</a>
</li>

<li>
<a href="/developers">Developers</a>
<a href="/news">News</a>
</li>

<li>
<a href="/about">About</a>
</li>
<!-- <li><a href="/developers">Developer guide</a></li>
<li><a href="/terms">Terms of use</a></li>
<li><a href="/privacy">Privacy policy</a></li>
--> <!-- <li><a href="/contact">Contact</a></li>
-->


</ul>
<content>
@@ -174,7 +174,7 @@
background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="612" height="612"><path d="M604.501 440.509L325.398 134.956c-5.331-5.357-12.423-7.627-19.386-7.27-6.989-.357-14.056 1.913-19.387 7.27L7.499 440.509c-9.999 10.024-9.999 26.298 0 36.323s26.223 10.024 36.222 0l262.293-287.164L568.28 476.832c9.999 10.024 26.222 10.024 36.221 0 9.999-10.023 9.999-26.298 0-36.323z"/></svg>');
}
</style>
<h1>News and updates</h1>
<h1>News</h1>
<p>The lists below give you an idea of what I'm working on. I send out an email each season with a summary of new features, templates, fixed bugs and future plans. <!-- View the <a href="/news/archive">newsletter archive</a>. --> Please don't hesitate to <a href="/contact">contact me</a> if you have any questions.</p>

<p>
@@ -3,7 +3,7 @@ <h1>Clients</h1>
<p>Blot turns a folder into a blog. You can synchronize your blog's folder with any of the following clients. You can switch your blog seamlessly between clients at any point. Please <a href="/contact">contact me</a> if there's a client you'd like me to add.</p>

<ul class="clients">
<li><a href="/clients/dropbox">
<li><a href="/publishing/clients/dropbox">
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 75.1 63.8" xml:space="preserve">
@@ -13,7 +13,7 @@ <h1>Clients</h1>
</svg>

<strong>Dropbox</strong><br>A file hosting service with wide support</a></li>
<li><a href="/clients/git">
<li><a href="/publishing/clients/git">
<?xml version="1.0" encoding="utf-8"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 114.01 114.01">

@@ -0,0 +1,12 @@
<h1>Formatting guide</h1>

<p style="margin-top:0">You can use a variety of standard tools to add formatting to your blog posts. Text files can include <a href="/formatting/markdown">Markdown</a> to add links, headings, lists and much more. You can mark up mathematics in <a style="border:none;text-decoration:none;margin-right:-4px" href="/formatting/tex">\(\TeX\)</a>. Note that Blot can turn <a href="/publishing">HTML files</a> into blog posts.</p>


<ul class="clients">
<li><a href="/publishing/formatting/markdown"><strong>Markdown</strong><br> A lightweight markup language with plain text formatting syntax.</a> </li>
<li><a href="/publishing/formatting/tex"><strong>\(\TeX\)</strong><br> A math typesetting library with powerful formatting features.</a> </li>
<li><a href="/publishing/formatting/layout-tags"><strong>Layout</strong><br> A custom Markdown extension which offers simple layout directives.</a> </li>
</ul>


0 comments on commit 8367bb5

Please sign in to comment.
You can’t perform that action at this time.