From a2ce20b5642f99cf50504f7cfae202ad4b3f1677 Mon Sep 17 00:00:00 2001
From: Devin Howard <devin@callysto.com>
Date: Wed, 13 Apr 2016 10:48:34 +0800
Subject: [PATCH 1/2] versioncode fix

---
 app/assets/javascripts/src/Metamaps.js.erb | 2 +-
 app/views/layouts/_lightboxes.html.erb     | 2 +-
 config/initializers/version.rb             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/src/Metamaps.js.erb b/app/assets/javascripts/src/Metamaps.js.erb
index 231592da..9044d7b6 100644
--- a/app/assets/javascripts/src/Metamaps.js.erb
+++ b/app/assets/javascripts/src/Metamaps.js.erb
@@ -21,7 +21,7 @@ Metamaps.panningInt = null;
 Metamaps.tempNode = null;
 Metamaps.tempInit = false;
 Metamaps.tempNode2 = null;
-Metamaps.VERSION = '<%= VERSION %>'
+Metamaps.VERSION = '<%= METAMAPS_VERSION %>'
 
 Metamaps.Settings = {
     embed: false, // indicates that the app is on a page that is optimized for embedding in iFrames on other web pages
diff --git a/app/views/layouts/_lightboxes.html.erb b/app/views/layouts/_lightboxes.html.erb
index 461366c0..97e2dd29 100644
--- a/app/views/layouts/_lightboxes.html.erb
+++ b/app/views/layouts/_lightboxes.html.erb
@@ -18,7 +18,7 @@
 
             <div id="rightAboutParms">
                 <p>PRIVATE BETA</p>
-                <p><%= VERSION %></p>
+                <p><%= METAMAPS_VERSION %></p>
                 <p>Mar 26, 2016</p>
             </div>
             <div class="clearfloat">
diff --git a/config/initializers/version.rb b/config/initializers/version.rb
index 1870c09f..a04901a1 100644
--- a/config/initializers/version.rb
+++ b/config/initializers/version.rb
@@ -1 +1 @@
-VERSION = '2.8.4'
+METAMAPS_VERSION = '2.8.5'

From e6c43131840e9664a33cab76b4c8945823396832 Mon Sep 17 00:00:00 2001
From: Devin Howard <devin@callysto.com>
Date: Wed, 13 Apr 2016 10:50:51 +0800
Subject: [PATCH 2/2] reindent upperelements template + fix input tag

---
 app/views/layouts/_upperelements.html.erb | 98 +++++++++++------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/app/views/layouts/_upperelements.html.erb b/app/views/layouts/_upperelements.html.erb
index 91a9955b..6aedfeec 100644
--- a/app/views/layouts/_upperelements.html.erb
+++ b/app/views/layouts/_upperelements.html.erb
@@ -2,63 +2,63 @@
 <!-- from left to right on the screen -->
 
 <div class="upperLeftUI">
-    <!-- home button -->
-    <div class="homeButton">
-        <a href="<%= root_url %>" <% if !current_user || appsPage %><%= 'data-bypass=true' %><% end %>></a>
-    </div> <!-- end homeButton -->
+  <!-- home button -->
+  <div class="homeButton">
+    <a href="<%= root_url %>" <% if !current_user || appsPage %><%= 'data-bypass=true' %><% end %>></a>
+  </div> <!-- end homeButton -->
 
-    <!-- search box -->
-    <div class="sidebarSearch">
-        <input type="text" class="sidebarSearchField" placeholder="Search for topics, maps, and mappers..."></input>
-        <div id="searchLoading"></div>
-        <div class="sidebarSearchIcon"></div>
-        <div class="clearfloat"></div>
-    </div> <!-- end sidebarSearch -->
+  <!-- search box -->
+  <div class="sidebarSearch">
+    <input type="text" class="sidebarSearchField" placeholder="Search for topics, maps, and mappers..." />
+    <div id="searchLoading"></div>
+    <div class="sidebarSearchIcon"></div>
     <div class="clearfloat"></div>
+  </div> <!-- end sidebarSearch -->
+  <div class="clearfloat"></div>
 </div><!-- end upperLeftUI -->
 
 <div class="upperRightUI">
-    <div class="supportUs upperRightEl openLightbox" data-open="donate">SUPPORT US!</div>
-    <div class="mapElement upperRightEl upperRightMapButtons">
-        <!-- filtering -->
-        <div class="sidebarFilter upperRightEl">
-            <div class="sidebarFilterIcon upperRightIcon"><div class="tooltipsUnder">Filter</div></div>
-            <div class="sidebarFilterBox upperRightBox">
-                <%= render :partial => 'shared/filterBox' %>
-            </div>
-        </div> <!-- end sidebarFilter -->
-
-        <% if current_user %>
-        <!-- fork map -->
-        <div class="sidebarFork upperRightEl">
-            <div class="sidebarForkIcon upperRightIcon"><div class="tooltipsUnder">Save To New Map</div></div>
-        </div> <!-- end sidebarFork -->
-        <% end %>
-
-        <div class="clearfloat"></div>
-    </div> <!-- end mapElement -->
+  <div class="supportUs upperRightEl openLightbox" data-open="donate">SUPPORT US!</div>
+  <div class="mapElement upperRightEl upperRightMapButtons">
+    <!-- filtering -->
+    <div class="sidebarFilter upperRightEl">
+      <div class="sidebarFilterIcon upperRightIcon"><div class="tooltipsUnder">Filter</div></div>
+      <div class="sidebarFilterBox upperRightBox">
+        <%= render :partial => 'shared/filterBox' %>
+      </div>
+    </div> <!-- end sidebarFilter -->
 
     <% if current_user %>
-    <!-- create new map -->
-    <div class="addMap openLightbox upperRightEl upperRightIcon" data-open="newmap"><div class="tooltipsUnder">Create New Map</div>
-    </div><!-- end addMap -->
+      <!-- fork map -->
+      <div class="sidebarFork upperRightEl">
+        <div class="sidebarForkIcon upperRightIcon"><div class="tooltipsUnder">Save To New Map</div></div>
+      </div> <!-- end sidebarFork -->
     <% end %>
 
-    <!-- Account / Sign in -->
-    <% if !(controller_name == "sessions" && action_name == "new") %>
-    <div class="sidebarAccount upperRightEl">
-        <div class="sidebarAccountIcon"><div class="tooltipsUnder">Account</div>
-            <% if current_user && current_user.image %>
-              <%= image_tag current_user.image.url(:thirtytwo), :size => "32x32" %>
-            <% elsif !current_user %>
-              SIGN IN
-              <div class="accountInnerArrow"></div>
-            <% end %>
-        </div>
-        <div class="sidebarAccountBox upperRightBox">
-            <%= render :partial => 'layouts/account' %>
-        </div>
-    </div><!-- end sidebarAccount -->
-    <% end %>
     <div class="clearfloat"></div>
+  </div> <!-- end mapElement -->
+
+  <% if current_user %>
+  <!-- create new map -->
+  <div class="addMap openLightbox upperRightEl upperRightIcon" data-open="newmap"><div class="tooltipsUnder">Create New Map</div>
+  </div><!-- end addMap -->
+  <% end %>
+
+  <!-- Account / Sign in -->
+  <% if !(controller_name == "sessions" && action_name == "new") %>
+  <div class="sidebarAccount upperRightEl">
+    <div class="sidebarAccountIcon"><div class="tooltipsUnder">Account</div>
+      <% if current_user && current_user.image %>
+        <%= image_tag current_user.image.url(:thirtytwo), :size => "32x32" %>
+      <% elsif !current_user %>
+        SIGN IN
+        <div class="accountInnerArrow"></div>
+      <% end %>
+    </div>
+    <div class="sidebarAccountBox upperRightBox">
+      <%= render :partial => 'layouts/account' %>
+    </div>
+  </div><!-- end sidebarAccount -->
+  <% end %>
+  <div class="clearfloat"></div>
 </div><!-- end upperRightUI -->