diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-12-22 21:57:02 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-12-22 21:57:02 -0500 |
| commit | f545de301a3188eefffb79de018d5fda2f03946d (patch) | |
| tree | c30c10c3cef88d84a6e38a43b63ddf5c4f83d2f5 /templates/public | |
| parent | 2e634dc457a35d06ec83409da3d6006107495569 (diff) | |
| parent | 2bfec5b17ca3ee3ea3b347c029b9d8dad3c5b4d0 (diff) | |
Merge branch 'archweb-generic' into master-nomake
Conflicts:
README.md
Diffstat (limited to 'templates/public')
| -rw-r--r-- | templates/public/index.html | 2 | ||||
| -rw-r--r-- | templates/public/keys.html | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/templates/public/index.html b/templates/public/index.html index 3a5d98d6..f577dd9f 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -108,7 +108,7 @@ </div> {% endcache %} -{% cache 59 main-page-right secure %} +{% cache 115 main-page-right secure %} <div id="nav-sidebar" class="widget"> <h4>Documentation</h4> diff --git a/templates/public/keys.html b/templates/public/keys.html index ab89423e..0818719c 100644 --- a/templates/public/keys.html +++ b/templates/public/keys.html @@ -86,16 +86,16 @@ </tr> </thead> <tbody> - {% for user in active_users %} + {% for user in active_users %}{% with user_key=user.userprofile.pgp_key %} <tr> <th>{{ user.get_full_name }}</th> - <td>{% pgp_key_link user.userprofile.pgp_key %}</td> + <td>{% pgp_key_link user_key %}</td> {% spaceless %}{% for key in keys %} - {% signature_exists signatures key.pgp_key user.userprofile.pgp_key as signed %} + {% signature_exists signatures key.pgp_key user_key as signed %} <td class="signed-{{ signed|yesno }}">{{ signed|yesno|capfirst }}</td> {% endfor %}{% endspaceless %} </tr> - {% endfor %} + {% endwith %}{% endfor %} </tbody> </table> </div> |