From 93b18cdd9a020d578be8f5e499a38c67c00c3bb8 Mon Sep 17 00:00:00 2001 From: Adam Waldenberg <adam.waldenberg@ejwa.se> Date: Mon, 17 Mar 2014 08:47:49 +0100 Subject: [PATCH] The name of the project is now shown in the title of the HTML output. Moved the gitinspector version number from the title down to the top text box of the HTML page. --- gitinspector/format.py | 9 +++++---- gitinspector/html/html.header | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gitinspector/format.py b/gitinspector/format.py index fb66bdc..90cc8ac 100644 --- a/gitinspector/format.py +++ b/gitinspector/format.py @@ -82,16 +82,17 @@ def output_header(): else: jquery_js = " src=\"http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js\">" - print(html_header.format(version = version.__version__, + print(html_header.format(title = _("Repository statistics for {0}").format(os.path.basename(basedir.get_basedir_git())), jquery = jquery_js, jquery_tablesorter = tablesorter_js, jquery_flot = flot_js, jquery_flot_pie = pie_js, jquery_flot_resize = resize_js, logo = logo.decode("utf-8", "replace"), - logo_text = _("The output has been generated by {0}; the statistical analysis tool" + logo_text = _("The output has been generated by {0} {1}. The statistical analysis tool" " for git repositories.").format( - "<a href=\"http://gitinspector.googlecode.com\">gitinspector</a>"), + "<a href=\"http://gitinspector.googlecode.com\">gitinspector</a>", + version.__version__), repo_text = _("Statistical information for the repository '{0}' was gathered on {1}.").format( os.path.basename(basedir. get_basedir_git()), localization.get_date()), show_minor_authors = _("Show minor authors"), @@ -105,7 +106,7 @@ def output_header(): print("\t<report-date>" + time.strftime("%Y/%m/%d") + "</report-date>") else: print(textwrap.fill(_("Statistical information for the repository '{0}' was gathered on {1}.").format( - os.path.basename(basedir. get_basedir_git()), localization.get_date()), width=terminal.get_size()[0])) + os.path.basename(basedir.get_basedir_git()), localization.get_date()), width=terminal.get_size()[0])) def output_footer(): if __selected_format__ == "html": diff --git a/gitinspector/html/html.header b/gitinspector/html/html.header index acf5aab..82acbd6 100644 --- a/gitinspector/html/html.header +++ b/gitinspector/html/html.header @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" /> - <title>Generated by gitinspector {version}</title> + <title>{title}</title> <script type="application/javascript"{jquery}</script> <script type="application/javascript">{jquery_tablesorter}</script> <script type="application/javascript">{jquery_flot}</script> @@ -352,5 +352,5 @@ <body> <div><div class="box logo"> <img src="data:image/png;base64,{logo}" /> - <p>{repo_text} {logo_text}</p> + <p>{repo_text}<br>{logo_text}</p> </div></div>