many methods

6 files changed, 17 insertions, 8 deletions

diff --git a/views/about/brochure.ejs b/views/about/brochure.ejs
index 49b03db..1dad763 100644
--- a/views/about/brochure.ejs
+++ b/views/about/brochure.ejs
@@ -34,12 +34,11 @@
         <li> VValls logo appears when embedding an exhibition on a web page
         <li>
         [[ if (! logged_in) { ]]
-          <button href="/signup">Sign Up</button>
-        [[ } else if (! user.plan_level || user.plan_level < plan.level) { ]]
-          <button href="https://vvalls.recurly.com/subscribe/basic/[[- user._id ]]/[[- user.username ]]">Buy Now</button>
+          <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 == plan.level) { ]]
 					Current Level
-        [[ } else { ]]
 				[[ } ]]
       </ul>
     </div>
@@ -56,11 +55,13 @@
         <li> No VValls logo on embed
         <li>
         [[ if (! logged_in) { ]]
-          <button href="/signup">Sign Up</button>
-        [[ } else if (! user.plan_level || user.plan_level < plan.level) { ]]
-          <button href="https://vvalls.recurly.com/subscribe/pro/[[- user._id ]]/[[- user.username ]]">Buy Now</button>
+          <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 == plan.level) { ]]
 					Current Level
+        [[ } else if (user.plan_level < plan.level) { ]]
+          <a href="/profile/billing"><button>Upgrade Now</button></a>
 				[[ } ]]
       </ul>
     </div>
diff --git a/views/partials/header.ejs b/views/partials/header.ejs
index ce5bab9..2acf2bc 100644
--- a/views/partials/header.ejs
+++ b/views/partials/header.ejs
@@ -64,6 +64,7 @@
 
 	[[ if (profile && String(user._id) == String(profile._id)) { ]]
 	<a href="/profile" data-role="edit-profile-modal" class="topLink editProfile">Settings</a>
+	<a href="/profile" data-role="edit-subscription-modal" class="topLink editSubscription">Subscription</a>
 	[[ } else if (! profile) { ]]
 	<a href="/profile" class="topLink profileLink">Profile</a>
 	[[ } ]]
diff --git a/views/staff/_users.ejs b/views/staff/_users.ejs
index d46058f..053e289 100644
--- a/views/staff/_users.ejs
+++ b/views/staff/_users.ejs
@@ -12,6 +12,7 @@
     </td>
     <td class="editLinks">
       <a href="/profile/[[- user.username ]]">[view profile]</a>
+      <a href="https://vvalls.recurly.com/accounts/[[- profile._id ]]">[recurly]</a>
     </td>
     <td>
       [[- user.last_seen ]]
diff --git a/views/staff/plans/_form.ejs b/views/staff/plans/_form.ejs
index ae5ca5a..b55c5cd 100644
--- a/views/staff/plans/_form.ejs
+++ b/views/staff/plans/_form.ejs
@@ -16,6 +16,11 @@
   <div><input id="plan_slug" name="slug" type="text" value="[[- plan.slug ]]"></div>
 </li>
 
+<li>
+  <label for="plan_level">Level</label>
+  <div><input id="plan_level" name="level" type="number" value="[[- plan.level ]]"></div>
+</li>
+
 <!-- - - - - -->
 
 <li class="section_break">
diff --git a/views/staff/subscriptions/index.ejs b/views/staff/subscriptions/index.ejs
index d1c0588..3efffb5 100644
--- a/views/staff/subscriptions/index.ejs
+++ b/views/staff/subscriptions/index.ejs
@@ -1,6 +1,6 @@
 [[ include ../_header ]]
 
-	<h1>Users</h1>
+	<h1>Subscriptions</h1>
 
 [[ include ../_nav ]]
   
diff --git a/views/staff/users/show.ejs b/views/staff/users/show.ejs
index 4ce1d9a..d6a21d5 100644
--- a/views/staff/users/show.ejs
+++ b/views/staff/users/show.ejs
@@ -19,6 +19,7 @@
       <td class="editLinks">
         <a href="/profile/[[- profile.username ]]">[view profile]</a>
         <a href="/staff/users/[[- profile.username ]]/media">[view media]</a>
+        <a href="https://vvalls.recurly.com/accounts/[[- profile._id ]]">[view on recurly]</a>
       </td>
     </tr>
   </table>