Merge lp:~salgado/launchpad/combined-css into lp:launchpad/db-devel

[Guilherme Salgado]

[Guilherme Salgado (salgado)]

This branch uses lazr-js's combine_files() function to combine all our
CSS files into a single one so that browsers can get all the styles
needed in a single request rather than 13.

[Māris Fogels (mars)]

Hi Salgado,

This is a nice change; it is always good to see so much code getting consolidated. And this will lead to a very nice speed boost for our users.

I assume that the windmill test suite passes? And you have checked the widgets on staging? The Windmill suite can test if JavaScript changed the DOM, but it can not test that a CSS style is being correctly applied: that must still be done manually.

Mars

review: Needs Information

[Guilherme Salgado (salgado)]

Hi Maris,

I've tried a bunch of different pages that use js widgets and they all
work and seem to have the correct styling. I must admit I didn't run the
windmill tests, though. I'll use Bjorn's branch and run them on ec2
now. Will let you know the results as soon as I have them

Cheers

--
Guilherme Salgado <email address hidden>

[Māris Fogels (mars)]

As said on IRC:

<salgado> mars, the windmill tests are "passing" on my branch. one of them actually fails, but it's the same one that fails on db-devel
<mars> salgado, ok
<salgado> and the styling looks just like before in a few random pages I picked up, as well as on js widgets
<mars> salgado, ok, the widgets are what I was worried about. You didn't mention what was included in the lazr-js upgrade.
<mars> and we don't have formal releases, and I didn't generate any sort of CHANGELOG :/
<salgado> mars, mostly browser-specific fixes, but there's also a minimal error widget for use with the lazr error api
<mars> ok, so no build system or widget API changes. Good.
<mars> salgado, r=mars then

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2009-11-20 16:56:27 +0000
+++ .bzrignore	2009-12-18 11:38:11 +0000
@@ -35,6 +35,7 @@
 lib/canonical/launchpad/apidoc/wadl-development.xml
 lib/canonical/launchpad/apidoc/wadl-test-playground.xml
 lib/canonical/launchpad/icing/build/*
+lib/canonical/launchpad/icing/combo.css
 trace.log
 test-appserver-layer-trace.log
 bin

=== modified file 'Makefile'
--- Makefile	2009-12-09 22:32:48 +0000
+++ Makefile	2009-12-18 11:38:11 +0000
@@ -109,13 +109,16 @@
 
 inplace: build
 
-build: $(BZR_VERSION_INFO) compile apidoc jsbuild
+build: $(BZR_VERSION_INFO) compile apidoc jsbuild css_combine
+
+css_combine:
+	${SHHH} bin/combine-css
 
 jsbuild_lazr:
 	# We absolutely do not want to include the lazr.testing module and its
 	# jsTestDriver test harness modifications in the lazr.js and launchpad.js
 	# roll-up files.  They fiddle with built-in functions!  See Bug 482340.
-	${SHHH} bin/jsbuild $(JSFLAGS) -b $(LAZR_BUILT_JS_ROOT) -x testing/
+	${SHHH} bin/jsbuild $(JSFLAGS) -b $(LAZR_BUILT_JS_ROOT) -x testing/ -c $(LAZR_BUILT_JS_ROOT)/yui
 
 jsbuild: jsbuild_lazr
 	${SHHH} bin/jsbuild \

=== added file 'buildout-templates/bin/combine-css.in'
--- buildout-templates/bin/combine-css.in	1970-01-01 00:00:00 +0000
+++ buildout-templates/bin/combine-css.in	2009-12-18 11:38:11 +0000
@@ -0,0 +1,36 @@
+#! /usr/bin/env ${buildout:directory}/bin/py
+
+import os
+
+from lazr.js.combo import combine_files
+
+
+root = '${buildout:directory}'
+icing = os.path.join(root, 'lib/canonical/launchpad/icing')
+# It'd probably be nice to have this script find all the CSS files we might
+# need and combine them together, but if we do that we'd certainly end up
+# including lots of styles that we don't need/want, so keeping this hard-coded
+# list seems like the best option for now.
+names = [
+    'style.css',
+    'lazr/build/yui/cssreset/reset.css',
+    'lazr/build/yui/cssfonts/fonts.css',
+    'lazr/build/yui/cssgrids/grids.css',
+    'lazr/build/lazr/assets/skins/sam/lazr.css',
+    'lazr/build/inlineedit/assets/skins/sam/editor.css',
+    'lazr/build/autocomplete/assets/skins/sam/autocomplete.css',
+    'lazr/build/overlay/assets/skins/sam/pretty-overlay.css',
+    'lazr/build/formoverlay/assets/formoverlay-core.css',
+    'lazr/build/picker/assets/skins/sam/picker.css',
+    'lazr/build/activator/assets/skins/sam/activator.css',
+    'lazr/build/choiceedit/assets/choiceedit-core.css',
+    # This one goes at the end because it's our main stylesheet and should
+    # take precedence over the others.
+    'style-3-0.css']
+result = ''
+for content in combine_files(names, icing):
+    result += content
+
+f = open(os.path.join(icing, 'combo.css'), 'w')
+f.write(result)
+f.close()

=== modified file 'lib/canonical/launchpad/icing/style.css'
--- lib/canonical/launchpad/icing/style.css	2009-12-08 10:57:44 +0000
+++ lib/canonical/launchpad/icing/style.css	2009-12-18 11:38:11 +0000
@@ -1434,12 +1434,12 @@
 
 #project-cloud-preview a {
   padding-left: 0.5em;
-  padding-right: 0.5em,
+  padding-right: 0.5em;
 }
 
 #project-tags a {
   padding-left: 0.5em;
-  padding-right: 0.5em,
+  padding-right: 0.5em;
 }
 
 /* Clouds of links. */

=== modified file 'lib/canonical/launchpad/scripts/runlaunchpad.py'
--- lib/canonical/launchpad/scripts/runlaunchpad.py	2009-08-12 21:45:06 +0000
+++ lib/canonical/launchpad/scripts/runlaunchpad.py	2009-12-18 11:38:11 +0000
@@ -183,18 +183,6 @@
     }
 
 
-def make_css_slimmer():
-    import contrib.slimmer
-    inputfile = make_abspath(
-        'lib/canonical/launchpad/icing/style.css')
-    outputfile = make_abspath(
-        'lib/canonical/launchpad/icing/+style-slimmer.css')
-
-    cssdata = open(inputfile, 'rb').read()
-    slimmed = contrib.slimmer.slimmer(cssdata, 'css')
-    open(outputfile, 'w').write(slimmed)
-
-
 def get_services_to_run(requested_services):
     """Return a list of services (TacFiles) given a list of service names.
 
@@ -259,9 +247,6 @@
     # Store our process id somewhere
     make_pidfile('launchpad')
 
-    # Create a new compressed +style-slimmer.css from style.css in +icing.
-    make_css_slimmer()
-
     # Create the ZCML override file based on the instance.
     config.generate_overrides()
 

=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
--- lib/lp/app/templates/base-layout-macros.pt	2009-12-08 16:43:44 +0000
+++ lib/lp/app/templates/base-layout-macros.pt	2009-12-18 11:38:11 +0000
@@ -43,7 +43,7 @@
       rooturl modules/canonical.launchpad.webapp.vhosts/allvhosts/configs/mainsite/rooturl;
       icingroot string:${rooturl}+icing/rev${revno};
       devmode modules/canonical.config/config/devmode;
-      yui string:${icingroot}/yui/current/build;
+      yui string:${icingroot}/yui;
       lazr_js string:${icingroot}/lazr/build;
       lp_js string:${icingroot}/build"
   >
@@ -243,80 +243,18 @@
 </metal:page-javascript>
 
 
-<metal:launchpad-stylesheet define-macro="launchpad-stylesheet"
-  tal:define="
-      revno modules/canonical.launchpad.versioninfo/revno | string:unknown;
-      rooturl modules/canonical.launchpad.webapp.vhosts/allvhosts/configs/mainsite/rooturl;
-      icingroot string:${rooturl}+icing/rev${revno};
-      devmode modules/canonical.config/config/devmode"
-  >
-  <style
-    type="text/css"
-    media="screen, print"
-    tal:condition="not: devmode"
-    tal:content="string:@import url(${icingroot}/+style-slimmer.css);"/>
-  <style
-    type="text/css"
-    media="screen, print"
-    tal:condition="devmode"
-    tal:content="string:@import url(${icingroot}/style.css);"/>
-
-  <link rel="stylesheet" type="text/css"
-      tal:attributes="href
-      string:${icingroot}/lazr/build/lazr/assets/skins/sam/lazr.css"
-      />
-  <link rel="stylesheet" type="text/css"
-      tal:attributes="href
-      string:${icingroot}/lazr/build/inlineedit/assets/skins/sam/editor.css"
-      />
-  <link rel="stylesheet" type="text/css"
-      tal:attributes="href
-      string:${icingroot}/lazr/build/autocomplete/assets/skins/sam/autocomplete.css"
-      />
-  <link rel="stylesheet" type="text/css"
-      tal:attributes="href
-      string:${icingroot}/lazr/build/overlay/assets/skins/sam/pretty-overlay.css"
-      />
-  <link rel="stylesheet" type="text/css"
-      tal:attributes="href
-      string:${icingroot}/lazr/build/formoverlay/assets/formoverlay.css"
-      />
-  <link rel="stylesheet" type="text/css"
-      tal:attributes="href
-      string:${icingroot}/lazr/build/picker/assets/skins/sam/picker.css"
-      />
-  <link rel="stylesheet" type="text/css"
-      tal:attributes="href
-      string:${icingroot}/lazr/build/activator/assets/skins/sam/activator.css"
-      />
-  <link rel="stylesheet" type="text/css"
-      tal:attributes="href
-      string:${icingroot}/lazr/build/choiceedit/assets/choiceedit-core.css"
-      />
-</metal:launchpad-stylesheet>
-
-
 <metal:launchpad-stylesheet-3-0 define-macro="launchpad-stylesheet-3-0"
   tal:define="
     revno modules/canonical.launchpad.versioninfo/revno | string:unknown;
     rooturl modules/canonical.launchpad.webapp.vhosts/allvhosts/configs/mainsite/rooturl;
-    icingroot string:${rooturl}+icing/rev${revno};
-    yui string:${icingroot}/yui/current/build;
-    devmode modules/canonical.config/config/devmode">
+    icingroot string:${rooturl}+icing/rev${revno}">
   <tal:comment replace="nothing">
-    This macro loads the old stylesheet, then the YUI CSS, and finally
-    the new stylesheet.
+    This macro loads a single css file containing all our stylesheets.
+    If you need to include a new css file here, add it to
+    buildout-templates/bin/combine-css.in instead.
   </tal:comment>
-  <metal:old-style-sheet use-macro="context/@@+base-layout-macros/launchpad-stylesheet" />
-  <link rel="stylesheet" type="text/css"
-    tal:attributes="href string:${yui}/cssreset/reset.css" />
-  <link rel="stylesheet" type="text/css"
-    tal:attributes="href string:${yui}/cssfonts/fonts.css" />
-  <link rel="stylesheet" type="text/css"
-    tal:attributes="href string:${yui}/cssgrids/grids.css" />
-
   <style type="text/css" media="screen, print"
-    tal:content="string:@import url(${icingroot}/style-3-0.css);"/>
+    tal:content="string:@import url(${icingroot}/combo.css);"/>
 </metal:launchpad-stylesheet-3-0>
 
 

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2009-12-12 00:27:49 +0000
+++ lib/lp/bugs/browser/bugtask.py	2009-12-18 11:38:11 +0000
@@ -2720,8 +2720,10 @@
     def hot_bugtasks(self):
         """Return the 10 most recently updated bugtasks for this target."""
         params = BugTaskSearchParams(
-            orderby="-date_last_updated", omit_dupes=True, user=self.user)
-        return list(self.context.searchTasks(params)[:10])
+            orderby="-date_last_updated", omit_dupes=True, user=self.user,
+            status=any(*UNRESOLVED_BUGTASK_STATUSES))
+        search = self.context.searchTasks(params)
+        return list(search[:10])
 
     @property
     def addquestion_url(self):

=== modified file 'lib/lp/bugs/stories/bugs/xx-product-bugs-page.txt'
--- lib/lp/bugs/stories/bugs/xx-product-bugs-page.txt	2009-10-02 15:16:03 +0000
+++ lib/lp/bugs/stories/bugs/xx-product-bugs-page.txt	2009-12-18 11:38:11 +0000
@@ -177,3 +177,25 @@
     #4 Reflow problems... New    Medium     on 2006-07-14
     #1 Firefox does no... New    Low        on 2006-05-19
 
+
+Fix released bugs are not shown. We demonstrate this by setting the bugtask
+for bug 4 to be "Fix released".
+
+    >>> from zope.component import getUtility
+    >>> from lp.bugs.interfaces.bug import BugTaskStatus, IBugSet
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> login('[e-mail]')
+    >>> bug_4 = getUtility(IBugSet).get(4)
+    >>> project_owner = getUtility(IPersonSet).getByName('name12')
+    >>> bug_4.bugtasks[0].transitionToStatus(
+    ...     BugTaskStatus.FIXRELEASED, project_owner)
+    >>> logout()
+
+And then reloading the page. The Fix released bug, bug 4, is no longer shown.
+
+    >>> anon_browser.reload()
+    >>> print extract_text(
+    ...     find_tag_by_id(anon_browser.contents, 'hot-bugs'))
+        Summary            Status Importance Last changed
+    #5 Firefox install... New    Critical   on 2006-07-14
+    #1 Firefox does no... New    Low        on 2006-05-19

=== modified file 'lib/lp/registry/templates/object-timeline-graph.pt'
--- lib/lp/registry/templates/object-timeline-graph.pt	2009-12-03 18:33:22 +0000
+++ lib/lp/registry/templates/object-timeline-graph.pt	2009-12-18 11:38:11 +0000
@@ -9,8 +9,6 @@
   i18n:domain="launchpad"
 >
 <head>
-  <metal:launchpad-stylesheet
-    use-macro="context/@@+base-layout-macros/launchpad-stylesheet" />
   <metal:load-javascript
     use-macro="context/@@+base-layout-macros/load-javascript" />
   <metal:lp-client-cache

=== removed file 'scripts/make-static.py'
--- scripts/make-static.py	2009-10-13 14:38:07 +0000
+++ scripts/make-static.py	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#!/usr/bin/python2.5
-#
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""
-Create static files such as +style-slimmer.css
-"""
-
-import _pythonpath
-from canonical.launchpad.scripts.runlaunchpad import make_css_slimmer
-
-if __name__=="__main__":
-    make_css_slimmer()
-    

=== modified file 'versions.cfg'
--- versions.cfg	2009-12-11 13:23:47 +0000
+++ versions.cfg	2009-12-18 11:38:11 +0000
@@ -31,7 +31,7 @@
 lazr.smtptest = 1.1
 lazr.testing = 0.1.1
 lazr.uri = 1.0.2
-lazr-js = 0.9dev-r153-1
+lazr-js = 0.9.2DEV
 martian = 0.11
 mechanize = 0.1.11
 mocker = 0.10.1