fixes

irublev · irublev · commit b91742d310a8 · 2017-06-16T22:12:52.000+03:00
diff --git a/404.html b/404.html
@@ -14,7 +14,7 @@ <h1 class="post-title">{{ page.title }}</h1>
       </header>
       <div class="page">
         <h1 class="page-title">{{title}}</h1>
-        <p class="lead">Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. <a href="{{ site.url }}{{ site.baseurl }}">Head back home</a> to try finding it again.</p>
+        <p class="lead">Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. <a href="{{ site.baseurl }}">Head back home</a> to try finding it again.</p>
       </div>
     </div>
   </div>
diff --git a/_config.yml b/_config.yml
@@ -1,4 +1,4 @@
-url: "https://irublev.github.io"
+url: "https://irublev.github.io/pgmex-blog"
 baseurl: "/pgmex-blog"
 title: PgMex Blog
 description: >
diff --git a/_includes/archive_post.html b/_includes/archive_post.html
@@ -10,7 +10,7 @@ <h3 id="{{ this_year }}-{{ this_month }}-ref">{{ this_month }}</h3>
     {% endif %}
 
 	<li>		
-		<span class="title"><a href="{{ post.url }}">{{post.title}}</a></span>
+		<span class="title"><a href="{{ post.url | prepend: site.baseurl }}">{{post.title}}</a></span>
 	</li>
 
     {% if forloop.last %}
diff --git a/_includes/categories_feed.xml b/_includes/categories_feed.xml
@@ -5,10 +5,10 @@ layout: nil
 <feed xmlns="http://www.w3.org/2005/Atom">
 
   <title><![CDATA[{% if site.titlecase %}{{ page.title | titlecase | cdata_escape }}{% else %}{{ page.title | cdata_escape }}{% endif %} | {{ site.title | cdata_escape }}]]></title>
-  <link href="{{ site.url }}{{ site.baseurl }}/{{ page.feed_url }}" rel="self"/>
-  <link href="{{ site.url }}{{ site.baseurl }}/"/>
+  <link href="{{ site.url }}/{{ page.feed_url }}" rel="self"/>
+  <link href="{{ site.url }}/"/>
   <updated>{{ site.time | date_to_xmlschema }}</updated>
-  <id>{{ site.url }}{{ site.baseurl }}/</id>
+  <id>{{ site.url }}/</id>
   <author>
     <name><![CDATA[{{ site.author | strip_html }}]]></name>
     {% if site.email %}<email><![CDATA[{{ site.email }}]]></email>{% endif %}
@@ -18,9 +18,9 @@ layout: nil
   {% for post in site.categories[page.category] limit: 5 %}
   <entry>
     <title type="html"><![CDATA[{% if site.titlecase %}{{ post.title | titlecase | cdata_escape }}{% else %}{{ post.title | cdata_escape }}{% endif %}]]></title>
-    <link href="{{ site.url }}{{ site.baseurl }}{{ post.url }}"/>
+    <link href="{{ site.url }}{{ post.url }}"/>
     <updated>{{ post.date | date_to_xmlschema }}</updated>
-    <id>{{ site.url }}{{ site.baseurl }}{{ post.id }}</id>
+    <id>{{ site.url }}{{ post.id }}</id>
     <content type="html"><![CDATA[{{ post.content | expand_urls: site.url | markdownify | cdata_escape }}]]></content>
   </entry>
   {% endfor %}
diff --git a/_includes/footer-scripts.html b/_includes/footer-scripts.html
@@ -1,6 +1,6 @@
 <script src="https://code.jquery.com/jquery-2.2.2.min.js" integrity="sha256-36cp2Co+/62rEAAYHLmRCPIych47CvdM+uTBJwSzWjI=" crossorigin="anonymous"></script> 
 <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script>
-<script src="{{ site.url }}{{ site.baseurl }}/js/main.js"></script>
+<script src="{{ site.baseurl }}/js/main.js"></script>
 
 {% if site.google_analytics %}
 <script>
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -91,7 +91,7 @@
         Blog content is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
         Unless otherwise stated or granted, code samples licensed under the MIT license.
         <br/>  
-        <!-- <a href="{{ site.url }}{{ site.baseurl }}/privacy">privacy</a> | <a href="{{ site.url }}{{ site.baseurl }}/blogtegrity">blogtegrity</a>  -->
+        <!-- <a href="{{ site.baseurl }}/privacy">privacy</a> | <a href="{{ site.baseurl }}/blogtegrity">blogtegrity</a>  -->
       </p>
       <p class="theme-by text-muted">
         Site design is based on 
diff --git a/_includes/head.html b/_includes/head.html
@@ -18,7 +18,7 @@
   <link rel="alternate" type="application/rss+xml" title="{{ site.title }} - {{ site.description }}" href="http://feeds.feedburner.com/AlliedTesting" />
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css" integrity="sha384-XdYbMnZ/QjLh6iI4ogqCTaIjrFk87ip+ekIjefZch0Y+PvJ8CDYtEs1ipDmPorQ+" crossorigin="anonymous">
-  <link rel="stylesheet" href="{{ site.url }}{{ site.baseurl }}/css/main.css">
+  <link rel="stylesheet" href="{{ site.baseurl }}/css/main.css">
   <link href='https://fonts.googleapis.com/css?family=Titillium+Web:400,700' rel='stylesheet' type='text/css'>
   {% seo %}
 </head>
diff --git a/_includes/nav.html b/_includes/nav.html
@@ -7,7 +7,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="{{ site.url }}{{ site.baseurl }}">{{ site.title }}</a>
+      <a class="navbar-brand" href="{{ site.url }}">{{ site.title }}</a>
     </div>
     <!-- <div class="navbar-header">
       <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#main-navbar" area-expanded="false">
@@ -17,21 +17,21 @@
         <span class="icon-bar"></span>
       </button>
       {% if site.title-img and site.subtitle-img %}
-        <a class="navbar-brand navbar-brand-logo" href="{{ site.url }}{{ site.baseurl }}">
+        <a class="navbar-brand navbar-brand-logo" href="{{ site.url }}">
           <img style=" float:left; display:inline" src="/img/{{ site.title-img }}" hspace=5px/>
           <img style=" float:left; display:inline" src="/img/{{ site.subtitle-img }}" hspace=5px/>
         </a>
       {% elsif site.title-img %}
-        <a class="navbar-brand navbar-brand-logo" href="{{ site.url }}{{ site.baseurl }}"><img src="/img/{{ site.title-img }}"/></a>
+        <a class="navbar-brand navbar-brand-logo" href="{{ site.url }}"><img src="/img/{{ site.title-img }}"/></a>
       {% else %}
-        <a class="navbar-brand" href="{{ site.url }}{{ site.baseurl }}">{{ site.title }}</a>
+        <a class="navbar-brand" href="{{ site.url }}">{{ site.title }}</a>
       {% endif %}
     </div> -->
 
     <div class="collapse navbar-collapse" id="main-navbar">
       <ul class="nav navbar-nav navbar-right">
         <li class="sidebar-nav-item{% if page.url == site.url %} active{% endif %}">
-          <a href="{{ site.url }}{{ site.baseurl }}">Home{% if page.url == site.url %} <span class="sr-only">(current)</span>{% endif %}</a>
+          <a href="{{ site.url }}">Home{% if page.url == site.url %} <span class="sr-only">(current)</span>{% endif %}</a>
         </li>
         
         {% comment %}
@@ -55,7 +55,7 @@
 	{% if site.gravatar and (layout.show-avatar or page.show-avatar) %}
 	<div class="avatar-container">
 	  <div class="avatar-img-border">
-	    <a href="{{ site.url }}{{ site.baseurl }}">
+	    <a href="{{ site.url }}">
 	      <img class="avatar-img" src="http://www.gravatar.com/avatar/{{ site.gravatar.hash }}?s={{ site.gravatar.size }}" />
             </a>
 	  </div>
diff --git a/_includes/post/comments_link.html b/_includes/post/comments_link.html
@@ -5,5 +5,5 @@
     {% assign disqus_identifier = page.disqus_identifier %}
   {% endif %}
   
-  <li><span class="fa fa-comment"></span> <a href="{{ post.url }}#disqus_thread"{% if disqus_identifier %} data-disqus-identifier="{{ disqus_identifier }}"{% endif %}> comments</a></li>
+  <li><span class="fa fa-comment"></span> <a href="{{ post.url | prepend: site.baseurl }}#disqus_thread"{% if disqus_identifier %} data-disqus-identifier="{{ disqus_identifier }}"{% endif %}> comments</a></li>
 {% endif %}
diff --git a/_layouts/post.html b/_layouts/post.html
@@ -18,12 +18,12 @@ <h1 class="post-title">{{ page.title }}</h1>
       <ul class="pager blog-pager">
         {% if page.previous.url %}
           <li class="previous">
-            <a href="{{ page.previous.url | replace: '//', '/' }}" data-toggle="tooltip" data-placement="top" title="{{page.previous.title}}">&larr; Previous Post</a>
+            <a href="{{ page.previous.url | prepend: site.baseurl | replace: '//', '/' }}" data-toggle="tooltip" data-placement="top" title="{{page.previous.title}}">&larr; Previous Post</a>
           </li>
         {% endif %}
         {% if page.next.url %}
           <li class="next">
-            <a href="{{ page.next.url | replace: '//', '/' }}" data-toggle="tooltip" data-placement="top" title="{{page.next.title}}">Next Post &rarr;</a>
+            <a href="{{ page.next.url | prepend: site.baseurl | replace: '//', '/' }}" data-toggle="tooltip" data-placement="top" title="{{page.next.title}}">Next Post &rarr;</a>
           </li>
         {% endif %}
       </ul>
diff --git a/about.md b/about.md
@@ -6,7 +6,7 @@ permalink: /about/
 
 <div style="text-align:center">
   <a href="{{ site.author.url }}">
-    <img src="{{ site.url }}{{ site.baseurl }}/img/allied_logo.jpg" class="profile-picture" width="256">
+    <img src="{{ site.baseurl }}/img/allied_logo.jpg" class="profile-picture" width="256">
   </a>
 </div>
 
diff --git a/index.html b/index.html
@@ -13,11 +13,11 @@
       <div class="posts-list">
         {% for post in paginator.posts %}
         <article class="post-preview">
-          <h2 class="post-title"><a href="{{ post.url }}">{{ post.title }}</a></h2>
+          <h2 class="post-title"><a href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a></h2>
           {% include post/meta.html %}      
           <div class="post-entry">
             {{ post.content | truncatewords: 50 | strip_html | xml_escape}}
-          <a href="{{ post.url }}" class="post-read-more">[Read&nbsp;More]</a>
+          <a href="{{ post.url | prepend: site.baseurl }}" class="post-read-more">[Read&nbsp;More]</a>
           </div>
         
         </article>
@@ -28,12 +28,12 @@ <h2 class="post-title"><a href="{{ post.url }}">{{ post.title }}</a></h2>
       <ul class="pager main-pager">
         {% if paginator.previous_page %}
         <li class="previous">
-          <a href="{{ paginator.previous_page_path | replace: '//', '/' }}">&larr; Newer Posts</a>
+          <a href="{{ paginator.previous_page_path | prepend: site.baseurl | replace: '//', '/' }}">&larr; Newer Posts</a>
         </li>
         {% endif %}
         {% if paginator.next_page %}
         <li class="next">
-          <a href="{{ paginator.next_page_path | replace: '//', '/' }}">Older Posts &rarr;</a>
+          <a href="{{ paginator.next_page_path | prepend: site.baseurl | replace: '//', '/' }}">Older Posts &rarr;</a>
         </li>
         {% endif %}
       </ul>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-url: "https://irublev.github.io"`
	`1`	`+url: "https://irublev.github.io/pgmex-blog"`
`2`	`2`	`baseurl: "/pgmex-blog"`
`3`	`3`	`title: PgMex Blog`
`4`	`4`	`description: >`