'update'

AtChina · Jan 4, 2015 · 5e7853f · 5e7853f
1 parent b80dc18
commit 5e7853f
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 20 deletions.
diff --git a/_config.yml b/_config.yml
@@ -7,10 +7,10 @@ description: > # this means to ignore newlines until "baseurl:"
  line in _config.yml. It will appear in your document head meta (for
  Google search results) and in your feed.xml site description.
 baseurl: "/"
-url: "http://atchina.me/"
+url: "http://atchina.me"
 github_username: AtChina
 permalink: /:categories/:title
-production_url : http://atchina.me/
+production_url : http://atchina.me
 paginate: 5
 paginate_path: "page:num"
 

diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,4 +1,4 @@
 <!--put the JS files in here-->
-<script src="{{ "assets/bower_components/jquery/jquery.min.js" | prepend: site.baseurl }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ "assets/bower_components/bootstrap/js/bootstrap.min.js" | prepend: site.baseurl }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ "assets/bower_components/Buttons/js/buttons.js" | prepend: site.baseurl }}" type="text/javascript" charset="utf-8"></script>
+<script src="http://atchina.me/assets/bower_components/jquery/jquery.min.js" type="text/javascript" charset="utf-8"></script>
+<script src="http://atchina.me/assets/bower_components/bootstrap/js/bootstrap.min.js" type="text/javascript" charset="utf-8"></script>
+<script src="http://atchina.me/assets/bower_components/Buttons/js/buttons.js" type="text/javascript" charset="utf-8"></script>
diff --git a/_includes/head.html b/_includes/head.html
@@ -6,20 +6,14 @@
 <meta name="viewport" content="width=device-width initial-scale=1">
 <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
 <!--bing the title of page-->
-<title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title> 
-<script language="javascript" type="text/javascript">
-if(location.href==="{{ site.url }}"){
- //window.location.replace("{{ site.url }}about.html");
- document.location.href="{{ site.url }}about.html";
-}
-</script>
+<title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
 <!--put the css files in here-->
-<link rel="shortcut icon" href="{{ "favicon.ico" | prepend: site.baseurl }}" />
-<link rel="stylesheet" href="{{ "assets/bower_components/bootstrap/css/bootstrap.min.css" | prepend: site.baseurl }}">
-<link rel="stylesheet" href="{{ "assets/bower_components/bootstrap/css/bootstrap-theme.min.css" | prepend: site.baseurl }}">
-<link rel="stylesheet" href="{{ "assets/css/main.css" | prepend: site.baseurl }}">
+<script src="http://atchina.me/assets/javascript/nav.js" type="text/javascript" charset="utf-8"></script>
+<link rel="shortcut icon" href="http://atchina.me/favicon.ico" />
+<link rel="stylesheet" href="http://atchina.me/assets/bower_components/bootstrap/css/bootstrap.min.css">
+<link rel="stylesheet" href="http://atchina.me/assets/bower_components/bootstrap/css/bootstrap-theme.min.css">
+<link rel="stylesheet" href="http://atchina.me/assets/css/main.css">
 <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
-<link rel="alternate" type="application/atom+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
-<link rel="stylesheet" href="{{ "assets/bower_components/Buttons/css/buttons.css" | prepend: site.baseurl }}">
-<link rel="stylesheet" href="{{ "assets/bower_components/font-awesome/css/font-awesome.css" | prepend: site.baseurl }}">
+<link rel="stylesheet" href="http://atchina.me/assets/bower_components/Buttons/css/buttons.css">
+<link rel="stylesheet" href="http://atchina.me/assets/bower_components/font-awesome/css/font-awesome.css">
 </head>
diff --git a/about.html b/about.html
@@ -2,7 +2,7 @@
 layout: index
 ---
 <div class="row">
- <img src="{{ "/nick.png" | prepend: site.baseurl }}" 
+ <img src="http://atchina.me/nick.png" 
  alt="..." 
  class="img-responsive img-thumbnail img-circle" />
 </div>

diff --git a/assets/javascript/nav.js b/assets/javascript/nav.js
@@ -0,0 +1,10 @@
+/**
+ * 单页面处理程序
+ * @param {[type]} ){} [description]
+ * @return {[type]} [description]
+ */
+$(function() {
+ if (document.location.location.href === "http://atchina.me/") {
+ document.location.href = "http://atchina.me/about.html";
+ }
+});