From f094fd29f75850bc99cfbb5506a300ac19a0c28e Mon Sep 17 00:00:00 2001
From: Connor Turland <connorturland@gmail.com>
Date: Wed, 3 Dec 2014 08:39:12 -0500
Subject: [PATCH] cleaned up unwanted stuff from metamapscc for tvw

---
 app/assets/javascripts/src/Metamaps.js    |  1 -
 app/assets/stylesheets/clean.css          | 12 ---------
 app/controllers/users_controller.rb       |  1 -
 app/views/layouts/_templates.html.erb     |  1 -
 app/views/layouts/_upperelements.html.erb |  1 -
 app/views/main/home.html.erb              | 33 -----------------------
 6 files changed, 49 deletions(-)

diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js
index d39dd461..a48b0b56 100644
--- a/app/assets/javascripts/src/Metamaps.js
+++ b/app/assets/javascripts/src/Metamaps.js
@@ -4619,7 +4619,6 @@ Metamaps.Map.CheatSheet = {
     init: function () {
         // tab the cheatsheet
         $('#cheatSheet').tabs();
-        $('#cheatSheet').tabs("disable", 1); // TODO re-enable once the tutorials are in
         $('#quickReference').tabs().addClass("ui-tabs-vertical ui-helper-clearfix");
         $("#quickReference .ui-tabs-nav li").removeClass("ui-corner-top").addClass("ui-corner-left");
         
diff --git a/app/assets/stylesheets/clean.css b/app/assets/stylesheets/clean.css
index 522b2bcb..31580a10 100644
--- a/app/assets/stylesheets/clean.css
+++ b/app/assets/stylesheets/clean.css
@@ -632,18 +632,6 @@
 	box-shadow: 0 3px 3px rgba(0,0,0,0.23), 0 3px 3px rgba(0,0,0,0.16);
 }
 
-.supportUs.upperRightEl {
-    cursor: pointer;
-    color: #4fc059;
-    font-size: 14px;
-    height: 14px;
-    margin: 9px 8px 9px 0;
-    display: none;
-}
-.homePage .supportUs, .explorePage .supportUs {
-    display: block;
-}
-
 .upperRightMapButtons {
 	position: relative;
 	top: -42px; /* puts it just offscreen */
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a7561c03..767c0bf1 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -74,7 +74,6 @@ class UsersController < ApplicationController
     @details['name'] = @user.name
     @details['created_at'] = @user.created_at.strftime("%m/%d/%Y")
     @details['image'] = @user.image.url(:ninetysix)
-    @details['generation'] = @user.generation
     @details['numSynapses'] = @user.synapses.count
     @details['numTopics'] = @user.topics.count
     @details['numMaps'] = @user.maps.count
diff --git a/app/views/layouts/_templates.html.erb b/app/views/layouts/_templates.html.erb
index 8bc56c01..d051aec0 100644
--- a/app/views/layouts/_templates.html.erb
+++ b/app/views/layouts/_templates.html.erb
@@ -84,7 +84,6 @@
       </div>
       <div class="mapperInfo">
         <div class="mapperCreatedAt">Mapper since: {{created_at}}</div>
-        <div class="mapperGeneration">Generation: {{generation}}</div>
       </div>
       <div class="mapperMetadata">
          <div class="metadataSection metadataMaps"><div>{{numMaps}}</div>maps</div>
diff --git a/app/views/layouts/_upperelements.html.erb b/app/views/layouts/_upperelements.html.erb
index a421e84b..d864c52f 100644
--- a/app/views/layouts/_upperelements.html.erb
+++ b/app/views/layouts/_upperelements.html.erb
@@ -18,7 +18,6 @@
 </div><!-- end upperLeftUI -->
 
 <div class="upperRightUI">
-    <div class="supportUs upperRightEl openLightbox" data-open="donate">SUPPORT US!</div>
     <div class="mapElement upperRightEl upperRightMapButtons">
             <!-- Realtime -->
             <div class="sidebarCollaborate upperRightEl">
diff --git a/app/views/main/home.html.erb b/app/views/main/home.html.erb
index 012c7236..26ffa511 100644
--- a/app/views/main/home.html.erb
+++ b/app/views/main/home.html.erb
@@ -7,7 +7,6 @@
 <% if !authenticated? %>
     <% content_for :title, "Home | Metamaps" %> 
     <div id="yield">
-<<<<<<< HEAD
         <div class="homeWrapper">
                 <div class="homeTextWrapper">
                   <div class="homeLogo"></div>
@@ -48,38 +47,6 @@
                 <div class="clearfloat"></div>
         </div>
     </div><!-- end yield -->                  
-=======
-        <div class="homeWrapper homeText">
-            <div class="homeTitle">Make Sense with Metamaps</div>
-            <div class="homeIntro">
-            <span class="green din-medium">METAMAPS.CC</span> is a free and open source platform that supports real-time sense-making, distributed collaboration, and the creative intelligence of individuals, organizations and communities. We are currently in an <span class="din-medium">invite-only beta.</span>
-            </div>
-        </div>
-        <div class="fullWidthWrapper withVideo">
-            <div class="homeWrapper">
-                <iframe class="homeVideo" src="//player.vimeo.com/video/113154814" width="560" height="315" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
-                <div class="callToAction">
-                    <h3>Who finds it useful?</h3>
-                    <p>Designers, inventors, artists, educators, strategists, consultants, facilitators, entrepreneurs, systems thinkers, changemakers, analysts, students, researchers... maybe you!</p>
-                    <button type="button" class="button learnMoreCTA" onclick="Metamaps.GlobalUI.openLightbox('about');">LEARN MORE</button>
-                    <a href="/explore/featured" class="exploreFeaturedCTA">EXPLORE FEATURED MAPS</a>
-                    <a href="/request" class="requestInviteCTA" data-bypass="true">REQUEST INVITE</a>
-                </div>
-                <div class="clearfloat"></div>
-            </div>
-        </div>
-        <div class="fullWidthWrapper withPartners">
-            <div class="homeWrapper homePartners">
-                <% # our partners %>
-            </div>
-        </div>
-    </div><!-- end yield -->
-    <div class="github-fork-ribbon-wrapper right-bottom">
-        <div class="github-fork-ribbon">
-            <a href="https://github.com/metamaps/metamaps_gen002" target="_blank">Fork me on GitHub</a>
-        </div>
-    </div>                     
->>>>>>> develop
     <script>
     Metamaps.currentSection = "";
     Metamaps.currentPage = "";