Skip to content
This repository was archived by the owner on Mar 25, 2018. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
_site
.project
8 changes: 4 additions & 4 deletions _includes/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@ <h3>Reference</h3>
<li><a href="/documentation/reference/location-metadata-design">Location Metadata Design</a></li>
<li><a href="/documentation/reference/compute-design">Compute API Design</a></li>
<li><a href="/documentation/reference/columnar-datadesign">Columnar Data Design</a></li>
<li><a href="/documentation/reference/jclouds-api">JClouds API</a></li>
<li><a href="/documentation/reference/oauth">JClouds OAuth Integration</a></li>
<li><a href="/documentation/reference/jclouds-api">jclouds API</a></li>
<li><a href="/documentation/reference/oauth">jclouds OAuth Integration</a></li>
<li><a href="/documentation/reference/osgi">Using jclouds with Apache Felix OSGi Container</a></li>
<li><a href="/documentation/reference/pool-design">Pool Design</a></li>
<li><a href="/documentation/reference/load-balancer-design">Load Balancer Design</a></li>
<li><a href="/documentation/reference/jclouds-logging">Logging in jclouds</a></li>
<li><a href="/documentation/reference/vmware-integration-design">VMWare Integration Approach &amp; Design</a></li>
<li><a href="/documentation/reference/supported-providers">Supported Providers</a></li>
<li><a href="/documentation/reference/apps-that-use-jclouds">Apps that use JClouds</a></li>
<li><a href="/documentation/reference/apps-that-use-jclouds">Apps that use jclouds</a></li>
<li><a href="/documentation/reference/using-provider-metadata">Using Provider Metadata</a></li>
</ul>

Expand All @@ -104,7 +104,7 @@ <h3>Developer Resources</h3>
<li><a href="/documentation/devguides/contributing-to-jclouds">Contributing to jclouds</a></li>
<li><a href="/documentation/devguides/contributing-to-documentation">Contributing to Documentation</a></li>
<li><a href="/documentation/devguides/using-eclipse">Using Eclipse</a></li>
<li><a href="/documentation/devguides/continuous-integration">JClouds Continuous Integration</a></li>
<li><a href="/documentation/devguides/continuous-integration">jclouds Continuous Integration</a></li>
<li><a href="/documentation/devguides/provider-metadata">Provider Metadata</a></li>
</ul>

Expand Down
5 changes: 2 additions & 3 deletions documentation/devguides/contributing-to-documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,13 @@ To change or contribute to the documentation:

More about the site:

As indicated above, the site is built using [github pages](http://pages.github.com/) - which is built using Jekyll[2],
a static site generator written ruby. Jekyll.
As indicated above, the site is built using [github pages](http://pages.github.com/) which uses [Jekyll](https://github.com/mojombo/jekyll/), a static site generator written in Ruby, under the covers. To preview any changes you make, install Jekyll (from [here](https://github.com/mojombo/jekyll/wiki/install), with Pygments too) then run `jekyll -pygments --safe --server` and open [localhost:4000](http://localhost:4000) in the browser.

The site structure is pretty simple as you can see in the [source of this site](https://github.com/jclouds/jclouds.github.com).
The *_layouts* folder contains the docs.html file which is used as the layout - containing main column and the sidebar.
The sidebar is an *include* which is inside the *_includes folder*.

`(Due a bug the sidebar can't be a markdown file, but this will be changed as soon as the bug is fixed).`
(Due a bug the sidebar can't be a markdown file, but this will be changed as soon as the bug is fixed. Also when running in the jekyll server, links without the .html are not resolved, and you'll have to manually append `.html` to some links; this runs fine on the server, so don't worry about it; however if you know a better way please let us know!)

Each folder under the documentation contains an *index.markdown* that will list all the pages that belong to
this "section". You can even edit the pages directly on github if you don't want to
Expand Down
6 changes: 3 additions & 3 deletions documentation/devguides/contributing-to-jclouds.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Parameters:
<tr>
<td>*package*</td>
<td>The Java base package of the project's classes.</td>
<td> _same as_ `groupId`.`artifactId` </td>
<td><i>groupId.artifactId</i></td>
<td></td>
</tr>
<tr>
Expand Down Expand Up @@ -128,11 +128,11 @@ you must delete the files this code will replace. Here are the files:
<td>adding compute logger</td>
</tr>
<tr>
<td>src/main/java/org/jclouds/`artifactId`/`providerName`ContextBuilder</td>
<td>src/main/java/org/jclouds/ <i>artifactId</i>/<i>providerName</i>ContextBuilder</td>
<td>converts to build a ComputeServiceContext instead of a RestContext</td>
</tr>
<tr>
<td>src/main/java/org/jclouds/`artifactId`/`providerName`ContextFactory</td>
<td>src/main/java/org/jclouds/ <i>artifactId</i>/<i>providerName</i>ContextFactory</td>
<td>converts to build a ComputeServiceContext instead of a RestContext</td>
</tr>
</table>
Expand Down
4 changes: 2 additions & 2 deletions documentation/devguides/index.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
layout: docs
title: JClouds Developer Resources
title: jclouds Developer Resources
---

### Developer Resources

* [Contributing to jclouds](/documentation/devguides/contributing-to-jclouds)
* [Contributing to Documentation](/documentation/devguides/contributing-to-documentation)
* [Using Eclipse](/documentation/devguides/using-eclipse)
* [JClouds Continuous Integration](/documentation/devguides/continuous-integration)
* [jclouds Continuous Integration](/documentation/devguides/continuous-integration)
* [Provider Metadata](/documentation/devguides/provider-metadata)
6 changes: 3 additions & 3 deletions documentation/reference/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ title: Reference Index
* [Location Metadata Design](/documentation/reference/location-metadata-design)
* [Compute API Design](/documentation/reference/compute-design)
* [Columnar Data Design](/documentation/reference/columnar-datadesign)
* [JClouds API](/documentation/reference/jclouds-api)
* [JClouds OAuth Integration](/documentation/reference/oauth)
* [jclouds API](/documentation/reference/jclouds-api)
* [jclouds OAuth Integration](/documentation/reference/oauth)
* [Using jclouds with Apache Felix OSGi Container](/documentation/reference/osgi)
* [Pool Design](/documentation/reference/pool-design)
* [Load Balancer Design](/documentation/reference/load-balancer-design)
* [Logging in jclouds](/documentation/reference/jclouds-logging)
* [VMWare Integration Approach & Design](/documentation/reference/vmware-integration-design)
* [Supported Providers](/documentation/reference/supported-providers)
* [Apps that use JClouds](/documentation/reference/apps-that-use-jclouds)
* [Apps that use jclouds](/documentation/reference/apps-that-use-jclouds)
* [Using Provider Metadata](/documentation/reference/using-provider-metadata)
* [Error Handling](/documentation/reference/error-handling)
Binary file added favicon.ico
Binary file not shown.
18 changes: 9 additions & 9 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
<link rel="stylesheet" type="text/css" href="style/colour.css" />
<script type="text/javascript">

var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-8638379-1']);
_gaq.push(['_trackPageview']);
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-8638379-1']);
_gaq.push(['_trackPageview']);

(function() {
� � var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
� � ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
� � var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();

</script>

Expand Down Expand Up @@ -142,7 +142,7 @@ <h1>WHY SHOULD I USE JCLOUDS?</h1>
</div>
</div>
<div id="footer">
Copyright 2011 jclouds, Inc. jclouds is licensed under the Apache License, Version 2.0. <br />
Copyright &copy;2011 jclouds, Inc. jclouds is licensed under the Apache License, Version 2.0. <br />
jclouds logo is trademark of jclouds, Inc.</a>
</div>
</div>
Expand Down
41 changes: 35 additions & 6 deletions style/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ font-size: 0.68em;

p {
margin: 0px;
padding: 0px 0px 16px 0px;
padding: 8px 0px 8px 0px;
line-height: 1.2em;
}

Expand All @@ -23,8 +23,29 @@ letter-spacing: .1em;

h2 {
margin: 0px;
padding: 0px 0px 4px 0px;
padding: 16px 0px 4px 0px;
font-size: 120%;
}

h3 {
margin: 0px;
padding: 8px 0px 4px 0px;
font-size: 100%;
}

h4 {
margin: 0px;
padding: 6px 0px 2px 0px;
font-size: 100%;
font-style: italic;
}

h5 {
margin: 0px;
padding: 4px 0px 2px 0px;
font-size: 100%;
font-weight: normal;
font-style: italic;
}

img {
Expand Down Expand Up @@ -61,24 +82,24 @@ border-left: 8px solid;

/* unordered list */
ul {
margin: 8px 0px 0px 16px;
margin: 6px 0px 0px 12px;
padding: 0px;
}

ul li {
list-style-type: square;
margin: 0px 0px 11px 0px;
margin: 0px 0px 8px 0px;
padding: 0px;
}

/* ordered list */
ol {
margin: 8px 0px 0px 24px;
margin: 6px 0px 0px 18px;
padding: 0px;
}

ol li {
margin: 0px 0px 11px 0px;
margin: 0px 0px 8px 0px;
padding: 0px;
}

Expand Down Expand Up @@ -255,6 +276,11 @@ border-bottom: 1px dashed;
border-bottom: 1px solid;
}

#column2 p a, #column2 p a:hover {
/* inside a paragraph, underlining with 2px of padding can result in the line below being scored out */
padding: 0px 0px 0px 0px;
}

/* contact page - form layout */
form {
margin-top: 0px;
Expand Down Expand Up @@ -305,3 +331,6 @@ pre {
width: 512px;
font-size: 150%;
}
code {
font-family: 'Droid Sans Mono', sans-serif;
}