From patchwork Fri Jul 8 03:00:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zygmunt Krynicki X-Patchwork-Id: 2580 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 DB6E524145 for ; Fri, 8 Jul 2011 03:00:58 +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 7FC43A184E3 for ; Fri, 8 Jul 2011 03:00:58 +0000 (UTC) Received: by mail-qy0-f173.google.com with SMTP id 10so68669qyk.11 for ; Thu, 07 Jul 2011 20:00:58 -0700 (PDT) Received: by 10.229.62.194 with SMTP id y2mr1232997qch.4.1310094058235; Thu, 07 Jul 2011 20:00:58 -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.48.135 with SMTP id r7cs125409qcf; Thu, 7 Jul 2011 20:00:57 -0700 (PDT) Received: by 10.227.199.207 with SMTP id et15mr1322698wbb.56.1310094055969; Thu, 07 Jul 2011 20:00:55 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id gb12si15485610wbb.28.2011.07.07.20.00.55; Thu, 07 Jul 2011 20:00:55 -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 1Qf1JG-0003JB-PG for ; Fri, 08 Jul 2011 03:00:54 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id BE2822E890E for ; Fri, 8 Jul 2011 03:00:54 +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: 194 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-server/trunk] Rev 194: Vast reorganization of server templates Message-Id: <20110708030054.11148.13285.launchpad@loganberry.canonical.com> Date: Fri, 08 Jul 2011 03:00:54 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13376"; Instance="initZopeless config overlay" X-Launchpad-Hash: e763bac155c9873e6b3f439b4b499269cdf33ec8 ------------------------------------------------------------ revno: 194 committer: Zygmunt Krynicki branch nick: trunk timestamp: Fri 2011-07-08 04:56:22 +0200 message: Vast reorganization of server templates removed: lava_server/templates/base.html lava_server/templates/list.html added: lava_server/templates/500.html lava_server/templates/layouts/content.html lava_server/templates/linaro_django_xmlrpc/_base.html modified: lava_server/templates/403.html lava_server/templates/404.html lava_server/templates/index.html lava_server/templates/layouts/base.html lava_server/templates/layouts/content_with_sidebar.html lava_server/templates/layouts/dialog.html lava_server/templates/linaro_django_xmlrpc/api.html lava_server/templates/linaro_django_xmlrpc/authtoken_confirm_delete.html lava_server/templates/linaro_django_xmlrpc/create_token.html lava_server/templates/linaro_django_xmlrpc/edit_token.html lava_server/templates/linaro_django_xmlrpc/tokens.html lava_server/templates/registration/base.html lava_server/templates/registration/logged_out.html lava_server/templates/version_details.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/403.html' --- lava_server/templates/403.html 2010-09-23 00:03:14 +0000 +++ lava_server/templates/403.html 2011-07-08 02:56:22 +0000 @@ -1,8 +1,8 @@ -{% extends "base.html" %} - -{% block title %} -| HTTP 403 -{% endblock %} +{% extends "layouts/content.html" %} + + +{% block title %} | HTTP 403 {% endblock %} + {% block content %}

403 Forbidden

=== modified file 'lava_server/templates/404.html' --- lava_server/templates/404.html 2010-09-23 00:03:14 +0000 +++ lava_server/templates/404.html 2011-07-08 02:56:22 +0000 @@ -1,8 +1,6 @@ {% extends "base.html" %} -{% block title %} -| HTTP 404 -{% endblock %} +{% block title %} | HTTP 404 {% endblock %} {% block content %}

404 Not found

=== added file 'lava_server/templates/500.html' --- lava_server/templates/500.html 1970-01-01 00:00:00 +0000 +++ lava_server/templates/500.html 2011-07-08 02:56:22 +0000 @@ -0,0 +1,7 @@ +{% extends "layouts/content.html" %} + +{% block title %} | HTTP 500 {% endblock %} + +{% block content %} +

500 Internal Server Error

+{% endblock %} === removed file 'lava_server/templates/base.html' --- lava_server/templates/base.html 2011-07-07 18:17:41 +0000 +++ lava_server/templates/base.html 1970-01-01 00:00:00 +0000 @@ -1,71 +0,0 @@ -{% extends "layouts/content_with_sidebar.html" %} -{% load i18n %} - - -{% block extrahead %} - - -{% endblock %} - - -{% block header %} -
- {% if user.is_authenticated %} - {% blocktrans %}Signed in as {{user}}{% endblocktrans %} - {% trans "Sign out" %} - {% if user.is_staff %} - {% trans " or visit " %}{% trans "admin interface" %} - {% endif %} - {% else %} - {% trans "You are not signed in" %} - - {% endif %} -
-

LAVA

-
- {% trans "Server Version:" %} {{ lava.version }} | {% trans "details..." %} -
-{% endblock %} - - -{% block navigation %} - -
-{% endblock %} - - -{% block breadcrumbs_outer %} -
{% trans "You are here: " %}
- -{% endblock %} - - -{% block footer %} - -

-{% blocktrans %} -This website should contain only valid XHTML markup, you can validate it -if you wish -{% endblocktrans %} -

-{% endblock %} === modified file 'lava_server/templates/index.html' --- lava_server/templates/index.html 2011-05-24 16:24:46 +0000 +++ lava_server/templates/index.html 2011-07-08 02:56:22 +0000 @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "layouts/content.html" %} {% load i18n %} @@ -11,12 +11,7 @@ {% endblock %} -{% block sidebar %} -{% endblock %} - - {% block content %} -

About LAVA

LAVA is a stack of technologies developed by Linaro Validation team that facilitates unattended image deployment, test planning, scheduling, execution, === modified file 'lava_server/templates/layouts/base.html' --- lava_server/templates/layouts/base.html 2010-12-09 19:49:37 +0000 +++ lava_server/templates/layouts/base.html 2011-07-08 02:56:22 +0000 @@ -1,11 +1,38 @@ +{% load i18n %} {% block title %}{% endblock %} + {% block scripts_and_styles %} + + + + + {% endblock %} + {% block extrahead %}{% endblock %} - {% block body %}{% endblock %} + {% block ajax_notification %} +

+ + {% trans "AJAX request is in progress..." %} +
+ + {% endblock %} + {% block body %} + {% endblock %} === added file 'lava_server/templates/layouts/content.html' --- lava_server/templates/layouts/content.html 1970-01-01 00:00:00 +0000 +++ lava_server/templates/layouts/content.html 2011-07-08 02:56:22 +0000 @@ -0,0 +1,94 @@ +{% extends "layouts/base.html" %} +{% load i18n %} + + +{% block title %} +{% trans "LAVA" %} +{% endblock %} + + +{% block body %} + + + + + + + + + + + + + + + + +
+ {% block extension_navigation %}{% endblock %} +
+ {% block content %}{% endblock %} +
+ +{% endblock %} === modified file 'lava_server/templates/layouts/content_with_sidebar.html' --- lava_server/templates/layouts/content_with_sidebar.html 2011-06-29 11:37:42 +0000 +++ lava_server/templates/layouts/content_with_sidebar.html 2011-07-08 02:56:22 +0000 @@ -11,8 +11,35 @@ @@ -23,7 +50,13 @@ @@ -42,6 +75,24 @@
{% endblock %} === modified file 'lava_server/templates/layouts/dialog.html' --- lava_server/templates/layouts/dialog.html 2010-12-09 19:49:37 +0000 +++ lava_server/templates/layouts/dialog.html 2011-07-08 02:56:22 +0000 @@ -1,6 +1,12 @@ {% extends "layouts/base.html" %} +{% block scripts_and_styles %} + + +{% endblock %} + + {% block extrahead %}