doc: move site/ under doc/, switch to hakyll-std

This commit is contained in:
Simon Michael 2014-10-31 14:59:04 -07:00
parent 23fb4ffd84
commit 78640449a0
44 changed files with 19 additions and 149 deletions

View File

@ -664,25 +664,26 @@ data/100000x1000x10.journal: tools/generatejournal
# rebuild all docs
docs: site codedocs
cleandocs: cleansite
cleandocs: site-clean
# build the hledger.org website
# Requires yst (cabal install yst)
# build some additional static bits of the hledger.org website
# Requires hakyll-std, a generic hakyll site builder
.PHONY: site
site: olddocs
-cd site; yst
-cd doc/site; hakyll build
cleansite: cleanolddocs
rm -rf site/site/*
site-clean: cleanolddocs
-cd doc/site; hakyll clean
# rm -rf doc/site/_site/*
sitepreview: site/site
cd site; ./site preview
site-preview: #doc/site/site
cd doc/site; hakyll preview
siteview: site
$(VIEWHTML) site/_site/index.html
site-view: site
$(VIEWHTML) doc/site/_site/index.html
autosite:
cd site; $(AUTOBUILD) site.hs -o site $(PREFERMACUSRLIBFLAGS) --run preview
# site-auto:
# cd doc/site; $(AUTOBUILD) site.hs -o site $(PREFERMACUSRLIBFLAGS) --run preview
# ensure some old doc versions are in place:
@ -796,16 +797,16 @@ view-haddock-%:
# http://www.cs.york.ac.uk/fp/darcs/hscolour/
HSCOLOUR=HsColour -css
hscolour: site/api/src site/api/src/hscolour.css
hscolour: doc/site/api/src doc/site/api/src/hscolour.css
for f in $(HADDOCKSOURCEFILES); do \
$(HSCOLOUR) -anchor $$f -osite/api/src/`echo $$f | sed -e's%[^/]*/%%' | sed -e's%/%-%g' | sed -e's%\.hs$$%.html%'` ; \
$(HSCOLOUR) -anchor $$f -odoc/site/api/src/`echo $$f | sed -e's%[^/]*/%%' | sed -e's%/%-%g' | sed -e's%\.hs$$%.html%'` ; \
done
site/api/src/hscolour.css: site/api/src
$(HSCOLOUR) -print-css >site/api/src/hscolour.css
doc/site/api/src/hscolour.css: doc/site/api/src
$(HSCOLOUR) -print-css >doc/site/api/src/hscolour.css
site/api/src:
mkdir -p site/api/src
doc/site/api/src:
mkdir -p doc/site/api/src
sourcegraph:
for p in $(PACKAGES); do (cd $$p; SourceGraph $$p.cabal); done

View File

Before

Width:  |  Height:  |  Size: 61 KiB

After

Width:  |  Height:  |  Size: 61 KiB

View File

Before

Width:  |  Height:  |  Size: 219 KiB

After

Width:  |  Height:  |  Size: 219 KiB

View File

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

View File

Before

Width:  |  Height:  |  Size: 65 KiB

After

Width:  |  Height:  |  Size: 65 KiB

View File

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

View File

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

View File

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

View File

Before

Width:  |  Height:  |  Size: 84 KiB

After

Width:  |  Height:  |  Size: 84 KiB

View File

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

View File

Before

Width:  |  Height:  |  Size: 209 B

After

Width:  |  Height:  |  Size: 209 B

View File

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

Before

Width:  |  Height:  |  Size: 867 B

After

Width:  |  Height:  |  Size: 867 B

View File

Before

Width:  |  Height:  |  Size: 668 B

After

Width:  |  Height:  |  Size: 668 B

View File

Before

Width:  |  Height:  |  Size: 673 B

After

Width:  |  Height:  |  Size: 673 B

View File

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

Before

Width:  |  Height:  |  Size: 70 B

After

Width:  |  Height:  |  Size: 70 B

View File

Before

Width:  |  Height:  |  Size: 326 B

After

Width:  |  Height:  |  Size: 326 B

View File

Before

Width:  |  Height:  |  Size: 326 B

After

Width:  |  Height:  |  Size: 326 B

View File

@ -1,6 +0,0 @@
indexfile : content.yaml
title : hledger.org
sourcedir : [., .., ../doc]
datadir : .
filesdir : [files]
layout : layout.html.st

View File

@ -1,56 +0,0 @@
- title : Home
url : start
source : README.md
data:
home: true
- User Manual:
- title : Latest
url : MANUAL.html
source : MANUAL.md
- title : 0.22 Manual
url : 0.22/MANUAL.html
source : 0.22/MANUAL.md
- title : 0.21 Manual
url : 0.21/MANUAL.html
source : 0.21/MANUAL.md
- title : Release notes
url : CHANGES.html
source : CHANGES.md
- title : Installing
url : installing
template : null.st
- title : FAQ
url : faq
template : null.st
- title : How to read CSV files
url : how-to-read-csv-files
template : null.st
- title : How to use account aliases
url : how-to-use-account-aliases
template : null.st
- title : Developer Guide
url : developer-guide
template : null.st
- title : More docs
url : start#documentation
template : null.st
- title : Old downloads
url : DOWNLOAD.html
source : DOWNLOAD.md
- title : hledger-web demo
url : demo
template : null.st

View File

@ -1,69 +0,0 @@
<html>
<head>
<title>$pagetitle$ - $sitetitle$</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="alternate" type="application/rss+xml" title="Joyful Systems blog, hledger tag" href="http://joyful.com/tags/hledger.xml" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css">
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
<![endif]-->
<link rel="stylesheet" href="/css/style.css" />
<!-- <link rel="stylesheet" type="text/css" media="print" href="$root$css/print.css" /> -->
<style>
$if(home)$
h1 { font-size:7em; }
$endif$
</style>
<!-- <link rel="stylesheet" href="/js/highslide/highslide.css" /> -->
<!-- <script src="/js/highslide/highslide.js"></script> -->
<!-- <script> -->
<!-- hs.graphicsDir = '/js/highslide/graphics/'; -->
<!-- hs.outlineType = 'rounded-black'; -->
<!-- hs.captionEval = 'this.thumb.title'; -->
<!-- </script> -->
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3/jquery.min.js"></script>
<script src="$root$js/nav.js"></script>
</head>
<body>
<a href="https://github.com/simonmichael/hledger"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_green_007200.png" alt="Fork me on GitHub"></a>
<div class="container">
<div class="row">
<div id="nav" class="col-sm-2" style="margin-top:5em;">
$nav$
</div>
<div class="col-sm-10">
$contents$
</div>
</div>
</div>
<div id="footer">
<hr />
&copy; 2007-2014 <a href="http://joyful.com/">Simon Michael</a> and contributors
</div>
<!-- <script src="js/bootstrap.min.js"></script> -->
<script type="text/javascript">
var gaJsHost = (('https:' == document.location.protocol) ? 'https://ssl.' : 'http://www.');
document.write(unescape('%3Cscript src=\'' + gaJsHost + 'google-analytics.com/ga.js\' type=\'text/javascript\'%3E%3C/script%3E'));
</script>
<script type="text/javascript">
try {
var pageTracker = _gat._getTracker('UA-3456280-3');
pageTracker._trackPageview();
} catch(err) {}
</script>
</body>
</html>

View File