Merge pull request #24451 from zbraniecki/1072797-use-apps-manifest-f…

…or-shared-pages-import Bug 1072797 - Use app's manifest.webapp for shared import pages. r=stas
mozilla-b2g · Sep 26, 2014 · c7cd440 · c7cd440
2 parents eeb860f + 11cb006
commit c7cd440
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 14 deletions.
diff --git a/shared/pages/import/curtain.html b/shared/pages/import/curtain.html
@@ -15,7 +15,7 @@
     <link rel="stylesheet" href="/shared/pages/import/style/root.css">
     <link rel="stylesheet" href="/shared/pages/import/style/curtain.css">
 
-    <link rel="manifest" href="/shared/pages/import/manifest.webapp">
+    <link rel="manifest" href="/manifest.webapp">
     <link rel="localization" href="/shared/locales/facebook/facebook.{locale}.properties">
     <script type="text/javascript" src="/shared/js/l10n.js"></script>
   </head>

diff --git a/shared/pages/import/import.html b/shared/pages/import/import.html
@@ -5,7 +5,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
 
-    <link rel="manifest" href="/shared/pages/import/manifest.webapp">
+    <link rel="manifest" href="/manifest.webapp">
     <link rel="localization" href="/shared/locales/facebook/facebook.{locale}.properties">
     <script type="text/javascript" src="/shared/js/l10n.js"></script>
 

diff --git a/shared/pages/import/manifest.webapp b/shared/pages/import/manifest.webapp
diff --git a/shared/pages/import/oauth.html b/shared/pages/import/oauth.html
@@ -5,7 +5,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
 
-    <link rel="manifest" href="/shared/pages/import/manifest.webapp">
+    <link rel="manifest" href="/manifest.webapp">
     <link rel="localization" href="/shared/locales/facebook/facebook.{locale}.properties">
     <script type="text/javascript" src="/shared/js/l10n.js"></script>