Skip to content

Commit

Permalink
add new templates and first website data structure
Browse files Browse the repository at this point in the history
  • Loading branch information
annaborn committed Mar 30, 2016
1 parent 770167b commit 82586b0
Show file tree
Hide file tree
Showing 62 changed files with 11,759 additions and 917 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
_site
.sass-cache
.jekyll-metadata
38 changes: 25 additions & 13 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,31 @@
# Welcome to Jekyll!
#
# This config file is meant for settings that affect your whole blog, values
# which you are expected to set up once and rarely need to edit after that.
# For technical reasons, this file is *NOT* reloaded automatically when you use
# 'jekyll serve'. If you change this file, please restart the server process.

# Site settings
title: Envire
email: your-email@domain.com
description: Environment Representation package to represent information of the environment for a robotic system
# Write an awesome description for your new site here. You can edit this
# line in _config.yml. It will appear in your document head meta (for
# Google search results) and in your feed.xml site description.
baseurl: "" # the subpath of your site, e.g. /blog/
url: "http://envire.github.io/" # the base hostname & protocol for your site
email: no-email
description: > # this means to ignore newlines until "baseurl:"
Write an awesome description for your new site here. You can edit this
line in _config.yml. It will appear in your document head meta (for
Google search results) and in your feed.xml site description.
baseurl: "" # the subpath of your site, e.g. /blog
url: "http://localhost:4000/" # the base hostname & protocol for your site
twitter_username: jekyllrb
github_username: jekyll
# Pagination
paginate: 5
paginate_path: "/news/page:num/"

# Build settings
markdown: kramdown


defaults:
- scope:
path: docs
type: page
values:
layout: docs
- scope:
path: packages
type: page
values:
layout: packages
36 changes: 36 additions & 0 deletions _data/nav_docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
- title: Introduction
items:
- id: intro_about_envire
title: About Envire
- title: Core
items:
- id: core_overview
title: Overview
- id: core_graph
title: Graph
subitems:
- id: core_graph_structure
title: Structure
- id: core_graph_transformation
title: Transformation
- id: core_graph_items
title: Items
- title: Plugins
items:
- id: plugins_overview
title: Overview
- id: plugin_new_plugin
title: Write new plugin
- title: Maps
items:
- id: maps_overview
title: Overview
- id: maps_types_existing
title: Existing Types
- title: Simulation
items:
- id: simulation_overview
title: Overview
- id: simulation_robot_representation
title: Robot Representation

22 changes: 22 additions & 0 deletions _data/nav_packages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
- title: Internal
items:
- id: packages_core
title: Core
- id: packages_maps_wrapper
title: Maps wrapper
- title: External
items:
- id: packages_mars
title: Mars
- id: packages_smurf
title: Smurf
- id: packages_maps
title: Maps
- title: Tools
items:
- id: packages_boost
title: Boost Serialization
- title: Rock
items:
- id: packages_orogen_envire
title: Orogen Envire
55 changes: 0 additions & 55 deletions _includes/footer.html

This file was deleted.

19 changes: 11 additions & 8 deletions _includes/head.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">

<title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
<link rel="icon" href="{{ "/images/envire_logo_graph.ico" | prepend: site.baseurl }}" type="image/vnd.microsoft.icon">

<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
<title>{% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %}</title>
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">

<link href="{{ "/css/bootstrap.css" | prepend: site.baseurl }}" rel="stylesheet">
<link href="{{ "/css/envire.css" | prepend: site.baseurl }}" rel="stylesheet">
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">
</head>
11 changes: 5 additions & 6 deletions _includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@
</a>

<div class="trigger">
{% assign pages = site.pages | sort:"order" %}
{% for page in pages %}
{% if page.title %}
<a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a>
{% endif %}
{% endfor %}
{% for my_page in site.pages %}
{% if my_page.title %}
<a class="page-link" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a>
{% endif %}
{% endfor %}
</div>
</nav>

Expand Down
22 changes: 22 additions & 0 deletions _includes/nav_docs.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<nav>
<!-- Docs Nav -->
{% for section in site.data.nav_docs %}
<div class="nav-docs-section">
<h3>{{ section.title }}</h3>
<ul>
{% for item in section.items %}
<li>
<a href="{{ item.id | prepend: site.baseurl }}.html">{{ item.title }}</a>
{% for subitem in item.subitems %}
<ul>
<li>
<a href="{{ subitem.id | prepend: site.baseurl }}.html">{{ subitem.title }}</a>
</li>
</ul>
{% endfor %}
</li>
{% endfor %}
</ul>
</div>
{% endfor %}
</nav>
48 changes: 48 additions & 0 deletions _includes/nav_main.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<nav class="navbar navbar-default navbar-fixed-top">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{{ site.url }}">{{ site.title }}</a>
</div>

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
{% assign pages = site.pages | sort:"order"%}
{% for my_page in pages %}
{% if my_page.nav == 'main' && my_page.title %}
{% if page.url == my_page.url %}
<li class="active"><a href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}<span class="sr-only">(current)</span></a></li>
{% else %}
<li><a href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a></li>
{% endif %}
{% endif %}
{% endfor %}
<!--<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li role="separator" class="divider"></li>
<li><a href="#">Separated link</a></li>
<li role="separator" class="divider"></li>
<li><a href="#">One more separated link</a></li>
</ul>
</li>-->
</ul>
<form class="navbar-form navbar-right" role="search">
<div class="form-group">
<input type="text" class="form-control" placeholder="Search">
</div>
<button type="submit" class="btn btn-default">Submit</button>
</form>
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>
15 changes: 15 additions & 0 deletions _includes/nav_packages.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<nav>
<!-- Docs Nav -->
{% for section in site.data.nav_packages %}
<div class="nav-docs-section">
<h3>{{ section.title }}</h3>
<ul>
{% for item in section.items %}
<li>
<a href="{{ item.id | prepend: site.baseurl }}.html">{{ item.title }}</a>
</li>
{% endfor %}
</ul>
</div>
{% endfor %}
</nav>
24 changes: 11 additions & 13 deletions _layouts/default.html
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
<!DOCTYPE html>
<html>

{% include head.html %}
{% include head.html %}

<body>
<body>
{% include nav_main.html %}

{% include header.html %}

<div class="page-content">
<div class="wrapper">
{{ content }}
</div>
</div>

{% include footer.html %}

</body>
<div class="container">
{{ content }}
</div>

<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src=""{{ "js/bootstrap.min.js" | prepend: site.baseurl }}"></script>
</body>
</html>
17 changes: 17 additions & 0 deletions _layouts/docs.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
layout: default
---
<div class="row">
<div class="col-md-3">
<nav>
{% include nav_docs.html %}
</nav>
</div>
<div class="col-md-9">
<div class="page-header">
<h1>{{page.title}} <small>{{page.subtitle}}</small></h1>
</div>

{{ content }}
</div>
</div>
Loading

0 comments on commit 82586b0

Please sign in to comment.