Merge pull request #25722 from patelba/1068918

Bug 1068918 - [Camera] Preview header should be first thing in markup

apps/camera/js/app.js

@@ -110,8 +110,8 @@ App.prototype.runControllers = function() {
   this.controllers.activity(this);
   this.controllers.camera(this);
   this.controllers.viewfinder(this);
-  this.controllers.controls(this);
   this.controllers.hud(this);
+  this.controllers.controls(this);  
   debug('controllers run');
 };
 

apps/camera/js/views/preview-gallery.js

@@ -89,10 +89,7 @@ return View.extend({
   },
 
   template: function() {
-    return '<div class="frame-container js-frame-container">' +
-        '<div class="media-frame js-media-frame"></div>' +
-      '</div>' +
-      '<div class="preview-menu js-preview-menu">' +
+    return '<div class="preview-menu js-preview-menu">' +
         '<gaia-header class="js-header" action="back">' +
           '<h1 data-l10n-id="preview">Preview</h1>' +
           '<button class="preview-share-icon js-share"' +
@@ -101,7 +98,10 @@ return View.extend({
             'js-options" name="options" data-icon="more"></button>' +
         '</gaia-header>' +
       '</div>' +
-    '<div class="count-text js-count-text"></div>';
+      '<div class="frame-container js-frame-container">' +
+        '<div class="media-frame js-media-frame"></div>' +
+      '</div>' +
+      '<div class="count-text js-count-text"></div>';
   },
 
   onTap: function() {

apps/camera/style/preview-gallery.css

@@ -61,7 +61,8 @@
  */
 
 .preview-menu {
-  position: relative; /* 1 */
+  position: relative;   
+  z-index: 1; /* 1 */
   opacity: 0;
   visibility: hidden;
   pointer-events: none;