Merge pull request #23487 from wilsonpage/1060385

Bug 1060385 - [shared/pages/import] Implement gaia-header
mozilla-b2g · Aug 30, 2014 · b98e39c · b98e39c
2 parents 3c04e67 + 9a20125
commit b98e39c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/shared/js/contacts/import/import_init.js b/shared/js/contacts/import/import_init.js
@@ -87,10 +87,15 @@
 
   function onLoad(access_token) {
     utils.listeners.add({
-      '#import-close': importer.ui.end,
       '#import-action': importer.ui.importAll,
       '#done-search': contacts.Search.exitSearchMode,
       '#groups-list': importer.ui.selection,
+      '#header': [
+        {
+          event: 'action',
+          handler: importer.ui.end
+        }
+      ],
       '#search-start': [
         {
           event: 'click',

diff --git a/shared/pages/import/import.html b/shared/pages/import/import.html
@@ -78,6 +78,12 @@
     <link href="/shared/style/scrolling.css" rel="stylesheet">
     <link href="/shared/style/animations.css" rel="stylesheet">
 
+    <!-- Web Components -->
+    <!-- <link rel="stylesheet" type="text/css" href="/shared/elements/gaia-icons/style.css" /> -->
+    <link rel="stylesheet" type="text/css" href="/shared/elements/gaia-theme/style.css" />
+    <script defer src="/shared/elements/config.js"></script>
+    <script defer src="/shared/elements/gaia-header/dist/script.js"></script>
+
     <!--
     <link rel="stylesheet" href="/shared/pages/import/style/root.css">
     <link rel="stylesheet" href="/shared/pages/import/style/facebook.css">
@@ -86,20 +92,13 @@
     <link rel="stylesheet" href="/shared/pages/import/style/search.css">
   </head>
 
-  <body role="application" class="skin-comms">
+  <body role="application" class="theme-communications skin-comms">
     <section role="region" id="content" class="import">
 
-      <header>
-        <a href="#" id="import-close">
-          <span class="icon icon-close" data-l10n-id="close">close</span>
-        </a>
-        <menu type="toolbar">
-          <button  id="import-action" data-l10n-id="import" disabled>
-            Import
-          </button>
-        </menu>
+      <gaia-header id="header" action="close">
+        <button id="import-action" data-l10n-id="import" disabled>Import</button>
         <h1>Service</h1>
-      </header>
+      </gaia-header>
 
       <section id="main">
         <!-- Contacts List Section -->