Merge pull request #7 from danpros/master

Update to master

README.md

@@ -38,6 +38,7 @@ Features
 - User role
 - Online backup
 - File cache
+- Auto Update
 
 Requirements
 ------------
@@ -173,7 +174,7 @@ So wrap the title with HTML comment with `t` for both side.
 
 Demo
 ----
-Visit a real blog powered by HTMLy at [Danlogs](http://www.danlogs.com).
+Visit [HTMLy Demo](http://demo.htmly.com).
 
 Credit
 ------
@@ -185,7 +186,7 @@ Contribute
 1. Fork and edit
 2. Submit pull request for consideration
 
-Contributers
+Contributors
 ----------
 - [danpros](https://github.com/danpros) - [Weblog](http://www.danpros.com)
 - [Kanti](https://github.com/Kanti) - [Weblog](https://kanti.de)

system/admin/admin.php

@@ -47,7 +47,7 @@ function edit_post($title, $tag, $url, $content, $oldfile, $destination = null,
     $oldurl = explode('_', $oldfile);
     if($date !== null)
     {
-        $oldurl[0] = substr($oldurl[0],0,-19) . date('Y-m-d-h-i-s',strtotime($date));
+        $oldurl[0] = substr($oldurl[0], 0, strrpos($oldurl[0], '/')) . '/' . date('Y-m-d-h-i-s',strtotime($date));
     }
 
     $post_title = $title;

system/includes/functions.php

@@ -1580,11 +1580,11 @@ function head_contents($title, $description, $canonical) {
     $wmt_id = config('google.wmt.id');
 
     $title = '<title>' . $title . '</title>';
-    $favicon = '<link href="' . site_url() . 'favicon.ico" rel="icon" type="image/x-icon"/>';
+    $favicon = '<link rel="icon" type="image/x-icon" href="' . site_url() . 'favicon.ico" />';
     $charset = '<meta charset="utf-8" />';
-    $generator = '<meta content="htmly" name="generator"/>';
+    $generator = '<meta name="generator" content="htmly" />';
     $xua = '<meta http-equiv="X-UA-Compatible" content="IE=edge" />';
-    $viewport = '<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" user-scalable="no" />';
+    $viewport = '<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />';
     $description = '<meta name="description" content="' . $description . '"/>';
     $sitemap = '<link rel="sitemap" href="' . site_url() . 'sitemap.xml" />';
     $canonical = '<link rel="canonical" href="' . $canonical . '" />';
@@ -1600,12 +1600,12 @@ function head_contents($title, $description, $canonical) {
     }
 
     if ($styleImage == 'on') {
-        $output .= $title . "\n" . $favicon . "\n" . $charset . "\n" . $generator . "\n" . $xua . "\n" . $viewport . "\n" . $description . "\n" . $sitemap . "\n" . $canonical . "\n" . $feed . "\n" . $lightboxcss . "\n" . $jquery . "\n" . $lightbox . "\n" . $corejs . "\n" . $webmasterTools . "\n";
+        $output .= $charset . "\n" . $xua . "\n" . $title . "\n" . $description . "\n" . $viewport . "\n" . $generator . "\n" . $webmasterTools . "\n" . $favicon . "\n" . $canonical . "\n" . $sitemap . "\n" . $feed . "\n" . $lightboxcss . "\n" . $jquery . "\n" . $lightbox . "\n" . $corejs . "\n";
     } else {
         if ($jq == 'enable') {
-            $output .= $title . "\n" . $favicon . "\n" . $charset . "\n" . $generator . "\n" . $xua . "\n" . $viewport . "\n" . $description . "\n" . $sitemap . "\n" . $canonical . "\n" . $feed . "\n" . $jquery . "\n" . $webmasterTools . "\n";
+            $output .= $charset . "\n" . $xua . "\n" . $title . "\n" . $description . "\n" . $viewport . "\n" . $generator . "\n" . $webmasterTools . "\n" . $favicon . "\n" . $canonical . "\n" . $sitemap . "\n" . $feed . "\n" . $jquery . "\n";
         } else {
-            $output .= $title . "\n" . $favicon . "\n" . $charset . "\n" . $generator . "\n" . $xua . "\n" . $viewport . "\n" . $description . "\n" . $sitemap . "\n" . $canonical . "\n" . $feed . "\n" . $webmasterTools . "\n";
+            $output .= $charset . "\n" . $xua . "\n" . $title . "\n" . $description . "\n" . $viewport . "\n" . $generator . "\n" . $webmasterTools . "\n" . $favicon . "\n" . $canonical . "\n" . $sitemap . "\n" . $feed . "\n";
         }
     }
 

themes/logs/css/style.css

@@ -585,13 +585,13 @@ ul li, ol li{
 .about, .social, .archive, .comments, .tagcloud, .recent {
     margin-bottom: 2em;
 }
+
+#sidebar .recent ul {
+    margin: 0.25em 0 0.25em 1.3em;
+}
  
-.recent li:before {
-    content: "►";
-    font-size: 12px;
-    -webkit-font-smoothing: antialiased;
-    margin-right: 5px;
-    color: #21759B;   
+#sidebar .recent li {
+    list-style-type: circle;
 }
 
 /*-------------------------
@@ -888,4 +888,4 @@ ul.archivegroup{
 }
 .archivegroup li.expanded,.archivegroup li.collapsed{
     list-style:none;
-}
+}