add the baseurl

luoyan35714 · Aug 29, 2016 · 92c261b · 92c261b
1 parent ae8c79d
commit 92c261b
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 39 deletions.
diff --git a/_includes/LessOrMore/pages_list b/_includes/LessOrMore/pages_list
@@ -2,9 +2,9 @@
   {% if node.title != null %}
     {% if group == null or group == node.group %}
     	{% if page.url == node.url %}
-    	<li class="active"><a href="{{ BASE_PATH }}{{node.url}}" class="active">{{node.title}}</a></li>
+    	<li class="active"><a href="{{ node.url | prepend: site.baseurl }}" class="active">{{ node.title }}</a></li>
     	{% else %}
-    	<li><a href="{{ BASE_PATH }}{{node.url}}">{{node.title}}</a></li>
+    	<li><a href="{{ node.url | prepend: site.baseurl }}">{{ node.title }}</a></li>
     	{% endif %}
     {% endif %}
   {% endif %}

diff --git a/_includes/banner.html b/_includes/banner.html
@@ -2,8 +2,8 @@
 <div class="banner">
   <div class="container">
   	{% if page.categories != null %}
-    	<a href="/categories/#{{page.categories}}-ref">{{page.categories}}</a>	/
-    	<a href="/tag/#{{page.tag}}-ref">{{page.tag}}</a>
+    	<a href="{{ '/categories/' | prepend: site.baseurl }}#{{page.categories}}-ref">{{page.categories}}</a>	/
+    	<a href="{{ '/tag/' | prepend: site.baseurl }}#{{page.tag}}-ref">{{page.tag}}</a>
     {% else %}
     	{{ site.banner }}
     {% endif %}

diff --git a/_includes/footer.html b/_includes/footer.html
@@ -5,8 +5,8 @@
 	</div>
 </footer>
 
-<script src="/styles/js/jquery.min.js"></script>
-<script src="/styles/js/bootstrap.min.js"></script>
-<script src="/styles/js/holder.min.js"></script>
-<script src="/styles/js/application.js"></script>
-<script src="/styles/js/lessismore.js"></script>
+<script src="{{ '/styles/js/jquery.min.js' | prepend: site.baseurl }}"></script>
+<script src="{{ '/styles/js/bootstrap.min.js' | prepend: site.baseurl }}"></script>
+<script src="{{ '/styles/js/holder.min.js' | prepend: site.baseurl }}"></script>
+<script src="{{ '/styles/js/application.js' | prepend: site.baseurl }}"></script>
+<script src="{{ '/styles/js/lessismore.js' | prepend: site.baseurl }}"></script>
diff --git a/_includes/head.html b/_includes/head.html
@@ -4,17 +4,17 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<title>{{ page.title }}</title>
 
-	<link rel="shortcut icon" href="{{ '/styles/images/favicon.jpg' | prepend: site.baseurl | prepend: site.url }}">
-	<link rel="icon" href="{{ '/styles/images/favicon.jpg' | prepend: site.baseurl | prepend: site.url }}">
+	<link rel="shortcut icon" href="{{ '/styles/images/favicon.jpg' | prepend: site.baseurl }}">
+	<link rel="icon" href="{{ '/styles/images/favicon.jpg' | prepend: site.baseurl }}">
 
-	<link rel="stylesheet" href="{{ '/styles/css/index.css' | prepend: site.baseurl | prepend: site.url }}">
-	<link rel="stylesheet" href="{{ '/styles/css/fontawesome/css/font-awesome.min.css' | prepend: site.baseurl | prepend: site.url }}">
-	<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
-	<link rel="alternate" type="application/rss+xml" title="{{ site.name }}" href="{{ '/feed.xml' | prepend: site.baseurl | prepend: site.url }}">
+	<link rel="stylesheet" href="{{ '/styles/css/index.css' | prepend: site.baseurl }}">
+	<link rel="stylesheet" href="{{ '/styles/css/fontawesome/css/font-awesome.min.css' | prepend: site.baseurl }}">
+	<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl }}">
+	<link rel="alternate" type="application/rss+xml" title="{{ site.name }}" href="{{ '/feed.xml' | prepend: site.baseurl }}">
 
 	<meta name="description" content="{{site.meta_description}}">
 
-	<script src="{{ '/styles/js/jquery.min.js' | prepend: site.baseurl | prepend: site.url }}"></script>
+	<script src="{{ '/styles/js/jquery.min.js' | prepend: site.baseurl }}"></script>
 	<!--[if lt IE 9]>
     	<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
   	<![endif]-->

diff --git a/_includes/header.html b/_includes/header.html
@@ -7,33 +7,33 @@
         <span class="icon-bar"></span>
       </button>
       <a href="/" class="navbar-brand">
-        <img src="/styles/images/logo.jpg">
+        <img src="{{ '/styles/images/logo.jpg' | prepend: site.baseurl }}">
       </a>
     </div>
     <nav class="collapse navbar-collapse bs-navbar-collapse" role="navigation">
       <ul class="nav navbar-nav">    
         <li>
-          <a href="/">Home</a>
+          <a href="{{ '/' | prepend: site.baseurl }}">Home</a>
         </li>
         <li>
-          <a href="/categories/">大类分解</a>
+          <a href="{{ '/categories/' | prepend: site.baseurl }}">大类分解</a>
         </li>
         <li>
-          <a href="/tag">小类内聚</a>
+          <a href="{{ '/tag' | prepend: site.baseurl }}">小类内聚</a>
         </li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <li>
-          <a href="/donate/"><strong>打赏</strong></a>
+          <a href="{{ '/donate/' | prepend: site.baseurl }}"><strong>打赏</strong></a>
         </li>
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">关于<b class="caret"></b></a>
           <ul class="dropdown-menu">
             <li><a rel="nofollow" target="_blank" href="{{site.github}}">Github</a></li>
             <li><a rel="nofollow" target="_blank" href="{{site.resume_site}}">关于作者</a></li>
-            <li><a rel="nofollow" href="/books">我的书单</a></li>
-            <li><a rel="nofollow" href="/reference">推荐博客</a></li>
-            <li><a href="/feed.xml">RSS订阅</a></li>
+            <li><a rel="nofollow" href="{{ '/books' | prepend: site.baseurl }}">我的书单</a></li>
+            <li><a rel="nofollow" href="{{ '/reference' | prepend: site.baseurl }}">推荐博客</a></li>
+            <li><a href="{{ '/feed.xml' | prepend: site.baseurl }}">RSS订阅</a></li>
             <li class="divider"></li>
             <li><a rel="nofollow" target="_blank" href="https://github.com/luoyan35714/LessOrMore.git">本项目</a></li>
           </ul>

diff --git a/_layouts/post.html b/_layouts/post.html
@@ -16,7 +16,7 @@ <h1 class="post-title">{{ page.title }}</h1>
               <!--
                 <p class="post-meta">{{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
               -->
-              <div class="meta">Posted on <span class="postdate">{{ page.date | date: "%b %d, %Y" }}</span> By <a target="_blank" href="http://www.hifreud.com/Resume.io">{{ site.author }}</a></div>
+              <div class="meta">Posted on <span class="postdate">{{ page.date | date: "%b %d, %Y" }}</span> By <a target="_blank" href="{{site.url}}">{{ site.author }}</a></div>
               <br />
             </header>
             <article class="post-content">

diff --git a/_posts/2014-11-17-welcome-to-jekyll.md b/_posts/2014-11-17-welcome-to-jekyll.md
@@ -16,7 +16,7 @@ First POST build by Jekyll.
 诫子书
 ------------------------
 
-![诫子书](/styles/images/jiezishu.jpg)
+![诫子书]({{ '/styles/images/jiezishu.jpg' | prepend: site.baseurl  }})
 
 
 [诸葛亮](#)

diff --git a/_posts/2016-08-27-how-to-use-this-jekyll-theme.md b/_posts/2016-08-27-how-to-use-this-jekyll-theme.md
@@ -113,8 +113,8 @@ jekyll server
 支付宝
 ----------------
 
-<img src="/styles/images/zhifubao.PNG" alt="支付宝二维码付款给Freud" width="310" />
+<img src="{{ '/styles/images/zhifubao.PNG' | prepend: site.baseurl }}" alt="支付宝二维码付款给Freud" width="310" />
 
 微信
 ----------------
-![微信二维码付款给Freud](/styles/images/weixin.png)
+![微信二维码付款给Freud]({{ '/styles/images/weixin.png' | prepend: site.baseurl }})
diff --git a/categories/index.html b/categories/index.html
@@ -13,13 +13,13 @@ <h1>目录</h1>
       		<ul class="nav sidenav">
 				{% if site.categories.first[0] == null %}
 					{% for category in site.categories %} 
-				    	<li><a href="{{ BASE_PATH }}{{ site.JB.categories_path }}#{{ category }}-ref">
+				    	<li><a href="#{{ category }}-ref">
 				    		{{ category | join: "/" }} <span style="color: #999999;" >({{ site.categories[category].size }})</span>
 				    	</a></li>
 			    	{% endfor %}
 			  	{% else %}
 			    	{% for category in site.categories %} 
-				    	<li><a href="{{ BASE_PATH }}{{ site.JB.categories_path }}#{{ category[0] }}-ref">
+				    	<li><a href="#{{ category[0] }}-ref">
 				    		{{ category[0] | join: "/" }} <span style="color: #999999;" >({{ category[1].size }})</span>
 				    	</a></li>
 			    	{% endfor %}

diff --git a/donate/index.md b/donate/index.md
@@ -12,12 +12,12 @@ header: 打赏
 
 如果在你开发或学习过程中本博客帮助到了你...
 
-你可以对本博客[小额赞助](/donate/method)一下，让我有动力继续写出更高质量的文章。
+你可以对本博客[小额赞助]({{ '/donate/method' | prepend: site.baseurl }})一下，让我有动力继续写出更高质量的文章。
 
 点击上面小额赞助即可呦！
 <br>
 
-![Thank you very much!](/styles/images/freud.jpg)
+![Thank you very much!]({{ '/styles/images/freud.jpg' | prepend: site.baseurl }})
 <br>
 
 >声明: 此博客空间用于分享作者个人的一些技术相关， 此网站基于[MIT开源协议](https://github.com/luoyan35714/LessOrMore/blob/master/LICENSE)所有内容完全免费，请放心使用。
@@ -30,7 +30,7 @@ header: 打赏
 <hr>
 您可以选择手机支付宝扫一扫
 
-<img src="/styles/images/zhifubao.PNG" alt="支付宝二维码付款给Freud" width="310" />
+<img src="{{ '/styles/images/zhifubao.PNG' | prepend: site.baseurl }}" alt="支付宝二维码付款给Freud" width="310" />
 
 <br>
 <br>
@@ -41,7 +41,7 @@ header: 打赏
 <hr>
 您可以选择手机微信扫一扫
 
-![微信二维码付款给Freud](/styles/images/weixin.png)
+![微信二维码付款给Freud]({{ '/styles/images/weixin.png' | prepend: site.baseurl }})
 
 <br>
 <br>

diff --git a/donate/method/index.md b/donate/method/index.md
@@ -15,7 +15,7 @@ permlink: /method
 <hr>
 您可以选择手机支付宝扫一扫
 
-<img src="/images/zhifubao_2.JPG" alt="支付宝二维码付款给Freud" width="310" />
+<img src="{{ '/styles/images/zhifubao.PNG' | prepend: site.baseurl }}" alt="支付宝二维码付款给Freud" width="310" />
 
 <br>
 <br>
@@ -26,7 +26,7 @@ permlink: /method
 <hr>
 您可以选择手机微信扫一扫
 
-![微信二维码付款给Freud](/images/weixin.png)
+![微信二维码付款给Freud]({{ '/styles/images/weixin.png' | prepend: site.baseurl }})
 
 <br>
 <br>

diff --git a/index.html b/index.html
@@ -59,7 +59,7 @@ <h3 id="month_{{this_year}}_{{this_month}}">{{this_month}}</h3>
                     <ul>
                   {% endif %}
 
-                  <li><span>{{ post.date | date: "%B %e, %Y" }}</span> &raquo; <a href="{{ BASE_PATH }}{{ post.url }}">{{ post.title }}</a></li>
+                  <li><span>{{ post.date | date: "%B %e, %Y" }}</span> &raquo; <a href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a></li>
 
                   {% if forloop.last %}
                     </ul>

diff --git a/tag/index.html b/tag/index.html
@@ -13,11 +13,11 @@ <h1>目录</h1>
       		<ul class="nav sidenav">
 			  	{% if site.tags.first[0] == null %}
 				  	{% for tag in site.tags %} 
-				  	<li><a href="{{ BASE_PATH }}{{ site.JB.tags_path }}#{{ tag }}-ref">{{ tag }} <span >({{ site.tags[tag].size }})</span></a></li>
+				  	<li><a href="{{ site.JB.tags_path }}#{{ tag }}-ref">{{ tag }} <span >({{ site.tags[tag].size }})</span></a></li>
 				  	{% endfor %}
 				{% else %}
 				  	{% for tag in site.tags %} 
-				  	<li><a href="{{ BASE_PATH }}{{ site.JB.tags_path }}#{{ tag[0] }}-ref">{{ tag[0] }} <span style="color: #999999;" >({{ tag[1].size }})</span></a></li>
+				  	<li><a href="{{ site.JB.tags_path }}#{{ tag[0] }}-ref">{{ tag[0] }} <span style="color: #999999;" >({{ tag[1].size }})</span></a></li>
 				  	{% endfor %}
 				{% endif %}
           	</ul>