Commit graph

134 commits

Author SHA1 Message Date
Jack Taylor
0df40cf71e Fix template indentation
Fix indentation for templates changed in 3cec621. This is a
separate commit as it makes for diffs that are easier to read.
2017-04-17 12:44:50 +09:00
Jack Taylor
a5113e5008 Make all full-page templates inherit from a block template
Use block templates [1] for all of the full-page templates such as
index.html, _default/list.html, etc. This reduces code duplicated
between them.

Also, move the code in partials/page.html and partials/post.html
to page/single.html and post/single.html respectively. With block
templates the contents of the partials is almost exactly the same
as the contents of the single page templates, and having dedicated
single-page templates for the content types means that we can get
rid of the if/then/else logic in _default/single.html.

This also gets rid of an excess container div; the duplication of
the divs was being obscured by the way _default/single.html was
interacting with the partials. (This is the same duplicated div
as in pull request #51 found by @1138-4EB.)

[1] https://gohugo.io/templates/blocks/
2017-04-17 12:44:44 +09:00
Michael Romero
7d9cf1adce Merge pull request #53 from rayjolt/i18n-hugo-version
Update the required Hugo version in theme.toml
2017-04-16 20:29:58 -07:00
Jack Taylor
aa6fb555b0 Update the required Hugo version in theme.toml
The i18n changes introduced in 5cf80fe require Hugo 0.17, so
update theme.toml accordingly.
2017-04-15 19:00:33 +09:00
Michael Romero
a63ae22301 Add Japanese language select to example config 2017-04-09 22:58:02 -07:00
Michael Romero
d54ed7f1c9 Revert "Add Japanese language select to example config"
This reverts commit 30d2dd7196.
2017-04-09 22:57:19 -07:00
Michael Romero
30d2dd7196 Add Japanese language select to example config 2017-04-09 22:55:55 -07:00
Michael Romero
56cfa6f0f1 Merge pull request #51 from 1138-4EB/duplicatedmaindiv
Removed duplicated main div, because it is included in single
2017-04-09 22:37:30 -07:00
Michael Romero
07a5bc3953 Merge branch 'master' into duplicatedmaindiv 2017-04-09 22:36:48 -07:00
Michael Romero
5cf80fe2f7 Merge pull request #50 from rayjolt/i18n
Enable i18n
2017-04-09 22:32:42 -07:00
1138-4EB
c39138e3c9 Removed duplicated main div, because it is included in single, which imports page and post. 2017-04-09 01:23:47 +02:00
Jack Taylor
9c467304ec Use the correct language in lang attributes
Set the lang attribute in the html element to be the right
language, and also add lang attributes to text in a language that
is different to the page language, such as the language switcher
links.
2017-04-07 13:08:44 +09:00
Jack Taylor
ff657d2db1 Add links to translated content
Links to translated content will appear next to the date, both on
the index page and on post pages. Also style the translation links
on post pages to be like those on the index page, although some
more thought about the design is probably in order.
2017-04-07 12:58:57 +09:00
Jack Taylor
c4cfe47e01 Make links language-relative
This ensures that links work correctly in languages other than
English. For example, clicking on the navbar "brand" link used to
take you to the English home page even if you were browsing the
site in another language. Now it takes you to the home page for
that language.
2017-04-07 08:01:06 +09:00
Jack Taylor
655c2011fe Add a language switcher to the navigation
This ignores whether the current page has a translation in a
given language, but it's a start.
2017-04-06 18:39:11 +09:00
Jack Taylor
0f74f45531 Move hard-coded strings to i18n files
Add translations in English and in Japanese
2017-04-06 18:39:11 +09:00
Michael Romero
1c26fe2526 Merge pull request #49 from rawkode/bugfix/support-all-taxonomies
Don't hardcode to a single taxonomy
2017-04-05 00:51:02 -07:00
David McKay
152f673f13
Don't hardcode to a single taxonomy 2017-04-04 17:37:39 +01:00
Michael Romero
0c1692e722 Generate galleries from image directories
Update to the latest version of hugo-easy-gallery. Use default functions
in shortcodes, surpress newlines, simplify background CSS, and generate
galleries from directories. 5c7171497ceca912cc9d61d7340f9b9cdf213f67
2017-04-03 00:50:26 -07:00
Michael Romero
2a110c80e5 Photoswipe now allows alternate text for caption
Adding changes from hugo-easy-gallery
f0e6d5d62f58284beadf98db71861af90f2cff8e
2017-04-02 22:15:03 -07:00
Michael Romero
e214c15e36 Merge pull request #48 from liwenyip/custom-head-and-footer
Add empty partials for custom html in head and footer
2017-04-02 18:45:45 -07:00
Li-Wen Yip
2223163a4f Add empty partials for custom html in head and footer
As per https://gohugo.io/templates/partials/ "Theme developers may want
to include a few partials with empty HTML files in the theme just so end
users have an easy place to inject their customized content."

Resolves #42
2017-04-02 23:50:42 +01:00
Michael Romero
0cfbe987c4 Merge pull request #47 from liwenyip/clean-up-head.html
Clean up head.html
2017-03-31 23:05:43 -07:00
Li-Wen Yip
4f32165e3c Clean up head.html
Create meta tags using `with` and `default` functions to eliminate
redundant code
2017-04-01 00:04:30 +01:00
Michael Romero
c2d51f82e1 Merge pull request #46 from liwenyip/conditionally-load-photoswipe
Load photoswipe js in footer.html instead of load-photoswipe.html
2017-03-28 09:01:33 -07:00
Li-Wen Yip
bc06d8f202 Load photoswipe js in footer.html instead of load-photoswipe.html 2017-03-28 09:36:27 +01:00
Li-Wen Yip
d8ad6de03c Merge remote-tracking branch 'refs/remotes/halogenica/master' into conditionally-load-photoswipe 2017-03-28 09:24:00 +01:00
Michael Romero
f384060b95 Merge pull request #45 from rayjolt/footer-data-file-fix
Update the footer template with the new data file location
2017-03-28 00:02:31 -07:00
Jack Taylor
2366c020e7 Update the footer template with the new data file location
The social icons data was moved in cfad05b, but we need to update
the footer template with the new location as well to be able to
access the data.
2017-03-28 15:55:57 +09:00
Michael Romero
cfad05b6a0 Move social.toml data file to theme folder
Move social.toml data file to theme folder so an end user doesn't
accidentally override the theme's social icons with their own social
data. Effectively puts the social.toml data in the theme's namespace.
2017-03-27 23:41:41 -07:00
Michael Romero
fa359a6dd2 Merge pull request #43 from rayjolt/footer-icons
Split the social icon data out from the footer template
2017-03-27 23:25:23 -07:00
Michael Romero
19b620f632 Update photoswipe gallery to hugo-easy-gallery
Using https://github.com/liwenyip/hugo-easy-gallery/ from @liwenyip
2017-03-27 21:00:24 -07:00
Michael Romero
de52bb63ed Only load cse.js if google cse is configured
Previously if gcse wasn't configured, the footer would attempt and fail
to load cse.js with an invalid gcse ID
2017-03-27 20:27:18 -07:00
Jack Taylor
4379aa951f Split the social icon data out from the footer template
Add a "social.toml" data file to hold the data for all the social
icons in the footer template. This reduces repetition in the
template code and makes it easier to reuse the data in other
parts of the theme, should that be desired in the future.

It also makes it easier for end users to add new icons by just
overriding the data file, instead of having to override the whole
footer template.
2017-03-28 12:06:17 +09:00
Michael Romero
21461b8257 Merge pull request #41 from liwenyip/fix-page-2
Fix issues with title, subtitle, and bigimg on page 2
2017-03-26 22:09:56 -07:00
Li-Wen Yip
5e287b6705 Fix issues with title, subtitle, and bigimg on page 2 2017-03-26 14:01:02 +01:00
Michael Romero
4d866ddfd7 Default date format if not defined in config.toml
Default date format if not defined in config.toml
2017-03-25 20:10:24 -07:00
Michael Romero
625176f1ce Merge pull request #39 from liwenyip/google-custom-search
Added support for Google Custom Search Engine
2017-03-25 15:03:28 -07:00
Michael Romero
018a170672 Merge pull request #38 from liwenyip/fix-og-description
Use .Summary instead of .Content for og:description and twitter:description
2017-03-25 15:00:43 -07:00
Michael Romero
4946318f22 Remove comments and bigimg from archetype
Remove comments and bigimg from archetype. These were problematic when
users chose the default 'metaDataFormat = "toml"' in the config.toml
2017-03-25 14:57:18 -07:00
Li-Wen Yip
0465584c2b Added support for Google Custom Search Engine 2017-03-25 16:17:01 +00:00
Li-Wen Yip
b7864a3f48 Use .Summary instead of .Content for og:description and twitter:description 2017-03-25 13:09:09 +00:00
Michael Romero
43ad9b7755 Fix example of photoswipe gallery
Fix the example of the photoswipe gallery, and fix the typo in the
photoswipe hyperlink.
2017-03-21 00:08:08 -07:00
Michael Romero
1f8bc8fb24 Merge pull request #35 from halogenica/photoswipe
Photoswipe
2017-03-21 00:03:43 -07:00
Michael Romero
53f6ca8b72 Merge remote-tracking branch 'refs/remotes/origin/master' into photoswipe 2017-03-20 23:59:09 -07:00
Michael Romero
57d7f5f2ac Fix hyperlink to photoswipe 2017-03-20 23:54:33 -07:00
Michael Romero
3e2b5c77dd Handle optional variables in header
Handle optional variables such as "subtitle" and "bigimg" in header to
avoid errors when these variables are not set.
2017-03-20 23:52:48 -07:00
Michael Romero
aae34f128c PhotoSwipe support 2017-03-20 21:45:55 -07:00
halogenica
ee6246379b Consolidate header_wp.html and header.html
Consolidate header_wp.html and header.html to a single header.html
file.
2017-03-19 16:50:32 -07:00
Michael Romero
b44b51c9f1 Merge pull request #31 from liwenyip/use-header_wp-in-index
User header_wp.html partial in index.html
2017-03-19 16:44:49 -07:00