diff --git a/layouts/_default/list.html b/layouts/_default/list.html index b94a4aa90..2b2b904cb 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -76,9 +76,7 @@

{{ .Title }}

- {{ partial "categories.html" }} - - {{ partial "tags.html" }} + {{ partial "sidebar.html" . }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index bbc70d750..3612bda8e 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -25,7 +25,6 @@

{{ if .Params.author }}By {{ .Params.author }} | {{ end }}{{ .Date.Format "January 2, 2006" }}

-

{{ .Summary }}

{{ .Content }} @@ -50,9 +49,7 @@ - {{ partial "categories.html" }} - - {{ partial "tags.html" }} + {{ partial "sidebar.html" . }} diff --git a/layouts/archetypes/default.md b/layouts/archetypes/default.md new file mode 100644 index 000000000..1ccf64c97 --- /dev/null +++ b/layouts/archetypes/default.md @@ -0,0 +1,10 @@ ++++ +tags = [] +categories = [] +description = "" +menu = "" +banner = "" +images = [] ++++ + + diff --git a/layouts/index.html b/layouts/index.html index 423bc04ca..03b8087fe 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -28,6 +28,7 @@ {{ partial "footer.html" . }}
+ diff --git a/layouts/partials/categories.html b/layouts/partials/categories.html deleted file mode 100644 index 3a7664a53..000000000 --- a/layouts/partials/categories.html +++ /dev/null @@ -1,19 +0,0 @@ -
- -
-

Categories

-
- -
- -
-
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html new file mode 100644 index 000000000..8679c4302 --- /dev/null +++ b/layouts/partials/sidebar.html @@ -0,0 +1,3 @@ +{{ partial "widgets/categories.html" . }} + +{{ partial "widgets/tags.html" . }} diff --git a/layouts/partials/tags.html b/layouts/partials/tags.html deleted file mode 100644 index a182e0923..000000000 --- a/layouts/partials/tags.html +++ /dev/null @@ -1,26 +0,0 @@ -
-
-

Tags

-
- -
- -
-
diff --git a/layouts/partials/widgets/categories.html b/layouts/partials/widgets/categories.html new file mode 100644 index 000000000..4e1ae01f9 --- /dev/null +++ b/layouts/partials/widgets/categories.html @@ -0,0 +1,21 @@ +{{ if .Site.Params.widgets.categories }} +{{ if isset .Site.Taxonomies "categories" }} +{{ if not (eq (len .Site.Taxonomies.categories) 0) }} +
+ +
+

Categories

+
+ +
+ +
+
+{{ end }} +{{ end }} +{{ end }} diff --git a/layouts/partials/widgets/tags.html b/layouts/partials/widgets/tags.html new file mode 100644 index 000000000..b476e395b --- /dev/null +++ b/layouts/partials/widgets/tags.html @@ -0,0 +1,20 @@ +{{ if .Site.Params.widgets.tags }} +{{ if isset .Site.Taxonomies "tags" }} +{{ if not (eq (len .Site.Taxonomies.tags) 0) }} +
+
+

Tags

+
+ +
+
    + {{ range $name, $items := .Site.Taxonomies.tags }} +
  • {{ $name }} +
    • + {{ end }} +
+
+
+{{ end }} +{{ end }} +{{ end }} diff --git a/theme.toml b/theme.toml index 85768cd50..8902ad158 100644 --- a/theme.toml +++ b/theme.toml @@ -1,17 +1,16 @@ name = "Universal" license = "MIT" -licenselink = "https://github.com/halogenica/Hugo-BeautifulHugo/blob/master/LICENSE" -description = "A port of Beautiful Jekyll theme" +licenselink = "https://github.com/devcows/hugo-universal-theme/blob/master/LICENSE" +description = "A port of the Universal theme" tags = ["blog", "company", "portfolio", "projects", "minimal", "responsive"] features = ["blog", "themes", "disqus", "minimal", "responsive"] min_version = 0.15 [author] - name = "halogenica" - homepage = "http://halogenica.net" + name = "adrianmo" + homepage = "https://github.com/adrianmo" # If Porting existing theme [original] - author = "dattali" - homepage = "http://deanattali.com/beautiful-jekyll/" - repo = "https://github.com/daattali/beautiful-jekyll" + author = "bootstrapious" + homepage = "http://bootstrapious.com/p/universal-business-e-commerce-template"