Merge lp:~jpds/launchpad/mirror_pages_v3 into lp:launchpad

[Jonathan Davies]

Updated distribution mirror pages to use v3 styling.

[Jonathan Davies (jpds)]

= Summary =

This branch updates distribution mirror pages to use v3 styling, with (./) buttons to separate options.

[Graham Binns (gmb)]

Hi Jonathan,

I'm happy with the template changes you've made here - UI review from Curtis pending, of course.

Two things:

 1. This isn't linked to a bug anywhere, so I don't know why these changes are being made. If there's a bug, please link it to the branch. If not, please file one and then link it. We use bugs to track work happening in Launchpad, so it's best if the branches and the bugs are linked.
 2. I said when I reviewed your branch yesterday that you need to write better cover letters. Your cover letter here isn't terribly informative. In future, please try to include:
   - Rationale for the changes in the branch (this can reference a bug if the bug has a lot of discussion or a description of a good fix).
   - The name of the person you had a pre-implementation discussion with about the branch.
   - The results of `make lint` (this helps us make sure that we don't land unused code).

review: Approve (code)

[Curtis Hovey (sinzui)]

Hi Johnathan.

This is a very nice improvement. I think the Organisation field should say "None" when the value is not set. Otherwise, this is good and I can land it for you.

review: Approve (ui)

=== modified file 'lib/lp/registry/browser/tests/distributionmirror-views.txt'
--- lib/lp/registry/browser/tests/distributionmirror-views.txt	2009-12-14 15:22:53 +0000
+++ lib/lp/registry/browser/tests/distributionmirror-views.txt	2010-02-09 21:40:34 +0000
@@ -359,10 +359,35 @@
     ...     archive_mirror, '+index', principal=user)
     >>> content = find_tag_by_id(view.render(), 'maincontent')
 
+The page shows the mirror's owner:
+
+    >>> print extract_text(find_tag_by_id(content, 'owner'))
+    Owner:
+    Mark Shuttleworth
+
 The page shows the mirror status
 
     >>> print extract_text(find_tag_by_id(content, 'status'))
-    Official Ubuntu Linux mirror administered by Mark Shuttleworth, ...
+    Status:
+    Official
+
+The page shows which country the mirror is in:
+
+    >>> print extract_text(find_tag_by_id(content, 'country'))
+    Country:
+    Antarctica
+
+The page shows which kind of mirror a mirror is:
+    
+    >>> print extract_text(find_tag_by_id(content, 'type'))
+    Type:
+    Archive
+
+And which organisation runs a mirror:
+
+    >>> print extract_text(find_tag_by_id(content, 'organisation'))
+    Organisation:
+    None
 
 The page contains a source list...
 

=== modified file 'lib/lp/registry/templates/distributionmirror-index.pt'
--- lib/lp/registry/templates/distributionmirror-index.pt	2009-12-08 15:51:34 +0000
+++ lib/lp/registry/templates/distributionmirror-index.pt	2010-02-09 21:40:34 +0000
@@ -12,70 +12,77 @@
     <h1 tal:content="view/page_title" />
   </tal:heading>
 
-  <tal:main metal:fill-slot="main"
-            define="overview_menu context/menu:overview">
-
-    <div class="top-portlet">
-    <p id="status" class="registered">
-      <strong>
-        <tal:status replace="context/status/title">Official</tal:status>
-      </strong>
-      <span tal:replace="context/distribution/title" /> mirror administered
-        by
-      <span tal:content="structure context/owner/fmt:link" />, first
-        registered
-      <span tal:content="context/date_created/fmt:displaydate" />
+  <tal:registering metal:fill-slot="registering">
+    <p>
+      Registered
+      <span tal:content="context/date_created/fmt:displaydate">
+      on 2005-01-01</span>
     </p>
+  </tal:registering>
 
-    <tal:is-admin condition="context/required:launchpad.Edit">
-    </tal:is-admin>
+  <tal:main
+    metal:fill-slot="main"
+    define="overview_menu context/menu:overview">
+    
+    <div class="top-portlet" tal:condition="context/description">
+      <p tal:content="structure context/description/fmt:text-to-html" />
     </div>
-    <h2>Archive information</h2>
+
     <div class="yui-g">
-      <div class="yui-u first">
-        <div class="top-portlet">
-          <tal:is-admin condition="context/required:launchpad.Edit">
-          <dl id="whiteboard">
+      <div class="portlet">
+        <h2>Archive information</h2>
+          <div class="yui-u first">
+            <div class="two-column-list">
+              <dl id="owner">
+                <dt>Owner:</dt>
+                <dd>
+                  <span tal:content="structure context/owner/fmt:link" />
+                  <a tal:replace="structure overview_menu/reassign/fmt:icon"/>
+                </dd>
+              </dl>
+
+              <dl id="status">
+                <dt>Status:</dt>
+                <dd>
+                  <tal:status replace="context/status/title">Official</tal:status>
+                  <a tal:replace="structure overview_menu/review/fmt:icon"/>
+                </dd>
+              </dl>
+            </div>
+
+            <dl id="whiteboard"
+              tal:condition="context/required:launchpad.Edit">
             <dt>
               Whiteboard
               <a tal:replace="structure overview_menu/review/fmt:icon"/>
             </dt>
             <dd tal:content="structure context/whiteboard/fmt:text-to-html" />
-          </dl>
-          </tal:is-admin>
-          <dl tal:condition="context/description">
-            <dt>Description:</dt>
-            <dd class="description"
-                tal:content="structure context/description/fmt:text-to-html" />
-          </dl>
-        </div>
-      </div>
-
-      <div class="yui-u">
-
-    <div class="top-portlet">
-      <div class="two-column-list">
-        <dl>
-          <dt>Speed:</dt>
-          <dd tal:content="context/speed/title" />
-        </dl>
-        <dl>
-          <dt>Country:</dt>
-          <dd tal:content="context/country/name" />
-        </dl>
-        <dl>
-          <dt>Type:</dt>
-          <dd tal:content="context/content/title" />
-        </dl>
-        <dl>
-          <dt>Organisation:</dt>
-          <dd tal:content="context/displayname" />
-        </dl>
-
-      </div>
-    </div>
-    </div>
-    </div>
+        </dl>
+
+        </div>
+
+        <div class="yui-u">
+          <div class="two-column-list">
+            <dl id="speed"> 
+              <dt>Speed:</dt>
+              <dd tal:content="context/speed/title" />
+            </dl>
+            <dl id="country">
+              <dt>Country:</dt>
+              <dd tal:content="context/country/name" />
+            </dl>
+            <dl id="type">
+              <dt>Type:</dt>
+              <dd tal:content="context/content/title" />
+            </dl>
+            <dl id="organisation">
+                <dt>Organisation:</dt>
+                <dd tal:condition="context/displayname"
+                  tal:content="context/displayname" />
+                <dd tal:condition="not: context/displayname">None</dd>
+            </dl>
+          </div>
+        </div>
 
     <div class="portlet"
          id="last-probe"