Now when using "./site check" everything looks good (excluding the
reference to nojs/index.html from templates/default.haml)
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
When an anchor within #page-content has a href matching /images\/.*/ it
should be viewed as a resource for download/view instead of loaded into
$page-content.
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
Now that the css (implemented using sass) has been fully ported to clay,
the sass folder can and has been completely removed.
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
Added the --verbose=0 option when "cabal run gencss compact" is run from
src/site.hs. This stops cabal from outputting compiler/success messages
to the front of the generated css file.
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
* ported sass/_blog.sass to within clay/Header.hs (excluding use of
mixins - see comments in source)
* split up clay css into a few modules (Util, Header and Main)
* still missing any properties that were implemented as sass
mixins (from sass/default.sass and sass/_blog.sass) as well as porting
the following sass files (from sass/):
* _home-page.sass
* _contact-page.sass
* _post-page.sass
* _tag-page.sass
* _src-highlight.sass
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
Removed dependency on sass in src/site.hs and replaced it with clay.
This is achieved by adding a second executable to the projects cabal
file (called 'gencss') and a folder (called 'clay) that contains all .hs files for
clay (nested however deeply). Then whenever the site is being built, the
"cabal build gencss" command is run, which if successful is followed by
"cabal run gencss compact" whose output is captured and saved to
/default.css.
The sass folder has been left while the majority of the sass has not
been ported over to clay. Only part of sass/default.sass has been ported.
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
Cleans up error reporting when an ajax call fails, and thus
the #page-content div can't be filled. This is accomplished by using
a #status which has a p.message element that can be populated for text
displaying status messages. By adding either .error or .success
to #status causes it to be highlighted as either a error or success message
respectively.
When its the first load of the page, and #page-content hasn't yet been
populated with content, an error message is shown in the #page-content
div.
Removed the /posts/ and /tags/ fallbacks in the generated
manifest.appcache because even when online, ajax calls for invalid URLs
under those paths return the respective fallback page instead of an
error message, and populate the #page-content div with the fallback. So
from this point forward the fact that the website is offline will be
handled from JavaScript.
When a page is not accessible in the application cache and the user is
offline, an error message is displayed using the mechanism mentioned
above.
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
Instead use a single pattern (providing the route also remains
unchanged; that is, idRoute)
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
Paginate tag pages, allowing maximum 2 pages per tag to be app cached.
Setup virtual paths for tag pages such that /tags/tagname.html loads
/tags/tagname1.html similar to how pages are handed. This is similar to
how pages are handled in that /pagename.html loads /pages/pagename.html.
Dry up blog page's pagination and create a dry template for pagination
because it is also used on the tag pages.
Signed-off-by: Collin J. Doering <rekahsoft@gmail.com>
This causes a bug when using the android browser. Specifically, because
pages/blog.html is appcached it always prefers the appcached version and
thus loads an empty blog (unless you explicit request pages/blog1.html)
This empty file is required while generating the navigation. There seems
to be no way to not write a file once within the Rules monad (or at
least it's not simple).
Signed-off-by: Collin J. Doering <rekahsoft@gmail.com>
Paginate URLs now working correctly. In posts and pages a link to a page can be given
using either:
- absolute url (eg. /pages/somepage.html)
- virtual page path (eg. /#/somepage.html)
This is achieved in js/default.js by treating a tags with the rel
attribute as virtual. Specifically, the rel attribute should be of the
form "address:/virtual/path.html" , though this isn't tested for. If a
value val, is found in the rel attribute then it is used as the URL in
loadPageContent where if it doesn't match certain regexps it is assumed
to be a page and "pages" + val is loaded into the page-content div. See
loadPageContent for more details.
Placed first page, previous page, next page, and last page links at
bottom of blog pages to switch between pages.
Still incomplete:
- pagination menu needs to be further styled with images, tool tips, etc.
- check if rel conforms to the form /address:.*/ and if not don't treat
is specially (as virtual)
Signed-off-by: Collin J. Doering <rekahsoft@gmail.com>
- pagination of posts now works (they are output to pages/blog<n>.html
where <n> is a number from 1 to some natural x)
- pages in pages/* are weighted 1 to some natural y for the purposes of
generating the menu; but now items that are weighted 0 will not show
up in the menu and instead will be hidden. This allows for the
paginated pages to be generated to _site/pages/blog<n>.html as above
but also avoids showing them in the generated menu.
Now there still is the issue of showing the pages. js/default.js has
been slightly modified to allow the new format of the paginated blog
pages along with the original blog page.
Things yet to complete for pagination:
- the original blog page still needs to be removed as it will be
replaced by the paginated pages
- need to modify templates/partials/post-teaser-list.haml to show the
forward/backward buttons from the paginate context.
- paginate tag pages
- find a clean way for the paginated pages (blgo and tags) can be
viewed/selected
Signed-off-by: Collin J. Doering <rekahsoft@gmail.com>
- made the border surrounding content a consistent width on each page
- minor aesthetic changes to the tag page
- removed need for index.html
Signed-off-by: Collin J. Doering <rekahsoft@gmail.com>
Was having issues with submodules filling two directories at the same
time (lib and lib-src; hard links maybe the cause?). Anyways for the
time being removed them.
Signed-off-by: Collin J. Doering <rekahsoft@gmail.com>
- fixed path of gitsubmodules
- added folder 'files' for files that are not to be App Cached
and included my public gpg key
- did a little work on the business card (displayed on the home page and
contact page
- changed app cache fallback pages to be in haml instead of html
js/default.js:
- added support for mailto and download-able (not app cached) links
- added support for mathjax (called on each call of 'loadPageContent')
site.hs:
- added support for using arbitrary pandoc reader/writer extensions
- added support for rendering of maths (using mathjax)
- added generation of tag pages to the application cache (a fallback
is still used for the rss feeds as they are not necessary while
offline)
TODO:
- pagination (n posts per page)
- save n most recent posts to localstorage and support option to
add/remove posts
- add general fallback page to handle main rss feed and other files
- content and styling
Signed-off-by: Collin J. Doering <rekahsoft@gmail.com>
Almost ready for prime time. What remains to be completed is as follows:
* pagination
* fix the escape parsing bug in the section parser
* add support to locally cache posts (opt-in)
* clean-up the code
* finish contact page and home page
The following was completed since last commit:
* added gpl.txt to project
* deleted otf free fonts to save space
* various structural changes
* added a new post 'first-post'
* various ascetic changes to templates and sass code
* used function to remove js from global namespace (js/default.js)
* added support for application cache and generating a cache manifest
file (site.hs) as well as created appropriate fallback .html
files '{post,tags}-fallback.html'
Signed-off-by: Collin J. Doering <rekahsoft@gmail.com>
* Changes
** Hakyll "site.hs"
*** Added the ability to have per-page templates (for all "pages/*")
*** "pages/*" can now be sectioned off into blocks
A section is a logical division of a page. It removes the requirement
for pages that have multiple sections to have some html in the
markdown for the page or to move some of the markdown content to the
template. Both of which are un-maintainable.
There are two types of sections, both with slightly different syntax's.
A _global section_ is a section who's content will be included in all
sections (regardless of ordering). This is handy for including links
and footnotes that might be needed in more then one section or
non-section . It is not accessible from the Context obtained from
genSectionContext. To indicate where a global section begins and ends
use "$section$" and "$endsection$" respectively (without
quotes). Formally:
$section$ <body> $endsection$
A _named section_ is a section of a document that can be accessed by a
given name from the context obtained from the function
genSectionContext. To specify a named section use the following syntax:
$section("<name>")$ <body> $endsection$
where <name> is the name of the section (any character except \")
and <body> is the section body
Anything that is not a section is referred to as a non-section. These
are still important as they will include all
content of the global sections of the document as well as the
non-section itself. To be a little more formal a non-section is
everything between "$end-section$" and ("$section$ or
$section("<name>")$").
**** Example: mypage.markdown
page title
==========
$section("column-one")$
This is text that can be formatted in the individual page template
located at "templates/pages/mypage.haml". Here is a link from a
global section. See [Home][].
$endsection$
This is some text in between two sections or a section and the top or
bottom of the page. It can be accessed by $body<n>$ where <n> its
position from the top of all non-sections starting from 0. Here i can
also use
$section$
[Home]: http://blog.rekahsoft.ca
$endsection$
***** To see more visit
- "pages/<name>" where the sectioned page markdown is written
- "templates/pages/<name>.haml" where the individual page
template is stored/loaded from
- "templates/page.haml" the generic page wrapper
** Miscellaneous
*** Reorganized the file structure
- created folder "image-src" for image-sources
- created folder "lib" for libraries that will be needed on the server
- moved jQuery and Skeleton to lib and made appropriate
- created folder "fonts" for FreeMono and FreeSans font files which are
now used via css @font-face
- create folder "css" and setup "site.hs" to minimize all css files
and publish them to idRoute
- created folder "sass" which contains a variety of s[ac]ss files along
with a file named "default.s[ax]ss" which will be processed by sass
to include any other s[ac]ss files that are needed and output
"default.css" to the site root
*** cleaned up .gitmodules
** Javascript
- fixed processing of urls
- temporarily disabled nojs version of site as its under heavy development
Note: still need to merge changes made to default version into the
nojs one; specifically having "templates/pages/*.haml" be applied to
there respective page before "templates/page.haml" is applied to the
result
** Styling
- switched to using sass (with a side bourbon) instead of css
leaving css folder and processing for convenience
- slimmed the site of the nav-loading image
- updated favicon (rounded corders, preparing to support more sizes)
- updated the logo-banner
- added new images for tab page
** Templates
- converted all "templates/**" to haml and made the apropriate
adjustments in site.hs
- added "templates/pages/*" which contains individual templates per
page in "pages/*"
** Known Issues
**** Sections cannot contain $section$ or $section("<name>")$ or $sectionend$ in them (this is an issue with escaping in the parser)
**** pagination has been attempted but no solution yet
**** haven't been able to generate two sets of tag-pages (one for the default version and the other for the nojs version
**** opening a internal link in a new tab in any browser will load the snippet that would normally loaded by by ajax
Signed-off-by: Collin J. Doering <rekahsoft@gmail.com>
No longer is nojs/pages/* generated. Instead pages are generated to nojs/pageName; where
pageName is the name of the page (with extension changed to html) with the exception that if
the page is named "home.markdown" it will be generated as index.html in the nojs folder.
Fixed links in templates accordingly.
All changes are detailed below. Both the ajax (default) and nojs version
are being generated properly. Remaining tasks include:
- theming (css - both versions)
- additional work on the templates (both versions [where applicable])
- writing content (used by both versions but only one copy needed)
- writing addition js where needed (for default version only)
Changes:
.gitmodules: added/fixed git submodules; uses bootstrap and jquery-address
css/default.css: various minor modifications to make things look sane
index.html: home page for default version of site
js/default.js: minor modifications to enable carousel and loading of content with ajax
news/*: A bunch of bogus news articles to test the generation of the site
pages/*: All pages are written here. Giving a 'weight' in the metadata will be used to order
the navigation.
site.hs: Many changes..see the source. Mostly complete (perhaps consider doing a screen
reader version of the site)
templates/*: Did various work thoughout the templates (including splitting up some between
the different versions (noted by templateName-versionName)
templates/archive.html
templates/default-nojs.html
templates/default.html
templates/footer.html
templates/nav-nojs.html
templates/nav.html
templates/news-nojs.html
templates/news.html
templates/page.html
templates/post-list.html
templates/post.html
templates/recent-news-nojs.html
templates/recent-news.html
