chrome/browser/resources/chromeos/network_ui/network_ui.html - Issue 1277223002: Add cr-network-select element for selecting a Chrome OS network

Side by Side Diff: chrome/browser/resources/chromeos/network_ui/network_ui.html

Issue 1277223002: Add cr-network-select element for selecting a Chrome OS network (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_515987_network_configure

Patch Set: Created 5 years, 4 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

« chrome/browser/resources/chromeos/network_ui/network_ui.css ('K') | « chrome/browser/resources/chromeos/network_ui/network_ui.css ('k') | chrome/browser/resources/chromeos/network_ui/network_ui.js » ('j') | chrome/browser/resources/settings/internet_page/internet_detail_page.html » ('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 i18n-values="dir:textdirection;lang:language">	2 <html i18n-values="dir:textdirection;lang:language">

3	3

4 <head>	4 <head>

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

6 <title id="network" i18n-content="titleText"></title>	6 <title id="network" i18n-content="titleText"></title>

7 <link rel="stylesheet" href="chrome://resources/css/text_defaults.css">	7 <link rel="stylesheet" href="chrome://resources/css/text_defaults.css">

8 <link rel="stylesheet" href="chrome://network/network_ui.css">	8 <link rel="stylesheet" href="chrome://network/network_ui.css">

9 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_network_icon/c r_network_icon.html">	9 <link rel="import" href="chrome://resources/cr_elements/v1_0/network/cr_networ k_icon.html">

10 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_onc/cr_onc_typ es.html">	10 <link rel="import" href="chrome://resources/cr_elements/v1_0/network/cr_networ k_select.html">

	11 <link rel="import" href="chrome://resources/cr_elements/v1_0/network/cr_onc_ty pes.html">

11 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-bu tton.html">	12 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-bu tton.html">

12	13

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

14 <script src="chrome://resources/js/util.js"></script>	15 <script src="chrome://resources/js/util.js"></script>

15 <script src="chrome://network/strings.js"></script>	16 <script src="chrome://network/strings.js"></script>

16 <script src="chrome://network/network_ui.js"></script>	17 <script src="chrome://network/network_ui.js"></script>

17 </head>	18 </head>

18	19

19 <body>	20 <body>

20 <div id="header">	21 <div id="header">

21 <p i18n-content="autoRefreshText"></p>	22 <p i18n-content="autoRefreshText"></p>

22 <span i18n-values=".innerHTML:deviceLogLinkText"></span>	23 <span i18n-values=".innerHTML:deviceLogLinkText"></span>

23 <div id="advanced-options">	24 <div id="advanced-options">

24 <span i18n-content="clickToExpandText"></span>	25 <span i18n-content="clickToExpandText"></span>

25 <span i18n-content="propertyFormatText"></span>	26 <span i18n-content="propertyFormatText"></span>

26 <select id="get-property-format">	27 <select id="get-property-format">

27 <option value="normal" i18n-content="normalFormatOption"></option>	28 <option value="normal" i18n-content="normalFormatOption"></option>

28 <option value="managed" i18n-content="managedFormatOption"></option>	29 <option value="managed" i18n-content="managedFormatOption"></option>

29 <option value="state" i18n-content="stateFormatOption"></option>	30 <option value="state" i18n-content="stateFormatOption"></option>

30 <option value="shill" i18n-content="shillFormatOption"></option>	31 <option value="shill" i18n-content="shillFormatOption"></option>

31 </select>	32 </select>

32 </div>	33 </div>

33	34

34 <div id="default-network">	35 <div id="default-network">

35 <cr-network-icon id="default-network-icon"></cr-network-icon>	36 <cr-network-select expandable show-active max-height="100">

36 <span id="default-network-text"></span>	37 </cr-network-select>

37 </div>	38 </div>

38	39

39 <div>	40 <div>

40 <paper-button raised class="colored" id="refresh"	41 <paper-button raised class="colored" id="refresh"

41 i18n-content="networkRefreshText">	42 i18n-content="networkRefreshText">

42 </paper-button>	43 </paper-button>

43 </div>	44 </div>

44 </div>	45 </div>

45	46

46 <h3 i18n-content="visibleNetworksLabel"></h3>	47 <h3 i18n-content="visibleNetworksLabel"></h3>

(...skipping 27 matching lines...) Expand all Loading...
74 <td>Type</td>	75 <td>Type</td>

75 <td>Profile</td>	76 <td>Profile</td>

76 <td>Visible</td>	77 <td>Visible</td>

77 <td>ONC Source</td>	78 <td>ONC Source</td>

78 </tr>	79 </tr>

79 </table>	80 </table>

80	81

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

82 </body>	83 </body>

83 </html>	84 </html>

OLD	NEW