dabodoc Commit
Revision 64
Date: 2011-03-04 03:09:36 -0800 (Fri, 04 Mar 2011)
Author: Werner
Trac: http://trac.dabodev.com/changeset/64
Changed:
_U trunk/api/sphinx/
_U trunk/api/sphinx/build/
D trunk/api/sphinx/config.py
U trunk/api/sphinx/makeRST.py
U trunk/api/sphinx/source/_static/AGW.css
U trunk/api/sphinx/source/_templates/layout.html
U trunk/api/sphinx/source/conf.py
Log:
- updated layout for better support of smaller screens/resolutions
- fix the escape of *args and **kargs
Diff:
Property changes on: trunk/api/sphinx
___________________________________________________________________
Name: svn:ignore
- galleryToClassIndex.py
sphinxstderr.txt
+ dabo.log
db_activity.log
galleryToClassIndex.py
sphinxstderr.txt
Property changes on: trunk/api/sphinx/build
___________________________________________________________________
Name: svn:ignore
- html
htmlhelp
pdf
+ doctrees
html
htmlhelp
pdf
singlehtml
Deleted: trunk/api/sphinx/config.py
Modified: trunk/api/sphinx/makeRST.py
===================================================================
--- trunk/api/sphinx/makeRST.py 2011-02-27 10:14:26 UTC (rev 63)
+++ trunk/api/sphinx/makeRST.py 2011-03-04 11:09:36 UTC (rev 64)
@@ -385,7 +385,7 @@
"""
-
+# this one is with a big logo on the top
htmlLayout = """
{% extends "!layout.html" %}
@@ -408,6 +408,26 @@
{% endblock %}
"""
+# this one has no logo at the top
+htmlLayout = """
+{% extends "!layout.html" %}
+
+{%- block relbaritems %}
+ <li>{{ title }}</li>
+{% endblock %}
+
+{% block rootrellink %}
+ <li><img src="_static/dabo_small.png" alt=""
style="vertical-align: middle; margin-top: 7px"/></li>
+ <li><a href="index.html" style="color: rgb(238,
152, 22); hover: rgb(53, 95, 124);">Introduction</a> | </li>
+ <li><a href="search.html" style="color:
rgb(238, 152, 22); hover: rgb(53, 95, 124);">Search</a> | </li>
+ <li><a href="gallery.html" style="color:
rgb(238, 152, 22); hover: rgb(53, 95, 124);">Gallery</a> | </li>
+ <li><a href="general_index.html" style="color:
rgb(238, 152, 22); hover: rgb(53, 95, 124);">Contents</a>»</li>
+{% endblock %}
+
+{% block header %}
+{% endblock %}
+"""
+
otherLayout = """
{% extends "!layout.html" %}
@@ -903,12 +923,12 @@
args = inspect.getargspec(m)
args = inspect.formatargspec(args[0], args[1], args[2], args[3])
- rArgs = args.replace("*args", "\*args").replace("**kwargs",
"\**kwargs").replace("**", "\**").replace("*", "\*")
- # have to use kls info to prevent duplicate defintion, because
of Dabo name mangling
+ rArgs = args.replace(" **", " \**").replace(" *", " \*")
+ # have to use kls info to prevent duplicate definition, because
of Dabo name mangling
strs += ".. function:: " + kls.__module__ + "." + kls.__name__
+ "." + method + rArgs
if isInherited:
strs += "\n :noindex:\n"
-
+
strs += "\n\n"
if m.__doc__ is None:
strs += "\n"
Modified: trunk/api/sphinx/source/_static/AGW.css
===================================================================
--- trunk/api/sphinx/source/_static/AGW.css 2011-02-27 10:14:26 UTC (rev 63)
+++ trunk/api/sphinx/source/_static/AGW.css 2011-03-04 11:09:36 UTC (rev 64)
@@ -7,7 +7,36 @@
p.graphviz {
overflow: auto
}
+
/**
+ * fix intro, search etc to the top, assumes no logo,
+ * need to adjust the document wrapper margin and use
+ * z-index on div.related and div.floatcenter (used
+ * by the image on e.g. introduction page)
+ */
+div.related{
+ position: fixed;
+ z-index: 10;
+}
+
+/*div.document {
+ position: inherit;
+}
+*/
+
+div.sphinxsidebar {
+ margin-top: 60px;
+ overflow: hidden;
+}
+div.floatcenter {
+ z-index: 1;
+}
+
+div.bodywrapper {
+ margin-top: 60px;
+}
+
+ * /**
* Spacing fixes
*/
@@ -93,6 +122,7 @@
div.related {
font-size: 1em;
+
}
div.related ul {
@@ -362,7 +392,7 @@
.gallery_class table td { padding: 0; }
.gallery_class table caption { font-size: 80%; }
.gallery .caption { height: 4em; vertical-align: top; }
- .gallery table { width: 200px; }
+ .gallery table { width: 225px; }
/**
Modified: trunk/api/sphinx/source/_templates/layout.html
===================================================================
--- trunk/api/sphinx/source/_templates/layout.html 2011-02-27 10:14:26 UTC
(rev 63)
+++ trunk/api/sphinx/source/_templates/layout.html 2011-03-04 11:09:36 UTC
(rev 64)
@@ -14,7 +14,4 @@
{% endblock %}
{% block header %}
-<div style="background-color: white; text-align: left; padding: 10px 10px 15px
15px">
-<img src="{{ pathto("_static/dabo_logo.png", 1) }}" alt="Dabo Logo" />
-</div>
{% endblock %}
Modified: trunk/api/sphinx/source/conf.py
===================================================================
--- trunk/api/sphinx/source/conf.py 2011-02-27 10:14:26 UTC (rev 63)
+++ trunk/api/sphinx/source/conf.py 2011-03-04 11:09:36 UTC (rev 64)
@@ -37,7 +37,6 @@
sys.path.append(os.path.abspath(r"c:\dev\dabo"))
sys.path.append("sphinxext")
-print sys.path
# need to force it into English
# not just for getting English only doc, but also due to encoding issues when
not
# running with utf-8 encoding
@@ -127,7 +126,8 @@
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
# documentation.
-html_theme_options = {"stickysidebar": True, "rightsidebar": True}
+html_theme_options = {"stickysidebar": False, "rightsidebar": False,
+ "collapsiblesidebar": True}
# Add any paths that contain custom themes here, relative to this directory.
html_theme_path = ["."]
_______________________________________________
Post Messages to: [email protected]
Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev
Searchable Archives: http://leafe.com/archives/search/dabo-dev
This message:
http://leafe.com/archives/byMID/[email protected]
