Merge lp:~beuno/launchpad/sprite-issues-never-die into lp:launchpad/db-devel

[Martin Albisetti]

Fix extraneous sprite icons in error messages.

[Martin Albisetti (beuno)]

This is a simple fix to avoid the problems with error messages (bug 487142), I just renamed the sprite class, and changed it in the only place that it currently seems in use.

[Brad Crittenden (bac)]

As we discussed on IRC, please change the use in projects-index.pt.

Thanks,
Brad

review: Approve (code)

=== modified file 'lib/canonical/launchpad/icing/style-3-0.css'
--- lib/canonical/launchpad/icing/style-3-0.css	2010-01-06 02:02:18 +0000
+++ lib/canonical/launchpad/icing/style-3-0.css	2010-01-12 14:39:18 +0000
@@ -893,7 +893,7 @@
 .person-inactive-badge {background:url(icon-sprites-2) 0 -64px no-repeat;}
 .mentoring {background:url(icon-sprites-2) 0 -96px no-repeat;}
 .undecided {background:url(icon-sprites-2) 0 -128px no-repeat;}
-.error {background:url(icon-sprites-2) 0 -160px no-repeat;}
+.error-icon {background:url(icon-sprites-2) 0 -160px no-repeat;}
 .cancel {background:url(icon-sprites-2) 0 -192px no-repeat;}
 .confirm {background:url(icon-sprites-2) 0 -224px no-repeat;}
 .flame {background:url(icon-sprites-2) 0 -256px no-repeat;}
 
=== modified file 'lib/lp/registry/templates/products-index.pt'
--- lib/lp/registry/templates/products-index.pt	2009-11-10 03:54:59 +0000
+++ lib/lp/registry/templates/products-index.pt	2010-01-12 14:39:18 +0000
@@ -93,7 +93,7 @@
       </table>
 
       <div id="application-summary">
-        <p class="sprite error"
+        <p class="sprite error-icon"
            tal:condition="not: view/search_results">
           No projects matching
           &#8220;<span tal:replace="view/search_string">moz</span>&#8221;
 
=== modified file 'lib/lp/registry/templates/projects-index.pt'
--- lib/lp/registry/templates/projects-index.pt	2009-11-10 05:05:49 +0000
+++ lib/lp/registry/templates/projects-index.pt	2010-01-12 14:39:18 +0000
@@ -57,7 +57,7 @@
             </tbody>
          </table>
 
-          <p class="sprite error application-summary"
+          <p class="sprite error-icon application-summary"
              tal:condition="not: view/search_results">
              No project groups matching
              &#8220;<span tal:replace="view/search_string">moz</span>&#8221;