OLD | NEW |
1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
2 <link rel="import" href="chrome://resources/html/polymer.html"> | 2 <link rel="import" href="chrome://resources/html/polymer.html"> |
3 <link rel="import" href="chrome://resources/html/promise_resolver.html"> | 3 <link rel="import" href="chrome://resources/html/promise_resolver.html"> |
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> |
5 <link rel="import" href="/about_page/about_page.html"> | 5 <link rel="import" href="/about_page/about_page.html"> |
6 <link rel="import" href="/advanced_page/advanced_page.html"> | 6 <link rel="import" href="/advanced_page/advanced_page.html"> |
7 <link rel="import" href="/basic_page/basic_page.html"> | 7 <link rel="import" href="/basic_page/basic_page.html"> |
8 <link rel="import" href="/settings_main/settings_main_rendered.html"> | 8 <link rel="import" href="/settings_main/settings_main_rendered.html"> |
9 <link rel="import" href="/settings_page/main_page_behavior.html"> | 9 <link rel="import" href="/settings_page/main_page_behavior.html"> |
10 <link rel="import" href="/settings_vars_css.html"> | 10 <link rel="import" href="/settings_vars_css.html"> |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 font-size: 120%; | 48 font-size: 120%; |
49 margin-bottom: 10px; | 49 margin-bottom: 10px; |
50 } | 50 } |
51 </style> | 51 </style> |
52 <content select="paper-icon-button"></content> | 52 <content select="paper-icon-button"></content> |
53 <div id="no-search-results" hidden$="[[!showNoResultsFound_]]"> | 53 <div id="no-search-results" hidden$="[[!showNoResultsFound_]]"> |
54 <div>$i18n{searchNoResults}</div> | 54 <div>$i18n{searchNoResults}</div> |
55 <div>$i18nRaw{searchNoResultsHelp}</div> | 55 <div>$i18nRaw{searchNoResultsHelp}</div> |
56 </div> | 56 </div> |
57 <template is="dom-if" if="[[showPages_.basic]]"> | 57 <template is="dom-if" if="[[showPages_.basic]]"> |
58 <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}"> | 58 <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}" |
| 59 page-visibility="[[pageVisibility]]"> |
59 </settings-basic-page> | 60 </settings-basic-page> |
60 </template> | 61 </template> |
61 <template is="dom-if" | 62 <template is="dom-if" |
62 if="[[showAdvancedToggle_(showPages_.basic, inSubpage_)]]"> | 63 if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]"> |
63 <div id="toggleSpacer"></div> | 64 <template is="dom-if" |
64 <div id="toggleContainer" hidden$="[[showNoResultsFound_]]"> | 65 if="[[showAdvancedToggle_(showPages_.basic, inSubpage_)]]"> |
65 <div id="advancedToggle" on-tap="toggleAdvancedPage_"> | 66 <div id="toggleSpacer"></div> |
66 <span>$i18n{advancedPageTitle}</span> | 67 <div id="toggleContainer" hidden$="[[showNoResultsFound_]]"> |
67 <iron-icon icon="[[arrowState_(showPages_.advanced)]]"></iron-icon> | 68 <div id="advancedToggle" on-tap="toggleAdvancedPage_"> |
| 69 <span>$i18n{advancedPageTitle}</span> |
| 70 <iron-icon icon="[[arrowState_(showPages_.advanced)]]"></iron-icon> |
| 71 </div> |
68 </div> | 72 </div> |
69 </div> | 73 </template> |
70 </template> | 74 <template is="dom-if" if="[[showPages_.advanced]]"> |
71 <template is="dom-if" if="[[showPages_.advanced]]"> | 75 <settings-advanced-page prefs="{{prefs}}" |
72 <settings-advanced-page prefs="{{prefs}}" | 76 current-route="{{currentRoute}}" |
73 current-route="{{currentRoute}}"> | 77 page-visibility="[[pageVisibility]]"> |
74 </settings-advanced-page> | 78 </settings-advanced-page> |
| 79 </template> |
75 </template> | 80 </template> |
76 <template is="dom-if" if="[[showPages_.about]]"> | 81 <template is="dom-if" if="[[showPages_.about]]"> |
77 <settings-about-page current-route="{{currentRoute}}"> | 82 <settings-about-page current-route="{{currentRoute}}"> |
78 </settings-about-page> | 83 </settings-about-page> |
79 </template> | 84 </template> |
80 <div id="overscroll"></div> | 85 <div id="overscroll"></div> |
81 </template> | 86 </template> |
82 <script src="settings_main.js"></script> | 87 <script src="settings_main.js"></script> |
83 <script src="/search_settings.js"></script> | 88 <script src="/search_settings.js"></script> |
84 </dom-module> | 89 </dom-module> |
OLD | NEW |