From 233bc0b84aef261a67a364ff3a8e91077fd70fd6 Mon Sep 17 00:00:00 2001 From: Dirk Dougherty Date: Tue, 7 Jul 2009 17:43:27 -0700 Subject: [PATCH] AI 150370: Add localized content infrastructure in droiddoc templates, javascript, and css. DocFile.java - instead of FileReader, use InputStreamReader with UTF-8 encoding. ClearPage.java - add UTF-8 output encoding to FileOutputStreamWriter. Note: this change also up-integrates gerrit 2146 (smain). BUG=1910893 Automated import of CL 150370 --- tools/droiddoc/src/ClearPage.java | 2 +- tools/droiddoc/src/DocFile.java | 3 +- tools/droiddoc/templates-sdk/customization.cs | 49 +++++++++++-------- tools/droiddoc/templates-sdk/header_tabs.cs | 34 ++++++++++--- .../assets/android-developer-core.css | 10 +++- .../assets/android-developer-docs.css | 8 ++- .../assets/android-developer-docs.js | 47 +++++++++--------- 7 files changed, 99 insertions(+), 54 deletions(-) diff --git a/tools/droiddoc/src/ClearPage.java b/tools/droiddoc/src/ClearPage.java index 2a8fcede8d..184c8b8581 100644 --- a/tools/droiddoc/src/ClearPage.java +++ b/tools/droiddoc/src/ClearPage.java @@ -126,7 +126,7 @@ public class ClearPage OutputStreamWriter stream = null; try { stream = new OutputStreamWriter( - new FileOutputStream(file)); + new FileOutputStream(file), "UTF-8"); String rendered = cs.render(); stream.write(rendered, 0, rendered.length()); } diff --git a/tools/droiddoc/src/DocFile.java b/tools/droiddoc/src/DocFile.java index b71c0816eb..0c3d112a21 100644 --- a/tools/droiddoc/src/DocFile.java +++ b/tools/droiddoc/src/DocFile.java @@ -33,7 +33,8 @@ public class DocFile try { File f = new File(filename); int length = (int)f.length(); - FileReader reader = new FileReader(f); + FileInputStream is = new FileInputStream(f); + InputStreamReader reader = new InputStreamReader(is, "UTF-8"); char[] buf = new char[length]; int index = 0; int amt; diff --git a/tools/droiddoc/templates-sdk/customization.cs b/tools/droiddoc/templates-sdk/customization.cs index 9ec1f44b54..ba0e0f6278 100644 --- a/tools/droiddoc/templates-sdk/customization.cs +++ b/tools/droiddoc/templates-sdk/customization.cs @@ -11,12 +11,12 @@ def:default_search_box() ?>
-
@@ -46,19 +46,29 @@ def:custom_masthead() ?>
@@ -151,9 +161,8 @@ def:default_left_nav() ?> if (!isMobile) { $("Use Tree Navigation").appendTo("#side-nav"); chooseDefaultNav(); - if ($("#nav-tree").is(':visible')) { - init_default_navtree(""); - } else { + if ($("#nav-tree").is(':visible')) init_navtree("nav-tree", "", NAVTREE_DATA); + else { addLoadEvent(function() { scrollIntoView("packages-nav"); scrollIntoView("classes-nav"); diff --git a/tools/droiddoc/templates-sdk/header_tabs.cs b/tools/droiddoc/templates-sdk/header_tabs.cs index 12b747e6b3..2fa5945fac 100644 --- a/tools/droiddoc/templates-sdk/header_tabs.cs +++ b/tools/droiddoc/templates-sdk/header_tabs.cs @@ -9,27 +9,47 @@
  • Blog - + ブログ + 博客 + 網誌
    • - \ No newline at end of file + diff --git a/tools/droiddoc/templates/assets/android-developer-core.css b/tools/droiddoc/templates/assets/android-developer-core.css index 8a1b9cd143..dee006fea4 100644 --- a/tools/droiddoc/templates/assets/android-developer-core.css +++ b/tools/droiddoc/templates/assets/android-developer-core.css @@ -238,6 +238,10 @@ hr.blue { top:7px; } +#header li a span+span { + display:none; +} + /* TAB HIGHLIGHTING */ .home #home-link a, .publish #publish-link a, @@ -276,8 +280,12 @@ hr.blue { color: #7FA9B5; } +#headerLinks img { + vertical-align:middle; +} + #language { - margin:0 10px; + margin:0 10px 0 4px; } #search { diff --git a/tools/droiddoc/templates/assets/android-developer-docs.css b/tools/droiddoc/templates/assets/android-developer-docs.css index f4aa5ef75d..cf44b261f2 100644 --- a/tools/droiddoc/templates/assets/android-developer-docs.css +++ b/tools/droiddoc/templates/assets/android-developer-docs.css @@ -89,6 +89,10 @@ zoom:1; } +#side-nav li a span+span { + display:none; +} + #side-nav li a:hover { text-decoration:underline; } @@ -1130,9 +1134,9 @@ body .ui-resizable-autohide .ui-resizable-handle { display: none; } /* use 'body page-break-inside: avoid; } - #qv, +/* #qv, #qv-wrapper { display:none; } - +*/ } diff --git a/tools/droiddoc/templates/assets/android-developer-docs.js b/tools/droiddoc/templates/assets/android-developer-docs.js index 160e4926dc..964191bf7a 100644 --- a/tools/droiddoc/templates/assets/android-developer-docs.js +++ b/tools/droiddoc/templates/assets/android-developer-docs.js @@ -31,15 +31,6 @@ if ((agent.indexOf("Mobile") != -1) || addLoadEvent(mobileSetup); } -/* loads the lists.js file to the page. -Loading this in the head was slowing page load time */ -addLoadEvent( function() { - var lists = document.createElement("script"); - lists.setAttribute("type","text/javascript"); - lists.setAttribute("src", toRoot+"reference/lists.js"); - $("head").append($(lists)); -} ); - window.onresize = resizeAll; function mobileSetup() { @@ -214,6 +205,19 @@ function resizeAll() { } } +function getBaseUri(uri) { + intlUrl = uri.substring(0,6) == "/intl/"; + if (intlUrl) { + base = uri.substring(uri.indexOf('intl/')+5,uri.length); + base = base.substring(base.indexOf('/')+1, base.length); + //alert("intl, returning base url: /" + base); + return ("/" + base); + } else { + //alert("not intl, returning uri as found."); + return uri; + } +} + function loadLast(cookiePath) { var location = window.location.href; if (location.indexOf("/"+cookiePath+"/") != -1) { @@ -228,7 +232,7 @@ function loadLast(cookiePath) { } $(window).unload(function(){ - var path = location.pathname; + var path = getBaseUri(location.pathname); if (path.indexOf("/reference/") != -1) { writeCookie("lastpage", path, "reference", null); } else if (path.indexOf("/guide/") != -1) { @@ -236,8 +240,6 @@ $(window).unload(function(){ } }); - - function toggle(obj, slide) { var ul = $("ul", obj); var li = ul.parent(); @@ -258,8 +260,6 @@ function toggle(obj, slide) { } } - - function buildToggleLists() { $(".toggle-list").each( function(i) { @@ -291,11 +291,11 @@ function swapNav() { nav_pref = NAV_PREF_PANELS; } else { nav_pref = NAV_PREF_TREE; - init_default_navtree(toRoot); + init_navtree("nav-tree", toRoot, NAVTREE_DATA); } var date = new Date(); date.setTime(date.getTime()+(10*365*24*60*60*1000)); // keep this for 10 years - writeCookie("nav", nav_pref, null, date.toGMTString()); + writeCookie("nav", nav_pref, "reference", date.toGMTString()); $("#nav-panels").toggle(); $("#panel-link").toggle(); @@ -396,12 +396,16 @@ function changeDocLang(lang) { changeNavLang(lang); } -function changeLangPref(lang) { +function changeLangPref(lang, refresh) { var date = new Date(); - date.setTime(date.getTime()+(50*365*24*60*60*1000)); // keep this for 50 years - writeCookie("pref_lang", lang, null, date); - - changeDocLang(lang); + expires = date.toGMTString(date.setTime(date.getTime()+(10*365*24*60*60*1000))); // keep this for 50 years + //alert("expires: " + expires) + writeCookie("pref_lang", lang, null, expires); + //changeDocLang(lang); + if (refresh) { + l = getBaseUri(location.pathname); + window.location = l; + } } function loadLangPref() { @@ -414,4 +418,3 @@ function loadLangPref() { function getLangPref() { return $("#language").find(":selected").attr("value"); } -