chrome/browser/resources/about_version.html - Issue 10916182: Refactor the about:version code out of about_ui.

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

Issue 10916182: Refactor the about:version code out of about_ui. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 3 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

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

2	2

3 <!--	3 <!--

4 about:version template page	4 about:version template page

5 -->	5 -->

6	6

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

8 <head>	8 <head>

9 <title i18n-content="title"></title>	9 <title i18n-content="title"></title>

10 <if expr="pp_ifdef('android')">	10 <if expr="pp_ifdef('android')">

11 <meta name="viewport" content="width=device-width">	11 <meta name="viewport" content="width=device-width">

12 </if>	12 </if>

13 <link rel="stylesheet" href="shared/css/about_version.css">	13 <link rel="stylesheet" href="shared/css/about_version.css">

14 <if expr="pp_ifdef('android')">	14 <if expr="pp_ifdef('android')">

15 <link rel="stylesheet" href="about_version_android.css">	15 <link rel="stylesheet" href="about_version_android.css">

16 </if>	16 </if>

	17 <script src="chrome://resources/js/cr.js"></script>

	18 <script src="chrome://resources/js/load_time_data.js"></script>

17 <script src="chrome://resources/js/parse_html_subset.js"></script>	19 <script src="chrome://resources/js/parse_html_subset.js"></script>

18 <script src="chrome://resources/js/util.js"></script>	20 <script src="chrome://resources/js/util.js"></script>

19 <script src="chrome://version/version.js"></script>	21 <script src="chrome://version/version.js"></script>

20 <script src="chrome://version/strings.js"></script>	22 <script src="chrome://version/strings.js"></script>

21 </head>	23 </head>

22	24

23 <body>	25 <body>

24 <div id="outer">	26 <div id="outer">

25 <div id="logo">	27 <div id="logo">

26 <if expr="pp_ifdef('enable_themes')">	28 <if expr="pp_ifdef('enable_themes')">

27 <img src="chrome://theme/IDR_PRODUCT_LOGO">	29 <img src="chrome://theme/IDR_PRODUCT_LOGO">

28 </if>	30 </if>

29 <if expr="not pp_ifdef('enable_themes')">	31 <if expr="not pp_ifdef('enable_themes')">

30 <img src="../../app/theme/default_100_percent/%DISTRIBUTION%/product_log o.png">	32 <img src="../../app/theme/default_100_percent/%DISTRIBUTION%/product_log o.png">

31 </if>	33 </if>

32 <div id="company" i18n-content="company"></div>	34 <div id="company" i18n-content="company"></div>

33 <div id="copyright" i18n-content="copyright"></div>	35 <div id="copyright" i18n-content="copyright"></div>

34 </div>	36 </div>

35 <table id="inner" cellpadding="0" cellspacing="0" border="0">	37 <table id="inner" cellpadding="0" cellspacing="0" border="0">

36 <tr><td class="label" valign="top" id="name" i18n-content="name"></td>	38 <tr><td class="label" valign="top" id="name" i18n-content="name"></td>

37 <td class="version" id="version"><span i18n-content="version"></span> (<span i18n-content="official"></span> <span i18n-content="cl"></span>) <span i1 8n-content="version_modifier"></span></td>	39 <td class="version" id="version"><span i18n-content="version"></span> (<span i18n-content="official"></span> <span i18n-content="cl"></span>) <span i1 8n-content="version_modifier"></span></td>
	Evan Stade 2012/09/10 09:46:59 fix up line wraps please fix up line wraps please SteveT 2012/09/10 15:14:57 So this is tricky because it looks like the origin So this is tricky because it looks like the original author wrote this line like this to get the spacing right. The resulting text with this current formatting looks like this: "23.0.1257.0 (Developer Build 154954)" I can break the <td></td> into separate lines and that's fine... but if I break each <span> onto their own lines, the spacing starts getting messed up. It looks like this: "23.0.1257.0 ( Developer Build 154954)" Any thoughts on how to handle the spacing around the parentheses properly? BTW I thought that the html style guide doesn't impose line-length caps? Evan Stade 2012/09/10 17:07:23 just don't line break in between the paren and the Show quoted text On 2012/09/10 15:14:57, SteveT wrote: > So this is tricky because it looks like the original author wrote this line like > this to get the spacing right. The resulting text with this current formatting > looks like this: > "23.0.1257.0 (Developer Build 154954)" > > I can break the <td></td> into separate lines and that's fine... but if I break > each <span> onto their own lines, the spacing starts getting messed up. It looks > like this: > "23.0.1257.0 ( Developer Build 154954)" > > Any thoughts on how to handle the spacing around the parentheses properly? just don't line break in between the paren and the span it contains. Show quoted text > > BTW I thought that the html style guide doesn't impose line-length caps? if all your consoles are set up to handle 80-character columns (as rietveld does) then excess line length makes it harder to read regardless of the language. SteveT 2012/09/10 20:14:51 Okay, that works. Interestingly... if I leave the Show quoted text On 2012/09/10 17:07:23, Evan Stade wrote: > On 2012/09/10 15:14:57, SteveT wrote: > > So this is tricky because it looks like the original author wrote this line > like > > this to get the spacing right. The resulting text with this current formatting > > looks like this: > > "23.0.1257.0 (Developer Build 154954)" > > > > I can break the <td></td> into separate lines and that's fine... but if I > break > > each <span> onto their own lines, the spacing starts getting messed up. It > looks > > like this: > > "23.0.1257.0 ( Developer Build 154954)" > > > > Any thoughts on how to handle the spacing around the parentheses properly? > > just don't line break in between the paren and the span it contains. Okay, that works. Interestingly... if I leave the <span>s all on one line, the product logo loads properly. But if I break them down, Chrome fails to fetch the resource. Not sure why that is. Anyways, adding the Theme data source like you suggested resolves the Logo issue consistently. Show quoted text > > > > > BTW I thought that the html style guide doesn't impose line-length caps? > > if all your consoles are set up to handle 80-character columns (as rietveld > does) then excess line length makes it harder to read regardless of the > language. Okay. I've tried to break up some of the lines where-ever I could.
38 </tr>	40 </tr>

39 <if expr="not pp_ifdef('chromeos')">	41 <if expr="not pp_ifdef('chromeos')">

40 <tr><td class="label" valign="top" i18n-content="os_name"></td>	42 <tr><td class="label" valign="top" i18n-content="os_name"></td>

41 <td class="version" id="os_type"><span i18n-content="os_type"></span> <span i18n-content="os_version"></span></td>	43 <td class="version" id="os_type"><span i18n-content="os_type"></span> <span i18n-content="os_version"></span></td>

42 </if>	44 </if>

43 <if expr="pp_ifdef('chromeos')">	45 <if expr="pp_ifdef('chromeos')">

44 <tr><td class="label" valign="top" i18n-content="platform"></td>	46 <tr><td class="label" valign="top" i18n-content="platform"></td>

45 <td class="version" id="os_type"><span i18n-content="os_version"></spa n></td>	47 <td class="version" id="os_type"><span i18n-content="os_version"></spa n></td>

46 </if>	48 </if>

47 </tr>	49 </tr>

(...skipping 19 matching lines...) Expand all Loading...
67 </tr>	69 </tr>

68 <tr><td class="label" valign="top" i18n-content="profile_path_name"></td >	70 <tr><td class="label" valign="top" i18n-content="profile_path_name"></td >

69 <td class="version" id="profile_path" i18n-content="profile_path"></ td>	71 <td class="version" id="profile_path" i18n-content="profile_path"></ td>

70 </tr>	72 </tr>

71 <tr id="variations-section">	73 <tr id="variations-section">

72 <td class="label" valign="top" i18n-content="variations_name"></td>	74 <td class="label" valign="top" i18n-content="variations_name"></td>

73 <td class="version" id="variations-list"></td>	75 <td class="version" id="variations-list"></td>

74 </tr>	76 </tr>

75 </table>	77 </table>

76 </div>	78 </div>

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

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

79 <script src="chrome://resources/js/jstemplate_compiled.js"></script>	79 <script src="chrome://resources/js/jstemplate_compiled.js"></script>
	Evan Stade 2012/09/10 09:46:59 this still necessary? this still necessary? SteveT 2012/09/10 15:14:57 Nope, removed it. Nope, removed it.
	80 <script src="chrome://resources/js/i18n_template2.js"></script>

80 </body>	81 </body>

81	82

82 </html>	83 </html>

OLD	NEW

« no previous file with comments | « no previous file | chrome/browser/resources/about_version.js » ('j') | chrome/browser/ui/webui/version_ui.cc » ('J')