Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3157)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/options/browser_options.html

Issue 7088010: Layout adjustment for i18n compatibility. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/resources/options/advanced_options.html ('K') | « chrome/browser/resources/options/advanced_options.html ('k') | chrome/browser/resources/options/chromeos/accounts_options.html » ('j') | chrome/browser/resources/options/chromeos/accounts_options.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options/browser_options.html
diff --git a/chrome/browser/resources/options/browser_options.html b/chrome/browser/resources/options/browser_options.html
index 4340615e39c24ea54c23e8aa88da68b028f0ee74..740e98dfefb34043e77ffd34db906f8c966e4c67 100644
--- a/chrome/browser/resources/options/browser_options.html
+++ b/chrome/browser/resources/options/browser_options.html
@@ -1,118 +1,120 @@
<div id="browserPage" class="page" hidden>
<h1 i18n-content="browserPage"></h1>
- <section id="startupSection">
- <h3 i18n-content="startupGroupName"></h3>
- <div>
- <div class="radio">
- <label>
- <input type="radio" name="startup" pref="session.restore_on_startup"
- value="0" metric="Options_Startup_Homepage">
- <span i18n-content="startupShowDefaultAndNewTab"></span>
- </label>
- </div>
- <div class="radio">
- <label>
- <input type="radio" name="startup" pref="session.restore_on_startup"
- value="1" metric="Options_Startup_LastSession">
- <span i18n-content="startupShowLastSession"></span>
- </label>
- </div>
- <div class="radio">
- <label>
- <input id="startupShowPagesButton" type="radio" name="startup"
- pref="session.restore_on_startup" value="4"
- metric="Options_Startup_Custom">
- <span id="startupShowPagesLabel"
- i18n-content="startupShowPages"></span>
- </label>
- </div>
- <div class="suboption">
- <div id="startupPageManagement" class="settings-list">
- <list id="startupPagesList"></list>
- <div>
- <button id="startupUseCurrentButton"
- i18n-content="startupUseCurrent"></button>
+ <div class="displaytable">
kevers 2011/06/02 19:03:36 Added new <div> block to use 'display:table'. Rem
+ <section id="startupSection">
+ <h3 i18n-content="startupGroupName"></h3>
+ <div>
+ <div class="radio">
+ <label>
+ <input type="radio" name="startup" pref="session.restore_on_startup"
+ value="0" metric="Options_Startup_Homepage">
+ <span i18n-content="startupShowDefaultAndNewTab"></span>
+ </label>
+ </div>
+ <div class="radio">
+ <label>
+ <input type="radio" name="startup" pref="session.restore_on_startup"
+ value="1" metric="Options_Startup_LastSession">
+ <span i18n-content="startupShowLastSession"></span>
+ </label>
+ </div>
+ <div class="radio">
+ <label>
+ <input id="startupShowPagesButton" type="radio" name="startup"
+ pref="session.restore_on_startup" value="4"
+ metric="Options_Startup_Custom">
+ <span id="startupShowPagesLabel"
+ i18n-content="startupShowPages"></span>
+ </label>
+ </div>
+ <div class="suboption">
+ <div id="startupPageManagement" class="settings-list">
+ <list id="startupPagesList"></list>
+ <div>
+ <button id="startupUseCurrentButton"
+ i18n-content="startupUseCurrent"></button>
+ </div>
</div>
</div>
</div>
- </div>
- </section>
- <section>
- <h3 i18n-content="homepageGroupName"></h3>
- <div>
- <div class="radio">
- <label>
- <input id="homepageUseNTPButton" type="radio" name="homepage"
- value="true" metric="Options_Homepage_IsNewTabPage">
- <span i18n-content="homepageUseNewTab"></span>
- </label>
- </div>
- <div id="customHomePageGroup">
+ </section>
+ <section>
+ <h3 i18n-content="homepageGroupName"></h3>
+ <div>
<div class="radio">
<label>
- <input id="homepageUseURLButton" type="radio" name="homepage"
- value="false" metric="Options_Homepage_IsNewTabPage">
- <span i18n-content="homepageUseURL"></span>
+ <input id="homepageUseNTPButton" type="radio" name="homepage"
+ value="true" metric="Options_Homepage_IsNewTabPage">
+ <span i18n-content="homepageUseNewTab"></span>
</label>
</div>
- <div>
- <input id="homepageURL" class="favicon-cell" type="url">
+ <div id="customHomePageGroup">
+ <div class="radio">
+ <label>
+ <input id="homepageUseURLButton" type="radio" name="homepage"
+ value="false" metric="Options_Homepage_IsNewTabPage">
+ <span i18n-content="homepageUseURL"></span>
+ </label>
+ </div>
+ <div>
+ <input id="homepageURL" class="favicon-cell" type="url">
+ </div>
</div>
</div>
- </div>
- </section>
- <section>
- <h3 i18n-content="toolbarGroupName"></h3>
- <div>
- <div class="checkbox">
- <label>
- <input id="toolbarShowHomeButton" pref="browser.show_home_button"
- metric="Options_Homepage_HomeButton" type="checkbox">
- <span i18n-content="toolbarShowHomeButton"></span>
- </label>
- </div>
- <div class="checkbox">
- <label>
- <input id="toolbarShowBookmarksBar"
- pref="bookmark_bar.show_on_all_tabs"
- metric="ShowBookmarksBar" type="checkbox">
- <span i18n-content="toolbarShowBookmarksBar"></span>
- </label>
- </div>
- </div>
- </section>
- <section>
- <h3 i18n-content="defaultSearchGroupName"></h3>
- <div id="defaultSearchEngineGroup">
- <div>
- <select id="defaultSearchEngine"></select>
- <button id="defaultSearchManageEnginesButton"
- i18n-content="defaultSearchManageEngines"></button>
- </div>
- <div id="instantOption" class="checkbox">
+ </section>
+ <section>
+ <h3 i18n-content="toolbarGroupName"></h3>
+ <div>
+ <div class="checkbox">
<label>
- <!-- TODO(estade): metric? -->
- <input id="instantEnableCheckbox" type="checkbox"
- pref="instant.enabled">
- <span i18n-content="instantName"></span>
+ <input id="toolbarShowHomeButton" pref="browser.show_home_button"
+ metric="Options_Homepage_HomeButton" type="checkbox">
+ <span i18n-content="toolbarShowHomeButton"></span>
</label>
</div>
- <div class="suboption informational-text">
- <span i18n-content="instantWarningText"></span>
- <a target="_blank" i18n-values="href:instantLearnMoreLink"
- i18n-content="learnMore"></a>
+ <div class="checkbox">
+ <label>
+ <input id="toolbarShowBookmarksBar"
+ pref="bookmark_bar.show_on_all_tabs"
+ metric="ShowBookmarksBar" type="checkbox">
+ <span i18n-content="toolbarShowBookmarksBar"></span>
+ </label>
</div>
</div>
- </section>
+ </section>
+ <section>
+ <h3 i18n-content="defaultSearchGroupName"></h3>
+ <div id="defaultSearchEngineGroup">
+ <div>
+ <select id="defaultSearchEngine"></select>
+ <button id="defaultSearchManageEnginesButton"
+ i18n-content="defaultSearchManageEngines"></button>
+ </div>
+ <div id="instantOption" class="checkbox">
+ <label>
+ <!-- TODO(estade): metric? -->
+ <input id="instantEnableCheckbox" type="checkbox"
+ pref="instant.enabled">
+ <span i18n-content="instantName"></span>
+ </label>
+ </div>
+ <div class="suboption informational-text">
+ <span i18n-content="instantWarningText"></span>
+ <a target="_blank" i18n-values="href:instantLearnMoreLink"
+ i18n-content="learnMore"></a>
+ </div>
+ </div>
+ </section>
<if expr="not pp_ifdef('chromeos')">
- <section>
- <h3 i18n-content="defaultBrowserGroupName"></h3>
- <div>
- <button id="defaultBrowserUseAsDefaultButton"
- i18n-content="defaultBrowserUseAsDefault"></button>
- <div id="defaultBrowserState"
- i18n-content="defaultBrowserUnknown"></div>
- </div>
- </section>
+ <section>
+ <h3 i18n-content="defaultBrowserGroupName"></h3>
+ <div>
+ <button id="defaultBrowserUseAsDefaultButton"
+ i18n-content="defaultBrowserUseAsDefault"></button>
+ <div id="defaultBrowserState"
+ i18n-content="defaultBrowserUnknown"></div>
+ </div>
+ </section>
</if>
+ </div>
</div>
« chrome/browser/resources/options/advanced_options.html ('K') | « chrome/browser/resources/options/advanced_options.html ('k') | chrome/browser/resources/options/chromeos/accounts_options.html » ('j') | chrome/browser/resources/options/chromeos/accounts_options.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698