@@ -22,10 +22,10 @@ navigator.mozL10n.once(function bluetoothSettings() {
return;
}

var backToSettingsBtn = document.getElementById('settings-back');
backToSettingsBtn.onclick = function backToSettings() {
var header = document.querySelector('gaia-header');
header.addEventListener('action', function backToSettings() {
window.close();
};
});

var gBluetoothCheckBox = document.querySelector('.bluetooth-status gaia-switch');

@@ -16,9 +16,11 @@
<link rel="stylesheet" type="text/css" href="shared/style/progress_activity.css"/>
<link rel="stylesheet" type="text/css" href="shared/style/input_areas.css"/>
<link rel="stylesheet" type="text/css" href="shared/style/action_menu.css"/>
<link rel="stylesheet" type="text/css" href="/shared/elements/gaia-icons/gaia-icons.css">
<link rel="stylesheet" type="text/css" href="app://theme.gaiamobile.org/shared/elements/gaia-theme/gaia-theme.css">
<!-- Shared code -->
<script type="text/javascript" src="shared/js/l10n.js"></script>
<script type="text/javascript" defer src="shared/js/font_size_utils.js"></script>
<script defer src="/shared/elements/gaia-header/dist/gaia-header.js"></script>
<script defer src="/shared/js/component_utils.js"></script>
<script defer src="/shared/elements/gaia_switch/script.js"></script>
<!-- Specific style -->
@@ -29,13 +31,12 @@
<script type="text/javascript" defer src="js/settings.js"></script>
</head>

<body role="application" class="skin-organic uninit">
<body role="application" class="skin-organic uninit theme-settings">
<section role="region">

<header>
<a href="#" id="settings-back"><span class="icon icon-back"></span></a>
<gaia-header action="back">
<h1 data-l10n-id="bluetooth-header"></h1>
</header>
</gaia-header>

<div>
<ul>
@@ -26,15 +26,15 @@ var BookmarkEditor = {
this.bookmarkTitle = document.getElementById('bookmark-title');
this.bookmarkURL = document.getElementById('bookmark-url');
this.bookmarkIcon = document.getElementById('bookmark-icon');
this.cancelButton = document.getElementById('cancel-button');
this.header = document.getElementById('header');
this.saveButton = document.getElementById('done-button');
this.appInstallationSection = document.getElementById('app-installation');
this.appIcon = document.getElementById('app-icon');
this.appIconPlaceholder = document.getElementById('app-icon-placeholder');
this.appNameText = document.getElementById('app-name');
this.installAppButton = document.getElementById('install-app-button');

this.cancelButton.addEventListener('click', this.close.bind(this));
this.header.addEventListener('action', this.close.bind(this));
this.saveListener = this.save.bind(this);
this.saveButton.addEventListener('click', this.saveListener);

@@ -11,14 +11,16 @@
<script type="text/javascript" src="shared/js/l10n.js"></script>
<script type="text/javascript" defer src="shared/js/url_helper.js"></script>
<script type="text/javascript" defer src="shared/js/bookmarks_database.js"></script>
<script type="text/javascript" defer src="shared/js/font_size_utils.js"></script>
<script type="text/javascript" defer src="shared/js/web_manifest_helper.js"></script>
<script type="text/javascript" defer src="shared/js/icons_helper.js"></script>
<script type="text/javascript" defer src="/shared/elements/gaia-header/dist/gaia-header.js"></script>

<link rel="stylesheet" type="text/css" href="shared/style/buttons.css">
<link rel="stylesheet" type="text/css" href="shared/style/headers.css">
<link rel="stylesheet" type="text/css" href="shared/style/input_areas.css">
<link rel="stylesheet" type="text/css" href="shared/style/status.css">
<link rel="stylesheet" type="text/css" href="/shared/elements/gaia-icons/gaia-icons.css">
<link rel="stylesheet" type="text/css" href="app://theme.gaiamobile.org/shared/elements/gaia-theme/gaia-theme.css">

<!-- Link to component just to copy the default_icon here -->
<!-- <script defer src="shared/elements/gaia_grid/script.js"></script> -->
@@ -34,18 +36,13 @@
<meta name="availableLanguages" content="en-US">
<link rel="localization" href="locales/bookmark.{locale}.properties">
</head>
<body>
<body class="theme-settings">
<section id="bookmark-entry-sheet" role="region" class="skin-organic">
<header>
<button id="cancel-button" type="button">
<span class="icon icon-close" data-l10n-id="cancel-action"></span>
</button>
<menu type="toolbar">
<button id="done-button" type="button" role="menuitem" data-l10n-id="add-action"></button>
</menu>
<gaia-header id="header" action="close">
<h1 id="add-bookmark-header" data-l10n-id="add-to-home-screen-title"></h1>
<h1 id="edit-bookmark-header" data-l10n-id="edit-pinned-site-title"></h1>
</header>
<button id="done-button" data-l10n-id="add-action"></button>
</gaia-header>
<form id="bookmark-form">
<div id="bookmark-icon"></div>
<p id="bookmark-url" dir="ltr"></p>
@@ -21,7 +21,6 @@

<script type="text/javascript" src="shared/js/l10n.js"></script>
<script defer src="shared/js/omadrm/fl.js"></script>
<script defer src="shared/js/font_size_utils.js"></script>

<script defer src="js/constants.js"></script>
<script defer src="js/utils.js"></script>
@@ -69,7 +69,6 @@
<script defer src="/shared/js/screen_layout.js"></script>
<script defer src="/shared/js/text_normalizer.js"></script>
<script defer src="/shared/js/lazy_loader.js"></script>
<script defer src="/shared/js/font_size_utils.js"></script>
<script defer src="/shared/js/basket_client.js"></script>
<script defer src="js/services_launcher.js"></script>
<script defer src="/shared/js/contacts/import/import_status_data.js"></script>
@@ -44,7 +44,6 @@

<!-- Shared code -->
<script defer src="shared/js/lazy_loader.js"></script>
<script defer src="shared/js/font_size_utils.js"></script>
<script defer src="shared/js/media/media_utils.js"></script>
<script defer src="shared/js/screen_layout.js"></script>
<script defer src="shared/js/media/downsample.js"></script>
@@ -109,7 +109,6 @@
<!--<script defer src="shared/js/airplane_mode_helper.js"></script> -->
<!--<script defer src="shared/js/toaster.js"></script> -->
<!--<script defer src="shared/js/lazy_loader.js"></script> -->
<!--<script defer src="shared/js/font_size_utils.js"></script> -->
<!--<script defer src="shared/js/screen_layout.js"></script> -->
<!--<script defer src="shared/js/fxa_iac_client.js"></script> -->
<!--<script defer src="shared/js/text_normalizer.js"></script> -->
@@ -139,13 +139,7 @@ define(function(require) {
} else {
if (!_loadModulesForSubPanelsPromise) {
_loadModulesForSubPanelsPromise = new Promise(function(resolve) {
require([
// XXX: It is assumed that the string for the header of the root
// panel always fits and the font size utils are not
// required.
'shared/font_size_utils', // used by all header building blocks
'shared/async_storage'
], resolve);
require(['shared/async_storage'], resolve);
});
}
return _loadModulesForSubPanelsPromise;
@@ -1,7 +1,6 @@
<header>
<a href="#root"><span class="icon icon-back">back</span></a>
<h1 data-l10n-id="browsingPrivacy-header"> Browsing Privacy </h1>
</header>
<gaia-header action="back" data-href="#root">
<h1 data-l10n-id="browsingPrivacy-header"></h1>
</gaia-header>

<div>
<ul>
@@ -1,7 +1,6 @@
<header>
<button type="reset"><span data-l10n-id="back" class="icon icon-back">Back</span></button>
<h1 data-l10n-id="callBarring-header"> Call barring </h1>
</header>
<gaia-header action="back" data-href="#root">
<h1 data-l10n-id="callBarring-header"></h1>
</gaia-header>

<div>
<header id="header-cb-outgoing">