From patchwork Tue Jul 26 09:44:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zygmunt Krynicki X-Patchwork-Id: 3132 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 0B36924142 for ; Tue, 26 Jul 2011 09:44:24 +0000 (UTC) Received: from mail-qy0-f173.google.com (mail-qy0-f173.google.com [209.85.216.173]) by fiordland.canonical.com (Postfix) with ESMTP id C2298A18426 for ; Tue, 26 Jul 2011 09:44:23 +0000 (UTC) Received: by qyk10 with SMTP id 10so1638262qyk.11 for ; Tue, 26 Jul 2011 02:44:23 -0700 (PDT) Received: by 10.229.68.200 with SMTP id w8mr467470qci.114.1311673463252; Tue, 26 Jul 2011 02:44:23 -0700 (PDT) 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.229.217.78 with SMTP id hl14cs105285qcb; Tue, 26 Jul 2011 02:44:23 -0700 (PDT) Received: by 10.227.202.19 with SMTP id fc19mr2279295wbb.61.1311673461653; Tue, 26 Jul 2011 02:44:21 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id fk2si548192wbb.115.2011.07.26.02.44.21; Tue, 26 Jul 2011 02:44:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) client-ip=91.189.90.139; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) smtp.mail=bounces@canonical.com Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QleBY-0002dZ-NS for ; Tue, 26 Jul 2011 09:44:20 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id AC9992E8059 for ; Tue, 26 Jul 2011 09:44:20 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-dashboard X-Launchpad-Branch: ~linaro-validation/lava-dashboard/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 250 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dashboard/trunk] Rev 250: Merge slight theme variation that removes the double navigation bar Message-Id: <20110726094420.2941.91876.launchpad@loganberry.canonical.com> Date: Tue, 26 Jul 2011 09:44:20 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13503"; Instance="initZopeless config overlay" X-Launchpad-Hash: 7efeaaf00be2968b5681e548ad7ad77310dc0aae Merge authors: Zygmunt Krynicki (zkrynicki) Related merge proposals: https://code.launchpad.net/~zkrynicki/lava-dashboard/theme/+merge/69181 proposed by: Zygmunt Krynicki (zkrynicki) ------------------------------------------------------------ revno: 250 [merge] committer: Zygmunt Krynicki branch nick: trunk timestamp: Tue 2011-07-26 11:41:42 +0200 message: Merge slight theme variation that removes the double navigation bar modified: dashboard_app/templates/dashboard_app/_content.html dashboard_app/templates/dashboard_app/_content_with_sidebar.html dashboard_app/templates/dashboard_app/_extension_navigation.html --- lp:lava-dashboard https://code.launchpad.net/~linaro-validation/lava-dashboard/trunk You are subscribed to branch lp:lava-dashboard. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dashboard/trunk/+edit-subscription === modified file 'dashboard_app/templates/dashboard_app/_content.html' --- dashboard_app/templates/dashboard_app/_content.html 2011-07-12 02:34:12 +0000 +++ dashboard_app/templates/dashboard_app/_content.html 2011-07-25 23:19:44 +0000 @@ -17,6 +17,6 @@ {% endblock %} -{% block extension_navigation %} +{% block navigation %} {% include "dashboard_app/_extension_navigation.html" %} {% endblock %} === modified file 'dashboard_app/templates/dashboard_app/_content_with_sidebar.html' --- dashboard_app/templates/dashboard_app/_content_with_sidebar.html 2011-07-12 02:34:12 +0000 +++ dashboard_app/templates/dashboard_app/_content_with_sidebar.html 2011-07-25 23:19:44 +0000 @@ -17,6 +17,6 @@ {% endblock %} -{% block extension_navigation %} +{% block navigation %} {% include "dashboard_app/_extension_navigation.html" %} {% endblock %} === modified file 'dashboard_app/templates/dashboard_app/_extension_navigation.html' --- dashboard_app/templates/dashboard_app/_extension_navigation.html 2011-07-22 00:57:44 +0000 +++ dashboard_app/templates/dashboard_app/_extension_navigation.html 2011-07-25 23:19:44 +0000 @@ -1,6 +1,8 @@ {% load i18n %} -