From 8a933a5fa54e6b46690b0ffbd47b1b2a2e200aeb Mon Sep 17 00:00:00 2001
From: Paul Annekov <paul.annekov@gmail.com>
Date: Sat, 11 Jul 2015 20:42:46 +0300
Subject: [PATCH] Moved the button, updated text

---
 css/app.css             | 9 ++++++++-
 dist/locales/en.json    | 4 ++--
 js/id/ui.js             | 8 ++++----
 js/id/ui/full_screen.js | 2 +-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/css/app.css b/css/app.css
index 08d939ccd..e093d234b 100644
--- a/css/app.css
+++ b/css/app.css
@@ -63,13 +63,20 @@ body {
     position: absolute;
     height: 40px;
     width: 40px;
-    right: 10px;
+    right: 50px;
     top: 10px;
     border-radius: 4px;
     margin-right: 10px;
     background: black;
 }
 
+.full-screen {
+    position: absolute;
+    width: 40px;
+    right: 10px;
+    top: 10px;
+}
+
 div, textarea, label, input, form, span, ul, li, ol, a, button, h1, h2, h3, h4, h5, p, img {
     -moz-box-sizing: border-box;
     -webkit-box-sizing: border-box;
diff --git a/dist/locales/en.json b/dist/locales/en.json
index f264d0416..340077464 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -431,8 +431,8 @@
         }
     },
     "full_screen": {
-        "title": "Full Screen",
-        "tooltip": "Go to Full Screen mode"
+        "title": "FS",
+        "tooltip": "Toggle Full Screen mode"
     },
     "merge_remote_changes": {
         "conflict": {
diff --git a/js/id/ui.js b/js/id/ui.js
index 59f4f02d8..4d4f80780 100644
--- a/js/id/ui.js
+++ b/js/id/ui.js
@@ -60,14 +60,14 @@ iD.ui = function(context) {
             .attr('class', 'button-wrap col1')
             .call(iD.ui.Save(context));
 
-        limiter.append('div')
-          .attr('class', 'button-wrap col1')
-          .call(iD.ui.FullScreen(context));
-
         bar.append('div')
             .attr('class', 'spinner')
             .call(iD.ui.Spinner(context));
 
+        bar.append('div')
+            .attr('class', 'full-screen')
+            .call(iD.ui.FullScreen(context));
+
         var controls = bar.append('div')
             .attr('class', 'map-controls');
 
diff --git a/js/id/ui/full_screen.js b/js/id/ui/full_screen.js
index 6d51f8702..90fa798be 100644
--- a/js/id/ui/full_screen.js
+++ b/js/id/ui/full_screen.js
@@ -48,7 +48,7 @@ iD.ui.FullScreen = function(context) {
             return;
 
         var tooltip = bootstrap.tooltip()
-            .placement('bottom')
+            .placement('left')
             .html(true)
             .title(iD.ui.tooltipHtml(t('full_screen.tooltip')));