diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-13 21:08:45 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-13 21:08:45 -0400 |
| commit | c6eb3b7b3c77d1b70126e0755c9ee66de88d5395 (patch) | |
| tree | 138b206e95b7ec98ad9d319dd95157a2028b4cd1 /templates | |
| parent | 81a4f3e5e602d900ebfb2c20eb7565fddfb013a2 (diff) | |
| parent | c910b9220c45eb9d493d260f325efda2141205a4 (diff) | |
Merge branch 'archweb-generic' into master-nomake
# Conflicts:
# public/views.py
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/feeds/news_description.html | 2 | ||||
| -rw-r--r-- | templates/feeds/packages_title.html | 1 | ||||
| -rw-r--r-- | templates/packages/details.html.jinja | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/templates/feeds/news_description.html b/templates/feeds/news_description.html deleted file mode 100644 index 61ceedf3..00000000 --- a/templates/feeds/news_description.html +++ /dev/null @@ -1,2 +0,0 @@ -<p>{{obj.author.get_full_name}} wrote:</p> -{{ obj.html }} diff --git a/templates/feeds/packages_title.html b/templates/feeds/packages_title.html deleted file mode 100644 index f92ac684..00000000 --- a/templates/feeds/packages_title.html +++ /dev/null @@ -1 +0,0 @@ -{{ obj.pkgname }} {{ obj.full_version }} {{ obj.arch.name }}
\ No newline at end of file diff --git a/templates/packages/details.html.jinja b/templates/packages/details.html.jinja index e7510766..22c778cb 100644 --- a/templates/packages/details.html.jinja +++ b/templates/packages/details.html.jinja @@ -188,7 +188,7 @@ <th>Last Updated:</th> <td>{{ pkg.last_update|date("DATETIME_FORMAT") }} UTC</td> </tr> - {% if user.is_authenticated %}{% with flag_request = pkg.flag_request() %}{% if flag_request %}<tr> + {% if user.is_authenticated() %}{% with flag_request = pkg.flag_request() %}{% if flag_request %}<tr> <th>Last Flag Request:</th> <td class="wrap">From {{ flag_request.who() }} on {{ flag_request.created|date }}:<br/> <div class="userdata">{{ flag_request.message|linebreaksbr|default("{no message}") }}</div></td> |