=== modified file 'lib/canonical/launchpad/icing/style-3-0.css'
--- lib/canonical/launchpad/icing/style-3-0.css	2009-08-17 20:36:01 +0000
+++ lib/canonical/launchpad/icing/style-3-0.css	2009-08-18 15:40:42 +0000
@@ -582,8 +582,8 @@
     border-bottom: 1px solid #d0d0d0;
     }
 .announcement .registered {
-    font-size: 95%;
-    margin-top: -2px
+    font-size: 93%;
+    margin-top: -2px;
     }
 
 /* From nice_pre in tales.py */

=== modified file 'lib/lp/registry/browser/announcement.py'
--- lib/lp/registry/browser/announcement.py	2009-08-17 20:36:01 +0000
+++ lib/lp/registry/browser/announcement.py	2009-08-19 00:45:18 +0000
@@ -72,14 +72,14 @@
     @enabled_with_permission('launchpad.Edit')
     def announce(self):
         text = 'Make announcement'
-        summary = 'Publish an item of news for this project'
+        summary = 'Create an item of news for this project'
         return Link('+announce', text, summary, icon='add')
 
 
 class AnnouncementContextMenu(ContextMenu, AnnouncementMenuMixin):
     """The menu for working with an Announcement."""
     usedfor = IAnnouncement
-    links = ('edit', 'retarget', 'publish', 'retract', 'delete')
+    links = ['edit', 'retarget', 'publish', 'retract', 'delete']
 
 
 class IAnnouncementEditMenu(Interface):
@@ -92,7 +92,7 @@
     usedfor = IAnnouncementEditMenu
     facet = 'overview'
     title = 'Change announcement'
-    links = ('edit', 'retarget', 'publish', 'retract', 'delete')
+    links = ['edit', 'retarget', 'publish', 'retract', 'delete']
 
     def __init__(self, context):
         super(AnnouncementEditNavigationMenu, self).__init__(context)
@@ -115,7 +115,7 @@
     usedfor = IAnnouncementCreateMenu
     facet = 'overview'
     title = 'Create announcement'
-    links = ('announce', )
+    links = ['announce']
 
 
 class AnnouncementFormMixin:

=== modified file 'lib/lp/registry/stories/announcements/xx-announcements.txt'
--- lib/lp/registry/stories/announcements/xx-announcements.txt	2009-08-17 20:36:01 +0000
+++ lib/lp/registry/stories/announcements/xx-announcements.txt	2009-08-19 01:15:01 +0000
@@ -75,6 +75,8 @@
 
     >>> print priv_browser.url
     http://launchpad.dev/apache
+    >>> print priv_browser.title
+    Apache in Launchpad
 
 We'll repeat the process for Tomcat, an IProduct that is part of the
 Apache project, but this time we won't specify a URL, and we will
@@ -107,8 +109,8 @@
     ...     name='field.publication_date.announcement_date').value = (
     ...          '2007-11-24 09:00:00')
     >>> priv_browser.getControl('Make announcement').click()
-    >>> print priv_browser.url
-    http://launchpad.dev/tomcat
+    >>> print priv_browser.title
+    Tomcat in Launchpad
 
 And check out the results:
 
@@ -138,8 +140,8 @@
     >>> priv_browser.getControl('Summary').value = (
     ...     'Derby announcement summary')
     >>> priv_browser.getControl('Make announcement').click()
-    >>> print priv_browser.url
-    http://launchpad.dev/derby
+    >>> print priv_browser.title
+    Derby - Java Database in Launchpad
     >>> 'Derby announcement' in latest_news(priv_browser.contents)
     True
 
@@ -158,8 +160,8 @@
     ...     name='field.publication_date.announcement_date').value = (
     ...          '2021-12-24 09:00:00')
     >>> priv_browser.getControl('Make announcement').click()
-    >>> print priv_browser.url
-    http://launchpad.dev/jokosher
+    >>> print priv_browser.title
+    Jokosher Audio Editor in Launchpad
     >>> 'Jokosher announcement' in latest_news(priv_browser.contents)
     True
 
@@ -174,8 +176,8 @@
     ...     'Kubuntu announcement summary')
     >>> priv_browser.getControl('some time in the future').click()
     >>> priv_browser.getControl('Make announcement').click()
-    >>> print priv_browser.url
-    http://launchpad.dev/kubuntu
+    >>> print priv_browser.title
+    Kubuntu - Free KDE-based Linux in Launchpad
     >>> "Kubuntu announcement" in latest_news(priv_browser.contents)
     True
 
@@ -188,8 +190,8 @@
     >>> priv_browser.getControl('Summary').value = (
     ...     'RedHat announcement summary')
     >>> priv_browser.getControl('Make announcement').click()
-    >>> print priv_browser.url
-    http://launchpad.dev/redhat
+    >>> print priv_browser.title
+    Redhat Advanced Server in Launchpad
     >>> "RedHat announcement" in latest_news(priv_browser.contents)
     True
 
@@ -319,16 +321,18 @@
 
     >>> priv_browser.getLink('Kubuntu announcement headline').click()
     >>> priv_browser.getLink('Publish announcement').click()
-    >>> priv_browser.url
-    'http://launchpad.dev/kubuntu/+announceme.../+publish'
+    >>> print priv_browser.title
+    Publish this announcement
+    >>> print priv_browser.url
+    http://launchpad.dev/kubuntu/+announceme.../+publish
     >>> radio = priv_browser.getControl(name="field.publication_date.action")
     >>> radio.value = ['immediately']
     >>> priv_browser.getControl('Publish').click()
 
 Doing so takes us back to the list of announcements.
 
-    >>> priv_browser.url
-    'http://launchpad.dev/kubuntu/+announcements'
+    >>> print priv_browser.title
+    Kubuntu news and announcements
 
 And since the announcement has been made, the everybody can now see
 it too:
@@ -419,16 +423,16 @@
 Editing announcements
 ---------------------
 
-To edit an announcement you must go to the individual announcement
-page and then follow the proper links.
+The announcement listing page does not have editing links.  They are
+available on the individual announcement pages.
 
     >>> priv_browser.open('http://launchpad.dev/tomcat/+announcements')
     >>> print priv_browser.getLink('Read more').url
     http://apache.org/announcement/rocking/
     >>> priv_browser.getLink('Apache announcement headline').click()
     >>> priv_browser.getLink('Modify announcement').click()
-    >>> print priv_browser.url
-    http://launchpad.dev/apache/+announcement/.../+edit
+    >>> print priv_browser.title
+    Modify this announcement
     >>> headline = priv_browser.getControl('Headline')
     >>> print headline.value
     Apache announcement headline
@@ -443,8 +447,8 @@
     >>> url.value = (
     ...     'http://apache.org/modified/url/')
     >>> priv_browser.getControl('Modify').click()
-    >>> print priv_browser.url
-    http://launchpad.dev/apache/+announcements
+    >>> print priv_browser.title
+    Apache news and announcements
     >>> priv_browser.open('http://launchpad.dev/tomcat/+announcements')
     >>> 'Modified headline' in announcements(priv_browser.contents)
     True
@@ -467,15 +471,15 @@
     >>> priv_browser.getLink('Kubuntu announcement headline').click()
     >>> priv_browser.getLink('Delete announcement').click()
     >>> priv_browser.getLink('retracting the announcement').click()
-    >>> priv_browser.url
-    'http://launchpad.dev/kubuntu/+announcement/.../+retract'
+    >>> print priv_browser.title
+    Retract this announcement
 
 Actually clicking "Retract" takes us back to the listing page. The item
 is shown as having been retracted if you are a privileged user.
 
     >>> priv_browser.getControl('Retract').click()
-    >>> priv_browser.url
-    'http://launchpad.dev/kubuntu/+announcements'
+    >>> print priv_browser.title
+    Kubuntu news and announcements
     >>> 'Kubuntu announcement ' in announcements(priv_browser.contents)
     True
     >>> 'Retracted' in announcements(priv_browser.contents)
@@ -499,15 +503,15 @@
 
     >>> priv_browser.getLink('Kubuntu announcement headline').click()
     >>> priv_browser.getLink('Publish announcement').click()
-    >>> priv_browser.url
-    'http://launchpad.dev/kubuntu/+announceme.../+publish'
+    >>> print priv_browser.title
+    Publish this announcement
     >>> radio = priv_browser.getControl(name="field.publication_date.action")
     >>> radio.value = ['immediately']
     >>> priv_browser.getControl(
     ...     name="field.publication_date.announcement_date").value = ''
     >>> priv_browser.getControl('Publish').click()
-    >>> priv_browser.url
-    'http://launchpad.dev/kubuntu/+announcements'
+    >>> print priv_browser.title
+    Kubuntu news and announcements
 
 And once again it is visible to unprivileged users:
 
@@ -528,12 +532,12 @@
     >>> priv_browser.open('http://launchpad.dev/kubuntu/+announcements')
     >>> priv_browser.getLink('Kubuntu announcement headline').click()
     >>> priv_browser.getLink('Move announcement').click()
-    >>> print priv_browser.url
-    http://launchpad.dev/kubuntu/+announcement/.../+retarget
+    >>> print priv_browser.title
+    Move this announcement to a different project
     >>> priv_browser.getControl('For').value = 'guadalinex'
     >>> priv_browser.getControl('Retarget').click()
-    >>> print priv_browser.url
-    http://launchpad.dev/guadalinex/+announcements
+    >>> print priv_browser.title
+    GuadaLinex news and announcements
     >>> 'Kubuntu announcement' in announcements(priv_browser.contents)
     True
 
@@ -545,14 +549,14 @@
     >>> kamion_browser.open('http://launchpad.dev/guadalinex/+announcements')
     >>> kamion_browser.getLink('Kubuntu announcement headline').click()
     >>> kamion_browser.getLink('Move announcement').click()
-    >>> print kamion_browser.url
-    http://launchpad.dev/guadalinex/+announcement/.../+retarget
+    >>> print kamion_browser.title
+    Move this announcement to a different project
     >>> kamion_browser.getControl('For').value = 'kubuntu'
     >>> kamion_browser.getControl('Retarget').click()
     >>> "don't have permission" in extract_text(find_main_content(kamion_browser.contents))
     True
-    >>> print kamion_browser.url
-    http://launchpad.dev/guadalinex/+announcement/.../+retarget
+    >>> print kamion_browser.title
+    Move this announcement to a different project
 
 
 Atom/RSS Feeds
@@ -617,8 +621,8 @@
     >>> priv_browser.getLink('Kubuntu announcement headline').click()
     >>> priv_browser.getLink('Delete announcement').click()
     >>> priv_browser.getLink('retracting the announcement').click()
-    >>> priv_browser.url
-    'http://launchpad.dev/guadalinex/+announcement/.../+retract'
+    >>> print priv_browser.title
+    Retract this announcement
     >>> priv_browser.getControl('Retract').click()
     >>> nopriv_browser.reload()
     >>> 'Kubuntu announcement ' in nopriv_browser.contents
@@ -710,10 +714,10 @@
     False
     >>> kamion_browser.getLink('Kubuntu announcement headline').click()
     >>> kamion_browser.getLink('Delete announcement').click()
-    >>> print kamion_browser.url
-    http://launchpad.dev/guadalinex/+announcement/.../+delete
+    >>> print kamion_browser.title
+    Delete this announcement
     >>> kamion_browser.getControl('Delete').click()
-    >>> print kamion_browser.url
-    http://launchpad.dev/guadalinex/+announcements
+    >>> print priv_browser.title
+    GuadaLinex news and announcements
     >>> no_announcements(kamion_browser.contents)
     True

=== modified file 'lib/lp/registry/templates/announcement-listing-detailed.pt'
--- lib/lp/registry/templates/announcement-listing-detailed.pt	2009-08-17 20:36:01 +0000
+++ lib/lp/registry/templates/announcement-listing-detailed.pt	2009-08-18 22:17:29 +0000
@@ -1,13 +1,19 @@
-<div class="portlet" tal:attributes="id string:${context/id}">
-  <div class="announcement">
-    <a tal:attributes="href string:${context/fmt:url}">
-      <h2>
+<tal:root
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+
+<div class="announcement"
+   tal:define="id_string string:${context/id}"
+   tal:attributes="id id_string/fmt:css-id">
+    <h2>
+      <a tal:attributes="href string:${context/fmt:url}">
         <tal:date tal:condition="context/date_announced">
           <span tal:replace="context/date_announced/fmt:date"/>:
         </tal:date>
         <tal:title content="context/title">News item title</tal:title>
-      </h2>
-    </a>
+      </a>
+    </h2>
 
     <p class="registered">
       Written for
@@ -16,8 +22,8 @@
       <tal:registrant replace="structure context/registrant/fmt:link" />.
     </p>
 
-    <tal:summary condition="context/summary"
-      tal:replace="structure context/summary/fmt:text-to-html" />
+    <div tal:condition="context/summary"
+         tal:replace="structure context/summary/fmt:text-to-html" />
     <p>
       <tal:future condition="context/future">
         <img src="/@@/warning" title="Announcement is not yet public." />
@@ -44,4 +50,4 @@
          <img src="/@@/link" alt="Link" /> Read more</a>
     </p>
   </div>
-</div>
+</tal:root>

=== modified file 'lib/lp/registry/templates/hasannouncements-index.pt'
--- lib/lp/registry/templates/hasannouncements-index.pt	2009-08-17 20:36:01 +0000
+++ lib/lp/registry/templates/hasannouncements-index.pt	2009-08-19 00:43:48 +0000
@@ -17,6 +17,7 @@
       <h1>News and announcements</h1>
     </tal:heading>
     <div metal:fill-slot="main">
+      <br />
       <p tal:condition="not: view/announcement_nav/batch/listlength">
         There are no announcements for this project.
       </p>
@@ -24,8 +25,18 @@
       <div tal:condition="view/announcement_nav/batch/listlength"
            id="announcements">
         <tal:per_announcement
-           repeat="announcement view/announcement_nav/currentBatch"
-           replace="structure announcement/@@+listing-detailed" />
+           repeat="announcement view/announcement_nav/currentBatch">
+          <div class="top-portlet"
+               tal:condition="repeat/announcement/start">
+            <tal:announcement-body
+               replace="structure announcement/@@+listing-detailed" />
+          </div>
+          <div class="portlet"
+               tal:condition="not: repeat/announcement/start">
+            <tal:announcement-body
+               replace="structure announcement/@@+listing-detailed" />
+          </div>
+        </tal:per_announcement>
       </div>
       <div class="lesser"
            tal:content="structure view/announcement_nav/@@+navigation-links-lower"
@@ -33,12 +44,11 @@
     </div>
 
     <tal:side metal:fill-slot="side"
-              define="announcements view/announcement_nav/currentBatch;
-                      overview_menu context/menu:overview">
+              define="announcements view/announcement_nav/currentBatch">
 
       <tal:menu replace="structure view/@@+global-actions" />
 
-      <div class="portlet">
+      <div class="portlet" tal:condition="view/announcement_nav/batch/listlength">
         <h2>
           <span style="float: right;">
             <a title="Atom 1.0 feed"
@@ -47,25 +57,22 @@
           Announcements
         </h2>
 
-        <p tal:condition="not: view/announcement_nav/batch/listlength">
-          <tal:name replace="context/displayname" /> has no announcements.
-        </p>
-
-        <tal:announcements tal:condition="view/announcement_nav/batch/listlength">
+        <tal:announcements>
           <ul>
-            <li tal:repeat="announcement announcements">
+            <li tal:repeat="announcement announcements"
+                style="margin-bottom: 0.5em;">
               <img src="/@@/warning" alt="[Not published]"
                    title="This is not yet a public announcement"
                    tal:condition="not: announcement/published" />
-              <a tal:attributes="href string:#${announcement/id}"
+              <a tal:define="id_string string:${announcement/id};
+                             css_id id_string/fmt:css-id"
+                 tal:attributes="href string:#${css_id}"
                  tal:content="announcement/title">
                 Announcement title
               </a>
               <strong
                  tal:condition="announcement/date_announced"
                  tal:content="announcement/date_announced/fmt:displaydate" />
-              <br />
-              <br />
             </li>
           </ul>
         </tal:announcements>