From patchwork Mon Jun 4 09:38:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zygmunt Krynicki X-Patchwork-Id: 9095 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 7CE1F23E0C for ; Mon, 4 Jun 2012 09:38:22 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id 3043FA185E5 for ; Mon, 4 Jun 2012 09:38:22 +0000 (UTC) Received: by ggnf1 with SMTP id f1so3192836ggn.11 for ; Mon, 04 Jun 2012 02:38:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :content-type:mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state; bh=RrbbdmMgEdzopsi2FVAjTXkQHkxDnMtY26GA0ZxLEro=; b=nBoKvBbnLuIOWC31JXNnBykVUpem5Zsob7WL6mkp7t6PcdOSRUoamBPQsahJuo1rBo dF+AlzjPc7E7BJAV6mgteBtIISOSrub/yG59eWYgPyOcxdWVIq3KviZylerurn99oEPW eBxngCfjxS4YhlnZ+sMP4u2jtd3gLjxN2xJEV82Vvox2/obIqFlc9KD8iTxKg+X2Rh5Q d+E52P1NLisYrAK8CAzfzW05Rn+1ErjjdHsbNB8SgbLnFbB2+C7UcqbR+v96/sPXU5dI FvMNIknnDBHg508ymfabsTN3SOKbsdv6fm+PvgMKWkKbOXvNVW0HFQ+42C75Hh8SZKZ+ zpNg== Received: by 10.50.193.196 with SMTP id hq4mr7200824igc.57.1338802701311; Mon, 04 Jun 2012 02:38:21 -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.231.24.148 with SMTP id v20csp96608ibb; Mon, 4 Jun 2012 02:38:20 -0700 (PDT) Received: by 10.205.132.13 with SMTP id hs13mr6469712bkc.78.1338802699550; Mon, 04 Jun 2012 02:38:19 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id o14si14007986wem.117.2012.06.04.02.38.18 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 04 Jun 2012 02:38:19 -0700 (PDT) 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 1SbTju-0005Ni-N3 for ; Mon, 04 Jun 2012 09:38:18 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 999C2E039A for ; Mon, 4 Jun 2012 09:38:18 +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: 377 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-server/trunk] Rev 377: Merge fixes for the menu bar in IE8 and IE9 Message-Id: <20120604093818.21480.83161.launchpad@ackee.canonical.com> Date: Mon, 04 Jun 2012 09:38:18 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15353"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 02af281f6135677f692eb3d45d4057d458348ff3 X-Gm-Message-State: ALoCoQkqFGtoEo1DwdEq7Alq18LbkpoLFGcxOeduV/QfHqRX0I5XiMhOI9izOQCgpJM2+bV4rRKu Merge authors: Yongqin Liu (liuyq0307) Related merge proposals: https://code.launchpad.net/~liuyq0307/lava-server/fix-display-ie8/+merge/108521 proposed by: Yongqin Liu (liuyq0307) review: Approve - Zygmunt Krynicki (zkrynicki) ------------------------------------------------------------ revno: 377 [merge] committer: Zygmunt Krynicki branch nick: trunk timestamp: Mon 2012-06-04 11:36:16 +0200 message: Merge fixes for the menu bar in IE8 and IE9 modified: lava_server/htdocs/css/default.css 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/htdocs/css/default.css' --- lava_server/htdocs/css/default.css 2011-11-22 20:38:02 +0000 +++ lava_server/htdocs/css/default.css 2012-06-04 05:10:13 +0000 @@ -73,6 +73,7 @@ display: -moz-box; display: -webkit-box; + height: 37px; width: 100%; position: relative; z-index: 1000; @@ -105,6 +106,11 @@ outline: none; } +#lava-panel .lava-panel-element{ + display: table-cell; + outline: none; +} + #lava-panel .lava-panel-element.lava-indicator { box-pack: end; -moz-box-pack: end; @@ -125,16 +131,26 @@ text-decoration: none; } -/* Spacer */ - -#lava-panel-spacer { - box-flex: 1; - -moz-box-flex: 1; - -webkit-box-flex: 1; -} - /* Panel menu items */ +#lava-menu-bar-right, #lava-menu-bar-left { + height: 30px; + position: absolute; + top: 0; + white-space: nowrap; + z-index: 1000; +} + +#lava-menu-bar-left { + left: 0; + padding-left: 4px; +} + +#lava-menu-bar-right { + right: 0; + padding-right: 5px; +} + #lava-panel ul.lava-panel-menu { list-style: none; @@ -180,6 +196,10 @@ text-align: center; } +#lava-user-indicator ul.lava-panel-menu { + text-align: left; +} + #lava-user-indicator img { vertical-align: top; } @@ -191,6 +211,7 @@ /* AJAX indicator */ #lava-ajax-indicator { + visibility: hidden; opacity: 0.0; } === modified file 'lava_server/templates/layouts/content.html' --- lava_server/templates/layouts/content.html 2011-11-22 20:56:07 +0000 +++ lava_server/templates/layouts/content.html 2012-06-04 03:32:24 +0000 @@ -17,24 +17,24 @@ {% block menu %} +
{% for menu in lava.menu_list %}
{{ menu.label }}{% if menu.sub_menu %} ▾{% endif %} + {% if menu.sub_menu %} + + {% endif %}
- {% if menu.sub_menu %} - - {% endif %} {% endfor %} {% endblock menu %} - - -
- +
+ +
@@ -46,12 +46,13 @@ $('#lava-ajax-indicator').animate({ opacity: 1.0 }, "fast", function() { + $("#lava-ajax-indicator").css("visibility", "visible"); }); }).ajaxStop(function() { $('#lava-ajax-indicator').animate({ opacity: 0.0 }, "fast", function() { - $("#lava-ajax-indicator").css("display", "hidden"); + $("#lava-ajax-indicator").css("visibility", "hidden"); }); }); @@ -73,17 +74,19 @@ >{% trans "Guest" %} {% endif %}
+ {% if user.is_authenticated %} + + {% endif %}
- {% if user.is_authenticated %} - - {% endif %} +
+ @@ -138,7 +141,7 @@ menu_should_open = true; $("#lava-panel").addClass("active"); - if ($(this).next(".lava-panel-menu").position().top > -500) { + if ($(this).children(".lava-panel-menu").position().top > -500) { // Clicking on a menu with a visible sub-menu just triggers the link return; } @@ -149,7 +152,7 @@ // Find the sub menu var self = $(this); current_menu = self; - current_sub_menu = self.next(".lava-panel-menu"); + current_sub_menu = self.children(".lava-panel-menu"); // Add an 'active' class to the current menu, this showes up as a nice gradient current_menu.addClass("active");