Improve docs relate path problem

.travis.yml

@@ -7,7 +7,6 @@ script: bash ./deploy.sh
 branches:
   only:
   - master
-  - hotfix/docs
 
 env:
   global:

deploy.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e # Exit with nonzero exit code if anything fails
 
-SOURCE_BRANCH="hotfix/docs"
+SOURCE_BRANCH="master"
 TARGET_BRANCH="gh-pages"
 
 function doCompile {

docs/_includes/footer.html

@@ -5,13 +5,13 @@
 <!-- Bootstrap core JavaScript
 ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
-<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/bootstrap-table/{{ site.current_version }}/bootstrap-table.min.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/bootstrap-table/{{ site.current_version }}/extensions/mobile/bootstrap-table-mobile.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js"></script>
+<script src="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/bootstrap-table.min.js"></script>
+<script src="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/extensions/mobile/bootstrap-table-mobile.js"></script>
 
 <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
 <script src="../assets/js/ie10-viewport-bug-workaround.js"></script>
 
-<script src="../assets/js/sidenav.js"></script>
-<script src="../assets/js/common.js"></script>
+<script src="../assets/js/sidenav.js?v={{ site.current_version }}"></script>
+<script src="../assets/js/common.js?v={{ site.current_version }}"></script>

docs/_includes/header.html

@@ -14,12 +14,12 @@
 </title>
 
 <!-- Bootstrap CSS -->
-<link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-<link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap-theme.min.css" rel="stylesheet">
-<link href="//cdnjs.cloudflare.com/ajax/libs/bootstrap-table/{{ site.current_version }}/bootstrap-table.min.css" rel="stylesheet">
+<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
+<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap-theme.min.css" rel="stylesheet">
+<link href="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/bootstrap-table.min.css" rel="stylesheet">
 <link href="../assets/css/docs.min.css" rel="stylesheet">
-<link href="../assets/css/sidenav.css" rel="stylesheet">
-<link href="../assets/css/style.css" rel="stylesheet">
+<link href="../assets/css/sidenav.css?v={{ site.current_version }}" rel="stylesheet">
+<link href="../assets/css/style.css?v={{ site.current_version }}" rel="stylesheet">
 
 <!--[if lt IE 9]><script src="../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
 <script src="../assets/js/ie-emulation-modes-warning.js"></script>

docs/_includes/nav.html

@@ -8,15 +8,15 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a href="{{ site.baseurl }}/" class="navbar-brand">Bootstrap Table</a>
+            <a href="../home/" class="navbar-brand">Bootstrap Table</a>
         </div>
         <nav class="collapse navbar-collapse bs-navbar-collapse" role="navigation">
             <ul class="nav navbar-nav">
                 <li {% if page.slug == "getting-started" %} class="active"{% endif %}>
-                    <a href="{{ site.baseurl }}/getting-started/">{% t pages.getting_started.title %}</a>
+                    <a href="../getting-started/">{% t pages.getting_started.title %}</a>
                 </li>
                 <li {% if page.slug == "documentation" %} class="active"{% endif %}>
-                    <a href="{{ site.baseurl }}/documentation/">{% t pages.documentation.title %}</a>
+                    <a href="../documentation/">{% t pages.documentation.title %}</a>
                 </li>
                 <li class="dropdown" {% if page.slug == "examples" %} class="active"{% endif %}>
                     <a href="javascript:" data-toggle="dropdown">
@@ -25,17 +25,17 @@
                     </a>
                     <ul class="dropdown-menu">
                         <li><a href="http://issues.wenzhixin.net.cn/bootstrap-table/" target="_blank">{% t pages.examples.title %}</a></li>
-                        <li><a href="{{ site.baseurl }}/examples/">jsFiddle Examples</a></li>
+                        <li><a href="https://github.com/wenzhixin/bootstrap-table/issues/1765">jsFiddle Examples</a></li>
                     </ul>
                 </li>
                 <li {% if page.slug == "extensions" %} class="active"{% endif %}>
-                    <a href="{{ site.baseurl }}/extensions/">{% t pages.extensions.title %}</a>
+                    <a href="../extensions/">{% t pages.extensions.title %}</a>
                 </li>
                 <li {% if page.slug == "donate" %} class="active"{% endif %}>
-                    <a href="{{ site.baseurl }}/donate/">{% t pages.donate.title %}</a>
+                    <a href="../donate/">{% t pages.donate.title %}</a>
                 </li>
                 <li {% if page.slug == "faq" %} class="active"{% endif %}>
-                    <a href="{{ site.baseurl }}/faq/">{% t pages.faq.title %}</a>
+                    <a href="../faq/">{% t pages.faq.title %}</a>
                 </li>
                 <li>
                     <a href="{{ site.repo }}" target="_blank">GitHub</a>

docs/assets/js/common.js

@@ -5,6 +5,9 @@ $(function () {
         .text('Edit on GitHub');
 
     // languages
+    var currentLanguage = 'en';
+    var baseDir = '../';
+    var pathDir = location.href.replace(/\/$/, '').split('/').pop();
     $('[data-language]').each(function (i) {
         var $this = $(this),
             language = $this.data('language');
@@ -13,13 +16,20 @@ $(function () {
         if (i === 0) {
             $this.addClass('active');
         }
-
-        $this.find('a').attr('href', '/' + (language === 'en' ? '' : language));
-        if (location.href.indexOf(language) !== -1) {
+        if (location.href.indexOf('/' + language + '/') !== -1) {
             $this.addClass('active').siblings().removeClass('active');
             $('.language').text($(this).text());
+            currentLanguage = language
         }
     });
+    if (currentLanguage !== 'en') {
+        baseDir = '../../'
+    }
+    $('[data-language]').each(function (i) {
+        var language = $(this).data('language');
+        $(this).find('a').attr('href', baseDir +
+            (language === 'en' ? '' : language + '/') + pathDir);
+    });
 
     // examples
     $('#examples').load('/wenzhixin/bootstrap-table/issues/1765 #issue-119870991 .comment-body', function () {

docs/examples.md

@@ -1,8 +0,0 @@
----
-layout: default
-title: pages.examples.title
-slug: examples
-lead: pages.examples.lead
----
-
-<div id="examples">Loading...</div>

docs/index.html

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>Boostrap Table</title>
+</head>
+<body>
+    <script>location.href = 'home'</script>
+</body>
+</html>