From patchwork Wed Sep 28 03:10:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Larson X-Patchwork-Id: 4380 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 A05A423EF6 for ; Wed, 28 Sep 2011 03:10:19 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 645A2A18FCE for ; Wed, 28 Sep 2011 03:10:19 +0000 (UTC) Received: by fxe23 with SMTP id 23so244945fxe.11 for ; Tue, 27 Sep 2011 20:10:19 -0700 (PDT) Received: by 10.223.94.134 with SMTP id z6mr13525805fam.8.1317179419196; Tue, 27 Sep 2011 20:10:19 -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.152.3.234 with SMTP id f10cs98033laf; Tue, 27 Sep 2011 20:10:18 -0700 (PDT) Received: by 10.227.201.79 with SMTP id ez15mr3487279wbb.99.1317179417357; Tue, 27 Sep 2011 20:10:17 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id fb15si16575409wbb.61.2011.09.27.20.10.17 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 27 Sep 2011 20:10:17 -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 1R8kXI-0004lV-RH for ; Wed, 28 Sep 2011 03:10:16 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id C3E4AE2322 for ; Wed, 28 Sep 2011 03:10:16 +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: 241 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-server/trunk] Rev 241: A few more things for 0.5 release Message-Id: <20110928031016.1488.61025.launchpad@ackee.canonical.com> Date: Wed, 28 Sep 2011 03:10:16 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14049"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 8c6d68f9e02cb7b6750e7302e47247a6566e217b Merge authors: Zygmunt Krynicki (zkrynicki) Related merge proposals: https://code.launchpad.net/~zkrynicki/lava-server/sidebar-improvements/+merge/77265 proposed by: Zygmunt Krynicki (zkrynicki) https://code.launchpad.net/~zkrynicki/lava-server/0.5-landing/+merge/77264 proposed by: Zygmunt Krynicki (zkrynicki) review: Approve - Paul Larson (pwlars) ------------------------------------------------------------ revno: 241 [merge] tags: release-0.5, 2011.09 committer: Paul Larson branch nick: lava-server timestamp: Tue 2011-09-27 22:06:10 -0500 message: A few more things for 0.5 release modified: lava_server/htdocs/css/default.css lava_server/templates/layouts/base.html lava_server/templates/layouts/content.html lava_server/templates/layouts/content_with_sidebar.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-09-23 08:23:09 +0000 +++ lava_server/htdocs/css/default.css 2011-09-27 19:48:26 +0000 @@ -5,7 +5,6 @@ code { font-family: UbuntuBeta Mono, Lucida Console, Consolas, monospace; - font-size: 10pt; } body { @@ -164,7 +163,7 @@ } #lava-server-sidebar.lava-sidebar { - color: black; + color: #333; height: 100%; padding: 2pt 2pt 5pt 5pt; border: none; @@ -174,6 +173,9 @@ box-shadow: 0 0 0.5em rgba(0, 0, 0, 0.2); background: white; top: 0; + font-size: 9pt; + font-family: 'Ubuntu', sans-serif; + overflow-y: auto; } /* Hidden sidebar should be opaque. Removing the border and keeping the shadow @@ -199,6 +201,85 @@ border-color: inherit !important; } +#lava-server-sidebar span.has-tooltip { + border-bottom: 1px dotted; +} + +#lava-server-sidebar dl { + margin: 0 0 0 1em; + padding: 0; +} + +#lava-server-sidebar dt { + font-weight: bold; + margin: 0; + padding: 0; +} + +#lava-server-sidebar dd { + margin: 0 0 0.5ex 1em; + padding: 0; +} + +#lava-server-sidebar p.help_text { + color: #888; + padding: 2pt; +} + +#lava-server-sidebar .help-button { + margin: 0 0 0 0.5em; + font-size: 7pt; + font-weight: bold; + cursor: help; + background-color: #555; + color: white; + border-radius: 0.5em; + padding: 0.3em; +} + +#lava-server-sidebar ul { + margin: 0 0 0 1em; + padding: 0 0 0 0; + list-style-position: inside; + list-style-type: square; +} + +#lava-server-sidebar dd ul { + margin: 0 0 0 0; + padding: 0 0 0 0; +} + +#lava-server-sidebar dd p { + margin: 0.2ex 0; +} + +#lava-server-sidebar h3 { + margin: 2ex 0 1ex 0; + padding: 0 0 0 0; + font-size: 12pt; + font-weight: bold; + line-height: 1.2ex; + display: inline-block; + color: inherit; +} + +#lava-server-sidebar h3 + p { + margin: 0; + text-indent: 1ex; +} + +#lava-server-sidebar div.console { + background-color: #222; + color: white; + border: 3px solid #000; + padding: 0.5ex; + overflow: auto; +} + +#lava-server-sidebar div.console code { + white-space: pre; +} + /* Content */ === modified file 'lava_server/templates/layouts/base.html' --- lava_server/templates/layouts/base.html 2011-09-22 10:50:10 +0000 +++ lava_server/templates/layouts/base.html 2011-09-27 19:48:36 +0000 @@ -11,6 +11,7 @@ + {% endblock %} {% block extrahead %}{% endblock %} === modified file 'lava_server/templates/layouts/content.html' --- lava_server/templates/layouts/content.html 2011-08-18 15:01:12 +0000 +++ lava_server/templates/layouts/content.html 2011-09-27 20:01:32 +0000 @@ -115,8 +115,10 @@ $(function() { $("#lava-server-topics dd").hide(); $("#lava-server-topics dt").click(function (event) { - $(":parent dd").slideUp("slow"); - $(this).next().slideDown("slow"); + if ($(this).next("dd").is(":hidden")) { + $(this).parent().children("dd").slideUp("fast"); + $(this).next("dd").slideDown("fast"); + } }); }); === modified file 'lava_server/templates/layouts/content_with_sidebar.html' --- lava_server/templates/layouts/content_with_sidebar.html 2011-09-22 10:50:10 +0000 +++ lava_server/templates/layouts/content_with_sidebar.html 2011-09-27 19:48:51 +0000 @@ -110,6 +110,36 @@ if ($.cookie(preferDockedCookieName) == "true") { dock_the_sidebar(); } + + // Collapse help_text items to a clickable question mark + $("#lava-server-sidebar dd p.help_text") + .each(function(index, item) { + $(item) + .hide() // hide the orginal text + .closest("dd").prev("dt") // to the closest data definition's topic + .append( // append a small span + $("", {"class": "help-button" }) + .text("?") // with a question mark + .click(function() { + $(this).hide(); // that goes away when clicked + $(item).show() // but displays the originally hidden text + }) + ); + }); + $("#lava-server-sidebar h3 + p.help_text") + .each(function(index, item) { + $(item) + .hide() // hide the orginal text + .prev("h3") // to the prevous header line + .append( // append a small span + $("", {"class": "help-button" }) + .text("?") // with a question mark + .click(function() { + $(this).hide(); // that goes away when clicked + $(item).show() // but displays the originally hidden text + }) + ); + }); }); {% endblock %}