From 4472afbdf2312aa439d31490acf47ff69c8db430 Mon Sep 17 00:00:00 2001
From: Divya Baid <32747809+divyabaid16@users.noreply.github.com>
Date: Wed, 19 Jun 2019 19:25:37 +0530
Subject: [PATCH] Bug fix (#721)

---
 app/views/layouts/knitter2.html.erb |  7 +--
 app/views/map/show.html.erb         | 73 -----------------------------
 app/views/maps/show.html.erb        |  1 -
 3 files changed, 1 insertion(+), 80 deletions(-)
 delete mode 100644 app/views/map/show.html.erb

diff --git a/app/views/layouts/knitter2.html.erb b/app/views/layouts/knitter2.html.erb
index 43b4479d0..e0dbc1353 100644
--- a/app/views/layouts/knitter2.html.erb
+++ b/app/views/layouts/knitter2.html.erb
@@ -112,7 +112,7 @@
                   <a class="nav-link" href="#map-exports-container" role="tab" data-toggle="tab">Export</a>
                 </li>
                 <li class="nav-item d-none d-sm-block">
-                  <a class="nav-link" href="#chat" role="tab" data-toggle="tab">Chat</a>
+                  <a class="nav-link" target="_blank" href="https://publiclab.org/chat" role="tab" style="border: none;">Chat</a>
                 </li>
               </ul>
 
@@ -179,11 +179,6 @@
                 <div role="tabpanel" class="tab-pane fade" id="map-exports-container">
                   <%= render :partial => "sidebar_exports" %>
                 </div>
-                <div role="tabpanel" class="tab-pane fade" id="chat">
-                  <a style="margin-right:4px;" class="float-right nav-link" href="https://webchat.oftc.net/?channels=publiclab<% if current_user %>&nick=<%= current_user.login %><% end %>" target="_blank">pop out</a>
-                  <p class="popover-title">Public Lab chatroom</p>
-                  <script>login = '<%= current_user.login if logged_in? %>'</script>
-                </div>
               </div>
             </div><!-- .sidebar-tabs -->
           </div><!-- .sidebar-content -->
diff --git a/app/views/map/show.html.erb b/app/views/map/show.html.erb
deleted file mode 100644
index da121cb20..000000000
--- a/app/views/map/show.html.erb
+++ /dev/null
@@ -1,73 +0,0 @@
-<script type="text/javascript" charset="utf-8">
-var map
-(function(){
-  mapBounds = new OpenLayers.Bounds(-20037508, -20037508, 20037508, 20037508.34)
-  mapMinZoom = 14, mapMaxZoom = 23;
-  spher_merc = new OpenLayers.Projection("EPSG:4326")
-  latlon = new OpenLayers.Projection("EPSG:900913")
-
-  Cartagen.setup({
-    stylesheet: "/knitter.gss",
-    static_map: true,
-    static_map_layers: [],
-    padding_top: -46,
-    key_input: true,
-    lat: <%= @map.lat %>,
-    lng: <%= @map.lon %>,
-    zoom: <%= @map.zoom %>,
-    map_name: '<%= @map.name %>',
-    vectors: false,//<%= @map.vectors %>,
-    <% if @map.tile_url != "" %>tile_url: "<%= @map.tile_url %>",<% end %>
-    <% if @map.tile_layer != ""%>tile_layer: "<%= @map.tile_layer %>",<% end %>
-  })
-
-  warpables = [
-    <% @map.warpables.each do |warpable| %>
-    {id: <%= warpable.id %>, img: '<%= warpable.image.url(:medium) %>', nodes: <%=raw @map.nodes[warpable.id.to_s].to_json %>, locked: <%= warpable.locked %>},
-    <% end %>
-  ]
-
-  document.observe('cartagen:init', function() {
-    Knitter.map_id = <%= @map.id %>
-    Knitter.start_openlayers('<%= @map.tiles %>')
-    Knitter.setup()
-  })
-})()
-</script>
-
-<div id="google" style="display:none;"><%= @map.description %></div>
-
-<div id="browsers" style="display:none;">
-  <p>MapKnitter is built on standards-compliant HTML 5 and Canvas, but is in development right now. It works best in Firefox, Chrome, or Safari, but IE8/9, Mobile Safari, and Android work to varying degrees, and are coming someday.</p>
-</div>
-
-<div id="header">
-  <a style="float:left;" href="/"><img src="/images/mapknitter-small-masked.png"/></a>
-  <div id="toolbars">
-    <div class="toolbar">
-      <a id="tool_upload" name='Upload an image' class='first silk green' href="/images/new_iframe" onClick="Modalbox.show('<iframe src =\'/images/new/<%= @map.id %>\' width=\'100%\' height=\'300\' style=\'border:0;\'></iframe>', {title: 'Select an image to upload', width: 600});Tool.change('Warp');return false;"><img src="/images/silk-grey/add.png" /></a>
-      <a name='Export your map in standard GIS formats' class='last silk blue' href="<%= map_path(@map.id) %>" target="_blank"><img src="/images/silk-grey/map_go.png" /></a>
-            <!--<a id="tool_trace" name='Trace a shape' class='last' href="javascript:void(0);" onClick="Tool.change('Pen');Tool.Pen.new_shape()"><img src="/images/tools/stock-tool-pencil-22.png" /></a>-->
-    </div>
-    <div class="toolbar">
-      <a name='View map' class='first silk' href="<%= map_path(@map) %>" target="_blank"><img src="/images/silk-grey/map.png" /></a>
-      <a name='View all images' class='silk' href="<%= map_path(@map) %>"><img src="/images/silk-grey/photos.png" /></a>
-      <a name='Geolocate your current position' class='silk' id="geolocate"  href="javascript:void(0);" onClick="if (User.geolocate() && User.lat != 0) {Cartagen.go_to(User.lat,User.lon,2)}"><img src="/images/silk-grey/house.png" /></a>
-      <script type="text/javascript" charset="utf-8">if (!User.geolocate) $('geolocate').hide()</script>
-      <a id="tagreport" name='Show all tags' class='silk' <% unless @map.vectors %>style="display:none;"<% end %> href="javascript:void(0);" onClick="Cartagen.tags('alert');"><img src="/images/silk-grey/tag_blue.png" /></a>
-      <a name='Dim background layer to see your own images' class='last silk' href="javascript:void(0);" onClick="Knitter.toggle_background();"><img src="/images/silk-grey/contrast_low.png" /></a>
-    </div>
-  </div>
-
-  <div id="save_state">
-    <span style="display:none;" id="save_saved">Saved</span>
-    <span style="display:none;" id="save_saving">Saving...</span>
-    <span style="display:none;" id="save_failed">Failed to save</span>
-  </div>
-
-</div>
-
-<div style="width:100%; height:100%; position:absolute; top:46px; z-index: 1;" class="transparent" id="map"></div>
-
-<div id="canvas" style="width:100%; height:100%; position:absolute; top:0;  z-index 10;"></div>
-
diff --git a/app/views/maps/show.html.erb b/app/views/maps/show.html.erb
index 56fb865aa..1fa6151f5 100644
--- a/app/views/maps/show.html.erb
+++ b/app/views/maps/show.html.erb
@@ -8,7 +8,6 @@
     <% else %>
       anonymous
     <% end %>
-    | <a href="/maps/<%= @map.slug %>?legacy=true">Legacy editor</a>
   </div>  
 <% end %>