Permalink
Browse files

Merge branch 'master' of github.com:oucs/time-series-api

Conflicts:
	openorg_timeseries/static/timeseries/base.css
  • Loading branch information...
2 parents d402765 + c9d6a82 commit 49fb56b08ff2e3faee8e36d23ad041b2ae4246e5 @alexsdutton alexsdutton committed Jan 22, 2012
@@ -2,4 +2,10 @@ table.timeseries-serializations, table.timeseries-samples {
border: 1px solid #aaa;
float:right;
font-size:80%;
+ margin:0 0 10px 10px;
}
+
+table.timeseries-serializations td, table.timeseries-samples td {
+ padding: 0;
+}
+
@@ -1 +1,5 @@
-{% extends "base.html" %}
+{% extends "base.html" %}
+
+{% block extra_head %}{{ block.super }}
+ <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}timeseries/base.css"/>
+{% endblock %}
@@ -76,7 +76,13 @@ <h3 id="ref-list">The <tt>list</tt> action</h3>
containing a <tt>names</tt> member, being a list of strings. For
example:</p>
- <pre>{ "names": ["first_series", "second_series", "third_series"] }</pre>
+ <pre>{
+ "names": [
+ "first_series",
+ "second_series",
+ "third_series"
+ ]
+}</pre>
<p>As <abbr title="comma-separated values">CSV</abbr>
the response is effectively a newline-delimited list of names:</p>

0 comments on commit 49fb56b

Please sign in to comment.