Hi,
> for now (trunk r5865) the baseurl (configured in pootle.prefs) seems to be
> ignored for the images of the page banner.
furthermore the file pootle.prefs contains the following:
> # logo URLs
> # Use either a complete URL, or a URL relative to the pootle server's
> # root directory.
> logos:
> medium = "/images/pootle-medium.png"
but for now, relative URLs do not seem to be treated as if they would depend
on the baseurl.
the attached patch replaces the one sent before and does the following:
1) remove the leading slashes from the default values of the three logo URLs
(since they seem to be meant to be below pootle's root directory)
2) prepend the configured baseurl to non-absolute logo URLs
I hope this conforms to the desired behaviour.
regards,
Lars
Binärdateien Pootle.orig/indexpage.pyc and Pootle/indexpage.pyc sind verschieden.
diff -ruN Pootle.orig/pagelayout.py Pootle/pagelayout.py
--- Pootle.orig/pagelayout.py 2007-05-16 14:10:18.000000000 +0200
+++ Pootle/pagelayout.py 2007-06-15 05:38:47.000000000 +0200
@@ -19,16 +19,21 @@
# along with translate; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-def layout_banner(maxheight, session):
+def layout_banner(maxheight, session, baseurl):
"""calculates dimensions, image name for banner"""
logo_width, logo_height = min((98*maxheight/130, maxheight), (98, 130))
banner_width, banner_height = min((290*maxheight/160, maxheight), (290, 160))
if logo_width <= 61:
- logo_image = getattr(getattr(session.instance, "logos", None), "medium", "/images/pootle-medium.png")
+ logo_image = getattr(getattr(session.instance, "logos", None), "medium", "images/pootle-medium.png")
else:
- logo_image = getattr(getattr(session.instance, "logos", None), "normal", "/images/pootle.png")
- banner_image = getattr(getattr(session.instance, "logos", None), "banner", "/images/WordForge-white.png")
+ logo_image = getattr(getattr(session.instance, "logos", None), "normal", "images/pootle.png")
+ banner_image = getattr(getattr(session.instance, "logos", None), "banner", "images/WordForge-white.png")
+ # non-absolute paths are relative to baseurl
+ if not banner_image.startswith("/"):
+ banner_image = baseurl + banner_image
+ if not logo_image.startswith("/"):
+ logo_image = baseurl + logo_image
return {"logo_width": logo_width, "logo_height": logo_height,
"banner_width": banner_width, "banner_height": banner_height,
"logo_image": logo_image, "banner_image": banner_image}
@@ -90,7 +95,7 @@
templatevars["baseurl"] = getattr(session.instance, "baseurl", "/")
if not templatevars["baseurl"].endswith("/"):
templatevars["baseurl"] += "/"
- banner_layout = layout_banner(bannerheight, session)
+ banner_layout = layout_banner(bannerheight, session, templatevars["baseurl"])
banner_layout["logo_alttext"] = session.localize("Pootle Logo")
banner_layout["banner_alttext"] = session.localize("WordForge Translation Project")
templatevars.update(banner_layout)
diff -ruN Pootle.orig/pootle.prefs Pootle/pootle.prefs
--- Pootle.orig/pootle.prefs 2007-06-04 11:54:00.000000000 +0200
+++ Pootle/pootle.prefs 2007-06-15 05:41:30.000000000 +0200
@@ -64,9 +64,9 @@
# Use either a complete URL, or a URL relative to the pootle server's
# root directory.
logos:
- medium = "/images/pootle-medium.png"
- normal = "/images/pootle.png"
- banner = "/images/WordForge-white.png"
+ medium = "images/pootle-medium.png"
+ normal = "images/pootle.png"
+ banner = "images/WordForge-white.png"
# Where users are directed by default when they login
homepage = "home/"
Binärdateien Pootle.orig/versioncontrol.pyc and Pootle/versioncontrol.pyc sind verschieden.
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Translate-pootle mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/translate-pootle
