--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/book/en/_themes/cubicweb/layout.html Thu Aug 28 16:22:05 2014 +0200
@@ -0,0 +1,63 @@
+{% extends "basic/layout.html" %}
+
+{%- block extrahead %}
+<link rel="stylesheet" href="{{ pathto('_static/font-nobile.css', 1) }}" type="text/css" media="screen" charset="utf-8" />
+<link rel="stylesheet" href="{{ pathto('_static/font-neuton.css', 1) }}" type="text/css" media="screen" charset="utf-8" />
+<!--[if lte IE 6]>
+<link rel="stylesheet" href="{{ pathto('_static/ie6.css', 1) }}" type="text/css" media="screen" charset="utf-8" />
+<![endif]-->
+{%- if theme_favicon %}
+<link rel="shortcut icon" href="{{ pathto('_static/'+theme_favicon, 1) }}"/>
+{%- endif %}
+
+{%- if theme_canonical_url %}
+<link rel="canonical" href="{{ theme_canonical_url }}{{ pagename }}.html"/>
+{%- endif %}
+{% endblock %}
+
+{% block header %}
+
+{% if theme_in_progress|tobool %}
+ <img style="position: fixed; display: block; width: 165px; height: 165px; bottom: 60px; right: 0; border: 0;" src="{{ pathto('_static/in_progress.png', 1) }}" alt="Documentation in progress" />
+{% endif %}
+
+{% if theme_outdated|tobool %}
+ <div style="bottom: 60px; right: 20px;position: fixed;"><a href="{{ latest_url }}" class="btn btn-large btn-danger"><strong>></strong> Read the latest version of this page</a></div>
+{% endif %}
+
+<div class="header-small">
+ {%- if theme_logo %}
+ {% set img, ext = theme_logo.split('.', -1) %}
+ <div class="logo-small">
+ <a href="{{ pathto(master_doc) }}">
+ <img class="logo" src="{{ pathto('_static/%s-small.%s' % (img, ext), 1)}}" alt="Logo"/>
+ </a>
+ </div>
+ {%- endif %}
+</div>
+{% endblock %}
+
+{%- macro relbar() %}
+<div class="related">
+ <h3>{{ _('Navigation') }}</h3>
+ <ul>
+ {%- for rellink in rellinks %}
+ <li class="right" {% if loop.first %}style="margin-right: 10px"{% endif %}>
+ <a href="{{ pathto(rellink[0]) }}" title="{{ rellink[1]|striptags|e }}"
+ {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a>
+ {%- if not loop.first %}{{ reldelim2 }}{% endif %}
+ </li>
+ {%- endfor %}
+ {%- block rootrellink %}
+ <li><a href="{{ pathto(master_doc) }}">{{ docstitle|e }}</a>{{ reldelim1 }}</li>
+ {%- endblock %}
+ {%- for parent in parents %}
+ <li><a href="{{ parent.link|e }}" {% if loop.last %}{{ accesskey("U") }}{% endif %}>{{ parent.title }}</a>{{ reldelim1 }}</li>
+ {%- endfor %}
+ {%- block relbaritems %} {% endblock %}
+ </ul>
+</div>
+{%- endmacro %}
+
+{%- block sidebarlogo %}{%- endblock %}
+{%- block sidebarsourcelink %}{%- endblock %}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/book/en/_themes/cubicweb/static/cubicweb.css_t Thu Aug 28 16:22:05 2014 +0200
@@ -0,0 +1,33 @@
+/*
+ * cubicweb.css_t
+ * ~~~~~~~~~~~~~~
+ *
+ * Sphinx stylesheet -- cubicweb theme.
+ *
+ * :copyright: Copyright 2014 by the Cubicweb team, see AUTHORS.
+ * :license: LGPL, see LICENSE for details.
+ *
+ */
+
+@import url("pyramid.css");
+
+div.header-small {
+ background-image: linear-gradient(white, #e2e2e2);
+ border-bottom: 1px solid #bbb;
+}
+
+div.logo-small {
+ padding: 10px;
+}
+
+img.logo {
+ width: 150px;
+}
+
+div.related a {
+ color: #e6820e;
+}
+
+a, a .pre {
+ color: #e6820e;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/book/en/_themes/cubicweb/static/cubicweb.ico Thu Aug 28 16:22:05 2014 +0200
@@ -0,0 +1,1 @@
+../../../../../../web/data/favicon.ico
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/book/en/_themes/cubicweb/static/logo-cubicweb-small.svg Thu Aug 28 16:22:05 2014 +0200
@@ -0,0 +1,1 @@
+logo-cubicweb.svg
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/book/en/_themes/cubicweb/static/logo-cubicweb.svg Thu Aug 28 16:22:05 2014 +0200
@@ -0,0 +1,1 @@
+../../../../../../web/data/logo-cubicweb.svg
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/book/en/_themes/cubicweb/theme.conf Thu Aug 28 16:22:05 2014 +0200
@@ -0,0 +1,12 @@
+[theme]
+inherit = pyramid
+pygments_style = sphinx.pygments_styles.PyramidStyle
+stylesheet = cubicweb.css
+
+
+[options]
+logo = logo-cubicweb.svg
+favicon = cubicweb.ico
+in_progress = false
+outdated = false
+canonical_url =
--- a/doc/book/en/conf.py Wed Jul 30 14:06:38 2014 +0200
+++ b/doc/book/en/conf.py Thu Aug 28 16:22:05 2014 +0200
@@ -52,8 +52,14 @@
# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'logilab.common.sphinx_ext']
+extensions = [
+ 'sphinx.ext.autodoc',
+# 'sphinx.ext.viewcode',
+ 'logilab.common.sphinx_ext',
+ ]
+
autoclass_content = 'both'
+
# Add any paths that contain templates here, relative to this directory.
#templates_path = []
@@ -117,8 +123,9 @@
# The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation".
html_title = '%s %s' % (project, release)
-html_theme = 'standard_theme'
-html_theme_path = ['.']
+
+html_theme_path = ['_themes']
+html_theme = 'cubicweb'
# A shorter title for the navigation bar. Default is the same as html_title.
#html_short_title = None
--- a/doc/book/en/standard_theme/layout.html Wed Jul 30 14:06:38 2014 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-{% extends "basic/layout.html" %}
-
-{% block header %}
-<div class="header">
- <a href="http://www.cubicweb.org">
- <img alt="cubicweb logo" src="{{ pathto('_static/cubicweb.png', 1) }}"/>
- </a>
-</div>
-{% endblock %}
-
-{# puts the sidebar into "sidebar1" block i.e. before the document body #}
-{% block sidebar1 %}{{ sidebar() }}{% endblock %}
-{% block sidebar2 %}{% endblock %}
Binary file doc/book/en/standard_theme/static/contents.png has changed
--- a/doc/book/en/standard_theme/static/lglb-sphinx-doc.css Wed Jul 30 14:06:38 2014 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,359 +0,0 @@
-/**
- * Sphinx stylesheet -- CubicWeb theme
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- * Inspired from sphinxdoc original theme and logilab theme.
- */
-
-@import url("basic.css");
-
-/* -- page layout ----------------------------------------------------------- */
-
-body {
- font-family: 'Bitstream Vera Sans', 'Lucida Grande', 'Lucida Sans Unicode',
- 'Geneva', 'Verdana', sans-serif;
- font-size: 14px;
- line-height: 150%;
- text-align: center;
- padding: 0;
-}
-
-div.document {
- text-align: left;
-}
-
-div.bodywrapper {
- margin: 0 0 0 230px;
- border-left: 1px solid #CCBCA7;
-}
-
-div.body {
- margin: 0;
- padding: 0.5em 20px 20px 20px;
-}
-
-div.header {
- text-align: left;
- }
-
-div.related {
- background-color: #FF7700;
- color: white;
- font-weight: bolder;
- font-size: 1em;
-}
-
-div.related a {
- color: white;
-}
-
-div.related ul {
- height: 2em;
- border-top: 1px solid #CCBCA7;
- border-bottom: 1px solid #CCBCA7;
-}
-
-div.related ul li {
- margin: 0;
- padding: 0;
- height: 2em;
- float: left;
-}
-
-div.related ul li.right {
- float: right;
- margin-right: 5px;
-}
-
-div.related ul li a {
- margin: 0;
- padding: 0 5px 0 5px;
- line-height: 1.75em;
-}
-
-div.sphinxsidebarwrapper {
- padding: 0;
-}
-
-div.sphinxsidebar {
- margin: 0;
- padding: 5px 10px 5px 10px;
- width: 210px;
- float: left;
- font-size: 1em;
- text-align: left;
-}
-
-div.sphinxsidebar h3, div.sphinxsidebar h4 {
- font-size: 1.2em;
- font-style: italic;
-}
-
-div.sphinxsidebar ul {
- padding-left: 1.5em;
- margin-top: 15px;
- padding: 0;
- line-height: 130%;
- font-weight: bold;
-}
-
-div.sphinxsidebar ul ul {
- margin-left: 20px;
- font-weight: normal;
-}
-
-div.sphinxsidebar li {
- margin: 0;
-}
-
-div.sphinxsidebar input {
- border: 1px solid #CCBCA7;
- font-family: sans-serif;
- font-size: 1em;
-}
-
-div.footer {
- color: orangered;
- padding: 3px 8px 3px 0;
- clear: both;
- font-size: 0.8em;
- text-align: center;
-}
-
-div.footer a {
- text-decoration: underline;
-}
-
-/* -- body styles ----------------------------------------------------------- */
-
-p {
- margin: 0.8em 0 0 0;
-}
-
-ul, ol {
- margin: 0;
-}
-
-li {
- margin: 0.2em 0 0 0;
-}
-
-a {
- color: orangered;
- text-decoration: none;
-}
-
-div.sphinxsidebar a {
- color: black;
- text-decoration: none;
-}
-
-a:hover {
- text-decoration: underline;
-}
-
-h1 {
- margin: 0;
- padding: 0.7em 0 0.3em 0;
- font-size: 1.5em;
- border-bottom: 1px dotted;
-}
-
-h2 {
- margin: 1.3em 0 0.2em 0;
- font-size: 1.35em;
- padding: 0;
- color: #303030;
-}
-
-h3 {
- margin: 1em 0 -0.3em 0;
- font-size: 1.2em;
- color: #202020;
-}
-
-div.body h1 a {
- color: #404040!important;
-}
-
-div.body h2 a {
- color: #303030!important;
-}
-
-div.body h3 a {
- color: #202020!important;
-}
-
-div.body h4 a, div.body h5 a, div.body h6 a {
- color: #000000!important;
-}
-
-h1 a.anchor, h2 a.anchor, h3 a.anchor, h4 a.anchor, h5 a.anchor, h6 a.anchor {
- display: none;
- margin: 0 0 0 0.3em;
- padding: 0 0.2em 0 0.2em;
- color: #AAA!important;
-}
-
-h1:hover a.anchor, h2:hover a.anchor, h3:hover a.anchor, h4:hover a.anchor,
-h5:hover a.anchor, h6:hover a.anchor {
- display: inline;
-}
-
-h1 a.anchor:hover, h2 a.anchor:hover, h3 a.anchor:hover, h4 a.anchor:hover,
-h5 a.anchor:hover, h6 a.anchor:hover {
- color: #777;
- background-color: #EEE;
-}
-
-a.headerlink {
- color: #C60F0F!important;
- font-size: 1em;
- margin-left: 6px;
- padding: 0 4px 0 4px;
- text-decoration: none!important;
-}
-
-a.headerlink:hover {
- background-color: #C0C0C0;
- color: #FFFFFF!important;
-}
-
-cite, code, tt {
- font-family: 'Consolas', 'Deja Vu Sans Mono',
- 'Bitstream Vera Sans Mono', monospace;
- font-size: 0.95em;
- letter-spacing: 0.01em;
-}
-
-tt {
- background-color: #F0F0F0;
- border-bottom: 1px solid #D0D0D0;
-}
-
-tt.descname, tt.descclassname, tt.xref {
- background-color: #F0F0F0;
- font-weight: normal;
- font-size: 1em;
- border: 1px solid #D0D0D0;
- border: 0;
-}
-
-hr {
- border: 1px solid #CC8B00;
- margin: 2em;
-}
-
-a tt {
- border: 0;
- color: #B45300;
-}
-
-a:hover tt {
- color: #4BACFF;
-}
-
-pre {
- font-family: 'Consolas', 'Deja Vu Sans Mono',
- 'Bitstream Vera Sans Mono', monospace;
- font-size: 0.95em;
- letter-spacing: 0.015em;
- line-height: 120%;
- padding: 0.5em;
- border: 1px solid #CCBCA7;
- background-color: #F0F0F0;
-}
-
-pre a {
- color: inherit;
- text-decoration: underline;
-}
-
-td.linenos pre {
- padding: 0.5em 0;
-}
-
-div.quotebar {
- background-color: #F8F8F8;
- max-width: 250px;
- float: right;
- padding: 2px 7px;
- border: 1px solid #C0C0C0;
-}
-
-div.topic {
- background-color: #F8F8F8;
-}
-
-table {
- border-collapse: collapse;
- margin: 0.8em -0.5em 0em -0.5em;
-}
-
-table td, table th {
- padding: 0.2em 0.5em 0.2em 0.5em;
-}
-
-div.admonition, div.warning {
- font-size: 0.9em;
- margin: 1em 0 1em 0;
- padding: 0;
-}
-
-div.admonition {
- border: 1px solid #86989B;
- background-color: #EBEBFF;
-}
-
-div.warning {
- border: 1px solid #940000;
- background-color: #FFEBEB;
-}
-
-div.admonition p, div.warning p {
- margin: 0.5em 1em 0.5em 1em;
- padding: 0;
-}
-
-div.admonition pre, div.warning pre {
- margin: 0.4em 1em 0.4em 1em;
-}
-
-div.admonition p.admonition-title,
-div.warning p.admonition-title {
- margin: 0;
- padding: 0.1em 0 0.1em 0.5em;
- color: #FFFFFF;
- font-weight: bold;
-}
-
-div.admonition p.admonition-title {
- border-bottom: 1px solid #86989B;
- background-color: #8C88B5;
-}
-
-div.warning p.admonition-title {
- background-color: #CF0000;
- border-bottom: 1px solid #940000;
-}
-
-div.admonition ul, div.admonition ol,
-div.warning ul, div.warning ol {
- margin: 0.1em 0.5em 0.5em 3em;
- padding: 0;
-}
-
-div.versioninfo {
- margin: 1em 0 0 0;
- border: 1px solid #C0C0C0;
- background-color: #DDEAF0;
- padding: 8px;
- line-height: 1.3em;
- font-size: 0.9em;
-}
-
-/* TOC trees */
-
-li.toctree-l1 {
- margin-top: 0.4em;
- }
\ No newline at end of file
Binary file doc/book/en/standard_theme/static/logilab_logo.png has changed
Binary file doc/book/en/standard_theme/static/navigation.png has changed
--- a/doc/book/en/standard_theme/theme.conf Wed Jul 30 14:06:38 2014 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-[theme]
-inherit = basic
-stylesheet = lglb-sphinx-doc.css
-pygments_style = friendly
