From 2138c7daed8f2c80e40e4d78620ff330d833790a Mon Sep 17 00:00:00 2001 From: Kanti Date: Sun, 24 Aug 2014 13:54:34 +0200 Subject: [PATCH 1/5] To Prevent Google to index sitemaps --- system/includes/functions.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/system/includes/functions.php b/system/includes/functions.php index faf7b47..732f8d9 100644 --- a/system/includes/functions.php +++ b/system/includes/functions.php @@ -1299,6 +1299,8 @@ function get_static_path() { // Generate sitemap.xml. function generate_sitemap($str) { + header('X-Robots-Tag: noindex'); + echo ''; if ($str == 'index') { From 36c01c08f3b8602be8b613d02483106d8e38f87d Mon Sep 17 00:00:00 2001 From: Kanti Date: Mon, 25 Aug 2014 11:12:32 +0200 Subject: [PATCH 2/5] Small Style Fixes with SubPages --- system/includes/functions.php | 4 +- themes/logs/css/style.css | 827 +++++++++++++++++++++--------------------- 2 files changed, 418 insertions(+), 413 deletions(-) diff --git a/system/includes/functions.php b/system/includes/functions.php index 732f8d9..c828d5b 100644 --- a/system/includes/functions.php +++ b/system/includes/functions.php @@ -1112,9 +1112,9 @@ function get_menu() {//aktive Link for Sub Pages ::TODO echo '
  • '; $subPages = get_static_sub_pages(str_replace('.md', '', $base)); - echo '' . ucwords($title) . '
    '; + echo '' . ucwords($title) . ''; if (!empty($subPages)) { - echo '
      '; + echo '
        '; $iSub = 0; $countSub = count($subPages); diff --git a/themes/logs/css/style.css b/themes/logs/css/style.css index a5e2320..464fe91 100644 --- a/themes/logs/css/style.css +++ b/themes/logs/css/style.css @@ -1,154 +1,154 @@ /*------------------------- - Simple reset + Simple reset --------------------------*/ * { - margin: 0; - padding: 0; + margin: 0; + padding: 0; } body { - font-size: 17px; - line-height: 1.6em; - font-family: Georgia, sans-serif; - background: #F7F7F7; - color: #444444; + font-size: 17px; + line-height: 1.6em; + font-family: Georgia, sans-serif; + background: #F7F7F7; + color: #444444; } section, footer, header, aside, nav{ - display: block; + display: block; } img { border: 0 none; height: auto; max-width: 100%; - outline: 0 none; + outline: 0 none; } .hide { - display:none; + display:none; } /*------------------------- - Heading + Heading --------------------------*/ h1, h2, h3, h4, h5, h6 { - font-family: 'Open Sans',sans-serif; - line-height: 1.3; - margin: 0.5em 0; - font-weight:400; + font-family: 'Open Sans',sans-serif; + line-height: 1.3; + margin: 0.5em 0; + font-weight:400; } h1 { - font-size: 28px; + font-size: 28px; } h2 { - font-size: 24px; + font-size: 24px; } h3 { - font-size: 18px; + font-size: 18px; } h4 { - font-size: 16px; + font-size: 16px; } h5 { - font-size: 14px; + font-size: 14px; } h6 { - font-size: 12px; + font-size: 12px; } /*------------------------- - Layout + Layout --------------------------*/ #cover { - padding: 0 0 20px 0; - float:left; - width:100%; + padding: 0 0 20px 0; + float:left; + width:100%; } #header-wrapper { - float:left; - width:100%; - position:relative; + float:left; + width:100%; + position:relative; } #header { - position: relative; - padding: 0 15px; - margin: 0 auto; + position: relative; + padding: 0 15px; + margin: 0 auto; } #main-wrapper { - float:left; - width:100%; - background: #ffffff; - position:relative; - border-top:1px solid #DFDFDF; - border-bottom:1px solid #DFDFDF; + float:left; + width:100%; + background: #ffffff; + position:relative; + border-top:1px solid #DFDFDF; + border-bottom:1px solid #DFDFDF; } #main { - position: relative; - padding: 0; - margin: 0 auto; - background: #ffffff; - overflow:hidden; - padding:30px 15px; + position: relative; + padding: 0; + margin: 0 auto; + background: #ffffff; + overflow:hidden; + padding:30px 15px; } .responsive { - width: 950px; + width: 950px; } /*------------------------- - Link + Link --------------------------*/ a { - color: #21759B; - text-decoration: none; + color: #21759B; + text-decoration: none; } a:hover { - text-decoration: none; - color: #D54E21; + text-decoration: none; + color: #D54E21; } .tab { - width:100%; - margin: 1.5em 0 0 0; - line-height:1; - border-bottom: 1px solid #E4E7EE; + width:100%; + margin: 1.5em 0 0 0; + line-height:1; + border-bottom: 1px solid #E4E7EE; } .tab a { - background: #E4E7EE; + background: #E4E7EE; border-radius: 6px 6px 0px 0; color: #555555; text-align: center; - padding: 8px 14px; - display:inline-block; - margin: 0 5px; - font-size: 12px; - font-weight: bold; - font-family: 'Open Sans',sans-serif; + padding: 8px 14px; + display:inline-block; + margin: 0 5px; + font-size: 12px; + font-weight: bold; + font-family: 'Open Sans',sans-serif; } /*------------------------- - Text element + Text element --------------------------*/ p { - margin: 1em 0; + margin: 1em 0; } blockquote:before { @@ -169,24 +169,24 @@ blockquote:after { } blockquote { - font-style: italic; - margin: 1em 0 1em 1em; + font-style: italic; + margin: 1em 0 1em 1em; } blockquote p { - display:inline; + display:inline; } pre { - margin: 1em 0; - overflow: auto; - background: #F1F1FF; - color: #333333; + margin: 1em 0; + overflow: auto; + background: #F1F1FF; + color: #333333; display: block; font-family: Consolas,Menlo,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New,monospace,serif; font-size: 14px; padding: 10px; - line-height:1.3; + line-height:1.3; } code { @@ -194,7 +194,7 @@ code { font-family: Consolas,Menlo,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New,monospace,serif; font-size: 15px; padding: 3px 8px; - background: #F1F1FF; + background: #F1F1FF; } pre code { @@ -202,253 +202,253 @@ pre code { display: block; font-family: Consolas,Menlo,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New,monospace,serif; font-size: 14px; - padding:0; - line-height:1.6; + padding:0; + line-height:1.6; } .thumbnail { float: left; height: 80px; - width: 80px; + width: 80px; margin: 5px 15px 0 0; overflow: hidden; - display: block; - background-repeat: no-repeat; + display: block; + background-repeat: no-repeat; background-position: center; background-size: cover; } ul, ol { padding-left: 30px; - margin: 1em 0; + margin: 1em 0; } ul li, ol li{ - margin: 0.25em 0; + margin: 0.25em 0; } /*------------------------- - Header + Header --------------------------*/ #branding{ - text-align: left; - position: relative; - width:100%; - float:left; - margin:1em 0; - text-shadow: 0 1px 0 #ffffff; + text-align: left; + position: relative; + width:100%; + float:left; + margin:1em 0; + text-shadow: 0 1px 0 #ffffff; } #branding a { - text-decoration: none; - color: #000000; + text-decoration: none; + color: #000000; } #branding p { - margin:0; - font-style:italic; - margin-top:5px; + margin:0; + font-style:italic; + margin-top:5px; } #branding h1, #branding h2 { - font-size: 36px; - font-family: Georgia,sans-serif; - margin:0; + font-size: 36px; + font-family: Georgia,sans-serif; + margin:0; } /*------------------------- - Menu + Menu --------------------------*/ #menu-wrapper { - float:left; - width:100%; - position:relative; - text-align: left; - font-family: 'Open Sans',sans-serif; - font-size:15px; - text-shadow: 0 1px 0 #ffffff; - padding-bottom:7px; + float:left; + width:100%; + position:relative; + text-align: left; + font-family: 'Open Sans',sans-serif; + font-size:15px; + text-shadow: 0 1px 0 #ffffff; + padding-bottom:7px; } #menu { - margin: 0 auto; - padding: 0 15px; + margin: 0 auto; + padding: 0 15px; } #menu ul { - list-style: none; - margin:0; - padding:0; + list-style: none; + margin:0; + padding:0; } #menu ul li { - padding: 0 10px; - float: left; - margin:0; + padding: 0 10px; + float: left; + margin:0; } #menu ul li.first { - padding-left:0; + padding-left:0; } #menu ul li.last { - padding-right:0; + padding-right:0; } #menu a { - text-decoration: none; - float:left; + text-decoration: none; + float:left; } #menu a:hover { - text-decoration: underline; + text-decoration: underline; } #menu ul li.active > a { - text-decoration: underline; + text-decoration: underline; } /*------------------------- - Search + Search --------------------------*/ #search-form { - float:right; + float:right; } .search-input { - border: 1px solid #E5E5E5; - border-top-color: gainsboro; - color: #666; - display: inline-block; - line-height: normal; - height: 22px; - padding: 0 3px; - -moz-border-radius:2px; - -webkit-border-radius:2px; - border-radius:2px; + border: 1px solid #E5E5E5; + border-top-color: gainsboro; + color: #666; + display: inline-block; + line-height: normal; + height: 22px; + padding: 0 3px; + -moz-border-radius:2px; + -webkit-border-radius:2px; + border-radius:2px; } .search-input:hover { - border:1px solid #b9b9b9; - border-top:1px solid #a0a0a0; - box-shadow:inset 0 1px 2px rgba(0,0,0,.1) + border:1px solid #b9b9b9; + border-top:1px solid #a0a0a0; + box-shadow:inset 0 1px 2px rgba(0,0,0,.1) } .search-input:focus { - border: 1px solid rgb(77, 144, 254); - box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.3) inset; - outline: medium none; + border: 1px solid rgb(77, 144, 254); + box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.3) inset; + outline: medium none; } .search-button { - background-color:#5e94ff; - border:1px solid #5e94ff; - -moz-border-radius:2px; - -webkit-border-radius:2px; - border-radius:2px; - -moz-box-shadow:0 1px 1px rgba(0,0,0,.2); - -webkit-box-shadow:0 1px 1px rgba(0,0,0,.2); - box-shadow:0 1px 1px rgba(0,0,0,.2); - color:#fff; - display:inline-block; - font-family:"open sans",arial,sans-serif; - font-size:13px; - font-weight:600; - line-height:1.54; - padding: 0; - margin:0; - text-align:center; - text-shadow:0 -1px 0 rgba(0,0,0,.2); - -moz-transition:all .218s ease-in; - -webkit-transition:all .218s ease-in; - transition:all .218s ease-in; - cursor:pointer; - height:23px; - padding: 0 3px; + background-color:#5e94ff; + border:1px solid #5e94ff; + -moz-border-radius:2px; + -webkit-border-radius:2px; + border-radius:2px; + -moz-box-shadow:0 1px 1px rgba(0,0,0,.2); + -webkit-box-shadow:0 1px 1px rgba(0,0,0,.2); + box-shadow:0 1px 1px rgba(0,0,0,.2); + color:#fff; + display:inline-block; + font-family:"open sans",arial,sans-serif; + font-size:13px; + font-weight:600; + line-height:1.54; + padding: 0; + margin:0; + text-align:center; + text-shadow:0 -1px 0 rgba(0,0,0,.2); + -moz-transition:all .218s ease-in; + -webkit-transition:all .218s ease-in; + transition:all .218s ease-in; + cursor:pointer; + height:23px; + padding: 0 3px; } /*------------------------- - Content + Content --------------------------*/ #content { - width: 700px; - float: left; - padding-right: 50px; + width: 700px; + float: left; + padding-right: 50px; } .breadcrumb { color: #999999; font-size: 15px; margin-bottom: 1em; - font-family: 'Open Sans',sans-serif; + font-family: 'Open Sans',sans-serif; } .breadcrumb a { - color: #777777; - border-bottom: 1px solid #DFDFDF; + color: #777777; + border-bottom: 1px solid #DFDFDF; } .breadcrumb a:hover { - border-bottom: 1px solid #D54E21; - color: #D54E21; + border-bottom: 1px solid #D54E21; + color: #D54E21; } .post { - margin: 0 0 24px 0; - overflow: hidden; + margin: 0 0 24px 0; + overflow: hidden; border-bottom: 1px solid #DFDFDF; } .post a, .post-list a, .pager a, .postnav a { - border-bottom: 1px solid #DFDFDF; + border-bottom: 1px solid #DFDFDF; } .post a:hover , .post-list a:hover , .pager a:hover, .postnav a:hover{ - border-bottom: 1px solid #D54E21; + border-bottom: 1px solid #D54E21; } .date { color: #999999; font-size: 13px; - font-family: 'Open Sans',sans-serif; - margin: 1em 0; + font-family: 'Open Sans',sans-serif; + margin: 1em 0; } .date a { - color: #777777; + color: #777777; } .date a:hover { - border-bottom: 1px solid #D54E21; - color: #D54E21; + border-bottom: 1px solid #D54E21; + color: #D54E21; } #main strong { - color: #454545; + color: #454545; } #main h1 a, #main h2 a { - border:none; + border:none; } .post.first .title-index { - margin-top:0; + margin-top:0; } .main { - margin-bottom:1.5em; + margin-bottom:1.5em; } .inpost .post { - border:none; + border:none; } .title-post { - margin-top:0; + margin-top:0; } .border { @@ -456,8 +456,8 @@ ul li, ol li{ margin-bottom: 15px; margin-top: 10px; padding-bottom: 15px; - width: 100%; - float:left; + width: 100%; + float:left; } .profile { @@ -465,50 +465,50 @@ ul li, ol li{ } .post-list { - font-size: 14px; + font-size: 14px; border-bottom: 1px solid #DFDFDF; - margin-bottom: 1em; - padding-bottom: 1em; + margin-bottom: 1em; + padding-bottom: 1em; } /*------------------------- - Share box + Share box --------------------------*/ .separator { - font-size: 20px; + font-size: 20px; } .share-box { - font-size: 14px; - float:left; - line-height: 1.5; + font-size: 14px; + float:left; + line-height: 1.5; } .author-info { - width: 540px; - float:left; + width: 540px; + float:left; } .share { - width:140px; - margin-left: 1em; - float:right; + width:140px; + margin-left: 1em; + float:right; } .share a { - display: inline-block; - width: 18px; - height: 18px; - margin: 0; - padding: 0 5px; - vertical-align: middle; - -o-transition: all .3s; - -moz-transition: all .3s; - -webkit-transition: all .3s; - -ms-transition: all .3s; - text-indent: -9999em; - border:none; + display: inline-block; + width: 18px; + height: 18px; + margin: 0; + padding: 0 5px; + vertical-align: middle; + -o-transition: all .3s; + -moz-transition: all .3s; + -webkit-transition: all .3s; + -ms-transition: all .3s; + text-indent: -9999em; + border:none; } .share a.twitter { background: url(../../default/img/share-twitter.png) left top no-repeat; } @@ -518,20 +518,20 @@ ul li, ol li{ .share a:hover { background-position: left -26px; border:none; } .related { - font-size:15px; - line-height: 1.5; + font-size:15px; + line-height: 1.5; } .pager, .postnav { - font-size: 15px; + font-size: 15px; } .pager .newer , .postnav .newer { - float:left; + float:left; } .pager .older , .postnav .older { - float:right; + float:right; } .border .fb-comments, .border #disqus_thread { @@ -545,29 +545,29 @@ ul li, ol li{ } /*------------------------- - Sidebar + Sidebar --------------------------*/ #sidebar { - float: left; - color: #5c5a54; - height:100%; - width: 200px; - font-size:15px; - line-height: 1.4; + float: left; + color: #5c5a54; + height:100%; + width: 200px; + font-size:15px; + line-height: 1.4; } #sidebar h2, #sidebar h3, #sidebar h4 { - color: #000000; - border-bottom: 1px solid #DFDFDF; - margin: 0 0 1em 0; - padding-bottom: 5px; + color: #000000; + border-bottom: 1px solid #DFDFDF; + margin: 0 0 1em 0; + padding-bottom: 5px; } #sidebar ul { - list-style: none; - margin:0; - padding:0; + list-style: none; + margin:0; + padding:0; } #sidebar .archivegroup ul.month { @@ -575,7 +575,7 @@ ul li, ol li{ } #sidebar .archivegroup ul.month li { - margin:0; + margin:0; } .archivegroup li.expanded, .archivegroup li.collapsed { @@ -583,278 +583,283 @@ ul li, ol li{ } .about, .social, .archive, .comments, .tagcloud { - margin-bottom:2em; + margin-bottom:2em; } /*------------------------- - Copyright + Copyright --------------------------*/ #copyright-wrapper { - margin: 20px 0 0 0; - float:left; - width:100%; - position:relative; - font-size: 14px; - line-height:1.5; + margin: 20px 0 0 0; + float:left; + width:100%; + position:relative; + font-size: 14px; + line-height:1.5; } #copyright { - text-align: center; - color: #909090; - text-shadow: 0 1px 0 #ffffff; - text-align:center; - margin: 0 auto; - padding: 0 15px; + text-align: center; + color: #909090; + text-shadow: 0 1px 0 #ffffff; + text-align:center; + margin: 0 auto; + padding: 0 15px; } #copyright p { - margin:0; + margin:0; } /*---------------------------- - The 404 page + The 404 page -----------------------------*/ .message{ - padding:50px 20px 20px 20px; + padding:50px 20px 20px 20px; } .message h1{ - font-size:36px; - margin-bottom: 18px; + font-size:36px; + margin-bottom: 18px; } .message p{ - font-size:13px; + font-size:13px; } .center{ - text-align:center; + text-align:center; } .search-404 { - position:relative; - float:left; - width:100%; - margin-bottom: 1.2em; + position:relative; + float:left; + width:100%; + margin-bottom: 1.2em; } .search-404 #search-form { - float:none; + float:none; } /*------------------------- - Table + Table --------------------------*/ table { - font-size:12px; - border: none; - width:100%; - color:#333333; - border: 1px solid #E3E3E3; - margin: 1em 0; - white-space: pre-wrap; - word-wrap:break-word; + font-size:12px; + border: none; + width:100%; + color:#333333; + border: 1px solid #E3E3E3; + margin: 1em 0; + white-space: pre-wrap; + word-wrap:break-word; } table h2.title { - margin:5px 0; + margin:5px 0; } th, td { - padding: 5px 10px; - border: none; + padding: 5px 10px; + border: none; } th.title { - margin:5px 0; - font-family: 'Open Sans',sans-serif; - font-size:16px; - font-weight:normal; + margin:5px 0; + font-family: 'Open Sans',sans-serif; + font-size:16px; + font-weight:normal; } td.title { - font-weight:normal; - background-color: #f6f6f6; - font-family: 'Open Sans',sans-serif; + font-weight:normal; + background-color: #f6f6f6; + font-family: 'Open Sans',sans-serif; } th { - background-color: #f6f6f6; - border-bottom: 1px solid #E3E3E3; - border-right: 1px solid #E3E3E3; - font-family: 'Open Sans',sans-serif; - font-size:16px; + background-color: #f6f6f6; + border-bottom: 1px solid #E3E3E3; + border-right: 1px solid #E3E3E3; + font-family: 'Open Sans',sans-serif; + font-size:16px; } td { - background-color: #fafafa; - border: 1px solid #E3E3E3; - border-top: none; - border-left:none; + background-color: #fafafa; + border: 1px solid #E3E3E3; + border-top: none; + border-left:none; } table.post-list td a { - margin:0 5px; + margin:0 5px; } /*---------------------------- - Media queries + Media queries -----------------------------*/ @media all and (max-width: 1024px) { - .responsive { - width: 95%; - } - - #content { - width: 73%; - padding-right:5%; - } - - .author-info { - width: 68%; - } - - .share { - width: 28%; - margin-left: 4%; - } - - #sidebar { - width: 22%; - } + .responsive { + width: 95%; + } + + #content { + width: 73%; + padding-right:5%; + } + + .author-info { + width: 68%; + } + + .share { + width: 28%; + margin-left: 4%; + } + + #sidebar { + width: 22%; + } } @media all and (max-width: 640px) { - .responsive { - width: 94%; - } - - #content { - width: 100%; - padding-right:0; - } - - .author-info , .related, .share-box{ - width: 100%; - } - - .share { - width: 100%; - margin-left: 0; - margin-bottom: 1em; - } - - #sidebar { - width: 100%; - } - - .tagcloud ul li { - float: left; - list-style: none outside none; - margin-right: 10px; - } - - .pager .newer , .postnav .newer { - float:left; - margin-bottom: 1em; - } - - .pager .older , .postnav .older { - float:left; - margin-bottom: 1em; - } - - #branding, #menu-wrapper { - text-align:center; - } - - #menu-wrapper ul { - width:100%; - text-align:center; - float:left; - } - - #menu-wrapper ul li { - float:none; - display:inline-block; - } - - #search-form { - float:left; - width:100%; - margin-bottom:1em; - } - - pre { - white-space: pre-wrap; - word-wrap:break-word; - } - + .responsive { + width: 94%; + } + + #content { + width: 100%; + padding-right:0; + } + + .author-info , .related, .share-box{ + width: 100%; + } + + .share { + width: 100%; + margin-left: 0; + margin-bottom: 1em; + } + + #sidebar { + width: 100%; + } + + .tagcloud ul li { + float: left; + list-style: none outside none; + margin-right: 10px; + } + + .pager .newer , .postnav .newer { + float:left; + margin-bottom: 1em; + } + + .pager .older , .postnav .older { + float:left; + margin-bottom: 1em; + } + + #branding, #menu-wrapper { + text-align:center; + } + + #menu-wrapper ul { + width:100%; + text-align:center; + float:left; + } + + #menu-wrapper ul li { + float:none; + display:inline-block; + vertical-align: top; + } + + #menu a { + float: none; + } + + #search-form { + float:left; + width:100%; + margin-bottom:1em; + } + + pre { + white-space: pre-wrap; + word-wrap:break-word; + } + } @media all and (max-width: 360px) { - .responsive { - width: 92%; - } + .responsive { + width: 92%; + } } @media all and (max-width: 320px) { - .responsive { - width: 90%; - } + .responsive { + width: 90%; + } } /*---------------------------- - Video + Video -----------------------------*/ .video-wrapper { - margin:1em 0; + margin:1em 0; } @media all and (min-width: 420px) { - .video-wrapper { - padding-top:315px!important; - position:relative; - width:100%; - max-width:420px!important; - max-height:315px!important; - } + .video-wrapper { + padding-top:315px!important; + position:relative; + width:100%; + max-width:420px!important; + max-height:315px!important; + } - .video-wrapper iframe, .video-wrapper object, .video-wrapper embed { - height: 100%; - left: 0; - position: absolute; - top: 0; - max-width:420px!important; - width: 100%; - max-height:315px!important; - } + .video-wrapper iframe, .video-wrapper object, .video-wrapper embed { + height: 100%; + left: 0; + position: absolute; + top: 0; + max-width:420px!important; + width: 100%; + max-height:315px!important; + } } @media all and (max-width: 420px) { - .video-wrapper { - position: relative; - padding-bottom: 56.25%; - padding-top: 30px; - height: 0; - overflow: hidden; - } - - .video-wrapper iframe, .video-wrapper object, .video-wrapper embed { - height: 100%; - left: 0; - position: absolute; - top: 0; - width: 100%; - } + .video-wrapper { + position: relative; + padding-bottom: 56.25%; + padding-top: 30px; + height: 0; + overflow: hidden; + } + + .video-wrapper iframe, .video-wrapper object, .video-wrapper embed { + height: 100%; + left: 0; + position: absolute; + top: 0; + width: 100%; + } } \ No newline at end of file From fe6a7a28367888adeeb16ee4202fd95e08731fc1 Mon Sep 17 00:00:00 2001 From: Kanti Date: Mon, 25 Aug 2014 11:47:12 +0200 Subject: [PATCH 3/5] Added Custom ImgDir for Themes. --- system/includes/functions.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/system/includes/functions.php b/system/includes/functions.php index c828d5b..caff264 100644 --- a/system/includes/functions.php +++ b/system/includes/functions.php @@ -852,31 +852,36 @@ function base64_encode_image($filename = string, $filetype = string) { } // Social links -function social() { +function social($imgDir = null) { $twitter = config('social.twitter'); $facebook = config('social.facebook'); $google = config('social.google'); $tumblr = config('social.tumblr'); $rss = site_url() . 'feed/rss'; + + if($imgDir === null) + { + $imgDir = "default/img/"; + } if (!empty($twitter)) { - echo 'Twitter'; + echo 'Twitter'; } if (!empty($facebook)) { - echo 'Facebook'; + echo 'Facebook'; } if (!empty($google)) { - echo 'Google+'; + echo 'Google+'; } if (!empty($tumblr)) { - echo 'Tumblr'; + echo 'Tumblr'; } - echo 'RSS Feed'; + echo 'RSS Feed'; } // Copyright From b769222a3a77333cf8f1b748fce8159776812088 Mon Sep 17 00:00:00 2001 From: Kanti Date: Mon, 25 Aug 2014 12:01:01 +0200 Subject: [PATCH 4/5] Updated Analytics --- system/includes/functions.php | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/system/includes/functions.php b/system/includes/functions.php index caff264..6d789ba 100644 --- a/system/includes/functions.php +++ b/system/includes/functions.php @@ -859,9 +859,8 @@ function social($imgDir = null) { $google = config('social.google'); $tumblr = config('social.tumblr'); $rss = site_url() . 'feed/rss'; - - if($imgDir === null) - { + + if ($imgDir === null) { $imgDir = "default/img/"; } @@ -986,16 +985,15 @@ function publisher() { function analytics() { $analytics = config('google.analytics.id'); $script = << - var _gaq = _gaq || []; - _gaq.push(['_setAccount', '{$analytics}']); - _gaq.push(['_trackPageview']); - (function() { - var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; - ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; - var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); - })(); - + EOF; if (!empty($analytics)) { return $script; @@ -1305,7 +1303,7 @@ function get_static_path() { function generate_sitemap($str) { header('X-Robots-Tag: noindex'); - + echo ''; if ($str == 'index') { From 54f4690dc921ca2fe490ca17260ce4b2b8834721 Mon Sep 17 00:00:00 2001 From: Kanti Date: Mon, 25 Aug 2014 14:06:15 +0200 Subject: [PATCH 5/5] Able to Add local analytics.js File into the Theme --- system/includes/functions.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/system/includes/functions.php b/system/includes/functions.php index 6d789ba..73b8795 100644 --- a/system/includes/functions.php +++ b/system/includes/functions.php @@ -982,14 +982,22 @@ function publisher() { } // Google Analytics -function analytics() { +function analytics($analyticsDir = null) { $analytics = config('google.analytics.id'); + if($analyticsDir === null) + { + $analyticsDir = '//www.google-analytics.com/analytics.js'; + } + else + { + $analyticsDir = site_url() . 'themes/' . $analyticsDir . 'analytics.js'; + } $script = << (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) - })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); + })(window,document,'script','{$analyticsDir}','ga'); ga('create', '{$analytics}', 'auto'); ga('send', 'pageview');