From patchwork Tue Nov 29 09:37:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zygmunt Krynicki X-Patchwork-Id: 5340 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 222BC23E17 for ; Tue, 29 Nov 2011 09:37:20 +0000 (UTC) Received: from mail-lpp01m010-f52.google.com (mail-lpp01m010-f52.google.com [209.85.215.52]) by fiordland.canonical.com (Postfix) with ESMTP id 07B55A18066 for ; Tue, 29 Nov 2011 09:37:19 +0000 (UTC) Received: by mail-lpp01m010-f52.google.com with SMTP id h2so1233343laa.11 for ; Tue, 29 Nov 2011 01:37:19 -0800 (PST) Received: by 10.152.135.225 with SMTP id pv1mr30671404lab.19.1322559438633; Tue, 29 Nov 2011 01:37:18 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.41.198 with SMTP id h6cs32658lal; Tue, 29 Nov 2011 01:37:17 -0800 (PST) Received: by 10.180.90.6 with SMTP id bs6mr47148460wib.63.1322559434124; Tue, 29 Nov 2011 01:37:14 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id ea10si2448460wib.4.2011.11.29.01.37.13 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 29 Nov 2011 01:37:14 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1RVK7l-0007Em-Qv for ; Tue, 29 Nov 2011 09:37:13 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id C6295E1604 for ; Tue, 29 Nov 2011 09:37:13 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-server X-Launchpad-Branch: ~linaro-validation/lava-server/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 291 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-server/trunk] Rev 291: Fix the bread crumb generated page title. Message-Id: <20111129093713.13982.56483.launchpad@ackee.canonical.com> Date: Tue, 29 Nov 2011 09:37:13 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14399"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 680bb562dedd2fba80e11484a0ea49f59a61d550 ------------------------------------------------------------ revno: 291 committer: Zygmunt Krynicki branch nick: lava-server timestamp: Fri 2011-11-18 12:24:38 +0100 message: Fix the bread crumb generated page title. The new method joins all the breadcrumbs with the pipe chachacter using django template filter. Breadcrumbs have also been improved to render to the name of the crumb (so explicit looping and calling methods is no longer needed). modified: lava_server/bread_crumbs.py lava_server/templates/layouts/base.html lava_server/templates/layouts/content.html --- lp:lava-server https://code.launchpad.net/~linaro-validation/lava-server/trunk You are subscribed to branch lp:lava-server. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-server/trunk/+edit-subscription === modified file 'lava_server/bread_crumbs.py' --- lava_server/bread_crumbs.py 2011-10-11 09:20:14 +0000 +++ lava_server/bread_crumbs.py 2011-11-18 11:24:38 +0000 @@ -135,6 +135,9 @@ self.bread_crumb = bread_crumb self.kwargs = kwargs + def __unicode__(self): + return self.get_name() + def get_name(self): return self.bread_crumb.get_name(self.kwargs) === modified file 'lava_server/templates/layouts/base.html' --- lava_server/templates/layouts/base.html 2011-11-08 23:50:58 +0000 +++ lava_server/templates/layouts/base.html 2011-11-18 11:24:38 +0000 @@ -2,7 +2,7 @@ - {% block title %}LAVA{% endblock %} + {% block title %}{% endblock %} {% block scripts_and_styles %} === modified file 'lava_server/templates/layouts/content.html' --- lava_server/templates/layouts/content.html 2011-11-10 12:26:47 +0000 +++ lava_server/templates/layouts/content.html 2011-11-18 11:24:38 +0000 @@ -3,7 +3,7 @@ {% block title %} -{{ block.super }}{% for bread_crumb in bread_crumb_trail %} | {{ bread_crumb.get_name }}{% endfor %} +{{ bread_crumb_trail|join:" | " }} {% endblock %}