Skip to content

Commit

Permalink
Merge pull request #810 from L4co77/Change-announcement-on-MoveIt-pag…
Browse files Browse the repository at this point in the history
…e-#1387

#1387 - Change announcement on MoveIt page
  • Loading branch information
shanehenrik committed Jul 12, 2023
2 parents 16357be + 1ca3935 commit 475cd31
Show file tree
Hide file tree
Showing 10 changed files with 176 additions and 163 deletions.
25 changes: 19 additions & 6 deletions _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@
</a>
<p>
Brought to you by
<a href="https://picknik.ai/?utm_source=moveit" target="_blank">PickNik Robotics</a>
<a href="https://picknik.ai/?utm_source=moveit" target="_blank"
>PickNik Robotics</a
>
</p>
<p>
Check out our
<a href="https://picknik.ai/studio/" target="_blank">MoveIt Developer Platform</a>
<a href="https://picknik.ai/studio/" target="_blank"
>MoveIt Developer Platform</a
>
</p>
<a class="button" href="/install">INSTALL NOW</a>
</div>
Expand All @@ -32,7 +36,9 @@ <h4>INSTALL</h4>
<h4>DOCS</h4>
<ul>
<li>
<a target="_blank" href="https://moveit.picknik.ai/">Tutorials</a>
<a target="_blank" href="https://moveit.picknik.ai/"
>Tutorials</a
>
</li>
<li>
<a href="/documentation/applications/">Applications</a>
Expand Down Expand Up @@ -87,7 +93,9 @@ <h4>CONTRIBUTE</h4>
<a href="/events/world-moveit-day-2022/">World MoveIt Day</a>
</li>
<li>
<a href="/documentation/contributing/pullrequests/">Pull Requests</a>
<a href="/documentation/contributing/pullrequests/"
>Pull Requests</a
>
</li>
<li>
<a href="/documentation/contributing/code/">Development</a>
Expand All @@ -97,10 +105,15 @@ <h4>CONTRIBUTE</h4>
</div>
</div>
<div class="col-xs-12 col-sm-12 footer-last-link">
<a href="https://github.com/ros-planning/moveit.ros.org">Edit website on <span class="color-blue">Github</span></a>
<a href="https://github.com/ros-planning/moveit.ros.org"
>Edit website on <span class="color-blue">Github</span></a
>
</div>
</div>
</div>
<script type="text/javascript" src="https://www.youtube.com/iframe_api"></script>
<script
type="text/javascript"
src="https://www.youtube.com/iframe_api"
></script>
<script type="text/javascript" src="/assets/js/main.js"></script>
</footer>
16 changes: 8 additions & 8 deletions _layouts/blog.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{% include default.html %}

<body>
{% include nav-bar.html %}
<div class="container container-blog">
{{ content }}
</div>
</body>
{% include footer.html %}
<body>
{% include nav-bar.html %}
<div class="container container-blog">
{{ content }}
</div>
{% include footer.html %}
</body>
</html>
28 changes: 14 additions & 14 deletions _layouts/contribution-guide.html
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{% include default.html %}

<body>
{% include nav-bar.html %}
<div class="container">
<div class="sub-pages section">
<div class='row'>
<div class='col-sm-12'>
<div class='row no-gutters'>
{% include contribution-guide-nav.html %}
<div class="rectangle-boarder-big col-9 col-sm-9">
{% include moveit-anchors.html html=content %}
<body>
{% include nav-bar.html %}
<div class="container">
<div class="sub-pages section">
<div class='row'>
<div class='col-sm-12'>
<div class='row no-gutters'>
{% include contribution-guide-nav.html %}
<div class="rectangle-boarder-big col-9 col-sm-9">
{% include moveit-anchors.html html=content %}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</body>
{% include footer.html %}
{% include footer.html %}
</body>
</html>
14 changes: 7 additions & 7 deletions _layouts/homepage.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% include default.html %}

<body class="black">
{% include announcement-banner.html %}
{% include nav-bar.html homepage=true %}
{{ content }}
</body>
{% include footer.html %}
<body class="black">
{% include announcement-banner.html %}
{% include nav-bar.html homepage=true %}
{{ content }}
{% include footer.html %}
</body>
</html>
28 changes: 14 additions & 14 deletions _layouts/install.html
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{% include default.html %}

<body>
{% include nav-bar.html %}
<div class="container">
<div class="sub-pages section">
<div class='row'>
<div class='col-sm-12'>
<div class='row no-gutters'>
{% include install-nav.html %}
<div class="rectangle-boarder-big col-9 col-sm-9">
{% include moveit-anchors.html html=content %}
<body>
{% include nav-bar.html %}
<div class="container">
<div class="sub-pages section">
<div class='row'>
<div class='col-sm-12'>
<div class='row no-gutters'>
{% include install-nav.html %}
<div class="rectangle-boarder-big col-9 col-sm-9">
{% include moveit-anchors.html html=content %}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</body>
{% include footer.html %}
{% include footer.html %}
</body>
</html>
22 changes: 11 additions & 11 deletions _layouts/page.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{% include default.html %}

<body class="bg-grey">
{% include nav-bar.html %}
<div class="container">
<div class="sub-pages section">
<div class='row'>
<div class='col-sm-12'>
{% include moveit-anchors.html html=content %}
<body class="bg-grey">
{% include nav-bar.html %}
<div class="container">
<div class="sub-pages section">
<div class='row'>
<div class='col-sm-12'>
{% include moveit-anchors.html html=content %}
</div>
</div>
</div>
</div>
</div>
</body>
{% include footer.html %}
{% include footer.html %}
</body>
</html>
122 changes: 61 additions & 61 deletions _layouts/post.html
Original file line number Diff line number Diff line change
@@ -1,69 +1,69 @@
{% include default.html %}

<body>
{% include nav-bar.html %}
<div class="container">
<div class="row justify-content-between">
<div class="col-sm-12 col-md-8">
<div class="single-post">
{% if page.date %}
<span class="blog-date">
{{ page.date | date: '%B %d, %Y'}}
</span>
{% endif %}
{% if page.media_type == 'video' %}
<div class="image-wrapper">
<iframe style="width:100%;" height="315" src="{{ page.media_link }}" frameborder="0"
allowfullscreen></iframe>
</div>
{% elsif page.media_type == 'image' %}
<img class="image-wrapper" src="{{ page.media_link }}" alt="{{ page.title | truncate: 50, '' }}" />
{% else %}
<div class="image-wrapper">
<img src="/assets/images/main/default-image.jpg" style="width:100%;" />
</div>
{% endif %}
<h1>{{ page.title }}</h1>
{% if page.author %}
<div class="author-name">
<h5>by {{ page.author }}</h5><br>
<body>
{% include nav-bar.html %}
<div class="container">
<div class="row justify-content-between">
<div class="col-sm-12 col-md-8">
<div class="single-post">
{% if page.date %}
<span class="blog-date">
{{ page.date | date: '%B %d, %Y'}}
</span>
{% endif %}
{% if page.media_type == 'video' %}
<div class="image-wrapper">
<iframe style="width:100%;" height="315" src="{{ page.media_link }}" frameborder="0"
allowfullscreen></iframe>
</div>
{% elsif page.media_type == 'image' %}
<img class="image-wrapper" src="{{ page.media_link }}" alt="{{ page.title | truncate: 50, '' }}" />
{% else %}
<div class="image-wrapper">
<img src="/assets/images/main/default-image.jpg" style="width:100%;" />
</div>
{% endif %}
<h1>{{ page.title }}</h1>
{% if page.author %}
<div class="author-name">
<h5>by {{ page.author }}</h5><br>
</div>
{% endif %}
{{ content }}
</div>
{% endif %}
{{ content }}
</div>
</div>
<div class="col-sm-12 col-lg-3 d-sm-none d-md-block">
<div class="other-post">
{% for post in site.related_posts limit:2 %}
<div class="col-sm-6 col-lg-12">
<div class="other-single">
<a href="{{ post.url }}">
{% if post.media_type == 'video' %}
<div class="image-wrapper">
<iframe style="width:100%;" height="315" src="{{ post.media_link }}" frameborder="0"
allowfullscreen></iframe>
</div>
{% elsif post.media_type == 'image' %}
<div class="image-wrapper real-image" style="background-image: url('{{ post.media_link }}');"></div>
{% else %}
<div class="image-wrapper">
<img src="/assets/images/main/default-image.jpg" style="width:100%;" />
</div>
{% endif %}
<div class="text-wrapper">
<span class="blog-date">
{{ post.date | date: "%B %d, %Y" }}
</span>
<h3>{{ post.title }}</h3>
<p>{{ post.description }}</p>
</div>
</a>
<div class="col-sm-12 col-lg-3 d-sm-none d-md-block">
<div class="other-post">
{% for post in site.related_posts limit:2 %}
<div class="col-sm-6 col-lg-12">
<div class="other-single">
<a href="{{ post.url }}">
{% if post.media_type == 'video' %}
<div class="image-wrapper">
<iframe style="width:100%;" height="315" src="{{ post.media_link }}" frameborder="0"
allowfullscreen></iframe>
</div>
{% elsif post.media_type == 'image' %}
<div class="image-wrapper real-image" style="background-image: url('{{ post.media_link }}');"></div>
{% else %}
<div class="image-wrapper">
<img src="/assets/images/main/default-image.jpg" style="width:100%;" />
</div>
{% endif %}
<div class="text-wrapper">
<span class="blog-date">
{{ post.date | date: "%B %d, %Y" }}
</span>
<h3>{{ post.title }}</h3>
<p>{{ post.description }}</p>
</div>
</a>
</div>
</div>
{% endfor %}
</div>
{% endfor %}
</div>
</div>
</div>
</div>
</body>
{% include footer.html %}
{% include footer.html %}
</body>
</html>

0 comments on commit 475cd31

Please sign in to comment.