chrome/browser/resources/options/options.html - Issue 7342009: Show a different banner in chrome://settings for extension-controlled settings.

Side by Side Diff: chrome/browser/resources/options/options.html

Issue 7342009: Show a different banner in chrome://settings for extension-controlled settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix stuff Created 9 years, 5 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 unified diff | Download patch | Annotate | Revision Log

« chrome/app/generated_resources.grd ('K') | « chrome/browser/resources/options/font_settings.js ('k') | chrome/browser/resources/options/options_page.js » ('j') | chrome/browser/resources/options/personal_options.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <!DOCTYPE HTML>	1 <!DOCTYPE HTML>

2 <html id="t" i18n-values="dir:textdirection">	2 <html id="t" i18n-values="dir:textdirection">

3 <head>	3 <head>

4 <meta charset="utf-8">	4 <meta charset="utf-8">

5 <!-- X-WebKit-CSP is our development name for Content-Security-Policy.	5 <!-- X-WebKit-CSP is our development name for Content-Security-Policy.

6 TODO(tsepez) rename when Content-security-policy is done.	6 TODO(tsepez) rename when Content-security-policy is done.

7 TODO(tsepez) remove unsafe-eval when bidichecker_packaged.js fixed.	7 TODO(tsepez) remove unsafe-eval when bidichecker_packaged.js fixed.

8 -->	8 -->

9 <meta http-equiv="X-WebKit-CSP" content="object-src 'none'; script-src chrome:// resources 'self' 'unsafe-eval'">	9 <meta http-equiv="X-WebKit-CSP" content="object-src 'none'; script-src chrome:// resources 'self' 'unsafe-eval'">

10 <!-- Set the title to that of the default page so that the title doesn't flash	10 <!-- Set the title to that of the default page so that the title doesn't flash

(...skipping 86 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
97 </div>	97 </div>

98 <div id="main-content">	98 <div id="main-content">

99 <div id="navbar-container">	99 <div id="navbar-container">

100 <h1 id="settings-title" i18n-content="title"></h1>	100 <h1 id="settings-title" i18n-content="title"></h1>

101 <ul id="navbar" role="tablist">	101 <ul id="navbar" role="tablist">

102 </ul>	102 </ul>

103 </div>	103 </div>

104 <div id="mainview">	104 <div id="mainview">

105 <div id="managed-prefs-banner" hidden>	105 <div id="managed-prefs-banner" hidden>

106 <span id="managed-prefs-icon"></span>	106 <span id="managed-prefs-icon"></span>

107 <span id="managed-prefs-text"	107 <span id="policy-managed-prefs-text"
	Evan Stade 2011/07/13 17:06:04 just use one span with the text content controlled just use one span with the text content controlled in js Bernhard Bauer 2011/07/13 22:15:12 Done. Show quoted text On 2011/07/13 17:06:04, Evan Stade wrote: > just use one span with the text content controlled in js Done.
108 i18n-content="managedPrefsBannerText"></span>	108 i18n-content="policyManagedPrefsBannerText"></span>

	109 <span id="extension-managed-prefs-text"

	110 i18n-content="extensionManagedPrefsBannerText"></span>

	111 <span id="policy-and-extension-managed-prefs-text"

	112 i18n-content="policyAndExtensionManagedPrefsBannerText"></span>

109 </div>	113 </div>

110 <div id="subpage-backdrop" hidden></div>	114 <div id="subpage-backdrop" hidden></div>

111 <div id="mainview-content">	115 <div id="mainview-content">

112 <div id="toplevel-page-container">	116 <div id="toplevel-page-container">

113 <!-- Please keep the main pages in desired order of display. This will	117 <!-- Please keep the main pages in desired order of display. This will

114 allow search results to display in the desired order. -->	118 allow search results to display in the desired order. -->

115 <include src="search_page.html">	119 <include src="search_page.html">

116 <include src="browser_options.html">	120 <include src="browser_options.html">

117 <include src="personal_options.html">	121 <include src="personal_options.html">

118 <if expr="pp_ifdef('chromeos')">	122 <if expr="pp_ifdef('chromeos')">

(...skipping 45 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
164 </div>	168 </div>

165 </div>	169 </div>

166 </div>	170 </div>

167 </div>	171 </div>

168 </div>	172 </div>

169 <script src="chrome://settings/strings.js"></script>	173 <script src="chrome://settings/strings.js"></script>

170 <script src="chrome://resources/js/i18n_template.js"></script>	174 <script src="chrome://resources/js/i18n_template.js"></script>

171 <script src="chrome://resources/js/i18n_process.js"></script>	175 <script src="chrome://resources/js/i18n_process.js"></script>

172 </body>	176 </body>

173 </html>	177 </html>

OLD	NEW