From 14df75d6e4940fa070120605c0c27414260c8c42 Mon Sep 17 00:00:00 2001
From: Danang Probo Sayekti <dan@danpros.com>
Date: Thu, 30 Jul 2015 11:13:00 +0700
Subject: [PATCH] Styling the blog theme

---
 system/includes/functions.php |  5 +--
 themes/blog/css/styles.css    | 27 ++++++----------
 themes/blog/layout.html.php   | 73 ++++++++++++++++++++++++-------------------
 themes/blog/post.html.php     |  6 ++--
 themes/blog/profile.html.php  |  2 +-
 themes/blog/static.html.php   |  2 +-
 6 files changed, 58 insertions(+), 57 deletions(-)

diff --git a/system/includes/functions.php b/system/includes/functions.php
index 00b1c83..105f9c5 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -824,7 +824,6 @@ function popular_posts($custom = null, $count = null)
                     if(empty($custom)) {
                         echo '<ul><li>No popular posts found</li></ul>';
                     } else {
-                        echo '<ul><li>No popular posts found</li></ul>';
                         return $tmp;
                     }
                 } 
@@ -1952,7 +1951,9 @@ EOF;
     echo '<li><a href="' . $base . 'admin">Admin</a></li>';
     if ($role === 'admin') {
         echo '<li><a href="' . $base . 'admin/posts">Posts</a></li>';
-        echo '<li><a href="' . $base . 'admin/popular">Popular</a></li>';
+        if (config('views.counter') == 'true') {
+		    echo '<li><a href="' . $base . 'admin/popular">Popular</a></li>';
+        }
     }
     echo '<li><a href="' . $base . 'admin/mine">Mine</a></li>';
     echo '<li><a href="' . $base . 'admin/draft">Draft</a></li>';
diff --git a/themes/blog/css/styles.css b/themes/blog/css/styles.css
index fbbd81f..8bd2037 100644
--- a/themes/blog/css/styles.css
+++ b/themes/blog/css/styles.css
@@ -325,6 +325,12 @@ iframe {
 .section {
   margin-bottom: 30px;
 }
+.inpost.section, .inpage.section, .inprofile.section, .comment-wrapper.section, .tags.section, .section.last {
+  margin-bottom: 0px;
+}
+.comment-wrapper.section {
+  margin-top:30px;
+}
 .section .section-inner {
   background: #fff;
   padding: 30px;
@@ -421,6 +427,9 @@ iframe {
 .tab {
   margin-bottom: 20px;
 }
+.pager {
+  margin-top:30px;
+}
 
 /* share section */
 .share{
@@ -456,24 +465,6 @@ iframe {
   margin-bottom: 0;
 }
 
-/* popular-posts Section */
-.popular-posts .item {
-  margin-bottom: 20px;
-}
-.popular-posts .item .title {
-  font-size: 16px;
-  line-height: 1.3;
-}
-.popular-posts .item .title a {
-  color: #778492;
-}
-.popular-posts .item .title a:hover {
-  color: #5f6b77;
-}
-.popular-posts .item:last-child {
-  margin-bottom: 0;
-}
-
 /* archive Section */
 ul.archivegroup {
   margin: 0;
diff --git a/themes/blog/layout.html.php b/themes/blog/layout.html.php
index b012b9d..0ba3a89 100644
--- a/themes/blog/layout.html.php
+++ b/themes/blog/layout.html.php
@@ -100,40 +100,50 @@
                 </aside><!--//section-->
                 <aside class="recent-posts aside section">
                     <div class="section-inner">
-                        <h2 class="heading">Latest Blog Posts</h2>
-                        <?php $lists = recent_posts(true);?>
-                        <?php $char = 60;?>
-                        <?php foreach ($lists as $l):?>
-                        <?php if (strlen(strip_tags($l->title)) > $char) { $recentTitle = shorten($l->title, $char) . '...';} else {$recentTitle = $l->title;}?>
-                        <div class="item">
-                            <h3 class="title"><a href="<?php echo $l->url;?>"><?php echo $recentTitle;?></a></h3>
-                            <div class="content">
-                                <p><?php echo shorten($l->body, 75); ?>...</p>
-                                <a class="more-link" href="<?php echo $l->url;?>"><i class="fa fa-link"></i> Read more</a>
-                            </div><!--//content-->
-                        </div>
-                        <?php endforeach;?>
-                    </div><!--//section-inner-->
-                </aside><!--//section-->
-                <?php if (config('views.counter') === 'true') :?>
-                <aside class="popular-posts aside section">
-                    <div class="section-inner">
-                        <h2 class="heading">Popular Blog Posts</h2>
-                        <?php $lists = popular_posts(true);?>
-                        <?php $char = 60;?>
-                        <?php foreach ($lists as $l):?>
-                        <?php if (strlen(strip_tags($l->title)) > $char) { $recentTitle = shorten($l->title, $char) . '...';} else {$recentTitle = $l->title;}?>
-                        <div class="item">
-                            <h3 class="title"><a href="<?php echo $l->url;?>"><?php echo $recentTitle;?></a></h3>
-                            <div class="content">
-                                <p><?php echo shorten($l->body, 75); ?>...</p>
-                                <a class="more-link" href="<?php echo $l->url;?>"><i class="fa fa-link"></i> Read more</a>
-                            </div><!--//content-->
+                        <!-- Tab nav -->
+                        <ul class="nav nav-tabs" role="tablist">
+                            <li role="presentation" class="active"><a href="#recent-posts" aria-controls="recent-posts" role="tab" data-toggle="tab">Recent Posts</a></li>
+                            <?php if (config('views.counter') === 'true') :?>
+                            <li role="presentation"><a href="#popular-posts" aria-controls="popular-posts" role="tab" data-toggle="tab">Popular Posts</a></li>
+                            <?php endif;?>
+                        </ul>
+                        <!-- Tab content -->
+                        <div class="tab-content">
+                            <div role="tabpanel" class="tab-pane active" id="recent-posts">
+                                <h2 class="hide">Recent Posts</h2>
+                                <?php $lists = recent_posts(true);?>
+                                <?php $char = 60;?>
+                                <?php foreach ($lists as $l):?>
+                                    <?php if (strlen(strip_tags($l->title)) > $char) { $recentTitle = shorten($l->title, $char) . '...';} else {$recentTitle = $l->title;}?>
+                                    <div class="item">
+                                        <h3 class="title"><a href="<?php echo $l->url;?>"><?php echo $recentTitle;?></a></h3>
+                                        <div class="content">
+                                        <p><?php echo shorten($l->body, 75); ?>...</p>
+                                        <a class="more-link" href="<?php echo $l->url;?>"><i class="fa fa-link"></i> Read more</a>
+                                        </div><!--//content-->
+                                    </div>
+                                <?php endforeach;?>
+                            </div>
+                            <?php if (config('views.counter') === 'true') :?>
+                            <div role="tabpanel" class="tab-pane" id="popular-posts">
+                                <h2 class="hide">Popular Posts</h2>
+                                <?php $lists = popular_posts(true);?>
+                                <?php $char = 60;?>
+                                <?php foreach ($lists as $l):?>
+                                    <?php if (strlen(strip_tags($l->title)) > $char) { $recentTitle = shorten($l->title, $char) . '...';} else {$recentTitle = $l->title;}?>
+                                    <div class="item">
+                                        <h3 class="title"><a href="<?php echo $l->url;?>"><?php echo $recentTitle;?></a></h3>
+                                        <div class="content">
+                                        <p><?php echo shorten($l->body, 75); ?>...</p>
+                                        <a class="more-link" href="<?php echo $l->url;?>"><i class="fa fa-link"></i> Read more</a>
+                                        </div><!--//content-->
+                                    </div>
+                                <?php endforeach;?>
+                            </div>
+                            <?php endif;?>
                         </div>
-                        <?php endforeach;?>
                     </div><!--//section-inner-->
                 </aside><!--//section-->
-                <?php endif;?>
                 <?php if (disqus()): ?>
                 <aside class="comments aside section">
                     <div class="section-inner">
@@ -153,7 +163,6 @@
                         </div><!--//content-->
                     </div><!--//section-inner-->
                 </aside><!--//section-->
-                
                 <aside class="tags aside section">
                     <div class="section-inner">
                         <h2 class="heading">Tags</h2>
diff --git a/themes/blog/post.html.php b/themes/blog/post.html.php
index f37c02e..2beba76 100644
--- a/themes/blog/post.html.php
+++ b/themes/blog/post.html.php
@@ -1,7 +1,7 @@
 <?php if (!empty($breadcrumb)): ?>
     <div class="breadcrumb"><?php echo $breadcrumb ?></div>
 <?php endif; ?>
-<section class="post section" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
+<section class="inpost post section" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
     <div class="section-inner">
         <div class="content">    
             <?php if (login()) { echo tab($p); } ?>   
@@ -94,7 +94,7 @@
     </div><!--//section-inner-->                 
 </section><!--//section-->
 <?php if (facebook() || disqus()): ?>
-    <section class="post section">
+    <section class="comment-wrapper post section">
         <div class="section-inner">
             <div class="content">
                <div id="comments">
@@ -109,4 +109,4 @@
             </div><!--//content-->  
         </div><!--//section-inner-->                 
     </section><!--//section-->
-<?php endif; ?>        
\ No newline at end of file
+<?php endif; ?>
\ No newline at end of file
diff --git a/themes/blog/profile.html.php b/themes/blog/profile.html.php
index 092cca8..e262519 100644
--- a/themes/blog/profile.html.php
+++ b/themes/blog/profile.html.php
@@ -1,7 +1,7 @@
 <?php if (!empty($breadcrumb)): ?>
     <div class="breadcrumb"><?php echo $breadcrumb ?></div>
 <?php endif; ?>
-<section class="post section">
+<section class="inprofile post section">
     <div class="section-inner">
         <div class="content"> 
             <div class="item" itemtype="http://schema.org/Person" itemscope="itemscope" itemprop="Person">
diff --git a/themes/blog/static.html.php b/themes/blog/static.html.php
index b16837f..fddd5e2 100644
--- a/themes/blog/static.html.php
+++ b/themes/blog/static.html.php
@@ -1,7 +1,7 @@
 <?php if (!empty($breadcrumb)): ?>
     <div class="breadcrumb"><?php echo $breadcrumb ?></div>
 <?php endif; ?>
-<section class="post section" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
+<section class="inpage post section" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
     <div class="section-inner">
         <div class="content">
             <?php if (login()) { echo tab($p); } ?>