Merge pull request sensiblecodeio#714 from scraperwiki/remove-free-si…

…gnup

Corporate signups only

client/template/help-whats-new.eco

@@ -5,7 +5,7 @@
   Here&rsquo;s a sixty-second rundown of how it works.</p>
   <p style="margin-bottom: 0">
     <a class="btn btn-large" data-nonpushstate href="/help/" style="margin-right: 20px;">Read the docs</a>
-    <a class="btn btn-primary btn-large" data-nonpushstate href="/pricing">Sign up <i class="icon-chevron-right"></i></a>
+    <a class="btn btn-primary btn-large" data-nonpushstate href="/login">Log in<i class="icon-chevron-right"></i></a>
   </p>
 </div>
 

client/template/nav.eco

@@ -54,7 +54,6 @@
 <li class="help"><a href="/contact" data-nonpushstate id="intercomButton" class="btn btn-danger">Help</a></li>
 <% else: %>
 <li class="login"><a href="/login" data-nonpushstate>Log in</a></li>
-<li class="pricing"><a href="/pricing">Sign up</a></li>
 <li class="docs"><a href="/help">Help</a></li>
 <% end %>
 </ul>

client/template/pricing.eco

@@ -33,6 +33,7 @@
 </div>
 -->
 
+<!--
 <div class="plan datascientist account-large swcol<% if @upgrade is 'upgrade': %> glowing<% end %>">
   <h2>Data Scientist</h2>
   <p class="cost">$29<small>/mth</small></p>
@@ -89,13 +90,19 @@
   </ul>
 </div>
 
-<div class="clearfix"></div>
+-->
+
+<!-- <div class="clearfix"></div>
 
 <p class="alert alert-error"><i class="icon-warning-sign"></i> Sorry, the <strong>twitter tools are not available!</strong> Please <i class="icon-hand-right"></i> <a href="https://blog.scraperwiki.com/2014/08/the-story-of-getting-twitter-data-and-its-missing-middle/">see our blog post</a> for more information.</a></p>
 
-<p class="corporate">We also offer Enterprise data hubs with professional services at prices from $1000 / month. 
+--> 
+
+<p class="corporate">We offer Enterprise data hubs with professional services at prices from $2000 / month. 
 For more information read our <a href="https://scraperwiki.com/help/corporate/">Corporate FAQ</a>,
 and if you are interested <a href="https://scraperwiki.com/professional#request">get in touch</a> with our professional services team.
 </p>
 
 
+
+

server/code/model/user.coffee

@@ -55,7 +55,7 @@ requestRecurlyAPI = (path, callback) ->
     if err?
       return callback err, null
     else if recurlyResp.statusCode is 404
-      return callback { error: "You have no Recurly account. Sign up for a paid plan at http://scraperwiki.com/pricing" }, null
+      return callback { error: "You have no Recurly account." }, null
     else if recurlyResp.statusCode isnt 200
       return callback { statusCode: recurlyResp.statusCode, error: recurlyResp.body }, null
 
@@ -118,7 +118,7 @@ class exports.User extends ModelBase
         return callback err, null
 
       if not obj.subscriptions
-        return callback { error: "You do not have a paid subscription. Sign up at http://scraperwiki.com/pricing" }, null
+        return callback { error: "You do not have a paid subscription." }, null
 
       # xml2js converts multiple entities within entities as an array,
       # but a single one is a single object. So we wrap into a list where necessary.

server/template/base_header.html

@@ -40,7 +40,6 @@
       <nav>
         <ul>
           <li class="login"><a href="/login">Log in</a></li>
-          <li class="pricing"><a href="/pricing">Sign up</a></li>
           <li class="docs"><a href="/help">Help</a></li>
         </ul>
       </nav>

server/template/login.html

@@ -25,10 +25,18 @@ <h2>Log into ScraperWiki</h2>
             <button type="submit" id="login" class="btn btn-primary">
               <i class="icon-ok space"></i> Log In
             </button>
-            <a class="btn btn-link" href="/pricing/">or Sign up</a>
             <!-- preload the spinner icon by hiding it off screen -->
             <img src="/image/loader-btn-primary.gif" width="16" height="16" style="position: absolute; left: -4000px;">
           </p>
+
+          <h2>Get a new account</h2>
+
+          <p class="corporate">We offer Enterprise data hubs with professional services at prices from $2000 / month.</p>
+
+          <p>For more information read our <a href="https://scraperwiki.com/help/corporate/">Corporate FAQ</a>,
+          and if you are interested <a href="https://scraperwiki.com/professional#request">get in touch</a> with our professional services team.
+          </p>
+
         </form>
 
     </div>