Merge pull request #3 from shokinn/master

Some minor usibility tweaks
author: Mehedi Sharif Titas <mehedishariftitas@gmail.com> 2018-10-24 17:53:16 +0300
committer: GitHub <noreply@github.com> 2018-10-24 17:53:16 +0300
commit: 5cac044d314d20418a074a94232d9493bb06dbd6 (patch)
tree: f64876b8ff88b00e4f2ebd657dc37d3e6150f627
parent: 0e4f62c1be30d54fd7c9118f2a2e540d08928829 (diff)
parent: 2b5ca9344b21dc56c9b256f0a1fe946b06816d60 (diff)
5 files changed, 67 insertions, 224 deletions
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index 2e6c526..1e2433e 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -3,7 +3,7 @@ languageCode = "en-us"
 title = "Timer | Responsive Multipurpose Bootstrap Hugo Template"
 theme = "timer-hugo"
 
-# We Used Ionicons Icon font for Icon, for more details check this link - https://ionicons.com/
+# We Used Ionicons Icon font for Icon, for more details check this link - https://ionicons.com/v2/
 
 # Site Menus
 [menu]
@@ -32,8 +32,14 @@ theme = "timer-hugo"
 # Site Params
 [params]
     home = "Home"
-    logo = "images/logo.png"
     dateFormat = "6 January 2006"
+    #
+    # You can use either an image or text as logo.
+    # To use an image use 'logo' (logo itself) and 'logo_alt' (alternative text if image cannot displayed)
+    # To use text as logo use 'logo_text'
+    logo = "images/logo.png"
+    logo_alt = "logo"
+    #logo_text = "logo_text"
 
     # Banner Section
     [params.banner]
@@ -78,4 +84,24 @@ theme = "timer-hugo"
         title   = "SOME OF OUR FEATURES WORKS"
         subtitle= "Aliquam lobortis. Maecenas vestibulum mollis diam. Pellentesque auctor neque nec urna. Nulla sit amet est. Aenean posuere <br> tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus."
 
+    # Footer section
+    [params.footer]
+        customized  = false # Set this variable to true if you customized the design.
+        copyright_owner = "Themefisher"
+        copyright_since = "2018"
+        [[params.footer.social]]
+            icon = "ion-social-facebook"
+            link = "https://facebook.com"
+        [[params.footer.social]]
+            icon = "ion-social-twitter"
+            link = "https://twitter.com"
+        [[params.footer.social]]
+            icon = "ion-social-linkedin"
+            link = "https://linkedin.com"
+        [[params.footer.social]]
+            icon = "ion-social-googleplus"
+            link = "https://googleplus.com"
+        [[params.footer.social]]
+            icon = "ion-social-github"
+            link = "https://github.com"
     
 \ No newline at end of file
diff --git a/layouts/404.html b/layouts/404.html
index 461f537..dceb532 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,111 +1,9 @@
-<!DOCTYPE html>
-<html class="no-js">
+{{ partial "header.html" . }}
 
-<head>
-    <!-- Basic Page Needs
-        ================================================== -->
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <link rel="icon" href="favicon.ico">
-    <title>Timer Agency Template</title>
-    <meta name="description" content="">
-    <meta name="keywords" content="">
-    <meta name="author" content="">
-    <!-- Mobile Specific Metas
-        ================================================== -->
-    <meta name="format-detection" content="telephone=no">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-
-    <!-- Template CSS Files
-        ================================================== -->
-    <!-- Twitter Bootstrs CSS -->
-    <link rel="stylesheet" href="plugins/bootstrap/bootstrap.min.css">
-    <!-- Ionicons Fonts Css -->
-    <link rel="stylesheet" href="plugins/ionicons/ionicons.min.css">
-    <!-- animate css -->
-    <link rel="stylesheet" href="plugins/animate-css/animate.css">
-    <!-- Hero area slider css-->
-    <link rel="stylesheet" href="plugins/slider/slider.css">
-    <!-- owl craousel css -->
-    <link rel="stylesheet" href="plugins/owl-carousel/owl.carousel.css">
-    <link rel="stylesheet" href="plugins/owl-carousel/owl.theme.css">
-    <!-- Fancybox -->
-    <link rel="stylesheet" href="plugins/facncybox/jquery.fancybox.css">
-    <!-- hover -->
-    <link rel="stylesheet" href="plugins/hover/hover-min.css">
-    <!-- template main css file -->
-    <link rel="stylesheet" href="css/style.css">
-</head>
-
-<body>
-
-    <!--
-        ==================================================
-        Header Section Start
-        ================================================== -->
-    <section class="top-bar animated-header">
-        <div class="container">
-            <div class="row">
-                <div class="col-lg-12">
-                    <nav class="navbar navbar-expand-lg navbar-light bg-light">
-                        <a class="navbar-brand" href="index.html">
-                            <img src="../images/logo.png" alt="logo">
-                        </a>
-                        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
-                            aria-expanded="false" aria-label="Toggle navigation">
-                            <span class="navbar-toggler-icon"></span>
-                        </button>
-
-                        <div class="collapse navbar-collapse" id="navbarSupportedContent">
-                            <ul class="navbar-nav ml-auto">
-                                <li class="nav-item">
-                                    <a class="nav-link" href="index.html">Home
-                                        <span class="sr-only">(current)</span>
-                                    </a>
-                                </li>
-                                <li class="nav-item">
-                                    <a class="nav-link" href="about.html">About</a>
-                                </li>
-                                <li class="nav-item">
-                                    <a class="nav-link" href="service.html">Service</a>
-                                </li>
-                                <li class="nav-item dropdown">
-                                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true"
-                                        aria-expanded="false">
-                                        Pages
-                                    </a>
-                                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-                                        <a class="dropdown-item" href="404.html">404 Page</a>
-                                        <a class="dropdown-item" href="gallery.html">Gallery</a>
-                                        <a class="dropdown-item" href="single-post.html">Single Post</a>
-                                    </div>
-                                </li>
-                                <li class="nav-item dropdown">
-                                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true"
-                                        aria-expanded="false">
-                                        Blog
-                                    </a>
-                                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-                                        <a class="dropdown-item" href="blog-fullwidth.html">Blog Full</a>
-                                        <a class="dropdown-item" href="blog-left-sidebar.html">Blog Left sidebar</a>
-                                        <a class="dropdown-item" href="blog-right-sidebar.html">Blog Right sidebar</a>
-                                    </div>
-                                </li>
-                                <li class="nav-item">
-                                    <a class="nav-link" href="contact.html">Contact</a>
-                                </li>
-                            </ul>
-                        </div>
-                    </nav>
-                </div>
-            </div>
-        </div>
-    </section>
-
-    <!--=================================
-=            404 Section            =
-==================================-->
+<!--
+    =================================
+    =            404 Section        =
+    ================================= -->
     <section class="moduler wrapper_404">
         <div class="container">
             <div class="row">
@@ -121,92 +19,14 @@
         </div>
     </section>
 
-    <!--
-            ==================================================
-            Call To Action Section Start
-            ================================================== -->
-    <section id="call-to-action">
-        <div class="container">
-            <div class="row">
-                <div class="col-md-12">
-                    <div class="block">
-                        <h2 class="title wow fadeInDown" data-wow-delay=".3s" data-wow-duration="500ms">SO WHAT YOU THINK ?</h1>
-                            <p class="wow fadeInDown" data-wow-delay=".5s" data-wow-duration="500ms">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Nobis,
-                                <br>possimus commodi, fugiat magnam temporibus vero magni recusandae? Dolore, maxime praesentium.</p>
-                            <a href="contact.html" class="btn btn-default btn-contact wow fadeInDown" data-wow-delay=".7s" data-wow-duration="500ms">Contact With Me</a>
-                    </div>
-                </div>
-
-            </div>
-        </div>
-    </section>
-
-    <!--
-            ==================================================
-            Footer Section Start
-            ================================================== -->
-    <footer id="footer">
-        <div class="container">
-            <div class="row content-justify-between">
-                <div class="col-md-8 col-12 text-center text-lg-left text-md-left">
-                    <p class="copyright">Copyright:
-                        <span>
-                            <script>document.write(new Date().getFullYear())</script>
-                        </span> Design and Developed by
-                        <a href="http://www.Themefisher.com" target="_blank">Themefisher</a>.
-                        <br> Get More Bootstrap Template From Our
-                        <a href="https://themefisher.com/free-bootstrap-templates/" target="_blank">Store</a>
-                    </p>
-                </div>
-                <div class="col-md-4 col-12">
-                    <!-- Social Media -->
-                    <ul class="social text-center text-md-right text-lg-right">
-                        <li>
-                            <a href="http://wwww.fb.com/themefisher" class="Facebook">
-                                <i class="ion-social-facebook"></i>
-                            </a>
-                        </li>
-                        <li>
-                            <a href="http://wwww.twitter.com/themefisher" class="Twitter">
-                                <i class="ion-social-twitter"></i>
-                            </a>
-                        </li>
-                        <li>
-                            <a href="#" class="Linkedin">
-                                <i class="ion-social-linkedin"></i>
-                            </a>
-                        </li>
-                        <li>
-                            <a href="http://wwww.fb.com/themefisher" class="Google Plus">
-                                <i class="ion-social-googleplus"></i>
-                            </a>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-    </footer>
-    <!-- /#footer -->
-
-    <!-- Template Javascript Files
-	================================================== -->
-    <!-- jquery -->
-    <script src="plugins/jQurey/jquery.min.js"></script>
-    <!-- Form Validation -->
-    <script src="plugins/form-validation/jquery.form.js"></script>
-    <script src="plugins/form-validation/jquery.validate.min.js"></script>
-    <!-- owl carouserl js -->
-    <script src="plugins/owl-carousel/owl.carousel.min.js"></script>
-    <!-- bootstrap js -->
-    <script src="plugins/bootstrap/bootstrap.min.js"></script>
-    <!-- wow js -->
-    <script src="plugins/wow-js/wow.min.js"></script>
-    <!-- slider js -->
-    <script src="plugins/slider/slider.js"></script>
-    <!-- Fancybox -->
-    <script src="plugins/facncybox/jquery.fancybox.js"></script>
-    <!-- template main js -->
-    <script src="js/main.js"></script>
-</body>
-
-</html>
-\ No newline at end of file
+<!--
+    ==================================================
+    Call To Action Section Start
+    ================================================== -->
+{{ partial "cta.html" . }}
+
+<!--
+    ==================================================
+    Footer Section Start
+    ================================================== -->
+{{ partial "footer.html" . }}
+\ No newline at end of file
diff --git a/layouts/partials/banner.html b/layouts/partials/banner.html
index 8a86436..23f04c6 100644
--- a/layouts/partials/banner.html
+++ b/layouts/partials/banner.html
@@ -8,23 +8,23 @@
                     {{ "<!-- Slider -->" | safeHTML}}
                     <section class="cd-intro">
                         <h1 class="wow fadeInUp animated cd-headline slide" data-wow-delay=".4s">
-                            {{ with .Site.Params.banner.heading }}<span>{{ . }}</span>{{ end }}
+                            {{ with .Site.Params.banner.heading | safeHTML }}<span>{{ . }}</span>{{ end }}
                             <br>
                             <span class="cd-words-wrapper">
                                 {{ range $index, $element := .Site.Params.banner.flipText }}
                                     {{ if eq $index 0 }}
-                                    <b class="is-visible">{{ .title }}</b>
+                                    <b class="is-visible">{{ .title | safeHTML }}</b>
                                     {{else}}
-                                    <b>{{ .title }}</b>
+                                    <b>{{ .title | safeHTML }}</b>
                                     {{end}}
                                 {{ end }}
                             </span>
                         </h1>
                     </section>
-                    {{ with .Site.Params.banner.description }}<h2 class="wow fadeInUp animated" data-wow-delay=".6s">{{ . }}</h2>{{ end }}
+                    {{ with .Site.Params.banner.description | safeHTML }}<h2 class="wow fadeInUp animated" data-wow-delay=".6s">{{ . }}</h2>{{ end }}
                     {{ if .Site.Params.banner.btn }}                    
                         <a class="btn-lines dark light wow fadeInUp animated btn btn-default btn-green hvr-bounce-to-right" data-wow-delay=".9s"
-                            href="{{ .Site.Params.banner.btnURL }}" target="_blank">{{ .Site.Params.banner.btnText }}</a>
+                            href="{{ .Site.Params.banner.btnURL }}">{{ .Site.Params.banner.btnText | safeHTML }}</a>
                     {{ end }}
                 </div>
             </div>
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 4f1e17b..8dca960 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -3,36 +3,29 @@
     <div class="container">
         <div class="row content-justify-between">
             <div class="col-md-8 col-12 text-center text-lg-left text-md-left">
-                <p class="copyright">Copyright:
+                <p class="copyright">Copyright {{ .Site.Params.footer.copyright_owner }} &copy;
                     <span>
+                    {{ if (and (lt .Site.Params.footer.copyright_since (now.Format "2006")) .Site.Params.footer.copyright_since) }}
+                        {{ .Site.Params.footer.copyright_since }} - 
+                    {{ end }}
                         <script>document.write(new Date().getFullYear())</script>
-                    </span> Design and Developed by
-                    <a href="http://www.Themefisher.com" target="_blank">Themefisher</a>.
+                    </span>
+                </p>
+                <p class="copyright">
+                    <a href="https://github.com/themefisher/timer-hugo" target="_blank">Timer Hugo</a> designed and developed by <a href="http://www.Themefisher.com" target="_blank">Themefisher</a> and <a href="https://github.com/themefisher/timer-hugo/graphs/contributors" target="_blank">these Contributors</a> is licensed under <a href="https://creativecommons.org/licenses/by/3.0/legalcode" target="_blank"><img src="/images/cc-by.svg" alt="CC BY 3.0" /></a>
+                    {{ if .Site.Params.footer.customized }}<br/>Desaturated from original{{ end }}
                 </p>
             </div>
             <div class="col-md-4 col-12">
                 {{ "<!-- Social Media -->" | safeHTML }}
                 <ul class="social text-center text-md-right text-lg-right">
+                {{ range $index, $element := .Site.Params.footer.social }}
                     <li>
-                        <a href="#" class="facebook">
-                            <i class="ion-social-facebook"></i>
-                        </a>
-                    </li>
-                    <li>
-                        <a href="#" class="twitter">
-                            <i class="ion-social-twitter"></i>
-                        </a>
-                    </li>
-                    <li>
-                        <a href="#" class="linkedin">
-                            <i class="ion-social-linkedin"></i>
-                        </a>
-                    </li>
-                    <li>
-                        <a href="#" class="googleplus">
-                            <i class="ion-social-googleplus"></i>
+                        <a href="{{ if eq .link "" }}#{{ else }}{{ .link | safeURL }}{{ end }}" target="_blank">
+                            <i class="{{ .icon }}"></i>
                         </a>
                     </li>
+                {{ end }}
                 </ul>
             </div>
         </div>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 0977f7b..ffae5db 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -42,7 +42,11 @@
             <div class="col-lg-12">
                 <nav class="navbar navbar-expand-lg navbar-light bg-light">
                     <a class="navbar-brand" href="{{ .Site.BaseURL }}">
-                        <img src="{{ .Site.Params.logo | absURL }}" alt="logo">
+                    {{ if isset .Site.Params "logo" }}
+                        <img src="{{ .Site.Params.logo | absURL }}" alt="{{ if isset .Site.Params "logo_alt" }}{{ .Site.Params.logo_alt }}{{ else }}logo{{ end }}">
+                    {{ else }}
+                        {{ .Site.Params.logo_text }}
+                    {{ end }}
                     </a>
                     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
                         aria-expanded="false" aria-label="Toggle navigation">
author	Mehedi Sharif Titas <mehedishariftitas@gmail.com>	2018-10-24 17:53:16 +0300
committer	GitHub <noreply@github.com>	2018-10-24 17:53:16 +0300
commit	5cac044d314d20418a074a94232d9493bb06dbd6 (patch)
tree	f64876b8ff88b00e4f2ebd657dc37d3e6150f627
parent	0e4f62c1be30d54fd7c9118f2a2e540d08928829 (diff)
parent	2b5ca9344b21dc56c9b256f0a1fe946b06816d60 (diff)