From: Tom MacWright <tom@macwright.org>
Date: Thu, 13 Jun 2013 16:45:16 +0000 (-0400)
Subject: Focus share link by default
X-Git-Tag: live~5402^2~23
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/c26b60c4c6ec77e903a25adcc8a2ddbd73aa2ebf?ds=sidebyside

Focus share link by default
---

diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js
index e97e29bb5..773145bed 100644
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@ -29,23 +29,31 @@ L.OSM.share = function (options) {
       .text(I18n.t('javascripts.share.link'))
       .appendTo($share_link);
 
+    var $input = $('<input />')
+      .attr('type', 'text')
+      .appendTo($share_link);
+
+    var $list = $('<ul>')
+      .appendTo($share_link);
+
+    var $short_option = $('<li>')
+      .appendTo($list);
+
+    var $short_url_label = $('<label></label>')
+      .attr('for', 'short_url')
+      .appendTo($short_option);
+
     var $short_url_input = $('<input />')
       .attr('id', 'short_url')
       .attr('type', 'checkbox')
       .prop('checked', 'checked')
-      .appendTo($share_link)
+      .appendTo($short_url_label)
       .bind('change', function() {
           options.short = $(this).prop('checked');
           update();
       });
 
-    var $short_url_label = $('<label></label>')
-      .text(I18n.t('javascripts.share.short_url'))
-      .attr('for', 'short_url')
-      .appendTo($share_link);
-
-    var $input = $('<input />')
-      .appendTo($share_link);
+    $short_url_label.append(I18n.t('javascripts.share.short_url'));
 
     map.on('moveend layeradd layerremove', update);
 
@@ -55,6 +63,7 @@ L.OSM.share = function (options) {
       e.stopPropagation();
       e.preventDefault();
       options.sidebar.togglePane($ui);
+      $input.select();
     }
 
     function update() {
diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 1e3bcc468..4ce15ec45 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -613,12 +613,16 @@ a.donate {
   label {
     display: block;
     padding: 5px;
-    background-color: #868e85;
+    background-color: #eee;
     cursor: pointer;
   }
 
   li.active label {
-    background-color: #68c879;
+    background-color: #ccc;
+  }
+
+  input[type=text] {
+    width:220px;
   }
 
   .base-layers {