Merge pull request #25 from akbargumbira/develop

[HOTFIX] Fix some small issue and UIs

Author: timlinux

users/static/js/user-map-component.js

@@ -245,9 +245,10 @@ function onMapClick(e) {
   var markerLocation = e.latlng;
   marker_new_user = L.marker(markerLocation);
   map.addLayer(marker_new_user);
+  var wrappedLocation = L.latLng(markerLocation.lat, markerLocation.lng).wrap()
   var user = {
-    'latitude': markerLocation.lat.toFixed(8),
-    'longitude': markerLocation.lng.toFixed(8)
+    'latitude': wrappedLocation.lat.toFixed(8),
+    'longitude': wrappedLocation.lng.toFixed(8)
   };
   var popup = getUserFormPopup(user, ADD_USER_MODE);
   marker_new_user.bindPopup(popup).openPopup()

users/static/js/user-map-utilities.js

@@ -112,7 +112,7 @@ function getUserForm(user, mode) {
  */
 function getUserFormPopup(user, mode) {
   var form = getUserForm(user, mode);
-  var popup = L.popup();
+  var popup = L.popup({closeButton: false});
   popup.setContent(form);
   return popup;
 }

users/templates/html/index.html

@@ -15,7 +15,6 @@
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
           <h3 class="modal-title">Request Edit Link</h3>
         </div>
         <div class="modal-body">
@@ -33,16 +32,12 @@ <h3 class="modal-title">Request Edit Link</h3>
                        name="email_reminder" required value=""/>
               </div>
             </div>
-            <div class="form-group">
-              <div class="col-lg-8">
-                <button type="button" class="btn btn-primary"
-                        onclick="sendReminder();">Send!
-                </button>
-              </div>
-            </div>
           </form>
         </div>
         <div class="modal-footer">
+          <button class="btn btn-primary" onclick="sendReminder();">
+            Send!
+          </button>
           <button class="btn btn-default" onclick="activateDefaultState()"
                   data-dismiss="modal" aria-hidden="true">
             Close