diff options
| author | Helmut Grohne <helmut@subdivi.de> | 2014-03-08 12:39:32 +0100 |
|---|---|---|
| committer | Helmut Grohne <helmut@subdivi.de> | 2014-03-08 12:39:32 +0100 |
| commit | c6a30cefff55cd247a47fa0a2d4f819592e1202b (patch) | |
| tree | 58b6ff52bc6827782c2973f1ce976e245ce5f34c /dedup/templates | |
| parent | 751f19ec1107c9059ae4834e4b757741ebee6cbd (diff) | |
| parent | bb0aea9971bc79d8787d8f034022d0ca803fcab3 (diff) | |
| download | debian-dedup-c6a30cefff55cd247a47fa0a2d4f819592e1202b.tar.gz | |
Merge branch 'master' into sqlalchemy
In the mean time, the master branch evolved quite a bit and the schema
changed again (eqclass added to function table). The main reason for the
merge is to resolve the large amounts of conflicts once, so development
of the sqlalchemy branch can continue and still benefit from changes in
the master branch such as schema compatibility, adapting the indent
level in web app due to the use of contextlib.closing which resembles
sqlalchemy's "with db.begin() as conn:".
Conflicts:
autoimport.py
dedup/utils.py
readyaml.py
update_sharing.py
webapp.py
Diffstat (limited to 'dedup/templates')
| -rw-r--r-- | dedup/templates/base.html | 4 | ||||
| -rw-r--r-- | dedup/templates/binary.html | 2 | ||||
| -rw-r--r-- | dedup/templates/index.html | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/dedup/templates/base.html b/dedup/templates/base.html index 62f4087..9dfb788 100644 --- a/dedup/templates/base.html +++ b/dedup/templates/base.html @@ -3,8 +3,8 @@ <head> <title>{% block title %}{% endblock %}</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <link rel="stylesheet" type="text/css" href="{{ urlroot|e }}/style.css"> - <link rel="icon" type="image/vnd.microsoft.icon" href="{{ urlroot|e }}/favicon.ico"> + <link rel="stylesheet" type="text/css" href="{{ urlroot|e }}/static/style.css"> + <link rel="icon" type="image/vnd.microsoft.icon" href="{{ urlroot|e }}/static/favicon.ico"> {% block header %}{% endblock %} </head> <body> diff --git a/dedup/templates/binary.html b/dedup/templates/binary.html index 69eceef..46c4fa6 100644 --- a/dedup/templates/binary.html +++ b/dedup/templates/binary.html @@ -21,7 +21,7 @@ <p>Note: Packages with yellow background are required to be installed when this package is installed.</p> {%- endif -%} {%- if issues -%} - <h3>issues with particular files</h3> + <h3 id="issues">issues with particular files</h3> <table border='1'><tr><th>filename</th><th>issue</th></tr> {%- for filename, issue in issues|dictsort(true) -%} <tr><td><span class="filename">{{ filename|e }}</span></td><td>{{ issue|e }}</td></tr> diff --git a/dedup/templates/index.html b/dedup/templates/index.html index 7c9000f..169027e 100644 --- a/dedup/templates/index.html +++ b/dedup/templates/index.html @@ -28,7 +28,7 @@ {% block content %} <h1>Debian duplication detector</h1> <ul> -<li>To inspect a particlar binary package, go to <pre>binary/<packagename></pre> Example: <a href="binary/git">binary/git</a> +<li>To inspect a particular binary package, go to <pre>binary/<packagename></pre> Example: <a href="binary/git">binary/git</a> <div style="display:none" id="form_div"><fieldset> <legend>Inspect package</legend> <noscript><b>This form is dysfunctional when javascript is not enabled</b></noscript> |