diff --git a/README.md b/README.md index ce882791..50cd85e4 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ A self-hosted blogging platform built with Go. Running at https://www.jasonernst ### Theming - WordPress-style theme system (`themes/{name}/`) - Switch themes from admin settings without restart (hot-reload) -- Two built-in themes: `default` (monospace, gray) and `minimal` (sans-serif, blue accent) +- One built-in theme, `default` (monospace, gray); [Minimal](https://github.com/goblogplatform/goblog-theme-minimal) and [Forest](https://github.com/goblogplatform/goblog-theme-forest) install from the theme directory - Theme-specific CSS served at `/theme/` - Custom header/footer code injection via settings (for analytics, etc.) @@ -141,6 +141,8 @@ Full guide: [goblog.live/docs/writing-a-theme](https://www.goblog.live/docs/writ **Admin → Themes** browses the [theme directory](https://www.goblog.live/themes), installs a theme into `themes/installed/` (bind-mount it in Docker, set with `THEMES_INSTALLED_DIR`, or installs vanish on restart), activates it, updates it when the directory has a newer release, and removes it. The directory URL is the `theme_directory_url` setting; see [Publishing a theme](https://www.goblog.live/docs/publishing-a-theme) to publish one. +**Upgrading to 0.7.0:** the `minimal` theme is no longer built in; it is [Minimal](https://github.com/goblogplatform/goblog-theme-minimal) in the theme directory. A site whose `theme` setting is `minimal` renders `default` after the upgrade until you install Minimal from **Admin → Themes** — the setting is left alone, so the site switches back the moment the theme is installed. + A theme is code: once activated its templates render every page, including the admin, with the same template functions and data goblog's own templates get. The directory's validation checks that a theme is well-formed, not that it is benign, and a listing on goblog.live is a maintainer's approval, not a code audit — install only themes you trust, as with plugins. ## Plugins diff --git a/admin/admin_test.go b/admin/admin_test.go index 74b13790..0454dbcf 100644 --- a/admin/admin_test.go +++ b/admin/admin_test.go @@ -825,7 +825,7 @@ func TestAdminComments(t *testing.T) { // (comments_require_login, issue #524) renders as a checkbox reflecting its // value in every theme, rather than a required text input. func TestAdminSettings_RendersCheckboxSetting(t *testing.T) { - for _, theme := range []string{"default", "minimal"} { + for _, theme := range []string{"default", overlayTheme} { for _, value := range []string{"true", "false"} { t.Run(theme+"/"+value, func(t *testing.T) { db, _ := gorm.Open(sqlite.Open(":memory:")) @@ -1049,7 +1049,7 @@ func TestAdminUsers_NonAdmin_Unauthorized(t *testing.T) { // admin status and the right control: promote for GitHub non-admins, demote // for admins, and nothing for email users (#565) or the last admin. func TestAdminUsers_RendersUsers(t *testing.T) { - for _, theme := range []string{"default", "minimal"} { + for _, theme := range []string{"default", overlayTheme} { t.Run(theme, func(t *testing.T) { router, a, db := newUsersHarness(t, theme) boss := seedUser(t, db, auth.ProviderGitHub, "1", "boss", true) @@ -1235,9 +1235,14 @@ func TestDemoteAdminAPI(t *testing.T) { } } +// overlayTheme is the second theme the admin tests render under: like a +// directory theme it ships only public templates (here just home.html), so +// every admin page must come from default's copies. +const overlayTheme = "overlay" + // themeTemplates parses the templates the way theme.Load layers them: the // shared set, then default, then the named theme on top — so a theme that -// ships no admin templates (minimal) renders default's. +// ships no admin templates renders default's. func themeTemplates(t *testing.T, theme string) *template.Template { t.Helper() tmpl := template.Must(template.New("").Funcs(template.FuncMap{ @@ -1245,7 +1250,11 @@ func themeTemplates(t *testing.T, theme string) *template.Template { }).ParseGlob("../templates/shared/*.html")) template.Must(tmpl.ParseGlob("../themes/default/templates/*.html")) if theme != "default" { - template.Must(tmpl.ParseGlob("../themes/" + theme + "/templates/*.html")) + dir := t.TempDir() + if err := os.WriteFile(filepath.Join(dir, "home.html"), []byte("

overlay home

"), 0o644); err != nil { + t.Fatal(err) + } + template.Must(tmpl.ParseGlob(filepath.Join(dir, "*.html"))) } return tmpl } @@ -1310,7 +1319,7 @@ func TestAdminDashboard(t *testing.T) { db.Create(&blog.Comment{PostID: 1, Name: "Commenter", Content: "Nice post"}) seedUser(t, db, auth.ProviderGitHub, "1", "boss", true) seedUser(t, db, auth.ProviderGitHub, "2", "plain", false) - db.Create(&blog.Setting{Key: "theme", Value: "minimal"}) + db.Create(&blog.Setting{Key: "theme", Value: overlayTheme}) body := getHTML(t, router, "/admin/dashboard") @@ -1356,7 +1365,7 @@ func TestAdminDashboard(t *testing.T) { } // Site panel. - if !strings.Contains(body, `href="/admin/themes"`) || !strings.Contains(body, ">minimal<") { + if !strings.Contains(body, `href="/admin/themes"`) || !strings.Contains(body, ">"+overlayTheme+"<") { t.Errorf("site panel must name the active theme and link to /admin/themes") } if !strings.Contains(body, `href="/admin/plugins"`) || !strings.Contains(body, "No plugins enabled") { @@ -1390,7 +1399,7 @@ func TestAdminDashboard_ActiveThemeFromInstaller(t *testing.T) { // TestAdminEmptyStates: every list page says so when it has nothing to list, // with a call to action where one exists (#596). func TestAdminEmptyStates(t *testing.T) { - for _, theme := range []string{"default", "minimal"} { + for _, theme := range []string{"default", overlayTheme} { t.Run(theme, func(t *testing.T) { router, a, _, _ := newAdminHarness(t, theme) a.On("IsAdmin", mock.Anything).Return(true) @@ -1417,9 +1426,9 @@ func TestAdminEmptyStates(t *testing.T) { // TestAdminPages_RenderInPanel: every admin page wraps its content in the // opaque panel below the nav, in default and in a theme that ships no admin -// templates of its own (minimal falls back to default's). +// templates of its own (the overlay falls back to default's). func TestAdminPages_RenderInPanel(t *testing.T) { - for _, theme := range []string{"default", "minimal"} { + for _, theme := range []string{"default", overlayTheme} { t.Run(theme, func(t *testing.T) { router, a, db, _ := newAdminHarness(t, theme) a.On("IsAdmin", mock.Anything).Return(true) diff --git a/blog/blog_test.go b/blog/blog_test.go index 9df002a3..3eb37263 100644 --- a/blog/blog_test.go +++ b/blog/blog_test.go @@ -1186,9 +1186,10 @@ func TestNoRoutePost_CommentFormFollowsLoginState(t *testing.T) { } // TestPostPage_CommentFormFollowsLoginState covers the comment section's three -// states (issue #524) in every theme. +// states (issue #524) in the built-in theme (directory themes ship their own +// post.html and are checked in their own repositories). func TestPostPage_CommentFormFollowsLoginState(t *testing.T) { - for _, theme := range []string{"default", "minimal"} { + for _, theme := range []string{"default"} { t.Run(theme+"/required and logged out", func(t *testing.T) { body := renderPostPage(t, theme, nil, "true") if strings.Contains(body, `action="/comments"`) { diff --git a/plugins/directory/registry/theme.go b/plugins/directory/registry/theme.go index 50427c14..d32f8565 100644 --- a/plugins/directory/registry/theme.go +++ b/plugins/directory/registry/theme.go @@ -53,11 +53,12 @@ type ThemeManifest struct { } // reservedThemeNames are directory names the loader treats specially or -// the base themes every goblog ships; a directory theme may not claim +// the base theme every goblog ships; a directory theme may not claim // them (nor the route names in reservedNames, which apply to both kinds). -// forest is not here on purpose: it is published to the directory and no -// longer ships with goblog, so it is an ordinary directory theme. -var reservedThemeNames = map[string]bool{"default": true, "minimal": true, "installed": true, "shared": true} +// forest and minimal are not here on purpose: both are published to the +// directory and no longer ship with goblog, so they are ordinary +// directory themes. +var reservedThemeNames = map[string]bool{"default": true, "installed": true, "shared": true} // ParseThemeManifest decodes and validates a theme manifest. func ParseThemeManifest(b []byte) (ThemeManifest, error) { diff --git a/plugins/directory/registry/theme_test.go b/plugins/directory/registry/theme_test.go index 80915879..2521195a 100644 --- a/plugins/directory/registry/theme_test.go +++ b/plugins/directory/registry/theme_test.go @@ -48,6 +48,13 @@ func TestParseThemeManifest(t *testing.T) { if m.Name != "ocean" || m.DisplayName != "Ocean" || m.License != "MIT" || m.MinGoblogVersion != "0.5.0" || m.Homepage != "https://example.test" { t.Errorf("manifest = %+v", m) } + // Themes goblog used to ship and has since published to the directory + // are ordinary directory names. + for _, name := range []string{"forest", "minimal"} { + if _, err := ParseThemeManifest([]byte(strings.Replace(goodThemeManifest, `"ocean"`, `"`+name+`"`, 1))); err != nil { + t.Errorf("%s: %v", name, err) + } + } cases := map[string]string{ `{"name":"Ocean"}`: "name must match", strings.Replace(goodThemeManifest, `"ocean"`, `"default"`, 1): "reserved", diff --git a/plugins/docs/content/publishing-a-theme.md b/plugins/docs/content/publishing-a-theme.md index afedf4c3..e155bfd7 100644 --- a/plugins/docs/content/publishing-a-theme.md +++ b/plugins/docs/content/publishing-a-theme.md @@ -38,7 +38,7 @@ The archive of the tag must be **16 MiB or smaller**, with **at most 2000 entrie | Field | Rule | |---|---| -| `name` | `^[a-z0-9-]+$` and unique among the directory's themes. It becomes the directory name under `themes/installed/` and the value of the site's `theme` setting once installed, so keep it stable across versions. **Reserved:** `default`, `minimal`, `installed` and `shared` are refused, and so are `submit` and `index` — the directory's own pages (`/themes/submit`, `/themes/index.json`). A goblog also never installs a directory theme over a built-in of the same name, or over a theme an operator copied in by hand. | +| `name` | `^[a-z0-9-]+$` and unique among the directory's themes. It becomes the directory name under `themes/installed/` and the value of the site's `theme` setting once installed, so keep it stable across versions. **Reserved:** `default`, `installed` and `shared` are refused, and so are `submit` and `index` — the directory's own pages (`/themes/submit`, `/themes/index.json`). A goblog also never installs a directory theme over a built-in of the same name, or over a theme an operator copied in by hand. | | `display_name` | The label in the directory listing. Required. | | `description` | One sentence for the listing. Required. | | `author` | Required. | @@ -111,7 +111,7 @@ Messages are prefixed with the repository (`owner/name: …`) and, once a releas | `goblog-theme.json: not found` | The file is missing at the tag that was checked (the latest release), even if it exists on `main`. Tag a release that includes it. | | `goblog-theme.json: invalid character …` (or another JSON error) | The manifest is not valid JSON. | | `name must match ^[a-z0-9-]+$` | Lower-case letters, digits and hyphens only. | -| `name "default" is reserved` (or `minimal`, `installed`, `shared`, `submit`, `index`) | Pick another name. | +| `name "default" is reserved` (or `installed`, `shared`, `submit`, `index`) | Pick another name. | | `display_name is required` / `description is required` / `author is required` | Fill in the field; whitespace alone does not count. | | `license "…" is not a known SPDX identifier` | Use one of the identifiers listed above, spelled exactly. | | `min_goblog_version must be a plain semver like 0.5.0` | Three numbers, no `v`, no `-beta`. | diff --git a/themes/minimal/screenshot.png b/themes/minimal/screenshot.png deleted file mode 100644 index 6e4f2a98..00000000 Binary files a/themes/minimal/screenshot.png and /dev/null differ diff --git a/themes/minimal/static/css/goblog.css b/themes/minimal/static/css/goblog.css deleted file mode 100644 index 91e9f181..00000000 --- a/themes/minimal/static/css/goblog.css +++ /dev/null @@ -1,93 +0,0 @@ -@import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;600&display=swap'); - -.blog-post-meta { margin: -10px 0px 0px 2px; color: #888; } -.tags { margin: 0px 0px 0px 2px; color: #888; } -.version { color: #bbb; font-size: 10px; margin-bottom: 20px; } -.profile { max-width:300px; margin-top: 30px; } -.footer { margin-top: 20px; } -html { height: 100%; } -body { font-family: 'Inter', sans-serif; min-height:100vh; display:flex; flex-direction:column; color: #1a1a1a; } -.wrapper { flex: 1; } -.menu a, .footer a { color: rgba(0,0,0,.60); } -.footer a:hover { color: #2563eb; } -.logo { background: #2563eb; color: #fff; font-size: 28px; padding: 10px 15px; float:left; border-radius: 4px; } -.logo:hover { background: #1d4ed8; color: #fff; text-decoration: none; } -.cover { padding-top: 35%; } -.menu { padding-top: 20px; } -.menu a { padding: 0px 10px; } -.full-height { height: 100%; } -.keywords { - border-right: solid 3px #2563eb; - white-space: nowrap; - overflow: hidden; - font-size: 14px; - color: rgba(0,0,0,.60); - animation: animated-text 4s steps(29,end) 1s 1 normal both, - animated-cursor 600ms steps(29,end) infinite; -} -.admin-posts { list-style: none; text-align: left; } -.admin-posts li { padding-bottom: 10px; } -.research { background:#f8fafc; margin-bottom: 5px; padding:8px; border-radius: 4px; } -.research:nth-child(even) { background: #fff; } -.bottom { min-height: 200px; width: 100%; background-color: #1e293b; color: #e2e8f0; } -.bottom a { color: #93c5fd; } -.bottom a:hover { color: #fff; } -/* text animation */ -@keyframes animated-text{ from{width: 0;} to{width: 350px;} } -/* cursor animations */ -@keyframes animated-cursor{ from{border-right-color: rgba(0,0,0,.75);} to{border-right-color: transparent;} } - -video { - left: 50%; - min-height: 100%; - min-width: 100%; - position: absolute; - top: 50%; - transform: translate(-50%, -50%); -} - -/* 1. No object-fit support: */ -@media (min-aspect-ratio: 16/9) { #video-bg > video { height: 300%; top: -100%; } } -@media (max-aspect-ratio: 16/9) { #video-bg > video { width: 300%; left: -100%; } } - -/* 2. If supporting object-fit, overriding (1): */ -@supports (object-fit: cover) { #video-bg > video { top: 0; left: 0; width: 100%; height: 100%; object-fit: cover; } } - -/* Markdown tables */ -#html table, #page-content table { - width: 100%; - margin-bottom: 1rem; - border-collapse: collapse; -} -#html th, #html td, #page-content th, #page-content td { - padding: 0.5rem; - border: 1px solid #e2e8f0; - text-align: left; -} -#html thead th, #page-content thead th { - border-bottom: 2px solid #e2e8f0; - background-color: #f8fafc; -} - -/* Comments */ -.comment { border-bottom: 1px solid #e2e8f0; padding: 15px 0; text-align: left; } -.comment-meta { color: #888; font-size: 13px; margin-bottom: 5px; } -.comment-content { font-size: 14px; } - -/* Search */ -.nav-search { display: inline; margin-left: 10px; } -.nav-search-input { font-family: 'Inter', sans-serif; font-size: 13px; padding: 2px 8px; border: 1px solid #d1d5db; border-radius: 6px; width: 140px; vertical-align: baseline; } -.nav-search-input:focus { outline: none; border-color: #2563eb; box-shadow: 0 0 0 2px rgba(37,99,235,0.2); } -.search-page-form { margin: 20px 0; } -.search-page-input { font-family: 'Inter', sans-serif; font-size: 14px; padding: 6px 10px; border: 1px solid #d1d5db; border-radius: 6px; width: 300px; } -.search-page-btn { font-family: 'Inter', sans-serif; font-size: 14px; padding: 6px 16px; border: none; border-radius: 6px; background: #2563eb; color: #fff; cursor: pointer; } -.search-page-btn:hover { background: #1d4ed8; } - -/* External backlinks table: keep every row to a single line, truncating long referer URLs */ -.backlinks-table .backlinks-referer { - width: 100%; - max-width: 0; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} diff --git a/themes/minimal/templates/about.html b/themes/minimal/templates/about.html deleted file mode 100644 index 2665ab1a..00000000 --- a/themes/minimal/templates/about.html +++ /dev/null @@ -1,52 +0,0 @@ -{{ template "header.html" .}} - -
-   -
- -
-

About Jason Ernst

-

- I'm currently Principal Software Engineer at a startup working on mobile - networks on phones. At the University of Guelph in Canada I hold adjunct - Professor status and serve on the committee of several graduate students - who are studying wireless networks and occasionally still co-publish - research papers. -

- -

- Prior to this I was a Senior Software Engineer at a two different robotics - startups in San Francisco (Rapid Robotics and Osaro). I was also the CTO and - first developer at a startup in Vancouver called RightMesh which was building - a mesh networking library for Android phones. During this time I was also an - adjunct professor at the University of Guelph and was the industrial PI of - a $2.13M MITACS grant to improve connectivity in Northern Canada, - specifically Rigolet. RightMesh raised $30M in an ICO in 2018. -

- -

- Before that I was the CTO of Redtree Robotics which was working - on a robotics hardware software platform to enable plug-and-play swarm - robotics. I started this company with a friend during grad school and - we raised some seed funding from Real Ventures. -

- -

- I've won, sponsored, and mentored hackathons. I love to give talks and - present papers. -

- -

- I also enjoy driving, working on cars, video games, contributing to - open source, - cycling, running, and travel. -

- -
-

Tags Archives

-
- -
- - -{{ template "footer.html" .}} diff --git a/themes/minimal/templates/archives.html b/themes/minimal/templates/archives.html deleted file mode 100644 index c5c3a8e3..00000000 --- a/themes/minimal/templates/archives.html +++ /dev/null @@ -1,28 +0,0 @@ -{{ template "header.html" .}} - -
-

Archives

- -

By Year

- {{ $byYear := .byYear }} - {{ range .yearKeys }} -

{{ . }}

- - {{ end }} -

By Month

- {{ $byYearMonth := .byYearMonth }} - {{ range .yearMonthKeys }} -

{{ . }}

- - {{ end }} -
- -{{ template "footer.html" .}} \ No newline at end of file diff --git a/themes/minimal/templates/error.html b/themes/minimal/templates/error.html deleted file mode 100644 index 8c10b9d2..00000000 --- a/themes/minimal/templates/error.html +++ /dev/null @@ -1,12 +0,0 @@ -{{ template "header.html" .}} - -
-
-
-

{{ .error }}

-
{{ .description }}
-
-
-
- -{{ template "footer.html" .}} diff --git a/themes/minimal/templates/footer.html b/themes/minimal/templates/footer.html deleted file mode 100644 index 76d0b54c..00000000 --- a/themes/minimal/templates/footer.html +++ /dev/null @@ -1,19 +0,0 @@ - -
-
-
-
-

{{ .settings.site_title.Value }}

- {{ with .plugin_footer_html }}{{ . | rawHTML }}{{ end }} -
-

Powered by goblog {{ .version }}

-
-
-
-{{ if or .admin_page .post }} - -{{ end }} -{{ with index .settings "custom_footer_code" }}{{ if .Value }} - {{ .Value | rawHTML }} -{{ end }}{{ end }} - diff --git a/themes/minimal/templates/header.html b/themes/minimal/templates/header.html deleted file mode 100644 index a27c7d04..00000000 --- a/themes/minimal/templates/header.html +++ /dev/null @@ -1,26 +0,0 @@ -{{ template "_head" . }} - - -
diff --git a/themes/minimal/templates/home.html b/themes/minimal/templates/home.html deleted file mode 100644 index 4650ca72..00000000 --- a/themes/minimal/templates/home.html +++ /dev/null @@ -1,47 +0,0 @@ -{{ template "header.html" .}} - -
-
-
- {{ .settings.site_title.Value }} -
-

{{ .settings.site_title.Value }}

-

{{ .settings.site_subtitle.Value }}

-
-
-

{{ .settings.site_tags.Value }}

-
-
- -
-
- -
-

Recent Posts

- {{ $count := 0 }} - {{ range .recent_posts }} - {{ if lt $count 5 }} -
- {{ .Title }} -

{{ .CreatedAt.Format "January 2, 2006" }}

-

{{ .PlainTextPreview 120 }}

-
- {{ end }} - {{ $count = len .Title }} - {{ end }} -

View all posts →

-
- -
-

Tags

-
- {{ range .tags }} - {{ .Name }} - {{ end }} -
-
- -
-
- -{{ template "footer.html" .}} diff --git a/themes/minimal/templates/login.html b/themes/minimal/templates/login.html deleted file mode 100644 index 23018f51..00000000 --- a/themes/minimal/templates/login.html +++ /dev/null @@ -1,78 +0,0 @@ -{{ template "header.html" .}} - - - -
-
-

Sign In

-

Log in to manage {{ .settings.site_title.Value }}

- - - Continue with GitHub - - - - - {{ if .email_login_enabled }} -

or sign in with email

-
- - -
- -

- - {{ end }} -
-
- -{{ template "footer.html" .}} diff --git a/themes/minimal/templates/page_archives.html b/themes/minimal/templates/page_archives.html deleted file mode 100644 index 6ae75c3b..00000000 --- a/themes/minimal/templates/page_archives.html +++ /dev/null @@ -1,31 +0,0 @@ -{{ template "header.html" .}} - -
-

{{ .page.Title }}

- {{ if .is_admin }} -

Edit this page

- {{ end }} - -

By Year

- {{ $byYear := .byYear }} - {{ range .yearKeys }} -

{{ . }}

- - {{ end }} -

By Month

- {{ $byYearMonth := .byYearMonth }} - {{ range .yearMonthKeys }} -

{{ . }}

- - {{ end }} -
- -{{ template "footer.html" .}} diff --git a/themes/minimal/templates/page_content.html b/themes/minimal/templates/page_content.html deleted file mode 100644 index 459946d4..00000000 --- a/themes/minimal/templates/page_content.html +++ /dev/null @@ -1,22 +0,0 @@ -{{ template "header.html" .}} - -
-

{{ .page.Title }}

- {{ if .is_admin }} -

Edit this page

- {{ end }} - {{ if .has_plugin_content }} -
{{ .plugin_content | rawHTML }}
- {{ else }} -
- - - - {{ end }} -
- -{{ template "footer.html" .}} diff --git a/themes/minimal/templates/page_tags.html b/themes/minimal/templates/page_tags.html deleted file mode 100644 index 1fb33f0a..00000000 --- a/themes/minimal/templates/page_tags.html +++ /dev/null @@ -1,27 +0,0 @@ -{{ template "header.html" .}} - -
-

{{ .page.Title }}

- {{ if .is_admin }} -

Edit this page

- {{ end }} - {{ range .tags }} -
-
- {{ if .Posts }} -

{{ .Name }}

-
    - {{ range .Posts }} - {{ if .Draft }} - {{ else }} -
  • {{ .Title }}
  • - {{ end }} - {{ end }} -
- {{ end }} -
-
- {{ end }} -
- -{{ template "footer.html" .}} diff --git a/themes/minimal/templates/page_writing.html b/themes/minimal/templates/page_writing.html deleted file mode 100644 index 99866fb3..00000000 --- a/themes/minimal/templates/page_writing.html +++ /dev/null @@ -1,25 +0,0 @@ -{{ template "header.html" .}} - -
- -

{{ .page.Title }}

- {{ if .is_admin }} -

Edit this page

- {{ end }} - - {{ range .posts }} -
-

{{ .Title }}

-

{{ .CreatedAt.Format "January 2, 2006" }} - {{ range .Tags }} - #{{ .Name }} - {{ end }} -

-

- {{ .HTMLPreview 200 }} -

-
- {{ end }} -
- -{{ template "footer.html" .}} diff --git a/themes/minimal/templates/post.html b/themes/minimal/templates/post.html deleted file mode 100644 index 2ae11101..00000000 --- a/themes/minimal/templates/post.html +++ /dev/null @@ -1,253 +0,0 @@ -{{ template "header.html" .}} - {{ if .is_admin }} - - {{ end }} - -
-
-

{{ .post.Title }}

-

{{ .post.CreatedAt.Format "January 2, 2006" }} - {{range .post.Tags}} - #{{.Name}} - {{end}} -

- {{ if .is_admin }} -

Edit - {{ if .post.Draft }} - | Publish - {{ else }} - | Draft - {{ end }} -

- {{ end }} -
-
-
- - {{ if .is_admin }} -
-
-

Backlinks

-

Posts that link to this post

- {{ if .backlinks }} -
    - {{ range .backlinks }} -
  • {{ .Title }} ({{ .CreatedAt.Format "Jan 02, 2006" }})
  • - {{ end }} -
- {{ else }} -

None

- {{ end }} -
-
- -
-
-

Linked Posts

-

Blog posts this post links to

- {{ if .outbound_links }} -
    - {{ range .outbound_links }} -
  • {{ .Title }} ({{ .CreatedAt.Format "Jan 02, 2006" }})
  • - {{ end }} -
- {{ else }} -

None

- {{ end }} -
-
- -
-
-

External Links

-

External URLs in this post

- {{ if .post.ExternalLinks }} -
    - {{ range .post.ExternalLinks }} -
  • {{ . }}
  • - {{ end }} -
- {{ else }} -

None

- {{ end }} -
-
- -
-
-

External Backlinks

-

External sites linking to this post

- {{ if .external_backlinks }} - - - - - - - - - - - {{ range .external_backlinks }} - - - - - - - {{ end }} - - - {{ else }} -

None

- {{ end }} -
-
- {{ end }} - -
- - - - - - - -
-
-
-
-

Comments ({{ len .comments }})

- - {{ if .comment_error }} - - {{ end }} - - {{ range .comments }} -
-
- {{ .Name }} — {{ .CreatedAt.Format "Jan 02, 2006 15:04 UTC" }} - {{ if $.is_admin }} - [delete] - {{ end }} -
-
- -
- {{ end }} - - - -
-

Leave a Comment

- {{ if and .comments_require_login (not .comment_user) }} -

Log in to leave a comment.

- {{ else }} -
- - - - -
- - -
- {{ if .comment_user }} -

Commenting as {{ .comment_user.Email }}

-
- - -
- {{ else }} -
- - -
-
- - -
- {{ end }} -
- - -
- - - -
- - {{ end }} - - -
-
-
-{{ template "footer.html" .}} diff --git a/themes/minimal/templates/post_type_listing.html b/themes/minimal/templates/post_type_listing.html deleted file mode 100644 index ee943eb7..00000000 --- a/themes/minimal/templates/post_type_listing.html +++ /dev/null @@ -1,30 +0,0 @@ -{{ template "header.html" .}} - -
- -

{{ .post_type.Name }}

- {{ if .post_type.Description }} -

{{ .post_type.Description }}

- {{ end }} - {{ if .is_admin }} -

Edit post type

- {{ end }} - - {{ range .posts }} -
-
-

{{ .Title }}

- -

- {{ .HTMLPreview 200 }} -

-
-
- {{ end }} -
- -{{ template "footer.html" .}} diff --git a/themes/minimal/templates/posts.html b/themes/minimal/templates/posts.html deleted file mode 100644 index 716a36f0..00000000 --- a/themes/minimal/templates/posts.html +++ /dev/null @@ -1,22 +0,0 @@ -{{ template "header.html" .}} - -
- -

Posts

- - {{ range .posts }} -
-

{{ .Title }}

-

{{ .CreatedAt.Format "January 2, 2006" }} - {{ range .Tags }} - #{{ .Name }} - {{ end }} -

-

- {{ .HTMLPreview 200 }} -

-
- {{ end }} -
- -{{ template "footer.html" .}} diff --git a/themes/minimal/templates/presentations.html b/themes/minimal/templates/presentations.html deleted file mode 100644 index ccd9e154..00000000 --- a/themes/minimal/templates/presentations.html +++ /dev/null @@ -1,19 +0,0 @@ -{{ template "header.html" .}} - -
-   -
- -
- -
-
-

Speaking

-

- blah blah blah -

-
-
- - -{{ template "footer.html" .}} diff --git a/themes/minimal/templates/projects.html b/themes/minimal/templates/projects.html deleted file mode 100644 index 379787e9..00000000 --- a/themes/minimal/templates/projects.html +++ /dev/null @@ -1,22 +0,0 @@ -{{ template "header.html" .}} - -
-
- -
-
- -
- -
-
-

Code and Projects

-

- blah blah blah -

-
-
- -{{ template "footer.html" .}} diff --git a/themes/minimal/templates/research.html b/themes/minimal/templates/research.html deleted file mode 100644 index 0292b553..00000000 --- a/themes/minimal/templates/research.html +++ /dev/null @@ -1,25 +0,0 @@ -{{ template "header.html" .}} - -
-   -
- -
-

Research and Publications

- {{ if .errors }} - - {{ end }} - {{range .articles}} -
-
- {{.Title}}
- {{.Authors}}
-
-
{{.Year}}
-
- {{end}} -
- -{{ template "footer.html" .}} \ No newline at end of file diff --git a/themes/minimal/templates/search.html b/themes/minimal/templates/search.html deleted file mode 100644 index b2717593..00000000 --- a/themes/minimal/templates/search.html +++ /dev/null @@ -1,39 +0,0 @@ -{{ template "header.html" .}} - -
- - {{ if .query }} -

Search results for '{{ .query }}'

-

{{ len .posts }} result{{ if ne (len .posts) 1 }}s{{ end }} found

- {{ else }} -

Search

- {{ end }} - -
- - - -
- - {{ if and .query (eq (len .posts) 0) }} -

No results found for '{{ .query }}'. Try a different search term.

- {{ end }} - - {{ range .posts }} -
-
-

{{ .Title }}

- -

- {{ .HTMLPreview 200 }} -

-
-
- {{ end }} -
- -{{ template "footer.html" .}} diff --git a/themes/minimal/templates/tag.html b/themes/minimal/templates/tag.html deleted file mode 100644 index a5fb7fb5..00000000 --- a/themes/minimal/templates/tag.html +++ /dev/null @@ -1,23 +0,0 @@ -{{ template "header.html" .}} - -
- -

Posts with Tag: {{.tag}}

- - {{ range .posts }} - {{ if .Draft }} - {{ else }} -
-
-

{{ .Title }}

- -

- {{ .HTMLPreview 100 }} -

- -
-
- {{ end }} - {{ end }} - -{{ template "footer.html" .}} diff --git a/themes/minimal/templates/tags.html b/themes/minimal/templates/tags.html deleted file mode 100644 index 1df718db..00000000 --- a/themes/minimal/templates/tags.html +++ /dev/null @@ -1,24 +0,0 @@ -{{ template "header.html" .}} - -
-

Blog Tags

- {{ range .tags }} -
-
- {{ if .Posts }} -

{{ .Name }}

-
    - {{ range .Posts }} - {{ if .Draft }} - {{ else }} -
  • {{ .Title }}
  • - {{ end }} - {{ end }} -
- {{ end }} -
-
- {{ end }} -
- -{{ template "footer.html" .}} diff --git a/themes/minimal/templates/wizard_auth.html b/themes/minimal/templates/wizard_auth.html deleted file mode 100644 index 96eff8ae..00000000 --- a/themes/minimal/templates/wizard_auth.html +++ /dev/null @@ -1,50 +0,0 @@ - - - Goblog Install Wizard - - - - - - - - -
-
-
-

Goblog Install Wizard

-
Github OAuth
- {{ if .errors }} - - {{ end }} -
-

You must go to https://github.com/settings/developers - and create a "New OAuth App" to hook this site up to github for logins. -

-

Set the callback url to the same URL as this page with /login appended to it.

-
-
- - -
-
- - -
-
- -
Create Admin Account
-

Once you setup the OAuth app, login with Github to test it out. The user you login with will be the - admin user for this site.

- -
- -
-
-
- - \ No newline at end of file diff --git a/themes/minimal/templates/wizard_db.html b/themes/minimal/templates/wizard_db.html deleted file mode 100644 index 99cf7590..00000000 --- a/themes/minimal/templates/wizard_db.html +++ /dev/null @@ -1,156 +0,0 @@ - - - Goblog Install Wizard - - - - - - - - - -
-
-
-

Goblog Install Wizard

-
Database:
- {{ if .errors }} - - {{ end }} - -
-
-
- - -
-
- - -
-
- - -
-
- -
-

Sqlite uses a file to store the database.

-
- - -
-
-
-

MySQL requires a mysql server running on the host provided below

-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
-
-

PostgreSQL requires a postgres server running on the host provided below

-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - - - Test Database - -
- -
-
-
- - - \ No newline at end of file diff --git a/themes/minimal/templates/wizard_settings.html b/themes/minimal/templates/wizard_settings.html deleted file mode 100644 index 740f6800..00000000 --- a/themes/minimal/templates/wizard_settings.html +++ /dev/null @@ -1,133 +0,0 @@ - - - Goblog Install Wizard - - - - - - - - - -
-
-
-

Goblog Install Wizard

- -
Goblog Settings
- {{ if .errors }} - - {{ end }} -
-
-
- - -
-
- - -
-
-
-
- - -
-
- - -
-
-
-
- - -
-
- - -
-
-
-
Socials: (leave blank if you don't want to display)
-
-
- -
- - -
- -
- - -
-
- -
- -
- - -
- -
- - -
-
- -
- -
- - -
- -
- - -
-
- -
- -
- - -
- -
- - -
-
- - -
- -
- - -
- -
- - -
-
- - - Save Settings - -
- -
-
-
- - \ No newline at end of file diff --git a/themes/minimal/templates/wizard_success.html b/themes/minimal/templates/wizard_success.html deleted file mode 100644 index 5935b326..00000000 --- a/themes/minimal/templates/wizard_success.html +++ /dev/null @@ -1,32 +0,0 @@ - - - Goblog Install Wizard - - - - - - - - -
-
-
-

Goblog Install Wizard

- -
-
-
- - - \ No newline at end of file