=== modified file 'lib/cdimage/tree.py' --- lib/cdimage/tree.py 2019-03-22 15:55:28 +0000 +++ lib/cdimage/tree.py 2019-04-11 22:13:38 +0000 @@ -366,6 +366,7 @@ self.project = self.config.project self.image_type = image_type self.prefmsg_emitted = False + self.webassets = self.assetincludes() # Keep this in sync with _guess_image_type below. @property @@ -437,14 +438,24 @@ else: return "" - def cssincludes(self): + def assetincludes(self): + p = "https://assets.ubuntu.com/v1/" + c = "//cdimage.ubuntu.com/include/" + assets = { + "css": p + "vanilla-framework-version-1.8.0.min.css", + "lockup": p + "411e1474-releases-lockup.svg", + "bg": p + "775cc62b-vanilla-grad-background.png", + "header_href": "https://www.ubuntu.com/", + } + if self.project in ("lubuntu", "lubuntu-next"): + assets["lockup"] = c + "lubuntu/lockup.png" + assets["bg"] = c + "lubuntu/background.png" + assets["header_href"] = "https://lubuntu.me/" if self.project == "kubuntu": - return ["//releases.ubuntu.com/include/kubuntu.css"] - if self.project in ("lubuntu", "lubuntu-next"): - return ["//cdimage.ubuntu.com/include/lubuntu/style.css"] - else: - return ["https://assets.ubuntu.com/v1/" + - "vanilla-framework-version-1.8.0.min.css"] + assets["lockup"] = c + "kubuntu/lockup.png" + assets["bg"] = c + "kubuntu/background.png" + aseets["header_href"] = "https://kubuntu.org/" + return assets def cdtypestr(self, publish_type, image_format): if image_format in ("tar.gz", "tar.xz", "custom.tar.gz"): @@ -1100,22 +1111,21 @@ with AtomicFile(header_path) as header, \ AtomicFile(footer_path) as footer, \ AtomicFile(htaccess_path) as htaccess: - heading = self.web_heading(base_prefix) + self.webassets["heading"] = self.web_heading(base_prefix) print( dedent("""\ - %s + {heading} - + -