From 660d44b6adc0b6580a22b7c4eff192763691b6b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Tue, 3 Mar 2015 20:47:35 +0100
Subject: [PATCH] Fixed form issue with firefox and IE, Closes #1551

---
 src/app/app.js              | 11 +----------
 src/app/partials/login.html |  8 ++++----
 src/css/less/tightform.less |  3 ++-
 src/views/index.html        |  2 +-
 wercker.yml                 |  2 +-
 5 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/app/app.js b/src/app/app.js
index 16a1e5f6193..4d1dec4f673 100644
--- a/src/app/app.js
+++ b/src/app/app.js
@@ -67,16 +67,7 @@ function (angular, $, _, appLevelRequire) {
     'pasvaz.bindonce'
   ];
 
-  var module_types = ['controllers', 'directives', 'factories', 'services', 'filters'];
-
-  if (window.grafanaBackend) {
-    module_types.push('routes');
-    angular.module('grafana.routes.standalone', []);
-  }
-  else {
-    module_types.push('routes.standalone');
-    angular.module('grafana.routes', []);
-  }
+  var module_types = ['controllers', 'directives', 'factories', 'services', 'filters', 'routes'];
 
   _.each(module_types, function (type) {
     var module_name = 'grafana.'+type;
diff --git a/src/app/partials/login.html b/src/app/partials/login.html
index 6994cd87e82..c0fb9e9e990 100644
--- a/src/app/partials/login.html
+++ b/src/app/partials/login.html
@@ -23,7 +23,7 @@
 							<strong>User</strong>
             </li>
             <li>
-              <input type="text" name="username" class="tight-form-input last" required ng-model='formModel.user' placeholder="email or username" style="width: 246px">
+              <input type="text" name="username" class="tight-form-input last" required ng-model='formModel.user' placeholder="email or username" style="width: 255px">
             </li>
           </ul>
           <div class="clearfix"></div>
@@ -34,7 +34,7 @@
 							<strong>Password</strong>
             </li>
             <li>
-							<input type="password" name="password" class="tight-form-input last" required ng-model="formModel.password" id="inputPassword" style="width: 246px" placeholder="password">
+							<input type="password" name="password" class="tight-form-input last" required ng-model="formModel.password" id="inputPassword" style="width: 255px" placeholder="password">
             </li>
           </ul>
           <div class="clearfix"></div>
@@ -46,7 +46,7 @@
 							<strong>Email</strong>
             </li>
             <li>
-              <input type="email" class="tight-form-input last" required ng-model='formModel.email' placeholder="email" style="width: 246px">
+              <input type="email" class="tight-form-input last" required ng-model='formModel.email' placeholder="email" style="width: 255px">
             </li>
           </ul>
           <div class="clearfix"></div>
@@ -58,7 +58,7 @@
 							<strong>Password</strong>
             </li>
             <li>
-							<input type="password" class="tight-form-input last" watch-change="passwordChanged(inputValue)" ng-minlength="4" required ng-model='formModel.password' placeholder="password" style="width: 246px">
+							<input type="password" class="tight-form-input last" watch-change="passwordChanged(inputValue)" ng-minlength="4" required ng-model='formModel.password' placeholder="password" style="width: 255px">
             </li>
           </ul>
           <div class="clearfix"></div>
diff --git a/src/css/less/tightform.less b/src/css/less/tightform.less
index bbad806823c..387420b6c49 100644
--- a/src/css/less/tightform.less
+++ b/src/css/less/tightform.less
@@ -151,7 +151,8 @@ input[type=text].tight-form-clear-input {
     border-right: 1px solid @grafanaTargetSegmentBorder;
     margin: 0px;
     border-radius: 0;
-    padding: 18px 6px;
+    padding: 8px 6px;
+    height: 100%;
     box-sizing: border-box;
     &.last {
       border-right: none;
diff --git a/src/views/index.html b/src/views/index.html
index c29fdd5a28a..a5b0dbba05c 100644
--- a/src/views/index.html
+++ b/src/views/index.html
@@ -22,7 +22,7 @@
 
 		<!-- build:js app/app.js -->
     <script src="[[.AppSubUrl]]/public/vendor/require/require.js"></script>
-    <script src="[[.AppSubUrl]]/public/app/components/require.backend.js"></script>
+    <script src="[[.AppSubUrl]]/public/app/components/require.config.js"></script>
     <!-- endbuild -->
   </head>
 
diff --git a/wercker.yml b/wercker.yml
index 757ca838fca..dfd7b1f6a11 100644
--- a/wercker.yml
+++ b/wercker.yml
@@ -34,7 +34,7 @@ build:
     - script:
         name: copy output
         code: |-
-          cp $WERCKER_SOURCE_DIR/dist $WERCKER_ROOT
+          cp -r $WERCKER_SOURCE_DIR/dist/ $WERCKER_ROOT/
           rsync -rv "$WERCKER_SOURCE_DIR/dist/" "$WERCKER_OUTPUT_DIR"
 
     - s3sync: