From patchwork Fri Oct 21 00:46: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: 4763 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 9EBE523E03 for ; Fri, 21 Oct 2011 00:46:24 +0000 (UTC) Received: from mail-bw0-f52.google.com (mail-bw0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id 87289A18222 for ; Fri, 21 Oct 2011 00:46:24 +0000 (UTC) Received: by bkbzs2 with SMTP id zs2so5880412bkb.11 for ; Thu, 20 Oct 2011 17:46:24 -0700 (PDT) Received: by 10.223.4.215 with SMTP id 23mr21314304fas.8.1319157983476; Thu, 20 Oct 2011 17:46: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.152.1.71 with SMTP id 7cs143557lak; Thu, 20 Oct 2011 17:46:23 -0700 (PDT) Received: by 10.227.24.8 with SMTP id t8mr4568861wbb.72.1319157974296; Thu, 20 Oct 2011 17:46:14 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id ep5si8333189wbb.132.2011.10.20.17.46.14 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Oct 2011 17:46:14 -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 1RH3FV-0006nG-Ok for ; Fri, 21 Oct 2011 00:46:13 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id AE7FCFB7DE for ; Fri, 21 Oct 2011 00:46: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: 267 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-server/trunk] Rev 267: Simplify the sidebar. Message-Id: <20111021004613.12801.78428.launchpad@ackee.canonical.com> Date: Fri, 21 Oct 2011 00:46: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="14165"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 198f7332a2ff2a1c0327d7d0bcfa3e2935525313 ------------------------------------------------------------ revno: 267 committer: Zygmunt Krynicki branch nick: lava-server timestamp: Fri 2011-10-21 01:30:06 +0200 message: Simplify the sidebar. Remove dock/undock feature Remove pin/unpin feature Show the sidebar automatically modified: 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/templates/layouts/content_with_sidebar.html' --- lava_server/templates/layouts/content_with_sidebar.html 2011-09-27 19:48:51 +0000 +++ lava_server/templates/layouts/content_with_sidebar.html 2011-10-20 23:30:06 +0000 @@ -18,16 +18,6 @@ $(window).load(function() { var preferDockedCookieName = "lava-server-prefer-docked"; var sidebar = $("#lava-server-sidebar"); - var dock = $("") - .button({ - label: "Dock the sidebar", - icons: { secondary: "ui-icon-circle-triangle-e" } - }) - .css("float", "right") - .prependTo(sidebar) - .click(function() { - dock_the_sidebar(); - }); function dock_the_sidebar() { var user_box = $("#lava-server-user-box"); @@ -37,8 +27,6 @@ var base_margin = ( $("#lava-server-content").outerWidth(true) - $("#lava-server-content").outerWidth(false)) / 2; - // Remove the 'try new sidebar' button - dock.hide(); // As for the sidebar sidebar @@ -55,61 +43,14 @@ content.css("marginRight", base_margin + "px"); }, onDestroy: function() { - dock.show(); user_box.prependTo(header); content.css("marginRight", base_margin + "px"); sidebar.addClass("classic") - }, - onPin: function() { - var heart = $("#heart"); - if (!heart.attr("checked")) { - heart.attr("checked", "checked"); - heart.change(); // jQuery does not seem to fire this manually. - heart.parent("div").effect("highlight", {}, 3000); - } - }, - extraControls: [ - // Undock button - $("", { - title: "Undock the sidebar" - }) - .css("float", "left") - .button({ - label: "Undock", - text: false, - icons: { primary: 'ui-icon-circle-triangle-w' } - }) - .click(function () { sidebar.sidebar("destroy"); }), - // Preferences - $('
') - .css({ - textAlign: "left", - marginTop: "1ex" - }) - .append( - $('', { - type: "checkbox", - checked: $.cookie(preferDockedCookieName, {path: '/'}) == 'true', - id: "heart", - title: "Dock the sidebar automatically" - }) - .change(function() { - $.cookie(preferDockedCookieName, $(this).attr("checked") ? true : '', {path: '/'}) - }) - ) - .append( - $('