Skip to content

Commit

Permalink
Fix baseurl issue, as per github/pages-gem#350; now using {{ site.url…
Browse files Browse the repository at this point in the history 
… }}/ in all pages
  • Loading branch information
@glimmerphoenix
glimmerphoenix committed Nov 30, 2018
1 parent 99019fd commit d1b7361
Show file tree
Hide file tree
Showing 7 changed files with 104 additions and 104 deletions.
4 changes: 2 additions & 2 deletions 404.html
View file
Expand Up @@ -7,7 +7,7 @@

<!-- main-container start -->
<!-- ================ -->
<div class="main-container parallax jumbotron border-clear light-translucent-bg text-center margin-clear" style="background-image:url('{{ site.baseurl }}images/fractal_storm.jpg');">
<div class="main-container parallax jumbotron border-clear light-translucent-bg text-center margin-clear" style="background-image:url('{{ site.url }}/images/fractal_storm.jpg');">
<div class="container">
<div class="row">
<!-- main start -->
Expand All @@ -18,7 +18,7 @@ <h2>Ooops! Page Not Found</h2>
<p>
The requested URL was not found on this server. Make sure that the URL displayed in the address bar of your browser is spelled and formatted correctly.
</p>
<a href="{{ site.baseurl }}" class="btn btn-default btn-animated btn-lg">Return Home <i class="fa fa-home"></i></a>
<a href="{{ site.url }}/" class="btn btn-default btn-animated btn-lg">Return Home <i class="fa fa-home"></i></a>
</div>
<!-- main end -->
</div>
Expand Down
86 changes: 43 additions & 43 deletions _includes/footer.html
View file
Expand Up @@ -10,17 +10,17 @@
<div class="row">
<div class="col-md-3">
<div class="footer-content">
<div class="logo-footer"><img id="logo-footer" src="{{ site.baseurl }}images/DSLab_logo_ neg.png" alt="DSLab URJC">
<div class="logo-footer"><img id="logo-footer" src="{{ site.url }}/images/DSLab_logo_ neg.png" alt="DSLab URJC">
</div>
<p>
URJC DSLAB is integrated in CETINIA (Centre for Intelligent Information Technologies), at University Rey Juan
Carlos. <a href="{{ site.baseurl }}about">Learn More<i class="fa fa-long-arrow-right pl-5"></i></a>
Carlos. <a href="{{ site.url }}/about">Learn More<i class="fa fa-long-arrow-right pl-5"></i></a>
</p>
<div class="separator-2"></div>
<nav>
<ul class="nav nav-pills nav-stacked">
<li>
<a href="{{ site.baseurl }}about">About</a>
<a href="{{ site.url }}/about">About</a>
</li>
<li>
<a href="http://www.masterdatascience.es">Master in Data Science</a>
Expand All @@ -32,7 +32,7 @@
<a href="http://www.urjc.es">URJC</a>
</li>
<li>
<a href="{{ site.baseurl }}credits">Credits</a>
<a href="{{ site.url }}/credits">Credits</a>
</li>
</ul>
</nav>
Expand All @@ -45,12 +45,12 @@ <h2 class="title">Latest From Blog</h2>
<div class="media margin-clear">
<div class="media-left">
<div class="overlay-container">
<img class="media-object" src="{{ site.baseurl }}images/logo_master.jpg" alt="Master-Data-Science-URJC">
<a href="{{ site.baseurl }}blog/test-post" class="overlay-link small"><i class="fa fa-link"></i></a>
<img class="media-object" src="{{ site.url }}/images/logo_master.jpg" alt="Master-Data-Science-URJC">
<a href="{{ site.url }}/blog/test-post" class="overlay-link small"><i class="fa fa-link"></i></a>
</div>
</div>
<div class="media-body">
<h6 class="media-heading"><a href="{{ site.baseurl }}blog/test-post">Registration is open for Master in Data Science 2016-2017...</a></h6>
<h6 class="media-heading"><a href="{{ site.url }}/blog/test-post">Registration is open for Master in Data Science 2016-2017...</a></h6>
<p class="small margin-clear">
<i class="fa fa-calendar pr-10"></i>Apr 8, 2016
</p>
Expand All @@ -60,12 +60,12 @@ <h6 class="media-heading"><a href="{{ site.baseurl }}blog/test-post">Registratio
<div class="media margin-clear">
<div class="media-left">
<div class="overlay-container">
<img class="media-object" src="{{ site.baseurl }}images/spark_logo.jpg" alt="Spark-logo">
<a href="{{ site.baseurl }}blog/test-post" class="overlay-link small"><i class="fa fa-link"></i></a>
<img class="media-object" src="{{ site.url }}/images/spark_logo.jpg" alt="Spark-logo">
<a href="{{ site.url }}/blog/test-post" class="overlay-link small"><i class="fa fa-link"></i></a>
</div>
</div>
<div class="media-body">
<h6 class="media-heading"><a href="{{ site.baseurl }}blog/test-post">Introducing GraphFrames in Spark...</a></h6>
<h6 class="media-heading"><a href="{{ site.url }}/blog/test-post">Introducing GraphFrames in Spark...</a></h6>
<p class="small margin-clear">
<i class="fa fa-calendar pr-10"></i>Mar 4, 2016
</p>
Expand All @@ -75,12 +75,12 @@ <h6 class="media-heading"><a href="{{ site.baseurl }}blog/test-post">Introducing
<div class="media margin-clear">
<div class="media-left">
<div class="overlay-container">
<img class="media-object" src="{{ site.baseurl }}images/mapr_logo.jpg" alt="MapR-logo">
<a href="{{ site.baseurl }}blog/test-post" class="overlay-link small"><i class="fa fa-link"></i></a>
<img class="media-object" src="{{ site.url }}/images/mapr_logo.jpg" alt="MapR-logo">
<a href="{{ site.url }}/blog/test-post" class="overlay-link small"><i class="fa fa-link"></i></a>
</div>
</div>
<div class="media-body">
<h6 class="media-heading"><a href="{{ site.baseurl }}blog/test-post">MapR launches Spark certification program...</a></h6>
<h6 class="media-heading"><a href="{{ site.url }}/blog/test-post">MapR launches Spark certification program...</a></h6>
<p class="small margin-clear">
<i class="fa fa-calendar pr-10"></i>Feb 25, 2016
</p>
Expand All @@ -98,38 +98,38 @@ <h2 class="title">Areas of Application</h2>
<div class="row grid-space-10">
<div class="col-xs-4 col-md-6">
<div class="overlay-container mb-10">
<img src="{{ site.baseurl }}images/high_voltage_small.jpg" alt="Energy Efficiency">
<a href="{{ site.baseurl }}research/projects" class="overlay-link small"> <i class="fa fa-link"></i> </a>
<img src="{{ site.url }}/images/high_voltage_small.jpg" alt="Energy Efficiency">
<a href="{{ site.url }}/research/projects" class="overlay-link small"> <i class="fa fa-link"></i> </a>
</div>
</div>
<div class="col-xs-4 col-md-6">
<div class="overlay-container mb-10">
<img src="{{ site.baseurl }}images/letters_small.jpg" alt="Text mining / opinion mining">
<a href="{{ site.baseurl }}research/projects" class="overlay-link small"> <i class="fa fa-link"></i> </a>
<img src="{{ site.url }}/images/letters_small.jpg" alt="Text mining / opinion mining">
<a href="{{ site.url }}/research/projects" class="overlay-link small"> <i class="fa fa-link"></i> </a>
</div>
</div>
<div class="col-xs-4 col-md-6">
<div class="overlay-container mb-10">
<img src="{{ site.baseurl }}images/3D_user_network_small.jpg" alt="Online communities and social networks">
<a href="{{ site.baseurl }}research/projects" class="overlay-link small"> <i class="fa fa-link"></i> </a>
<img src="{{ site.url }}/images/3D_user_network_small.jpg" alt="Online communities and social networks">
<a href="{{ site.url }}/research/projects" class="overlay-link small"> <i class="fa fa-link"></i> </a>
</div>
</div>
<div class="col-xs-4 col-md-6">
<div class="overlay-container mb-10">
<img src="{{ site.baseurl }}images/fingerprint_small.jpg" alt="Border control">
<a href="{{ site.baseurl }}research/projects" class="overlay-link small"> <i class="fa fa-link"></i> </a>
<img src="{{ site.url }}/images/fingerprint_small.jpg" alt="Border control">
<a href="{{ site.url }}/research/projects" class="overlay-link small"> <i class="fa fa-link"></i> </a>
</div>
</div>
<div class="col-xs-4 col-md-6">
<div class="overlay-container mb-10">
<img src="{{ site.baseurl }}images/video_surveillance_small.jpg" alt="Video surveillance">
<a href="{{ site.baseurl }}research/projects" class="overlay-link small"> <i class="fa fa-link"></i> </a>
<img src="{{ site.url }}/images/video_surveillance_small.jpg" alt="Video surveillance">
<a href="{{ site.url }}/research/projects" class="overlay-link small"> <i class="fa fa-link"></i> </a>
</div>
</div>
<div class="col-xs-4 col-md-6">
<div class="overlay-container mb-10">
<img src="{{ site.baseurl }}images/cloud_security_small.jpg" alt="">
<a href="{{ site.baseurl }}research/projects" class="overlay-link small"> <i class="fa fa-link"></i> </a>
<img src="{{ site.url }}/images/cloud_security_small.jpg" alt="">
<a href="{{ site.url }}/research/projects" class="overlay-link small"> <i class="fa fa-link"></i> </a>
</div>
</div>
</div>
Expand Down Expand Up @@ -215,35 +215,35 @@ <h2 class="title">Find Us</h2>
<!-- JavaScript files placed at the end of the document so the pages load faster -->
<!-- ================================================== -->
<!-- Jquery and Bootstap core js files -->
<script type="text/javascript" src="{{ site.baseurl }}plugins/jquery.min.js"></script>
<script type="text/javascript" src="{{ site.baseurl }}bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="{{ site.url }}/plugins/jquery.min.js"></script>
<script type="text/javascript" src="{{ site.url }}/bootstrap/js/bootstrap.min.js"></script>
<!-- Modernizr javascript -->
<script type="text/javascript" src="{{ site.baseurl }}plugins/modernizr.js"></script>
<script type="text/javascript" src="{{ site.url }}/plugins/modernizr.js"></script>
<!-- jQuery Revolution Slider -->
<script type="text/javascript" src="{{ site.baseurl }}plugins/rs-plugin/js/jquery.themepunch.tools.min.js"></script>
<script type="text/javascript" src="{{ site.baseurl }}plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
<script type="text/javascript" src="{{ site.url }}/plugins/rs-plugin/js/jquery.themepunch.tools.min.js"></script>
<script type="text/javascript" src="{{ site.url }}/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
<!-- Isotope javascript -->
<script type="text/javascript" src="{{ site.baseurl }}plugins/isotope/isotope.pkgd.min.js"></script>
<script type="text/javascript" src="{{ site.url }}/plugins/isotope/isotope.pkgd.min.js"></script>
<!-- Magnific Popup javascript -->
<script type="text/javascript" src="{{ site.baseurl }}plugins/magnific-popup/jquery.magnific-popup.min.js"></script>
<script type="text/javascript" src="{{ site.url }}/plugins/magnific-popup/jquery.magnific-popup.min.js"></script>
<!-- Appear javascript -->
<script type="text/javascript" src="{{ site.baseurl }}plugins/waypoints/jquery.waypoints.min.js"></script>
<script type="text/javascript" src="{{ site.url }}/plugins/waypoints/jquery.waypoints.min.js"></script>
<!-- Count To javascript -->
<script type="text/javascript" src="{{ site.baseurl }}plugins/jquery.countTo.js"></script>
<script type="text/javascript" src="{{ site.url }}/plugins/jquery.countTo.js"></script>
<!-- Parallax javascript -->
<script src="{{ site.baseurl }}plugins/jquery.parallax-1.1.3.js"></script>
<script src="{{ site.url }}/plugins/jquery.parallax-1.1.3.js"></script>
<!-- Contact form -->
<script src="{{ site.baseurl }}plugins/jquery.validate.js"></script>
<script src="{{ site.url }}/plugins/jquery.validate.js"></script>
<!-- Morphext -->
<script type="text/javascript" src="{{ site.baseurl }}plugins/morphext/morphext.min.js"></script>
<script type="text/javascript" src="{{ site.url }}/plugins/morphext/morphext.min.js"></script>
<!-- Background Video -->
<script src="{{ site.baseurl }}plugins/vide/jquery.vide.js"></script>
<script src="{{ site.url }}/plugins/vide/jquery.vide.js"></script>
<!-- Owl carousel javascript -->
<script type="text/javascript" src="{{ site.baseurl }}plugins/owl-carousel/owl.carousel.js"></script>
<script type="text/javascript" src="{{ site.url }}/plugins/owl-carousel/owl.carousel.js"></script>
<!-- SmoothScroll javascript -->
<script type="text/javascript" src="{{ site.baseurl }}plugins/jquery.browser.js"></script>
<script type="text/javascript" src="{{ site.baseurl }}plugins/SmoothScroll.js"></script>
<script type="text/javascript" src="{{ site.url }}/plugins/jquery.browser.js"></script>
<script type="text/javascript" src="{{ site.url }}/plugins/SmoothScroll.js"></script>
<!-- Initialization of Plugins -->
<script type="text/javascript" src="{{ site.baseurl }}js/template.js"></script>
<script type="text/javascript" src="{{ site.url }}/js/template.js"></script>
<!-- Custom Scripts -->
<script type="text/javascript" src="{{ site.baseurl }}js/custom.js"></script>
<script type="text/javascript" src="{{ site.url }}/js/custom.js"></script>
28 changes: 14 additions & 14 deletions _includes/head.html
View file
Expand Up @@ -14,7 +14,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<!-- Favicon -->
<link rel="shortcut icon" href="{{ site.baseurl }}images/favicon.ico">
<link rel="shortcut icon" href="{{ site.url }}/images/favicon.ico">

<!-- Web Fonts -->
<link href='http://fonts.googleapis.com/css?family=Roboto:400,300,300italic,400italic,500,500italic,700,700italic' rel='stylesheet' type='text/css'>
Expand All @@ -23,28 +23,28 @@
<link href='http://fonts.googleapis.com/css?family=PT+Serif' rel='stylesheet' type='text/css'>

<!-- Bootstrap core CSS -->
<link href="{{ site.baseurl }}bootstrap/css/bootstrap.css" rel="stylesheet">
<link href="{{ site.url }}/bootstrap/css/bootstrap.css" rel="stylesheet">

<!-- Font Awesome CSS -->
<link href="{{ site.baseurl }}fonts/font-awesome/css/font-awesome.css" rel="stylesheet">
<link href="{{ site.url }}/fonts/font-awesome/css/font-awesome.css" rel="stylesheet">

<!-- Fontello CSS -->
<link href="{{ site.baseurl }}fonts/fontello/css/fontello.css" rel="stylesheet">
<link href="{{ site.url }}/fonts/fontello/css/fontello.css" rel="stylesheet">

<!-- Plugins -->
<link href="{{ site.baseurl }}plugins/magnific-popup/magnific-popup.css" rel="stylesheet">
<link href="{{ site.baseurl }}plugins/rs-plugin/css/settings.css" rel="stylesheet">
<link href="{{ site.baseurl }}css/animations.css" rel="stylesheet">
<link href="{{ site.baseurl }}plugins/owl-carousel/owl.carousel.css" rel="stylesheet">
<link href="{{ site.baseurl }}plugins/owl-carousel/owl.transitions.css" rel="stylesheet">
<link href="{{ site.baseurl }}plugins/hover/hover-min.css" rel="stylesheet">
<link href="{{ site.baseurl }}plugins/morphext/morphext.css" rel="stylesheet">
<link href="{{ site.url }}/plugins/magnific-popup/magnific-popup.css" rel="stylesheet">
<link href="{{ site.url }}/plugins/rs-plugin/css/settings.css" rel="stylesheet">
<link href="{{ site.url }}/css/animations.css" rel="stylesheet">
<link href="{{ site.url }}/plugins/owl-carousel/owl.carousel.css" rel="stylesheet">
<link href="{{ site.url }}/plugins/owl-carousel/owl.transitions.css" rel="stylesheet">
<link href="{{ site.url }}/plugins/hover/hover-min.css" rel="stylesheet">
<link href="{{ site.url }}/plugins/morphext/morphext.css" rel="stylesheet">

<!-- The Project core CSS file -->
<link href="{{ site.baseurl }}css/style.css" rel="stylesheet" >
<link href="{{ site.url }}/css/style.css" rel="stylesheet" >
<!-- Color Scheme (In order to change the color scheme, replace the blue.css with the color scheme that you prefer)-->
<link href="{{ site.baseurl }}css/skins/blue.css" rel="stylesheet">
<link href="{{ site.url }}/css/skins/blue.css" rel="stylesheet">

<!-- Custom css -->
<link href="{{ site.baseurl }}css/custom.css" rel="stylesheet">
<link href="{{ site.url }}/css/custom.css" rel="stylesheet">
</head>
26 changes: 13 additions & 13 deletions _includes/navbar.html
View file
Expand Up @@ -124,7 +124,7 @@

<!-- logo -->
<div id="logo" class="logo">
<a href="{{ site.baseurl }}"><img id="DSLab_logo" src="{{ site.baseurl }}images/DSLab_logo.png" alt="Data Science Lab"></a>
<a href="{{ site.url }}/"><img id="DSLab_logo" src="{{ site.url }}/images/DSLab_logo.png" alt="Data Science Lab"></a>
</div>

<!-- name-and-slogan -->
Expand Down Expand Up @@ -173,18 +173,18 @@

<!-- menu start Home -->
<li class="active">
<a href="{{ site.baseurl }}">Home</a>
<a href="{{ site.url }}/">Home</a>
</li>
<!-- menu end -->
<!-- menu start About-->
<li class="dropdown ">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">About</a>
<ul class="dropdown-menu">
<li>
<a href="{{ site.baseurl }}about">About Us</a>
<a href="{{ site.url }}/about">About Us</a>
</li>
<li>
<a href="{{ site.baseurl }}about/people">People</a>
<a href="{{ site.url }}/about/people">People</a>
</li>
</ul>
</li>
Expand All @@ -197,7 +197,7 @@
<a href="http://www.masterdatascience.es">Master in Data Science</a>
</li>
<li>
<a href="{{ site.baseurl }}education/courses">Courses</a>
<a href="{{ site.url }}/education/courses">Courses</a>
</li>
</ul>
</li>
Expand All @@ -207,40 +207,40 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Research</a>
<ul class="dropdown-menu">
<li>
<a href="{{ site.baseurl }}research">Research lines</a>
<a href="{{ site.url }}/research">Research lines</a>
</li>
<li>
<a href="{{ site.baseurl }}research/projects">Projects</a>
<a href="{{ site.url }}/research/projects">Projects</a>
</li>
<li>
<a href="{{ site.baseurl }}research/publications">Publications</a>
<a href="{{ site.url }}/research/publications">Publications</a>
</li>
</ul>
</li>
<!-- menu end -->
<!-- menu start Consulting -->
<li>
<a href="{{ site.baseurl }}consulting">Consulting</a>
<a href="{{ site.url }}/consulting">Consulting</a>
</li>
<!-- menu end -->
<!-- menu start Parnters -->
<li>
<a href="{{ site.baseurl }}partners">Partners</a>
<a href="{{ site.url }}/partners">Partners</a>
</li>
<!-- menu end -->
<!-- menu start Blog -->
<li class="dropdown ">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Blog</a>
<ul class="dropdown-menu">
<li>
<a href="{{ site.baseurl }}blog" class="dropdown-toggle" data-toggle="dropdown">Blog Home</a>
<a href="{{ site.url }}/blog" class="dropdown-toggle" data-toggle="dropdown">Blog Home</a>
</li>
<!--
<li>
<a href="{{ site.baseurl }}blog/masonry">Masonry</a>
<a href="{{ site.url }}/blog/masonry">Masonry</a>
</li>
<li>
<a href="{{ site.baseurl }}blog/timeline">Timeline</a>
<a href="{{ site.url }}/blog/timeline">Timeline</a>
</li>
-->
</ul>
Expand Down

0 comments on commit d1b7361

Please sign in to comment.