diff options
| author | Marc Englund <marc.englund@itmill.com> | 2008-03-03 10:04:32 +0000 |
|---|---|---|
| committer | Marc Englund <marc.englund@itmill.com> | 2008-03-03 10:04:32 +0000 |
| commit | 5c4db3461bf91acba2229f87e528156712cae3ef (patch) | |
| tree | 4c68a71f7b8d5b0d8e07aeae65498f9cd66a3752 /src | |
| parent | d545e9a267a7e82f498396357759973f6a1f47fd (diff) | |
| download | vaadin-framework-5c4db3461bf91acba2229f87e528156712cae3ef.tar.gz vaadin-framework-5c4db3461bf91acba2229f87e528156712cae3ef.zip | |
Title of generated page is no longer "IT Mill Toolkit 5" if the mainwindow has a caption. Fixes #1456
svn changeset:3957/svn branch:trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java index 605bfd89bc..f9f31d8bcd 100644 --- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java +++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java @@ -643,6 +643,8 @@ public class ApplicationServlet extends HttpServlet { response.getOutputStream())); final String pathInfo = request.getPathInfo() == null ? "/" : request .getPathInfo(); + String title = ((window == null || window.getCaption() == null) ? "IT Mill Toolkit 5" + : window.getCaption()); page .write("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" " + "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"); @@ -650,7 +652,9 @@ public class ApplicationServlet extends HttpServlet { page .write("<html xmlns=\"http://www.w3.org/1999/xhtml\" style=\"width:100%;" + "height:100%;border:0;margin:0;\">\n<head>\n" - + "<title>IT Mill Toolkit 5</title>\n" + + "<title>" + + title + + "</title>\n" + "<script type=\"text/javascript\">\n" + " var itmill = {\n" + " appUri:'"); |