add business logic to new plan style

3 files changed, 175 insertions, 150 deletions

diff --git a/views/about/_old_plans.ejs b/views/about/_old_plans.ejs
new file mode 100644
index 0000000..e4b07be
--- /dev/null
+++ b/views/about/_old_plans.ejs
@@ -0,0 +1,63 @@
+     <div class="about_plan planbox free_plan_info">
+      <h3>[[- plans.free.name ]]</h3>
+      <ul>
+        <li> [[- plans.free.stock_project_limit ]] exhibition with pre-designed template floor plan
+      </ul>
+    </div>
+
+    <div class="about_plan planbox">
+      <h3>[[- plans.basic.name ]]</h3>
+      <ul>
+        <li> $[[- plans.basic.monthly_price ]]/mo or $[[- plans.basic.yearly_price ]]/year
+        <li> Comes with [[- plans.basic.basic_layout_limit ]] basic floor plan and [[- plans.basic.basic_project_limit ]] exhibitions
+        <li> Each new basic floor plan costs $[[- plans.basic.basic_layout_monthly_price ]]/mo
+             or $[[- plans.basic.basic_layout_yearly_price ]]/year, minimum 3 months
+        <li> Each new floor plan can have up to [[- plans.basic.basic_project_limit ]] exhibitions
+        <li> VValls logo appears when embedding an exhibition on a web page
+        <li>
+        [[ if (! logged_in) { ]]
+          <button data-role="show-signup-modal">Sign Up</button>
+        [[ } else if (! user.plan_level) { ]]
+          <a href="https://vvalls.recurly.com/subscribe/basic-monthly/[[- user._id ]]/[[- user.username ]]"><button>Buy Now</button></a>
+        [[ } else if (user.plan_level == plans.basic.level) { ]]
+					Current Level
+				[[ } ]]
+      </ul>
+    </div>
+
+    <div class="about_plan planbox">
+      <h3>[[- plans.pro.name ]]</h3>
+      <ul>
+        <li> $[[- plans.pro.monthly_price ]]/mo or $[[- plans.pro.yearly_price ]]/year
+        <li> Comes with [[- plans.pro.pro_layout_limit ]] pro floor plan and [[- plans.pro.pro_project_limit ]] exhibitions
+        <li> Each new pro floor plan costs $[[- plans.pro.pro_layout_monthly_price ]]/mo
+             or $[[- plans.pro.pro_layout_yearly_price ]]/year, minimum 3 months
+        <li> Each new pro floor plan can have up to [[- plans.pro.pro_project_limit ]] exhibitions
+        <li> Includes planning for 3D objects in the room
+        <li> No VValls logo on embed
+        <li>
+        [[ if (! logged_in) { ]]
+          <button data-role="show-signup-modal">Sign Up</button>
+        [[ } else if (! user.plan_level) { ]]
+          <a href="https://vvalls.recurly.com/subscribe/pro-monthly/[[- user._id ]]/[[- user.username ]]"><button>Buy Now</button></a>
+        [[ } else if (user.plan_level == plans.pro.level) { ]]
+					Current Level
+        [[ } else if (user.plan_level < plans.pro.level) { ]]
+          <a href="/profile/billing"><button>Upgrade Now</button></a>
+				[[ } ]]
+      </ul>
+    </div>
+  
+    <div class="about_custom planbox miscbox">
+      <ul>
+        <li> Buying any extra floor plan unlocks collaboration.<br>Invite an artist or curator to work on the exhibition with you.
+        <li> Basic Floor plan: Rectangle-based design of any dimension.
+        <li> Pro Floor plan: Trace an arbitrary floor plan from image.
+      </ul>
+    </div>
+
+    <div class="about_custom custombox planbox">
+      <h3>Want Something Custom?</h3>
+      <li> We offer customized white-label options for business and educational uses.
+      <li> <a href="mailto:hello@vvalls.com">Contact us</a> for more information.
+    </div>
diff --git a/views/about/_plans.ejs b/views/about/_plans.ejs
index 16fb9c6..af2a050 100644
--- a/views/about/_plans.ejs
+++ b/views/about/_plans.ejs
@@ -1,63 +1,117 @@
-    <div class="about_plan planbox free_plan_info">
-      <h3>[[- plans.free.name ]]</h3>
-      <ul>
-        <li> [[- plans.free.stock_project_limit ]] exhibition with pre-designed template floor plan
-      </ul>
-    </div>
 
-    <div class="about_plan planbox">
-      <h3>[[- plans.basic.name ]]</h3>
-      <ul>
-        <li> $[[- plans.basic.monthly_price ]]/mo or $[[- plans.basic.yearly_price ]]/year
-        <li> Comes with [[- plans.basic.basic_layout_limit ]] basic floor plan and [[- plans.basic.basic_project_limit ]] exhibitions
-        <li> Each new basic floor plan costs $[[- plans.basic.basic_layout_monthly_price ]]/mo
-             or $[[- plans.basic.basic_layout_yearly_price ]]/year, minimum 3 months
-        <li> Each new floor plan can have up to [[- plans.basic.basic_project_limit ]] exhibitions
-        <li> VValls logo appears when embedding an exhibition on a web page
-        <li>
-        [[ if (! logged_in) { ]]
-          <button data-role="show-signup-modal">Sign Up</button>
-        [[ } else if (! user.plan_level) { ]]
-          <a href="https://vvalls.recurly.com/subscribe/basic-monthly/[[- user._id ]]/[[- user.username ]]"><button>Buy Now</button></a>
-        [[ } else if (user.plan_level == plans.basic.level) { ]]
-					Current Level
-				[[ } ]]
-      </ul>
+<ul id="plans">
+  <li class="most-popular">
+    <div class="top">
+      <h2>[[- plans.pro.name ]]</h2>
+      <h3><span class="dollar">$</span><span class="price large">[[- plans.pro.monthly_price ]]</span> <span class="month large">/ mo </span></h3>
+      <h4>Ideal for large galleries<br>and small businesses.</h4>
     </div>
-
-    <div class="about_plan planbox">
-      <h3>[[- plans.pro.name ]]</h3>
-      <ul>
-        <li> $[[- plans.pro.monthly_price ]]/mo or $[[- plans.pro.yearly_price ]]/year
-        <li> Comes with [[- plans.pro.pro_layout_limit ]] pro floor plan and [[- plans.pro.pro_project_limit ]] exhibitions
-        <li> Each new pro floor plan costs $[[- plans.pro.pro_layout_monthly_price ]]/mo
-             or $[[- plans.pro.pro_layout_yearly_price ]]/year, minimum 3 months
-        <li> Each new pro floor plan can have up to [[- plans.pro.pro_project_limit ]] exhibitions
-        <li> Includes planning for 3D objects in the room
-        <li> No VValls logo on embed
-        <li>
-        [[ if (! logged_in) { ]]
-          <button data-role="show-signup-modal">Sign Up</button>
-        [[ } else if (! user.plan_level) { ]]
-          <a href="https://vvalls.recurly.com/subscribe/pro-monthly/[[- user._id ]]/[[- user.username ]]"><button>Buy Now</button></a>
-        [[ } else if (user.plan_level == plans.pro.level) { ]]
-					Current Level
-        [[ } else if (user.plan_level < plans.pro.level) { ]]
-          <a href="/profile/billing"><button>Upgrade Now</button></a>
-				[[ } ]]
-      </ul>
+    <ul>
+      <li>
+        [[- plans.pro.pro_layout_limit ]] Pro Floor Plan and [[- plans.pro.pro_project_limit ]] Exhibitions
+      </li>
+      <li>
+        Trace a Floor Plan from a Drawing
+      </li>
+      <li>
+        Image Hosting For Artworks
+      </li>
+      <li>
+        Planning for 3D Objects 
+      </li>
+      <li>
+        Everything the Medium Plan Contains 
+      </li>
+      <li>
+        No VValls Branding!
+      </li>
+    </ul>
+    <div class="signup">
+      [[ if (! logged_in) { ]]
+        <a class="button" href="#" data-role="show-signup-modal">Sign Up for [[- plans.pro.name ]]</a>
+      [[ } else if (! user.plan_level || user.plan_level < plans.pro.level) { ]]
+        <a href="https://vvalls.recurly.com/subscribe/pro-monthly/[[- user._id ]]/[[- user.username ]]">Sign Up for [[- plans.pro.name ]]</a>
+      [[ } else if (user.plan_level == plans.basic.level) { ]]
+        <div class="current">Current Level</div>
+      [[ } ]]
+    </div>
+  </li>
+  <li>
+    <div class="top">
+      <h2>[[- plans.basic.name ]]</h2>
+      <h3><span class="dollar">$</span><span class="price medium">[[- plans.basic.monthly_price ]]</span> <span class="month medium">/ mo </span></h3>
+      <h4>Great for small galleries<br>and art projects.</h4>
     </div>
-  
-    <div class="about_custom planbox miscbox">
-      <ul>
-        <li> Buying any extra floor plan unlocks collaboration.<br>Invite an artist or curator to work on the exhibition with you.
-        <li> Basic Floor plan: Rectangle-based design of any dimension.
-        <li> Pro Floor plan: Trace an arbitrary floor plan from image.
-      </ul>
+    <ul>
+      <li>
+        [[- plans.basic.basic_layout_limit ]] Basic Floor Plan and [[- plans.basic.basic_project_limit ]] Exhibitions
+      </li>
+      <li>
+        Add More Basic Floor Plans for $[[- plans.basic.basic_layout_monthly_price ]]/mo
+      </li>
+      <li>
+        Invite Artists to Collaborate
+      </li>
+      <li>
+        Prepay a Year and Get Two Months Free
+      </li>
+      <li>
+        Everything the Small Plan Contains 
+      </li>
+      <li>
+        VValls Branding
+      </li>
+    </ul>
+    <div class="signup">
+      [[ if (! logged_in) { ]]
+        <a class="button" href="#" data-role="show-signup-modal">Sign Up for [[- plans.basic.name ]]</a>
+      [[ } else if (! user.plan_level || user.plan_level < plans.basic.level) { ]]
+        <a href="https://vvalls.recurly.com/subscribe/basic-monthly/[[- user._id ]]/[[- user.username ]]">Sign Up for [[- plans.basic.name ]]</a>
+      [[ } else if (user.plan_level == plans.basic.level) { ]]
+        <div class="current">Current Level</div>
+      [[ } ]]
     </div>
+  </li>
+  <li>
+    <div class="top">
+      <h2>[[- plans.free.name ]]</h2>
+      <h3><span class="dollar">$</span><span class="price small">0</span> <span class="month small">/ mo </span></h3>
+      <h4>Free forever.</h4>
+    </div>
+    <ul>
+      <li>
+        [[- plans.free.stock_project_limit ]] Basic Exhibition
+      </li>
+      <li>
+        Use Any of our Built-In Floor Plans 
+      </li>
+      <li>
+        Embed Images and Videos in your Room
+      </li>
+      <li>
+        Custom Color and Wallpaper
+      </li>
+      <li>
+        Embed Room on Your Website
+      </li>
+      <li>
+        VValls Branding
+      </li>
+    </ul>
 
-    <div class="about_custom custombox planbox">
-      <h3>Want Something Custom?</h3>
-      <li> We offer customized white-label options for business and educational uses.
-      <li> <a href="mailto:hello@vvalls.com">Contact us</a> for more information.
+    <div class="signup">
+      [[ if (! logged_in) { ]]
+        <a class="button" href="#" data-role="show-signup-modal">Sign Up for Small</a>
+      [[ } else if (user.plan_level >= plans.basic.level) { ]]
+        <div class="current">Current Level</div>
+      [[ } ]]
     </div>
+  </li>
+</ul>
+
+<div class="about_custom custombox planbox">
+  <h3>Want Something Custom?</h3>
+  <li> We offer customized white-label options for business and educational uses.
+    <br>
+    <a href="mailto:hello@vvalls.com">Contact us</a> for more information.
+</div>
diff --git a/views/about/brochure.ejs b/views/about/brochure.ejs
index 80cb154..e34d3d3 100644
--- a/views/about/brochure.ejs
+++ b/views/about/brochure.ejs
@@ -11,99 +11,7 @@
 	<h1 class="leader">Subscriptions</h1>
 
 	<div class="projectList about aboutintro">
-  
-
-		<ul id="plans">
-		  <li class="most-popular">
-		    <div class="top">
-		      <h2>Large</h2>
-		      <h3><span class="dollar">$</span><span class="price large">50</span> <span class="month large">/ mo </span></h3>
-		      <h4>Ideal for businesses and ecommerce sites.</h4>
-		    </div>
-		    <ul>
-		      <li>
-		        15 Source Accounts / Hashtags 
-		      </li>
-		      <li>
-		        3 Embeddable Feeds 
-		      </li>
-		      <li>
-		        Pulls In New Posts Every 10 Minutes 
-		      </li>
-		      <li>
-		        Analytics and Analysis Tools 
-		      </li>
-		      <li>
-		        Everything the Medium Plan Contains 
-		      </li>
-		      <li>
-		        No Juicer Branding! 
-		      </li>
-		    </ul>
-		    <div class="signup"><a class="button" href="/credit-card/new?plan=large">Sign Up for Large</a></div>
-		  </li>
-		  <li>
-		    <div class="top">
-		      <h2>Medium</h2>
-		      <h3><span class="dollar">$</span><span class="price medium">10</span> <span class="month medium">/ mo </span></h3>
-		      <h4>Great for personal sites and small blogs.</h4>
-		    </div>
-		    <ul>
-		      <li>
-		        5 Source Accounts / Hashtags 
-		      </li>
-		      <li>
-		        1 Embeddable Feed 
-		      </li>
-		      <li>
-		        Pulls In New Posts Every Hour 
-		      </li>
-		      <li>
-		        Moderation and Filtering Tools 
-		      </li>
-		      <li>
-		        Everything the Small Plan Contains 
-		      </li>
-		      <li>
-		        No Juicer Branding! 
-		      </li>
-		    </ul>
-		    <div class="signup"><a class="button" href="/credit-card/new?plan=medium">Sign Up for Medium</a></div>
-		  </li>
-		  <li>
-		    <div class="top">
-		      <h2>Small</h2>
-		      <h3><span class="dollar">$</span><span class="price small">0</span> <span class="month small">/ mo </span></h3>
-		      <h4>Free forever.</h4>
-		    </div>
-		    <ul>
-		      <li>
-		        2 Source Accounts / Hashtags 
-		      </li>
-		      <li>
-		        1 Embeddable Social Media Feed 
-		      </li>
-		      <li>
-		        Pulls In New Posts Every 24 Hours 
-		      </li>
-		      <li>
-		        All Templates and Custom Styling 
-		      </li>
-		      <li>
-		        HTTPS Secure Connection Support 
-		      </li>
-		      <li>
-		        Juicer Branding 
-		      </li>
-		    </ul>
-		    <div class="signup"><a class="button" href="/sign-up">Sign Up for Small</a></div>
-		  </li>
-		</ul>
-
-
-
-
-		[[ include _plans ]]
+    [[ include _plans ]]
   </div>
 
 	[[ include ../partials/confirm-modal ]]