styled homepage, made sure password forgot, and password reset pages were accessible when logged out, updated metacode images

app/assets/javascripts/src/Metamaps.GlobalUI.js

@@ -54,10 +54,7 @@ $(document).ready(function () {
             Metamaps[prop].init();
         }
     }
-
-    if (Metamaps.Active.Mapper) {
-        Metamaps.GlobalUI.Search.authInit();
-    }
+    
 });
 
 Metamaps.GlobalUI = {

app/assets/stylesheets/clean.css

@@ -87,14 +87,8 @@
 }
 
 .logo {
-    color: #9E9E9E;
-    font-family: "vinyl", sans-serif;
-    font-style: italic;
-    text-transform: uppercase;
-    font-weight: 400;
-    font-size: 30px;
-    line-height: 30px;
-    text-align: center;
+    height: 37px;
+    background: url(TVWlogo.png) no-repeat center center;
 }
 .bottomLinks {
 	color: #9e9e9e;
@@ -626,66 +620,107 @@
 /* homepage */
 
 .homeWrapper {
-    width: 560px;
-    margin: 56px auto 72px;
+    position: absolute;
+    left: 50%;
+    width: 708px;
+    margin: 56px 0 72px -480px;
     color: #424242;
 }
 
-.homeTitle {
-    font-size: 48px;
-    line-height: 48px;
-    text-align: center;
-    margin-bottom: 20px;
+.homeTextWrapper {
+    width: 460px;
+    float: left;
 }
 
-.homeIntro {
-    font-size: 23px;
-    line-height: 26px;
+.homeTextWrapper .homeLogo {
+    width: 460px;
+    height: 200px;
+    background: url(TVWmetamaps.png) no-repeat 0 0;
+}
+
+.homeText {
+    padding: 0 14px;
+    font-size: 24px;
     text-align: justify;
-    margin-bottom: 20px;
 }
 
-.homeWrapper .green {
-    color: #4fc059;
-}
-
-.homeVideo {
-    margin-bottom: 20px;
-}
-
-.callToAction a {
-    display: block;
-    width: 220px;
-    height: 12px;
-    padding: 16px 0;
+.learnMore {
+    font-size: 21px;
     text-align: center;
+    margin-top: 64px;
+}
+.homeLinks {
+    margin-top: 16px;
+    padding: 0 14px;
+}
+#toMetamaps {
+    display: inline-block;
+    width: 170px;
+    height: 36px;
+    background: url(MetamapsLogo.png) no-repeat 0 0;
+    margin-bottom: -5px;
+}
+#toTheValueWeb {
+    display: inline-block;
+    width: 204px;
+    height: 25px;
+    background: url(TVWtext.png) no-repeat 0 0;
+    margin-left:54px;
+}
+
+
+.homeWrapper #new_user {
+    margin-left: 48px;
+    margin-top: 160px;
+    width: 200px;
+    float: left;
+}
+
+.homeWrapper #new_user .accountInput {
+    width: 200px;
+    margin: 0 0 10px;
+}
+.homeWrapper #new_user input[type="email"], .homeWrapper #new_user input[type="password"] {
+    width: 200px;
+    height: 32px;
     border-radius: 2px;
-    font-size: 12px;
-    box-shadow: 0px 1px 1.5px rgba(0,0,0,0.12), 0 1px 1px rgba(0,0,0,0.24);
-    margin: 0 auto;
-    color: #FFFFFF;
+    -moz-border-radius: 2px;
+    -webkit-border-radius: 2px;
+    background-color: #ffffff;
+    color: #424242 !important;
+    font-family: din-medium;
+    font-size: 14px;
+    text-align: left;
+    padding: 5px 0px 0px 10px;
+    direction: ltr;
+    -webkit-appearance: none;
+    appearance: none;
+    margin: 0px 0px;
+    background: #fff;
+    border: none;
+    outline: none;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    letter-spacing: normal;
+    word-spacing: normal;
+    text-transform: none;
+    text-indent: 0px;
+    text-shadow: none;
 }
-.callToAction .requestInviteCTA {
-    background-color: #4fc059;
-    margin-bottom: 15px;
+.homeWrapper #new_user .accountSubmit {
+    margin-left: 0;
 }
-.callToAction .requestInviteCTA:hover {
-    background-color: #49ad4e;
+.homeWrapper #new_user .accountRememberMe {
+    margin-right: 0;
 }
-.callToAction .exploreFeaturedCTA {
-    background-color: #a354cd;
-}
-.callToAction .exploreFeaturedCTA:hover {
-    background-color: #9150bc;
+.homeWrapper #new_user .accountForgotPass {
+    margin: 8px 0 0 0;
 }
 
-.github-fork-ribbon-wrapper {
-    display:none;
-}
 
-.homePage .github-fork-ribbon-wrapper {
-    display: block;
-}
+/* 204x25  , 170x36 */
+
 
 /* end home page */
 

app/assets/stylesheets/uservoice.css

@@ -10,7 +10,7 @@ div.uv-icon.uv-bottom-left {
 	left:0;
 	margin-left:0px;
 	text-indent:-100000px;
-	top:25%;
+	top:65%;
 	width:25px;
 	z-index:100000;	
 	opacity: 1;

app/controllers/application_controller.rb

@@ -36,7 +36,9 @@ private
       
       path = request.env["PATH_INFO"]
 
-      unless path == "/" || path == new_user_registration_path || path == new_user_session_path
+      accessible_urls = ["/", new_user_registration_path, new_user_session_path, new_user_password_path, edit_user_password_path]
+
+      unless accessible_urls.include?(path)
         store_location_for(:user, path) and redirect_to root_url, notice: "You must be logged in."
         return false
       end

app/views/layouts/application.html.erb

@@ -14,11 +14,17 @@
 
   <%= stylesheet_link_tag    "application", :media => "all" %>
   <%= javascript_include_tag "application" %>
-  <script type="text/javascript" src="//use.typekit.net/tki2nyo.js"></script>
-  <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
-  <script type="text/javascript" src="//use.typekit.net/obp7wss.js"></script>
-  <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
 
+
+  <!-- for metamaps.thevalueweb.com -->
+  <script src="//use.typekit.net/jcy0yfj.js"></script>
+  <!-- for tvw.mooo.com TODO remove -->
+  <script src="//use.typekit.net/poj3rbu.js"></script>
+  <!-- for localhost development -->
+  <script type="text/javascript" src="//use.typekit.net/tki2nyo.js"></script>
+  <!-- to initialize all typekits -->
+  <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
+  
         <!-- app code -->
         <script type="text/javascript">
             require.config({baseUrl: '/famous/'});

app/views/main/home.html.erb

@@ -8,7 +8,18 @@
     <% content_for :title, "Home | Metamaps" %> 
     <div id="yield">
         <div class="homeWrapper">
-            <div class="homeTitle">THE VALUE WEB</div>
+                <div class="homeTextWrapper">
+                  <div class="homeLogo"></div>
+                  <div class="homeText">
+                    Welcome to the collaborative, realtime design and sensemaking playground
+                    for members of The Value Web globally.
+                  </div>
+                  <div class="learnMore">LEARN MORE:</div>
+                  <div class="homeLinks">
+                    <a id="toMetamaps" href="http://metamaps.cc" data-bypass="true"></a>
+                    <a id="toTheValueWeb" href="http://www.thevalueweb.org" data-bypass="true"></a>
+                  </div>
+                </div>
 
                 <%= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { class: "loginAnywhere" }) do |f| %>
                     <div class="accountInput accountEmail">
@@ -33,6 +44,7 @@
                       <% end -%>
                     </div>
                 <% end %>
+                <div class="clearfloat"></div>
         </div>
     </div><!-- end yield -->                  
     <script>

public/famous/main.js

@@ -262,14 +262,14 @@ define(function(require, exports, module) {
     // LOGO
     f.logo = {};
     f.logo.surf = new Surface({
-        size: [258, 56],
+        size: [258, 63],
         content: templates.logoContent,
         classes: ['footer']
     });
 
     f.logo.mod = new Modifier({
         origin: [0.5, 1],
-        transform: Transform.translate(0, 56, 0)
+        transform: Transform.translate(0, 63, 0)
     });
     f.logo.show = function () {
         f.logo.mod.setTransform(
@@ -279,7 +279,7 @@ define(function(require, exports, module) {
     };
     f.logo.hide = function () {
         f.logo.mod.setTransform(
-            Transform.translate(0, 56, 0), 
+            Transform.translate(0, 63, 0), 
             { duration: 300, curve: 'easeIn' }
         );
     };

public/famous/templates.js

@@ -2,7 +2,7 @@ define(function(require, exports, module) {
     
 var t = {};
 
-t.logoContent = '<div class="logo">METAMAPS</div>';
+t.logoContent = '<div class="logo"></div>';
 t.logoContent += '<ul class="bottomLinks">';
 t.logoContent += '<li onclick="Metamaps.GlobalUI.openLightbox(\'about\')">About /&nbsp;</li>';
 t.logoContent += '<li><a href="http://metamaps.cc/maps/331" data-bypass="true">Terms of Use /&nbsp;</a></li>';