Skeleton switched from having 16 columns to 12. A few improvements to
skeleton also required a little tweaking of the current css as well as a
cleanup of templates/default.html.
Note: templates/default-nojs.html was not updated though an update will
be trivial. This is only relevant if the nojs section of the site is
revived.
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
Now when './site deploy' is run the empty files that are left over from
Hakyll generating the site are removed. Also rsync now uses verbose
output so that its easy to see what files are updated on the server.
Note, because the commands run by './site deploy' include 'echo' and
'find' this requires a posix environment (and thus can't be built on
Windows without cygwin).
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
Added spans that will show "First Page", "Previous Page", "Next Page",
"Last Page" when its unavailable. Eg. the user is on the last page so
there should be no link to click and instead just place holder text.
The css uses flexbox display and thus only works in modern
browsers (see: http://caniuse.com/#feat=flexbox). This may be changed in
the future as to support more browsers (IE9+ specifically).
Images/Icons for "First Page", "Previous Page", "Next Page", "Last Page"
have yet to be set (though would preferably be done in pure CSS).
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
This post is just a filler post (lorem ipsum) to test pagination (along
with a couple others - which soon will be removed).
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
Stopped using git submodules (for jquery, jquery-address, skeleton, and
any other libraries used for this site) but forgot to remove the
.gitmodules file. This commit removed said empty file.
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
The only checks that fail are the 'insecure regexp' checks (which in
this case are not insecure) as well as a few functions that take unused
parameters.
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
Wrapped client side url router in a function that returns an object (the
interface for the router). Because javascript passes by reference,
passing the array of handler/route objects to the router was an issue
so the array of routes used for this application was moved to within the
wrapper function. In the future this should be changed so
the array is supplied and can be modified with a method like addRoute.
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
Re-factored how urls are handled. Specifically, made it more clear which
urls are rewritten when as well as what to run beforeSending, onError
and onSuccess.
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
Use the unicode arrow '2192' infront of ol > li bullets. This must have
been missed while porting css from sass to clay.
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
Both the clay css and templates/partials/post.html added a horizontal
rule at the top of each post footer (using the css border property and
hr respectively). Opted for using the clay css one as its used on
multiple pages (eg. blog pages and tag pages).
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
When a page listed in the navigation was opened in a new page/tab, the
url used to be the whole path (/#/pages/pagename.html). This commit
enables rewriting of the urls (using jquery address) so that the client
always sees a pretty url (eg /#/blog.html instead of
/#/pages/blog.html).
Also fixed issue introduced last commit (b6d6830) where when clicking on
post or tag links failed to activate the blog menuitem.
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
Previously, all anchor clicks within #page-content was handled by a
event listener that checked whether the anchor's href was to an
'external' url and if so loaded it directly. Otherwise it passed the
value of the anchors href attribute to the jquery address plugin (via
the $.address.value function).
This unfortunately cause clicking on anchors to work fine but when
opening them in a new page or window (or copying the link) caused the
link to reference the html snippet of the page/post instead of the
entire application.
To rectify this, this commit simply transforms internal urls href
attribute after the snippet is loaded into #page-content.
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
Excluding insecure regexps (used to check urls - which is not a security
risk in this case). In a future commit this can be fixed by adding
comments ignoring the jslint errors or by making the regexps more
specific.
Also in the ajax call in loadPageContent the callbacks fore beforeSend
and error have unused parameters (xhr and settings, though the error
callback uses its second argument status).
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
Commit cd5ae7b652 (the switch to clay)
introduced a error rendering source code in posts.
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
Removed all haml templates and returned to using the default hakyll
style html templates. The main reason for this was to avoid the
requirement for external tools that cannot be installed with cabal. Also
as much as haml is nicer to read and write (in my opinion) it is in this
case just adding another layer of needless abstraction.
Perhaps in the future haml-like functionality can be added to default
hakyll templates. Until then, follow the KISS mentality.
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
Switched from four .four.column divs (one for firstPage, previousPage,
nextPage, and lastPage) to two .eight.column divs (one for firstPage and
previousPage, and the other for nextPage and lastPage).
This is mostly an ascetic fix that will be modified in the future when I
get around to theming the pagination buttons.
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
The template "templates/recent-posts.haml" has been superseded by
"templates/partials/recent-post-list.haml" but was left behind.
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
I was thinking of using hamlet for templates but hadn't implemented
anything yet. Using hamlet doesn't work well in this case though because
hamlet templates are compiled (using template haskell). Removed this
false mention from README.md.
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
Only two ghc warnings remain; that is:
* defaulting a type to integer (line 476)
* discarding the result of a do-notation statement (can be turned off
with the -fno-warn-unused-do-bind option (line 502)
Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
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>
Collin J. Doering