More porting efforts

10 files changed, 63 insertions, 59 deletions

diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index b94a4aa..2b2b904 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -76,9 +76,7 @@
 
                         <!-- *** MENUS AND WIDGETS *** -->
 
-                        {{ partial "categories.html" }}
-
-                        {{ partial "tags.html" }}
+                        {{ partial "sidebar.html" . }}
 
                         <!-- *** MENUS AND FILTERS END *** -->
 
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index bbc70d7..3612bda 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -25,7 +25,6 @@
                     <div class="col-md-9" id="blog-post">
 
                         <p class="text-muted text-uppercase mb-small text-right">{{ if .Params.author }}By <a href="#">{{ .Params.author }}</a> | {{ end }}{{ .Date.Format "January 2, 2006" }}</p>
-                        <p class="lead">{{ .Summary }}</p>
 
                         <div id="post-content">
                           {{ .Content }}
@@ -50,9 +49,7 @@
 
                         <!-- *** MENUS AND WIDGETS *** -->
 
-                        {{ partial "categories.html" }}
-
-                        {{ partial "tags.html" }}
+                        {{ partial "sidebar.html" . }}
 
                         <!-- *** MENUS AND FILTERS END *** -->
 
diff --git a/layouts/archetypes/default.md b/layouts/archetypes/default.md
new file mode 100644
index 0000000..1ccf64c
--- /dev/null
+++ b/layouts/archetypes/default.md
@@ -0,0 +1,10 @@
++++
+tags = []
+categories = []
+description = ""
+menu = ""
+banner = ""
+images = []
++++
+
+<!--more-->
diff --git a/layouts/index.html b/layouts/index.html
index 423bc04..03b8087 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -28,6 +28,7 @@
         {{ partial "footer.html" . }}
 
     </div>
+
     <!-- /#all -->
 
     <!-- #### JAVASCRIPT FILES ### -->
diff --git a/layouts/partials/categories.html b/layouts/partials/categories.html
deleted file mode 100644
index 3a7664a..0000000
--- a/layouts/partials/categories.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="panel panel-default sidebar-menu">
-
-    <div class="panel-heading">
-        <h3 class="panel-title">Categories</h3>
-    </div>
-
-    <div class="panel-body">
-        <ul class="nav nav-pills nav-stacked">
-            <li><a href="blog.html">Webdesign</a>
-            </li>
-            <li class="active"><a href="blog.html">Tutorials</a>
-            </li>
-            <li><a href="blog.html">Print</a>
-            </li>
-            <li><a href="blog.html">Our tips</a>
-            </li>
-        </ul>
-    </div>
-</div>
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
new file mode 100644
index 0000000..8679c43
--- /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 a182e09..0000000
--- a/layouts/partials/tags.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="panel sidebar-menu">
-    <div class="panel-heading">
-        <h3 class="panel-title">Tags</h3>
-    </div>
-
-    <div class="panel-body">
-        <ul class="tag-cloud">
-            <li><a href="#"><i class="fa fa-tags"></i> html5</a>
-            </li>
-            <li><a href="#"><i class="fa fa-tags"></i> css3</a>
-            </li>
-            <li><a href="#"><i class="fa fa-tags"></i> jquery</a>
-            </li>
-            <li><a href="#"><i class="fa fa-tags"></i> ajax</a>
-            </li>
-            <li><a href="#"><i class="fa fa-tags"></i> php</a>
-            </li>
-            <li><a href="#"><i class="fa fa-tags"></i> responsive</a>
-            </li>
-            <li><a href="#"><i class="fa fa-tags"></i> visio</a>
-            </li>
-            <li><a href="#"><i class="fa fa-tags"></i> bootstrap</a>
-            </li>
-        </ul>
-    </div>
-</div>
diff --git a/layouts/partials/widgets/categories.html b/layouts/partials/widgets/categories.html
new file mode 100644
index 0000000..4e1ae01
--- /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) }}
+<div class="panel panel-default sidebar-menu">
+
+    <div class="panel-heading">
+        <h3 class="panel-title">Categories</h3>
+    </div>
+
+    <div class="panel-body">
+        <ul class="nav nav-pills nav-stacked">
+            {{ range $name, $items := .Site.Taxonomies.categories }}
+            <li><a href="{{ $.Site.BaseURL }}categories/{{ $name | urlize | lower }}">{{ $name }} ({{ len $items }})</a>
+            </li>
+            {{ end }}
+        </ul>
+    </div>
+</div>
+{{ end }}
+{{ end }}
+{{ end }}
diff --git a/layouts/partials/widgets/tags.html b/layouts/partials/widgets/tags.html
new file mode 100644
index 0000000..b476e39
--- /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) }}
+<div class="panel sidebar-menu">
+    <div class="panel-heading">
+        <h3 class="panel-title">Tags</h3>
+    </div>
+
+    <div class="panel-body">
+        <ul class="tag-cloud">
+            {{ range $name, $items := .Site.Taxonomies.tags }}
+            <li><a href="{{ $.Site.BaseURL }}tags/{{ $name | urlize | lower }}"><i class="fa fa-tags"></i> {{ $name }}</a>
+            </li>
+            {{ end }}
+        </ul>
+    </div>
+</div>
+{{ end }}
+{{ end }}
+{{ end }}
diff --git a/theme.toml b/theme.toml
index 85768cd..8902ad1 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"