From patchwork Wed Sep 11 19:42:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Terceiro X-Patchwork-Id: 19980 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f70.google.com (mail-vb0-f70.google.com [209.85.212.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 54D9B248D9 for ; Wed, 11 Sep 2013 19:42:29 +0000 (UTC) Received: by mail-vb0-f70.google.com with SMTP id h10sf10780717vbh.5 for ; Wed, 11 Sep 2013 12:42:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:mime-version:to:from:subject :message-id:date:reply-to:sender:errors-to:precedence :x-original-sender:x-original-authentication-results:mailing-list :list-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=x0l+CgZ3vPRFG/aQQ2jXD6VB6DRv8pJS50ZE0wRJi1U=; b=AJPdPjOxRnF95dwfpVauqEM3UnkrnpqPKFGxPtFvQfWk3dnHqQpQC47NS8n34cVCY7 42fhjJmp9G+L0+dtfmU8et5bEcl65xE7cGZacBwcw8ifsSZ2rLQio98ijO0qhlKATp3W dktCiY5AJSPKGV4y5ZHAT6qxOEIHsaqaL4TZMOjWOfDXG6A73dofBBcezSAiHlQTt/cT 7nO9iAYYZ+1t0aF1+f/AGuClA8NsZjxCgugqf5P6IQA7wY+o9qej18rqNjzj7zlaTYLo qiHKrGrascUtgfDYbwvxcVeJ3xdnvUwLOYVZb4ETkobNz7N2TUTcU9C449Txt3P5LUZL lzFA== X-Received: by 10.236.163.67 with SMTP id z43mr1234953yhk.27.1378928548956; Wed, 11 Sep 2013 12:42:28 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.99.72 with SMTP id eo8ls418495qeb.41.gmail; Wed, 11 Sep 2013 12:42:28 -0700 (PDT) X-Received: by 10.58.97.238 with SMTP id ed14mr1587971veb.34.1378928548679; Wed, 11 Sep 2013 12:42:28 -0700 (PDT) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id v6si6515604vet.114.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 11 Sep 2013 12:42:28 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id oy12so6048266veb.26 for ; Wed, 11 Sep 2013 12:42:28 -0700 (PDT) X-Gm-Message-State: ALoCoQmcSTGHiAYzgnvy25zbQ/IHflneUAhMk8cOdI3PEtEApuA8P7SybDPrtu7cAIeOceic76rE X-Received: by 10.58.100.234 with SMTP id fb10mr2805697veb.5.1378928548524; Wed, 11 Sep 2013 12:42:28 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp76142vcz; Wed, 11 Sep 2013 12:42:27 -0700 (PDT) X-Received: by 10.180.103.7 with SMTP id fs7mr2756069wib.42.1378928547377; Wed, 11 Sep 2013 12:42:27 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id wy3si11523290wjc.103.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 11 Sep 2013 12:42:27 -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; Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1VJqJ0-0001pO-PI for ; Wed, 11 Sep 2013 19:42:26 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id AE71CE09E9 for ; Wed, 11 Sep 2013 19:42:26 +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: 426 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-server/trunk] Rev 426: new LAVA theme Message-Id: <20130911194226.13729.15262.launchpad@ackee.canonical.com> Date: Wed, 11 Sep 2013 19:42:26 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: list X-Generated-By: Launchpad (canonical.com); Revision="16761"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: b29e1e49d53dfb70a5568b9d525d8c195e677483 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: noreply@launchpad.net X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Merge authors: Antonio Terceiro (terceiro) Antonio Terceiro (terceiro) Related merge proposals: https://code.launchpad.net/~terceiro/lava-server/new-theme/+merge/184903 proposed by: Antonio Terceiro (terceiro) review: Approve - Tyler Baker (tyler-baker) ------------------------------------------------------------ revno: 426 [merge] committer: Antonio Terceiro branch nick: trunk timestamp: Wed 2013-09-11 16:41:10 -0300 message: new LAVA theme added: lava_server/htdocs/images/linaro-sprinkles.png lava_server/htdocs/images/linaro-sprinkles.svg modified: lava_server/context_processors.py lava_server/htdocs/css/default.css lava_server/htdocs/css/demo_table_jui.css lava_server/htdocs/css/login.css lava_server/htdocs/images/logo.png lava_server/templates/index.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/context_processors.py' --- lava_server/context_processors.py 2013-09-06 15:27:45 +0000 +++ lava_server/context_processors.py 2013-09-11 19:34:55 +0000 @@ -27,7 +27,7 @@ def lava(request): menu_list = [ - Menu("LAVA", reverse('lava.home')), + Menu("Home", reverse('lava.home')), ] for extension in loader.extensions: menu = extension.get_menu() === modified file 'lava_server/htdocs/css/default.css' --- lava_server/htdocs/css/default.css 2013-08-07 11:35:41 +0000 +++ lava_server/htdocs/css/default.css 2013-09-11 19:34:55 +0000 @@ -9,7 +9,6 @@ margin: 0; height: 100%; color: #EEE; - background-color: #999999; font-family: Ubuntu, Helvetica Neue, Verdana, sans-serif; } @@ -23,25 +22,29 @@ } a { - color: #08C; + color: #2e3436; +} + +a:hover { + color: #6C9D10; } /* Selection style */ -::selection { +::selection { color: white; - background-color: #222; + background-color: #6C9D10; } ::-moz-selection { color: white; - background-color: #222; + background-color: #6C9D10; } ::-webkit-selection { color: white; - background-color: #222; + background-color: #6C9D10; } /* The master container of all things, similar to body */ @@ -58,8 +61,9 @@ /* Header */ #lava-panel { - background: black; - color: #cccccc; + color: #888a85; + background: -moz-linear-gradient(center top , #FFFFFF 0%, #F5F5F5 100%) repeat scroll 0 0 transparent; + border-bottom: 1px solid #dfdfdf; font-family: 'Cantarell', sans-serif; font-weight: bold; @@ -73,24 +77,12 @@ display: -moz-box; display: -webkit-box; - height: 37px; + height: 50px; width: 100%; position: relative; z-index: 1000; - - - background-image: linear-gradient(bottom, #444 50%, #333 90%); - background-image: -o-linear-gradient(bottom, #444 50%, #333 90%); - background-image: -moz-linear-gradient(bottom, #444 50%, #333 90%); - background-image: -webkit-linear-gradient(bottom, #444 50%, #333 90%); - background-image: -ms-linear-gradient(bottom, #444 50%, #333 90%); - background-image: -webkit-gradient( - linear, - left bottom, - left top, - color-stop(0.5, #444), - color-stop(0.9, #333) - ); + + } #lava-panel .lava-panel-element .lava-panel-menu-text { @@ -123,7 +115,7 @@ #lava-panel .lava-panel-element.active { color: white; - background: #009fd4; + background: #98c13d; } #lava-panel a { @@ -136,18 +128,18 @@ #lava-menu-bar-right, #lava-menu-bar-left { height: 30px; position: absolute; - top: 0; + top: 15px; white-space: nowrap; z-index: 1000; } #lava-menu-bar-left { - left: 0; + left: 30px; padding-left: 4px; } #lava-menu-bar-right { - right: 0; + right: 30px; padding-right: 5px; } @@ -159,10 +151,9 @@ top: -1000px; background: white; - color: black; + color: #888a85; border: 1px solid #BBB; - border-radius: 0 0 3px 3px; margin: 0; padding: 3px 0; @@ -176,7 +167,6 @@ padding: 0; font-size: 10pt; font-weight: bold; - text-shadow: 0 0 2pt #CCC; } #lava-panel ul.lava-panel-menu li a { @@ -186,8 +176,7 @@ #lava-panel ul.lava-panel-menu li a:hover { color: white; - background: #009fd4; - text-shadow: none; + background: #98c13d; } /* User indicator */ @@ -205,7 +194,7 @@ } #lava-user-indicator .sign-in-hint { - color: #888; + color: #888a85; } /* AJAX indicator */ @@ -229,21 +218,20 @@ /* Logo */ -#lava-logo { - min-width: 860px; - margin: 1em 3em; -} - -#lava-logo img { - border: none; +#lava-logo-caption { + color: #739C18 !important; + font-weight: 900; + text-shadow: 0.1em 0.1em #c0e0c0 !important; } /* Around content area */ #lava-around-content { margin: 1em 3em; - background-color: #333; - border-radius: 8px; + background: #E9E9E9; + border: 1px solid #dfdfdf; + box-shadow: 0 0 3px rgba(0, 0, 0, 0.2); + color: #888a85; } #lava-around-content:before { @@ -255,18 +243,6 @@ top: 0; left: 0; z-index: -1000; - background-image: linear-gradient(bottom, rgb(153,153,153) 0%, rgb(0,0,0) 70%); - background-image: -o-linear-gradient(bottom, rgb(153,153,153) 0%, rgb(0,0,0) 70%); - background-image: -moz-linear-gradient(bottom, rgb(153,153,153) 0%, rgb(0,0,0) 70%); - background-image: -webkit-linear-gradient(bottom, rgb(153,153,153) 0%, rgb(0,0,0) 70%); - background-image: -ms-linear-gradient(bottom, rgb(153,153,153) 0%, rgb(0,0,0) 70%); - background-image: -webkit-gradient( - linear, - left bottom, - left top, - color-stop(0, rgb(153,153,153)), - color-stop(0.7, rgb(0,0,0)) - ); } /* Breadcrumbs */ @@ -274,7 +250,7 @@ #lava-breadcrumbs { font-size: 10pt; margin: 0; - padding: 1ex 1em 0.5ex 1em; + padding: 10px; } #lava-breadcrumbs ul { @@ -306,13 +282,9 @@ #lava-content-and-sidebar, #lava-content-without-sidebar { color: #444; - background-color: white; - border-radius: 8px; - -moz-border-radius: 8px; - - margin-top: 1ex; - - box-shadow: 0 -3pt 5pt rgba(0,0,0, 0.4); + background-color: #F5F5F5; + border-top: 1px solid #DFDFDF; + overflow-x: auto; display: table; @@ -355,29 +327,16 @@ left: 0; right: 0; clear: both; - border-top: 2px solid #fff; + + background: -moz-linear-gradient(center top , #F5F5F5 0%, #FFFFFF 100%) repeat scroll 0 0 transparent; + border-top: 1px solid #dfdfdf; + color: #888a85; margin: 0 auto; height: 100px; text-align: center; - font-size: 8pt; - - background-image: linear-gradient(bottom, rgb(75,75,75) 30%, rgb(35,35,35) 100%); - background-image: -o-linear-gradient(bottom, rgb(75,75,75) 30%, rgb(35,35,35) 100%); - background-image: -moz-linear-gradient(bottom, rgb(75,75,75) 30%, rgb(35,35,35) 100%); - background-image: -webkit-linear-gradient(bottom, rgb(75,75,75) 30%, rgb(35,35,35) 100%); - background-image: -ms-linear-gradient(bottom, rgb(75,75,75) 30%, rgb(35,35,35) 100%); - - background-image: -webkit-gradient( - linear, - left bottom, - left top, - color-stop(0.3, rgb(75,75,75)), - color-stop(1, rgb(35,35,35)) - ); - /* This is mainly for IE6 */ - background-color: #4b4b4b; + } #lava-footer ul { @@ -401,11 +360,6 @@ content: ""; } -#lava-footer a { - color: inherit !important; - color: white; /* IE6 */ -} - /* Text listings */ ol.file_listing { @@ -447,7 +401,7 @@ table.form_helper p.help_text { margin: 0.2ex 1ex; - color: #888; + color: #888a85; } table.form_helper tr { @@ -494,7 +448,7 @@ /* Console snippets */ div.console { - background-color: #222; + background-color: #6C9D10; color: white; border: 3px solid #000; padding: 0.5ex; @@ -506,17 +460,17 @@ } div.console ::selection { - color: #222; + color: #6C9D10; background-color: white; } div.console ::-moz-selection { - color: #222; + color: #6C9D10; background-color: white; } div.console ::-webkit-selection { - color: #222; + color: #6C9D10; background-color: white; } @@ -548,7 +502,7 @@ } #lava-sidebar p.help_text { - color: #888; + color: #888a85; padding: 2pt; } @@ -559,7 +513,6 @@ cursor: help; background-color: #555; color: white; - border-radius: 0.5em; padding: 0.3em; } === modified file 'lava_server/htdocs/css/demo_table_jui.css' --- lava_server/htdocs/css/demo_table_jui.css 2011-11-08 23:50:58 +0000 +++ lava_server/htdocs/css/demo_table_jui.css 2013-09-11 19:34:55 +0000 @@ -74,6 +74,10 @@ font-weight: normal; } +.ui-widget-header, .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { + background: -moz-linear-gradient(center top , #FFFFFF 0%, #F5F5F5 100%) repeat scroll 0 0 transparent; +} + /* * Sort arrow icon positioning @@ -278,7 +282,7 @@ tr.odd { - background-color: #E2E4FF; + background-color: #E9EEE9; } tr.even { @@ -376,27 +380,27 @@ */ /* For the standard odd/even */ tr.odd td.sorting_1 { - background-color: #D3D6FF; + background-color: #DADADA; } tr.odd td.sorting_2 { - background-color: #DADCFF; + background-color: #DFDFDF; } tr.odd td.sorting_3 { - background-color: #E0E2FF; + background-color: #E0E0E0; } tr.even td.sorting_1 { - background-color: #EAEBFF; + background-color: #E9E9E9; } tr.even td.sorting_2 { - background-color: #F2F3FF; + background-color: #F2F2F3; } tr.even td.sorting_3 { - background-color: #F9F9FF; + background-color: #F9F9F9; } === modified file 'lava_server/htdocs/css/login.css' --- lava_server/htdocs/css/login.css 2011-05-23 14:36:47 +0000 +++ lava_server/htdocs/css/login.css 2013-09-10 20:58:07 +0000 @@ -1,7 +1,4 @@ body { - background-color: #222; - background: #222 -moz-radial-gradient(50% 0, circle, #444, #222 40%) no-repeat; - background: #222 -webkit-gradient(radial, 50% 0, 0, 50% 0, 650, from(#444), color-stop(40%, #222)) no-repeat; color: #F5F4E1; font-size: 10pt; margin: 0; @@ -20,12 +17,11 @@ } #header h1 { - color: white; + color: #6C9D10 ; font-size: 32pt; margin: 0.2em; padding: 5pt; text-align: center; - text-shadow: #000 2px 2px; } #header h1.long { @@ -48,9 +44,8 @@ padding: 10pt; } -#content { - color: white; - text-shadow: #333 2px 2px; +#content { + color: #222; } #content p.error { @@ -68,8 +63,11 @@ } #content a { - color: rgb(212, 74, 23); - text-decoration: none; + color: #888a85; +} + +#content a:hover { + color: #6C9D10; } /* Main layout table */ @@ -106,7 +104,7 @@ background-color: #515151; background-color: rgba(255, 255, 255, 0.1); border: 2pt solid #292929; - color: white; + color: #888a85; display: block; margin: auto; padding: 3pt; @@ -114,9 +112,8 @@ } input[type=text]:focus, input[type=password]:focus { - background-color: #0c0c0c; - background-color: rgba(0, 0, 0, 0.8); - border: 2pt solid rgb(212, 74, 23); + background-color: #F5F4E1; + border: 2pt solid #6C9D10; } input[type=password] { @@ -131,7 +128,7 @@ -webkit-border-radius: 5pt; -webkit-box-shadow: 0 2pt 4pt #222; background-color: #D44917; - background: -moz-linear-gradient(center bottom, rgb(212,52,16) 6%, rgb(212,74,23) 75%); + background: -moz-linear-gradient(center bottom, #6C9D10 6%, #98c13d 75%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0.06, rgb(212, 52, 16)), color-stop(0.75, rgb(212, 74, 23))); border-radius: 5pt; border: none; @@ -142,7 +139,6 @@ margin: 1em auto; padding: 5pt; text-decoration: none; - text-shadow: #333 2px 2px; } input.watermark { === added file 'lava_server/htdocs/images/linaro-sprinkles.png' === added file 'lava_server/htdocs/images/linaro-sprinkles.svg' --- lava_server/htdocs/images/linaro-sprinkles.svg 1970-01-01 00:00:00 +0000 +++ lava_server/htdocs/images/linaro-sprinkles.svg 2013-09-11 19:34:55 +0000 @@ -0,0 +1,90 @@ + + + +image/svg+xml \ No newline at end of file === modified file 'lava_server/htdocs/images/logo.png' Binary files lava_server/htdocs/images/logo.png 2011-11-08 23:47:23 +0000 and lava_server/htdocs/images/logo.png 2013-09-10 20:55:55 +0000 differ === modified file 'lava_server/templates/index.html' --- lava_server/templates/index.html 2013-08-30 13:34:33 +0000 +++ lava_server/templates/index.html 2013-09-10 20:55:55 +0000 @@ -5,23 +5,6 @@ {% block breadcrumb_container %} {% endblock %} -{% block before_content %} - - -{% endblock %} - - {% block content %}

LAVA Highlights

This page contains highlights from the installed lava server extensions. === modified file 'lava_server/templates/layouts/content.html' --- lava_server/templates/layouts/content.html 2013-08-19 10:45:42 +0000 +++ lava_server/templates/layouts/content.html 2013-09-11 19:34:55 +0000 @@ -18,6 +18,12 @@ {% block menu %}

+
+ +
+
+ LAVA +
{% for menu in lava.menu_list %}
{{ menu.label }}{% if menu.sub_menu %} ▾{% endif %} @@ -68,21 +74,18 @@
- {% if not user.is_authenticated %} - - {% endif %} + {% if user.is_authenticated %} - {% if user.is_authenticated %} {{user.get_full_name|default:user.username}} ▾ {% else %} {% if request.get_full_path == "/accounts/logout/" %} {% trans "Guest" %} - {% else %} + class="username">{% trans "Sign In" %} + {% else %} {% trans "Guest" %} + class="username">{% trans "Sign In" %} {% endif %} {% endif %}