Merge lp:~sinzui/launchpad/css-ui-1 into lp:launchpad

[Curtis Hovey]

Clean up the CSS.

    Launchpad bug:
        https://bugs.launchpad.net/bugs/90502
        https://bugs.launchpad.net/bugs/415267
    Pre-implementation: no one
    Test command: ./bin/test -vv \
      -t distribution-views -t xx-productseries-series

Bug #90502 [class="highlight" and class="highlighted" shouldn't coexist]
    * Both classes use the base rules. There should be only one.
      The 3.0 eliminated most of the highlighted cases. polls are being
      removed, so distro mirrors are the only case

Bug #415267 [Table header cells should not be centered]
    ages with wide tables but narrow data, such as
    <https://code.launchpad.net/ubuntu/+source/hotssh>, demonstrate a mistake
    I made in designing Launchpad tables: the text in table header cells
    should not be centered.

--------------------------------------------------------------------

RULES

Bug #90502 [class="highlight" and class="highlighted" shouldn't coexist]
    * update distributionmirror-macros.pt to use highlight instead of
      highlighted
    * Remove the highligted rules from the CSS.
    * Rename dimmed to lowlight.

Bug #415267 [Table header cells should not be centered]
    * use text-align: left so that the left edge of the text in the th
      aligns with the text in the td.

QA

Bug #90502 [class="highlight" and class="highlighted" shouldn't coexist]
    * Visit https://launchpad.net/ubuntu/+cdmirrors
    * Verify the country and total are highlighted.

Bug #415267 [Table header cells should not be centered]
    * Visit any table listing in lp and verify that the table headers
      have left-aligned text.

LINT

    lib/canonical/launchpad/icing/style-3-0.css.in
    lib/canonical/launchpad/icing/style.css
    lib/lp/answers/templates/question-listing-detailed.pt
    lib/lp/registry/browser/distribution.py
    lib/lp/registry/browser/product.py
    lib/lp/registry/browser/tests/distribution-views.txt
    lib/lp/registry/stories/productseries/xx-productseries-series.txt
    lib/lp/registry/templates/distributionmirror-macros.pt
    lib/lp/registry/templates/productreleasefile-macros.pt
    lib/lp/registry/templates/team-editproposed.pt

IMPLEMENTATION

Bug #90502 [class="highlight" and class="highlighted" shouldn't coexist]
    Update template to use highlight and removed highligted from css.
    Removed unhighlighted. Renamed dimmed to lowlight. Removed .series
    class because the rules are always superseded by other css rules.
    lib/canonical/launchpad/icing/style-3-0.css.in
    lib/canonical/launchpad/icing/style.css
    lib/lp/registry/browser/distribution.py
    lib/lp/registry/browser/product.py
    lib/lp/registry/browser/tests/distribution-views.txt
    lib/lp/registry/stories/productseries/xx-productseries-series.txt
    lib/lp/registry/templates/distributionmirror-macros.pt

Bug #415267 [Table header cells should not be centered]
    Updated the style as mpt suggested.
    lib/canonical/launchpad/icing/style-3-0.css.in

[Brad Crittenden (bac)]

The changes look good Curtis. But if I grep for 'class="highlighted"' I get six hits:

bzr ls -VR --kind=file --null | xargs -0 grep -In class\=\"highlighted\"
lib/canonical/launchpad/webapp/error.py:118: return ('<div class="highlighted" style="'
lib/lp/soyuz/browser/sourcepackagerelease.py:158: highlight = r'<span class="highlighted">\1</span>'
lib/lp/soyuz/browser/tests/test_sourcepackagerelease.py:90: '<span class="highlighted">https://upstream.dom/fnord/no/</span> '
lib/lp/soyuz/browser/tests/test_sourcepackagerelease.py:102: '<span class="highlighted">/usr/share/common-licenses/GPL</span>')
lib/lp/soyuz/browser/tests/test_sourcepackagerelease.py:113: '<span class="highlighted">/usr/share/common-licenses/GPL</span> '
lib/lp/soyuz/browser/tests/test_sourcepackagerelease.py:114: 'or <span class="highlighted">https://osi.org/mit</span>')

review: Approve (code)

[Curtis Hovey (sinzui)]

On Fri, 2010-12-17 at 18:31 +0000, Brad Crittenden wrote:
> Review: Approve code
> The changes look good Curtis. But if I grep for 'class="highlighted"' I get six hits:

I am incompetent. I wrote the spr code and test :(. I resolved the
conflict you point out too.

--
__Curtis C. Hovey_________
http://launchpad.net/

=== modified file 'lib/canonical/launchpad/icing/style-3-0.css.in'
--- lib/canonical/launchpad/icing/style-3-0.css.in	2010-12-16 15:53:37 +0000
+++ lib/canonical/launchpad/icing/style-3-0.css.in	2010-12-18 00:58:15 +0000
@@ -537,7 +537,7 @@
     vertical-align: baseline;
     }
 thead th, tr.thead th {
-    text-align: center;
+    text-align: left;
     vertical-align: bottom;
     }
 th.icon, td.icon {
@@ -663,9 +663,6 @@
 table.listing tfoot td {
     border: 1px solid #d2d2d2;
     }
-table.listing tr.note {
-    font-size: 77%;
-    }
 table.listing th, table.listing td {
     padding: 0.25em;
     }
@@ -681,7 +678,7 @@
     border: 1px #d2d2d2;
     border-style: dotted none none none;
     }
-table.listing tr.note td {
+table.listing .note td {
     border-style: none;
     }
 table.listing img {
@@ -1469,11 +1466,20 @@
    Universal presentation
    Colors and fonts
 */
-pre .highlighted {
-    border: none;
-    padding: 0em;
-    margin: 0em;
-    }
+
+.exception {
+    color: #cc0000;
+    }
+.highlight {
+    background: #ddd;
+    border: 1px solid #ddd;
+    }
+.lowlight {
+  opacity: .5;
+  filter: alpha(opacity=50);
+  -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
+}
+
 .answers-stat {
     color: #3840BE;
     }
@@ -1780,6 +1786,10 @@
 .launchpad-gold {
     color: #F8C300;
     }
+
+.discreet, .lesser, .duplicate-details {
+    font-size: 85%;
+    }
 pre.changelog, table.diff,
 .bug-comment, .bug-activity, .codereviewcomment {
     font-size: 93%;
 
=== modified file 'lib/canonical/launchpad/icing/style.css'
--- lib/canonical/launchpad/icing/style.css	2010-12-16 17:12:13 +0000
+++ lib/canonical/launchpad/icing/style.css	2010-12-18 00:58:15 +0000
@@ -25,13 +25,6 @@
 
 /* === Fonts and colors === */
 
-
-
-
-
-.exception {color: #cc0000;}
-.discreet, .lesser, .duplicate-details {font-size: 90%;}
-.extra-discreet {font-size: 75%;}
 .unavailable {color: #999; background: none;}
 
 .duplicate-details p { padding: 0em; margin-top: 0em; margin-bottom: 0.2em; }
@@ -61,17 +54,6 @@
   .notforscreen {display:none;}
 }
 
-.highlighted, tr.highlight {background: #ddd; border: 1px solid #ddd;}
-.highlighted {padding: 0.5em;}
-.highlighted h3 {margin-top: 0;}
-.unhighlighted {padding: 0 0.5em;}
-.dimmed {
-  padding: 0 0.5em;
-  opacity: .5;
-  filter: alpha(opacity=50);
-  -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
-}
-
 .debug {
   background: none;
   color: #f09;
@@ -262,7 +244,6 @@
     margin-top: 1em;
 }
 
-.product.series, .series {margin-bottom: 1em;}
 #packages h1, #projects h1 {margin-top: 1.2em;}
 
 
 
=== modified file 'lib/canonical/launchpad/webapp/error.py'
--- lib/canonical/launchpad/webapp/error.py	2010-08-31 11:11:09 +0000
+++ lib/canonical/launchpad/webapp/error.py	2010-12-18 00:58:15 +0000
@@ -115,7 +115,7 @@
     def inside_div(self, html):
         """Returns the given HTML inside a div of an appropriate class."""
 
-        return ('<div class="highlighted" style="'
+        return ('<div class="highlight" style="'
                 "font-family: 'UbuntuBeta Mono', 'Ubuntu Mono', monospace;"
                 ' font-size: smaller;">'
                 '%s'
 
=== modified file 'lib/lp/answers/stories/project-add-question.txt'
--- lib/lp/answers/stories/project-add-question.txt	2010-08-02 02:33:53 +0000
+++ lib/lp/answers/stories/project-add-question.txt	2010-12-18 00:58:15 +0000
@@ -1,18 +1,20 @@
-= Asking a New Question from a ProjectGroup =
+Asking a New Question from a ProjectGroup
+=========================================
 
-Even though project groups are not QuestionTargets, it is still possible to
-create a question from a project group. There are some form and behaviour
-difference from the regular process for asking a question (documented
-in 35-question-add.txt). Firstly, we do not know the product the
-product the question is about, so we ask the user to select one.
+Even though project groups are not QuestionTargets, it is still possible
+to create a question from a project group. There are some form and
+behaviour difference from the regular process for asking a question
+(documented in 35-question-add.txt). Firstly, we do not know the product
+the product the question is about, so we ask the user to select one.
 Secondly, without knowing the product, we cannot show the which of the
 user's preferred languages are supported.
 
 
-== Ask a question about a Product in a ProjectGroup ==
+Ask a question about a Product in a ProjectGroup
+------------------------------------------------
 
-The user must be logged in to ask a question. When he attempts to ask
-a question, without being logged in, he encounters an unauthorized
+The user must be logged in to ask a question. When he attempts to ask a
+question, without being logged in, he encounters an unauthorized
 exception (and the user will be prompted to login from another page).
 The logged user will see the Ask a Question page, for the Mozilla
 Project in this case.
@@ -28,11 +30,11 @@
     >>> print user_browser.title
     Ask a question...
 
-The workflow is identical to the regular one, except that the user
-must select one of the ProjectGroup's Products. The page displays a list of
-products associated with the project. Note that the site policy is
-to use the word 'Project' for 'Products' (and 'Distributions') so
-that users do not have to learn our business' semantics.
+The workflow is identical to the regular one, except that the user must
+select one of the ProjectGroup's Products. The page displays a list of
+products associated with the project. Note that the site policy is to
+use the word 'Project' for 'Products' (and 'Distributions') so that
+users do not have to learn our business' semantics.
 
     >>> print user_browser.getControl('Project').displayOptions
     ['Mozilla Firefox', 'Mozilla Thunderbird']
@@ -70,7 +72,7 @@
 
     >>> similar_questions = find_tag_by_id(
     ...     user_browser.contents, 'similar-questions')
-    >>> for row in similar_questions.fetch('tr', 'noted'):
+    >>> for row in similar_questions.fetch('tr', 'lesser'):
     ...     print row.a.renderContents()
     Problem showing the SVG demo on W3C site
 
@@ -81,8 +83,8 @@
     >>> user_browser.getControl('Mozilla Thunderbird').selected = True
 
 If he empties the question summary, and submits the form he'll be
-redirected to the first page. Let's assume he does this by accident
-as he revises the summary after reading the similar questions.
+redirected to the first page. Let's assume he does this by accident as
+he revises the summary after reading the similar questions.
 
     >>> user_browser.getControl('Summary').value = ''
     >>> user_browser.getControl('Post Question').click()
@@ -94,12 +96,13 @@
     >>> print soup.first('div', 'message').renderContents()
     You must enter a summary of your problem.
 
-The product Thunderbird that he selected on the previous screen is
-still selected. No Privileged Person re-enters his question summary,
-and submits the form.
+The product Thunderbird that he selected on the previous screen is still
+selected. No Privileged Person re-enters his question summary, and
+submits the form.
 
     >>> print user_browser.getControl('Project').displayValue
     ['Mozilla Thunderbird']
+
     >>> user_browser.getControl('Summary').value = (
     ...     'Problem displaying complex SVG')
     >>> user_browser.getControl('Continue').click()
@@ -113,39 +116,43 @@
     There are no existing FAQs or questions similar to the summary you
     entered.
 
-The user then elaborates upon his question by entering a description
-of the problem. He submits the form using the 'Post Question' button.
+The user then elaborates upon his question by entering a description of
+the problem. He submits the form using the 'Post Question' button.
 
     >>> user_browser.getControl('Description').value = (
-    ... "I received an HTML message containing an inlined SVG\n"
-    ... "representation of a chessboard. It didn't displayed properly.\n"
-    ... "Is there a way to configure Thunderbird to display SVG properly?\n")
+    ...  "I received an HTML message containing an inlined SVG\n"
+    ...  "representation of a chessboard. It didn't displayed properly.\n"
+    ...  "Is there a way to configure Thunderbird to display SVG properly?\n")
     >>> user_browser.getControl('Post Question').click()
 
-No Privileged Person is taken to page displaying his question. From
-this point on, the user's interaction with the question follows to
-regular workflow. (see 30-question-workflow.txt for the details).
+No Privileged Person is taken to page displaying his question. From this
+point on, the user's interaction with the question follows to regular
+workflow. (see 30-question-workflow.txt for the details).
 
     >>> user_browser.url
     '.../thunderbird/+question/...'
+
     >>> print user_browser.title
     Question #... : Questions : Mozilla Thunderbird
 
 
-== Supported Language behaviour ==
+Supported Language behaviour
+----------------------------
 
 Following a similar path as demonstrated above with a non-English
-language speaker illustrates a less-than-ideal behaviour for
-supported languages. (See xx-question-add-in-other-languages.txt
-for the regular behaviour).
-
-=== Register a support contact who speaks a non-English language ===
-
-To illustrate the supported language behavior, we add an answer
-contact to Thunderbird who has Japanese as a preferred language.
-Japanese will be a supported language for Thunderbird Questions,
-which allows us to test the supported languages behaviour for
-non-English languages. Dafydd speaks Japanese, so we will use him.
+language speaker illustrates a less-than-ideal behaviour for supported
+languages. (See xx-question-add-in-other-languages.txt for the regular
+behaviour).
+
+
+Register a support contact who speaks a non-English language
+............................................................
+
+To illustrate the supported language behavior, we add an answer contact
+to Thunderbird who has Japanese as a preferred language. Japanese will
+be a supported language for Thunderbird Questions, which allows us to
+test the supported languages behaviour for non-English languages. Dafydd
+speaks Japanese, so we will use him.
 
     >>> daf_browser = setupBrowser(auth='Basic [e-mail]:daf')
     >>> daf_browser.open('http://launchpad.dev/~daf/+editlanguages')
@@ -169,10 +176,9 @@
     You have been added as an answer contact for Mozilla Thunderbird.
 
 And we add Japanese to No Privileges Person's preferred languages. We
-then have a condition for certain products, Thunderbird in this
-example, where the user's languages and the answer contact's languages
-will match. This condition demonstrates the supported language
-behaviour.
+then have a condition for certain products, Thunderbird in this example,
+where the user's languages and the answer contact's languages will
+match. This condition demonstrates the supported language behaviour.
 
     >>> user_browser.open(
     ...     'http://launchpad.dev/~no-priv/+editlanguages')
@@ -187,33 +193,36 @@
 
 So if No Privileges Person were to visit the Ask a Question page for
 Thunderbird directly, he will see that Japanese, as well English (the
-default supported language), have asterisks next to them in
-the Language list. This indicates that he can ask a question in
-Japanese or English and expect someone to reply in the same language.
+default supported language), have asterisks next to them in the Language
+list. This indicates that he can ask a question in Japanese or English
+and expect someone to reply in the same language.
 
     >>> user_browser.open(
-    ... 'http://answers.launchpad.dev/thunderbird/+addquestion')
+    ...     'http://answers.launchpad.dev/thunderbird/+addquestion')
     >>> print user_browser.getControl('Language').displayOptions
     ['English (en) *', 'Japanese (ja) *']
 
-The supported languages will not be shown immediately when Sample
-Person asks a question Thunderbird question from the context of the
-Mozilla Project.
-
-
-=== Ask a non-English question about a Product in a ProjectGroup ===
+The supported languages will not be shown immediately when Sample Person
+asks a question Thunderbird question from the context of the Mozilla
+Project.
+
+
+Ask a non-English question about a Product in a ProjectGroup
+............................................................
 
 Supported languages are only shown after the user submits the 'Product'
 associated with the project. When a user enters the 'Product'
 information incorrectly we cannot show the supported languages to the
 user.
 
-==== Supported languages aren't displayed after choosing a product ====
+
+Supported languages aren't displayed after choosing a product
+.............................................................
 
 XXX sinzui 2007-05-02 #111793 (Supported languages will not be shown in
-some cases when asking questions from the ProjectGroup facet)
-No Privileges Person visits the Ask a question page from a project just
-as No Privileged Person did above, but this time in wants to do so in
+some cases when asking questions from the ProjectGroup facet) No
+Privileges Person visits the Ask a question page from a project just as
+No Privileged Person did above, but this time in wants to do so in
 Japanese.
 
     >>> user_browser.open('http://answers.launchpad.dev/mozilla')
@@ -221,22 +230,23 @@
     >>> print user_browser.title
     Ask a question...
 
-The page displays a list of products associated with the project.
-The first item in the list is the default value, and it will be
-submitted if the user does not change it.
+The page displays a list of products associated with the project. The
+first item in the list is the default value, and it will be submitted if
+the user does not change it.
 
     >>> print user_browser.getControl('Project').displayOptions
     ['Mozilla Firefox', 'Mozilla Thunderbird']
+
     >>> print user_browser.getControl('Project').displayValue
     ['Mozilla Firefox']
 
 Like for the regular workflow, the user is shown a list of languages,
 with the supported languages flagged with an asterisk. Note that only
-English is flagged because we do not know which Product the
-question is about. Without knowing the product, we cannot flag the
-supported languages other than the default language of English. If the
-user were to submit his question in another language, he might find
-that the language is supported on the next page.
+English is flagged because we do not know which Product the question is
+about. Without knowing the product, we cannot flag the supported
+languages other than the default language of English. If the user were
+to submit his question in another language, he might find that the
+language is supported on the next page.
 
     >>> print user_browser.getControl('Language').displayOptions
     ['English (en) *', 'Japanese (ja)']
@@ -252,10 +262,10 @@
     ...     'Problem displaying complex SVG')
     >>> user_browser.getControl('Continue').click()
 
-He's shown a list of similar questions related to the product
-Firefox. He can see which of his preferred languages are supported
-for the Firefox product by reviewing which languages has asterisks
-in the Languages list--only English in the example.
+He's shown a list of similar questions related to the product Firefox.
+He can see which of his preferred languages are supported for the
+Firefox product by reviewing which languages has asterisks in the
+Languages list--only English in the example.
 
     >>> print user_browser.getControl('Language').displayOptions
     ['English (en) *', 'Japanese (ja)']
@@ -273,15 +283,17 @@
 
 If No Privileges Person asks a question in Japanese, it will be
 supported by Dafydd, but No Privileges Person will never know that.
-Let's stop here. The rest of this scenario is just adding a question
-as described above--filling in a description and submitting the data
-with the 'Post Question' button.
-
-==== Supported languages are displayed after the submitting a product ====
+Let's stop here. The rest of this scenario is just adding a question as
+described above--filling in a description and submitting the data with
+the 'Post Question' button.
+
+
+Supported languages are displayed after the submitting a product
+................................................................
 
 Let's try this again from the starting page, but this time, No
-Privileges Person correctly chooses Thunderbird as the subject of
-his question.
+Privileges Person correctly chooses Thunderbird as the subject of his
+question.
 
     >>> user_browser.open('http://answers.launchpad.dev/mozilla')
     >>> user_browser.getLink('Ask a question').click()
@@ -295,38 +307,41 @@
 
     >>> print user_browser.getControl('Language').displayOptions
     ['English (en) *', 'Japanese (ja)']
+
     >>> user_browser.getControl('Summary').value = (
     ...     'Problem displaying complex SVG')
     >>> user_browser.getControl('Continue').click()
 
-The product Thunderbird that he selected on the previous screen is
-still selected. He can see that this product has support for Japanese
-as well as English when he sees the asterisks next to both in the
-Languages list. Japanese is supported because Dafydd speaks Japanese
-and is an answer contact for Thunderbird. We see this only after a
-question summary is submitted for a product.
+The product Thunderbird that he selected on the previous screen is still
+selected. He can see that this product has support for Japanese as well
+as English when he sees the asterisks next to both in the Languages
+list. Japanese is supported because Dafydd speaks Japanese and is an
+answer contact for Thunderbird. We see this only after a question
+summary is submitted for a product.
 
     >>> print user_browser.getControl('Language').displayOptions
     ['English (en) *', 'Japanese (ja) *']
 
-No Privileges Person sets the language to Japanese, changes his
-question summary, writes a description, and submits the form with the
-'Post Question' button.
+No Privileges Person sets the language to Japanese, changes his question
+summary, writes a description, and submits the form with the 'Post
+Question' button.
 
     >>> print user_browser.getControl('Project').displayValue
     ['Mozilla Thunderbird']
+
     >>> user_browser.getControl('Japanese (ja) *').selected = True
     >>> user_browser.getControl('Summary').value = (
     ...     'Pretend this is written in Japanese')
     >>> user_browser.getControl('Description').value = (
-    ... "Something in kanji and hiragana.")
+    ...      "Something in kanji and hiragana.")
     >>> user_browser.getControl('Post Question').click()
 
-The user is taken to page displaying his question. Changing the
-language or the summary did not search for similar questions
-again--the question is created.
+The user is taken to page displaying his question. Changing the language
+or the summary did not search for similar questions again--the question
+is created.
 
     >>> user_browser.url
     '.../thunderbird/+question/...'
+
     >>> print user_browser.title
     Question #... : Questions : Mozilla Thunderbird
 
=== modified file 'lib/lp/answers/stories/questions-index.txt'
--- lib/lp/answers/stories/questions-index.txt	2010-11-15 23:55:43 +0000
+++ lib/lp/answers/stories/questions-index.txt	2010-12-18 00:58:15 +0000
@@ -14,7 +14,7 @@
     >>> firefox.answers_usage = ServiceUsage.LAUNCHPAD
     >>> ubuntu.answers_usage = ServiceUsage.LAUNCHPAD
     >>> logout()
-    >>> transaction.commit()    
+    >>> transaction.commit()
 
     >>> anon_browser.open('http://answers.launchpad.dev/')
     >>> print anon_browser.title
@@ -26,7 +26,7 @@
     ...     anon_browser.contents, 'latest-questions-asked')
     >>> print latest_questions_asked.first('h2').renderContents()
     Latest questions asked
-    >>> for row in latest_questions_asked.fetch('tr', 'noted'):
+    >>> for row in latest_questions_asked.fetch('tr', 'lesser'):
     ...     row.first('a').renderContents()
     'Problemas de Impress\xc3\xa3o no Firefox'
     'Problema al recompilar kernel con soporte smp (doble-n\xc3\xbacleo)'
@@ -40,7 +40,7 @@
     ...     anon_browser.contents, 'latest-questions-solved')
     >>> print latest_questions_solved.first('h2').renderContents()
     Latest questions solved
-    >>> for row in latest_questions_solved.fetch('tr', 'noted'):
+    >>> for row in latest_questions_solved.fetch('tr', 'lesser'):
     ...     row.first('a').renderContents()
     'mailto: problem in webpage'
 
 
=== modified file 'lib/lp/answers/templates/question-listing-detailed.pt'
--- lib/lp/answers/templates/question-listing-detailed.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/answers/templates/question-listing-detailed.pt	2010-12-18 00:58:15 +0000
@@ -4,7 +4,7 @@
   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
   <tal:description
     define="global description context/description/fmt:obfuscate-email/fmt:shorten/320" />
-<tr class="noted"
+<tr class="lesser"
     tal:attributes="title description">
   <td class="icon left">
     <img alt="" src="/@@/question" />
@@ -20,7 +20,7 @@
       />
       (<span tal:replace="context/status/title">Approved</span>)
     </div>
-    <div class="lesser">
+    <div>
       posted
       <span
         tal:attributes="title context/datecreated/fmt:datetime"
 
=== modified file 'lib/lp/registry/browser/distribution.py'
--- lib/lp/registry/browser/distribution.py	2010-11-28 00:47:39 +0000
+++ lib/lp/registry/browser/distribution.py	2010-12-18 00:58:15 +0000
@@ -829,13 +829,14 @@
         return all_series
 
     def getCssClass(self, series):
-        """The highlighted, unhighlighted, or dimmed CSS class."""
+        """The highlight, lowlight, or normal CSS class."""
         if series.status == SeriesStatus.DEVELOPMENT:
-            return 'highlighted'
+            return 'highlight'
         elif series.status == SeriesStatus.OBSOLETE:
-            return 'dimmed'
+            return 'lowlight'
         else:
-            return 'unhighlighted'
+            # This is normal presentation.
+            return ''
 
 
 class DistributionChangeMirrorAdminView(RegistryEditFormView):
 
=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2010-11-23 23:22:27 +0000
+++ lib/lp/registry/browser/product.py	2010-12-18 00:58:15 +0000
@@ -810,13 +810,14 @@
 
     @property
     def css_class(self):
-        """The highlighted, unhighlighted, or dimmed CSS class."""
+        """The highlight, lowlight, or normal CSS class."""
         if self.is_development_focus:
-            return 'highlighted'
+            return 'highlight'
         elif self.status == SeriesStatus.OBSOLETE:
-            return 'dimmed'
+            return 'lowlight'
         else:
-            return 'unhighlighted'
+            # This is normal presentation.
+            return ''
 
 
 class SeriesWithReleases(DecoratedSeries):
 
=== modified file 'lib/lp/registry/browser/tests/distribution-views.txt'
--- lib/lp/registry/browser/tests/distribution-views.txt	2010-11-29 19:08:26 +0000
+++ lib/lp/registry/browser/tests/distribution-views.txt	2010-12-18 00:58:15 +0000
@@ -306,10 +306,10 @@
 
     >>> for styled_series in view.styled_series:
     ...     print styled_series['series'].name, styled_series['css_class']
-    breezy-autotest unhighlighted
-    grumpy unhighlighted
-    hoary highlighted
-    warty unhighlighted
+    breezy-autotest
+    grumpy
+    hoary highlight
+    warty
 
 
 Distribution +ppas
 
=== modified file 'lib/lp/registry/stories/distributionmirror/xx-distribution-mirrors.txt'
--- lib/lp/registry/stories/distributionmirror/xx-distribution-mirrors.txt	2010-03-26 02:27:44 +0000
+++ lib/lp/registry/stories/distributionmirror/xx-distribution-mirrors.txt	2010-12-18 00:58:15 +0000
@@ -1,4 +1,5 @@
-= Distribution mirrors =
+Distribution mirrors
+====================
 
 There are several pages which list the mirrors of a given distribution based
 on their status and content.
@@ -11,13 +12,13 @@
     ...     country = extract_text(header.find('th'))
     ...     mirrors = []
     ...     for tr in header.findNextSiblings('tr'):
-    ...         if 'highlighted' in str(tr.attrs):
+    ...         if 'highlight' in str(tr.attrs):
     ...             print "%s: %s" % (country, mirrors)
     ...             country = extract_text(tr.find('th'))
     ...             if country == 'Total':
     ...                 break
     ...             mirrors = []
-    ...         elif 'note' in str(tr.attrs):
+    ...         elif 'lesser' in str(tr.attrs):
     ...             # This is an empty row to visually separate the mirrors
     ...             # from different countries, so we'll just skip it.
     ...             pass
@@ -25,7 +26,8 @@
     ...             tds = tuple([extract_text(td) for td in tr.findAll('td')])
     ...             mirrors.append(tds)
 
-== Official mirrors ==
+Official mirrors
+----------------
 
 These are the mirrors that show up in public listings. They're highly
 reliable and we strongly encourage their use.
@@ -48,7 +50,8 @@
     United Kingdom: [(u'Canonical-archive', u'http', u'100 Mbps',
       u'Last update unknown')]
 
-    >>> find_tags_by_class(browser.contents, 'distromirrorstatusSIXHOURSBEHIND')
+    >>> find_tags_by_class(
+    ...     browser.contents, 'distromirrorstatusSIXHOURSBEHIND')
     [<span class="distromirrorstatusSIXHOURSBEHIND">Six hours behind</span>]
     >>> find_tags_by_class(browser.contents, 'distromirrorstatusUNKNOWN')[0]
     <span class="distromirrorstatusUNKNOWN">Last update unknown</span>
@@ -60,14 +63,15 @@
     >>> browser.url
     'http://launchpad.dev/ubuntu/+cdmirrors'
     >>> print_mirrors_by_countries(browser.contents)
-    France: 
+    France:
       [(u'Releases-mirror', u'http', u'2 Mbps'),
        (u'Unreachable-mirror', u'http', u'512 Kbps')]
     Germany: [(u'Releases-mirror2', u'http', u'2 Mbps')]
     United Kingdom: [(u'Canonical-releases', u'http', u'100 Mbps')]
 
 
-=== Disabled mirrors ===
+Disabled mirrors
+................
 
 These are official mirrors for which the last check wasn't successful (e.g.
 they were out of date, missing some content, etc). This list can only be
@@ -88,7 +92,8 @@
     ...We don't know of any Disabled Mirrors for this distribution...
 
 
-== Unofficial mirrors ==
+Unofficial mirrors
+------------------
 
 The unofficial mirrors are listed in a separate page, which is not public.
 It's only visible to distro owners, mirror admins of the distro or
@@ -107,7 +112,9 @@
     >>> print_mirrors_by_countries(browser.contents)
     France: [(u'Invalid-mirror', u'http', u'2 Mbps', u'Last update unknown')]
 
-== Pending-review mirrors ==
+
+Pending-review mirrors
+----------------------
 
 These are the mirrors that were created but none of the mirror admins have
 looked at yet.  Since all pending mirrors are grouped on one page the
@@ -122,7 +129,8 @@
     >>> browser = setupBrowser(auth='Basic [e-mail]:test')
     >>> # Register an unreviewed archive mirror.
     >>> browser.open('http://launchpad.dev/ubuntu/+newmirror')
-    >>> browser.getControl(name='field.displayname').value = 'Kabul LUG mirror'
+    >>> browser.getControl(
+    ...     name='field.displayname').value = 'Kabul LUG mirror'
     >>> browser.getControl(name='field.ftp_base_url').value = (
     ...     'ftp://kabullug.org/ubuntu')
     >>> browser.getControl(name='field.country').value = ['1'] # Afghanistan
 
=== modified file 'lib/lp/registry/stories/productseries/xx-productseries-series.txt'
--- lib/lp/registry/stories/productseries/xx-productseries-series.txt	2010-08-13 01:20:31 +0000
+++ lib/lp/registry/stories/productseries/xx-productseries-series.txt	2010-12-18 00:58:15 +0000
@@ -38,7 +38,7 @@
 it is highlighted.
 
     >>> print series_trunk['class']
-    highlighted series
+    highlight series
 
 The 1.0 series is not the focus of development, it is active, so it is not
 highlighted.
@@ -52,9 +52,9 @@
     The 1.0 branch of the Mozilla web browser. Currently, this is the ...
 
     >>> print series_1_0['class']
-    unhighlighted series
+    series
 
-Any user can see that obsolete series are dimmed. Obsolete series do not
+Any user can see that obsolete series are lowlight. Obsolete series do not
 show bug status counts because it is expensive to retrieve the information.
 
     >>> series_xxx = find_tag_by_id(content, 'series-xxx')
@@ -64,4 +64,4 @@
     Use true GTK UI.
 
     >>> print series_xxx['class']
-    dimmed series
+    lowlight series
 
=== modified file 'lib/lp/registry/templates/distributionmirror-macros.pt'
--- lib/lp/registry/templates/distributionmirror-macros.pt	2009-12-09 19:41:23 +0000
+++ lib/lp/registry/templates/distributionmirror-macros.pt	2010-12-18 00:58:15 +0000
@@ -16,7 +16,7 @@
   <table class="listing" id="mirrors_list">
   <tbody>
     <tal:country_and_mirrors repeat="country_and_mirrors mirrors_by_country">
-      <tr class="highlighted">
+      <tr class="highlight">
         <th colspan="2" style="text-align: left"
             tal:content="country_and_mirrors/country" />
         <th style="text-align: left"
@@ -59,12 +59,12 @@
         Include a blank row after the last entry of a country to provide
         vertical spacing to separate the next country.
       </tal:comment>
-      <tr class="note">
+      <tr class="lesser">
         <td>&nbsp;</td>
       </tr>
 
     </tal:country_and_mirrors>
-    <tr class="highlighted">
+    <tr class="highlight">
       <th colspan="5" style="text-align: left; font-weight: bold;">Total</th>
     </tr>
     <tr>
 
=== modified file 'lib/lp/registry/templates/productreleasefile-macros.pt'
--- lib/lp/registry/templates/productreleasefile-macros.pt	2010-01-15 20:42:44 +0000
+++ lib/lp/registry/templates/productreleasefile-macros.pt	2010-12-18 00:58:15 +0000
@@ -26,7 +26,7 @@
                       define="last_downloaded lfa/last_downloaded">
         <span tal:replace="lfa/hits/fmt:intcomma">10</span>
         <br />
-        <span class="extra-discreet greyed-out">
+        <span class="lesser greyed-out">
           last downloaded
           <strong tal:condition="not:last_downloaded/days">
             today
 
=== modified file 'lib/lp/registry/templates/team-editproposed.pt'
--- lib/lp/registry/templates/team-editproposed.pt	2009-09-01 19:43:30 +0000
+++ lib/lp/registry/templates/team-editproposed.pt	2010-12-18 00:58:15 +0000
@@ -32,8 +32,8 @@
             <td style="text-align: left">
               <span tal:replace="structure member/fmt:link" />
               <br />
-              <span class="extra-discreet">
-                (Applied on 
+              <span class="lesser">
+                (Applied on
                 <span tal:replace="membership/date_proposed/fmt:date" />)
               </span>
             </td>
 
=== modified file 'lib/lp/soyuz/browser/sourcepackagerelease.py'
--- lib/lp/soyuz/browser/sourcepackagerelease.py	2010-07-02 20:32:58 +0000
+++ lib/lp/soyuz/browser/sourcepackagerelease.py	2010-12-18 00:58:15 +0000
@@ -155,5 +155,5 @@
             return ''
         # Match any string with 2 or more non-consecutive slashes in it.
         pattern = re.compile(r'([\S]+/[\S]+/[\S]+)')
-        highlight = r'<span class="highlighted">\1</span>'
+        highlight = r'<span class="highlight">\1</span>'
         return pattern.sub(highlight, self.context.copyright)
 
=== modified file 'lib/lp/soyuz/browser/tests/test_sourcepackagerelease.py'
--- lib/lp/soyuz/browser/tests/test_sourcepackagerelease.py	2010-10-04 19:50:45 +0000
+++ lib/lp/soyuz/browser/tests/test_sourcepackagerelease.py	2010-12-18 00:58:15 +0000
@@ -87,7 +87,7 @@
             'Downloaded from https://upstream.dom/fnord/no/ and')
         expected = (
             'Downloaded from '
-            '<span class="highlighted">https://upstream.dom/fnord/no/</span> '
+            '<span class="highlight">https://upstream.dom/fnord/no/</span> '
             'and')
         view = create_initialized_view(
             self.source_package_release, '+copyright')
@@ -99,7 +99,7 @@
             'See /usr/share/common-licenses/GPL')
         expected = (
             'See '
-            '<span class="highlighted">/usr/share/common-licenses/GPL</span>')
+            '<span class="highlight">/usr/share/common-licenses/GPL</span>')
         view = create_initialized_view(
             self.source_package_release, '+copyright')
         self.assertEqual(expected, view.highlighted_copyright)
@@ -110,8 +110,8 @@
             'See /usr/share/common-licenses/GPL or https://osi.org/mit')
         expected = (
             'See '
-            '<span class="highlighted">/usr/share/common-licenses/GPL</span> '
-             'or <span class="highlighted">https://osi.org/mit</span>')
+            '<span class="highlight">/usr/share/common-licenses/GPL</span> '
+             'or <span class="highlight">https://osi.org/mit</span>')
         view = create_initialized_view(
             self.source_package_release, '+copyright')
         self.assertEqual(expected, view.highlighted_copyright)