Commit 296f2893 authored by Christos Stavrakakis's avatar Christos Stavrakakis

Merge branch 'master' into develop

Conflicts:
	snf-webproject/synnefo/webproject/manage.py
parents 15f55600 36aff028
......@@ -13,7 +13,29 @@ source_suffix = '.rst'
master_doc = 'index'
exclude_patterns = ['_build']
pygments_style = 'sphinx'
html_theme = 'nature'
html_theme = 'default'
html_theme_options = {
'collapsiblesidebar': 'true',
'footerbgcolor': '#55b577',
'footertextcolor': '#000000',
'sidebarbgcolor': '#ffffff',
'sidebarbtncolor': '#f2f2f2',
'sidebartextcolor': '#000000',
'sidebarlinkcolor': '#328e4a',
'relbarbgcolor': '#55b577',
'relbartextcolor': '#ffffff',
'relbarlinkcolor': '#ffffff',
'bgcolor': '#ffffff',
'textcolor': '#000000',
'headbgcolor': '#ffffff',
'headtextcolor': '#000000',
'headlinkcolor': '#c60f0f',
'linkcolor': '#328e4a',
'visitedlinkcolor': '#63409b',
'codebgcolor': '#eeffcc',
'codetextcolor': '#333333'
}
html_static_path = ['_static']
htmlhelp_basename = 'synnefodoc'
......
docs/images/synnefo-logo.png

6.52 KB | W: | H:

docs/images/synnefo-logo.png

2.75 KB | W: | H:

docs/images/synnefo-logo.png
docs/images/synnefo-logo.png
docs/images/synnefo-logo.png
docs/images/synnefo-logo.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -313,7 +313,11 @@ def configure_logging():
class EncodedStdOut(object):
def __init__(self, stdout):
self.encoding = stdout.encoding or locale.getpreferredencoding()
try:
std_encoding = stdout.encoding
except AttributeError:
std_encoding = None
self.encoding = std_encoding or locale.getpreferredencoding()
self.original_stdout = stdout
def write(self, string):
......@@ -321,6 +325,9 @@ class EncodedStdOut(object):
string = string.encode(self.encoding)
self.original_stdout.write(string)
def __getattr__(self, name):
return getattr(self.original_stdout, name)
def main():
# no need to run setup_environ
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment