caboose-cms 0.9.193 → 0.9.194

data/app/models/caboose/schema.rb

@@ -214,14 +214,16 @@ class Caboose::Schema < Caboose::Utilities::Schema
       ],      
       Caboose::BlockTypeCategory => [
         [ :parent_id  , :integer ],
-        [ :name       , :string  ]
+        [ :name       , :string  ],
+        [ :sort_order, :integer ],
+        [ :show_in_sidebar, :boolean, { :default => true }]
       ],
       Caboose::BlockTypeSource => [
         [ :name       , :string ],
         [ :url        , :string ],
         [ :token      , :string ],
         [ :priority   , :integer, { :default => 0 }],
-        [ :active     , :boolean, { :default => true }],
+        [ :active     , :boolean, { :default => true }]
       ],
       Caboose::BlockTypeSummary => [
         [ :block_type_source_id , :integer ],

data/app/views/caboose/block_type_categories/admin_edit.html.erb

@@ -0,0 +1,43 @@
+<h1>Edit Block Type Category</h1>
+
+<p><div id='blocktypecategory_<%= @btc.id %>_name' ></div></p>
+<p><div id='blocktypecategory_<%= @btc.id %>_parent_id' ></div></p>
+<p><div id='blocktypecategory_<%= @btc.id %>_sort_order' ></div></p>
+<p><div id='blocktypecategory_<%= @btc.id %>_show_in_sidebar' ></div></p>
+
+<h5>Blocks</h5>
+<ul>
+<% Caboose::BlockType.where(:block_type_category_id => @btc.id).order(:id).all.each do |bt| %>
+<li><a href="/admin/block-types/<%= bt.id %>"><%= bt.description %></a></li>
+<% end %>
+</ul>
+<br />
+
+<a href="/admin/block-type-categories" class="caboose-btn">< Back</a>
+
+<% content_for :caboose_css do %>
+<style type='text/css'>
+
+</style>
+<% end %>
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<script type="text/javascript">
+
+$(document).ready(function() {
+  new ModelBinder({
+    name: 'BlockTypeCategory',
+    id: <%= @btc.id %>,
+    update_url: '/admin/block-type-categories/<%= @btc.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+      { name: 'name' , nice_name: 'Name', type: 'text'     , value: <%= raw Caboose.json(@btc.name) %>, width: 400 },
+      { name: 'parent_id' , nice_name: 'Parent', type: 'text'     , value: <%= raw Caboose.json(@btc.parent_id) %>, width: 400 },
+      { name: 'sort_order' , nice_name: 'Sort Order', type: 'text'     , value: <%= raw Caboose.json(@btc.sort_order) %>, width: 400 },
+      { name: 'show_in_sidebar' , nice_name: 'Show in Sidebar', type: 'checkbox'     , value: <%= raw Caboose.json(@btc.show_in_sidebar) %>, width: 400 }
+    ]    
+  });  
+});
+
+</script>
+<% end %>

data/app/views/caboose/block_type_categories/admin_index.html.erb

@@ -0,0 +1,23 @@
+<h1>Block Type Categories</h1>
+
+<ul>
+	<% @btc.each do |btc| %>
+		<li>
+			<a href="/admin/block-type-categories/<%= btc.id %>"><%= btc.name %></a>
+			<ul>
+				<% btc.children.each do |btc2| %>
+					<li>
+						<a href="/admin/block-type-categories/<%= btc2.id %>"><%= btc2.name %></a>
+						<ul>
+							<% btc2.children.each do |btc3| %>
+								<li>
+									<a href="/admin/block-type-categories/<%= btc3.id %>"><%= btc3.name %></a>
+								</li>
+							<% end %>
+						</ul>
+					</li>
+				<% end %>
+			</ul>
+		</li>
+	<% end %>
+</ul>

data/app/views/caboose/block_types/admin_edit.html.erb

@@ -25,17 +25,17 @@ bt = @block_type
 <p><div id='blocktype_<%= bt.id %>_default'                         ></div></p>
 <p><div id='blocktype_<%= bt.id %>_width'                           ></div></p>
 <p><div id='blocktype_<%= bt.id %>_height'                          ></div></p>
-<p><div id='blocktype_<%= bt.id %>_fixed_placeholder'               ></div></p>
+<!-- <p><div id='blocktype_<%= bt.id %>_fixed_placeholder'               ></div></p> -->
 <p><div id='blocktype_<%= bt.id %>_options_url'                     ></div></p>
 <p><div id='blocktype_<%= bt.id %>_options'                         ></div></p>
-<p><div id='blocktype_<%= bt.id %>_is_global'                       ></div></p>
+<!-- <p><div id='blocktype_<%= bt.id %>_is_global'                       ></div></p> -->
 <p><div id='blocktype_<%= bt.id %>_use_render_function'             ></div></p>
 <p><div id='blocktype_<%= bt.id %>_use_render_function_for_layout'  ></div></p>
 <p><div id='blocktype_<%= bt.id %>_use_js_for_modal'                ></div></p>
 <p><div id='blocktype_<%= bt.id %>_allow_child_blocks'              ></div></p>
 <p><div id='blocktype_<%= bt.id %>_default_child_block_type_id'     ></div></p>
-<p><div id='blocktype_<%= bt.id %>_default_constrain'               ></div></p>
-<p><div id='blocktype_<%= bt.id %>_default_full_width'              ></div></p>
+<!-- <p><div id='blocktype_<%= bt.id %>_default_constrain'               ></div></p>
+<p><div id='blocktype_<%= bt.id %>_default_full_width'              ></div></p> -->
 <p><div id='blocktype_<%= bt.id %>_default_included'              ></div></p>
 <p>
 
@@ -100,7 +100,7 @@ $(document).ready(function() {
       { name: 'description'                    , sort: 'description'                    , show: true  , bulk_edit: false, nice_name: 'Description'                    , type: 'text'              , value: function(bt) { return bt.description;                     }, width: 400 },
       { name: 'field_type'                     , sort: 'field_type'                     , show: true  , bulk_edit: false, nice_name: 'Field type'                     , type: 'select'            , value: function(bt) { return bt.field_type;                      }, width: 400, options_url: '/admin/block-types/field-type-options' },      
       { name: 'block_type_category_id'         , sort: 'block_type_category_id'         , show: false , bulk_edit: false, nice_name: 'Category'                       , type: 'select'            , value: function(bt) { return bt.block_type_category_id;          }, width: 400, options_url: '/admin/block-type-categories/tree-options' },
-      { name: 'is_global'                      , sort: 'is_global'                      , show: false , bulk_edit: false, nice_name: 'Global'                         , type: 'checkbox'          , value: function(bt) { return bt.is_global;                       }, text: function(bt) { return bt.is_global                      ? 'Yes' : 'No' }, width: 400 },
+  //    { name: 'is_global'                      , sort: 'is_global'                      , show: false , bulk_edit: false, nice_name: 'Global'                         , type: 'checkbox'          , value: function(bt) { return bt.is_global;                       }, text: function(bt) { return bt.is_global                      ? 'Yes' : 'No' }, width: 400 },
       { name: 'use_render_function'            , sort: 'use_render_function'            , show: true  , bulk_edit: false, nice_name: 'Use Render Function'            , type: 'checkbox'          , value: function(bt) { return bt.use_render_function;             }, text: function(bt) { return bt.use_render_function            ? 'Yes' : 'No' }, width: 400 },
       { name: 'use_render_function_for_layout' , sort: 'use_render_function_for_layout' , show: true  , bulk_edit: false, nice_name: 'Use Render Function for Modal'  , type: 'checkbox'          , value: function(bt) { return bt.use_render_function_for_layout;  }, text: function(bt) { return bt.use_render_function_for_layout ? 'Yes' : 'No' }, width: 400 },
       { name: 'use_js_for_modal'               , sort: 'use_js_for_modal'               , show: true  , bulk_edit: false, nice_name: 'Use JS for Modal'               , type: 'checkbox'          , value: function(bt) { return bt.use_js_for_modal;                }, text: function(bt) { return bt.use_js_for_modal               ? 'Yes' : 'No' }, width: 400 },
@@ -109,9 +109,9 @@ $(document).ready(function() {
       { name: 'default'                        , sort: 'default'                        , show: false , bulk_edit: false, nice_name: 'Default value'                  , type: 'text'              , value: function(bt) { return bt.default;                         }, width: 400 },
       { name: 'width'                          , sort: 'width'                          , show: false , bulk_edit: false, nice_name: 'Width'                          , type: 'text'              , value: function(bt) { return bt.width;                           }, width: 400 },
       { name: 'height'                         , sort: 'height'                         , show: false , bulk_edit: false, nice_name: 'Height'                         , type: 'text'              , value: function(bt) { return bt.height;                          }, width: 400 },
-      { name: 'fixed_placeholder'              , sort: 'fixed_placeholder'              , show: false , bulk_edit: false, nice_name: 'Fixed placeholder'              , type: 'checkbox'          , value: function(bt) { return bt.fixed_placeholder;               }, text: function(bt) { return bt.fixed_placeholder  ? 'Yes' : 'No' }, width: 400 },
-      { name: 'default_constrain'              , sort: 'default_constrain'              , show: false , bulk_edit: false, nice_name: 'Constrain by Default'           , type: 'checkbox'          , value: function(bt) { return bt.default_constrain;               }, text: function(bt) { return bt.default_constrain  ? 'Yes' : 'No' }, width: 400 },
-      { name: 'default_full_width'             , sort: 'default_full_width'             , show: false , bulk_edit: false, nice_name: 'Full Width by Default'          , type: 'checkbox'          , value: function(bt) { return bt.default_full_width;              }, text: function(bt) { return bt.default_full_width ? 'Yes' : 'No' }, width: 400 },
+  //    { name: 'fixed_placeholder'              , sort: 'fixed_placeholder'              , show: false , bulk_edit: false, nice_name: 'Fixed placeholder'              , type: 'checkbox'          , value: function(bt) { return bt.fixed_placeholder;               }, text: function(bt) { return bt.fixed_placeholder  ? 'Yes' : 'No' }, width: 400 },
+  //    { name: 'default_constrain'              , sort: 'default_constrain'              , show: false , bulk_edit: false, nice_name: 'Constrain by Default'           , type: 'checkbox'          , value: function(bt) { return bt.default_constrain;               }, text: function(bt) { return bt.default_constrain  ? 'Yes' : 'No' }, width: 400 },
+  //    { name: 'default_full_width'             , sort: 'default_full_width'             , show: false , bulk_edit: false, nice_name: 'Full Width by Default'          , type: 'checkbox'          , value: function(bt) { return bt.default_full_width;              }, text: function(bt) { return bt.default_full_width ? 'Yes' : 'No' }, width: 400 },
       { name: 'options_url'                    , sort: 'options_url'                    , show: false , bulk_edit: false, nice_name: 'Options URL'                    , type: 'text'              , value: function(bt) { return bt.options_url;                     }, width: 400 },
       { name: 'options_function'               , sort: 'options_function'               , show: false , bulk_edit: false, nice_name: 'Options Function'               , type: 'textarea'          , value: function(bt) { return bt.options_function;                }, width: 400, height: 100 },
       { name: 'options'                        , sort: 'options'                        , show: false , bulk_edit: false, nice_name: 'Options'                        , type: 'textarea'          , value: function(bt) { return bt.options;                         }, width: 400, height: 100 }            

data/app/views/caboose/extras/error.html.erb

@@ -1,3 +1,3 @@
 <h1>Error</h1>
 <p class='note error'><%= @error %></p>
-<p><a href="/modal/login?logout=1&return_url=<%= @return_url %>">Login as a different user</a></p>
+<p><a href="/login?logout=1&return_url=<%= @return_url %>">Login as a different user</a></p>

data/app/views/caboose/login/forgot_password_form.html.erb

@@ -1,59 +1,46 @@
-
-<form action='/login/forgot-password' method='post' id='forgot_form'>
-  <h1>Forgot Password</h1>
-  <div id='content3'>    
+<div class="caboose-login-wrapper">
+  <div class="caboose-login-form-wrapper">
+    <h5>Forgot Password</h5>
     <p>Enter your username or email address and we'll send you a link that lets you reset your password.</p>
-    <input type='hidden'    name='return_url' value='<%= @return_url %>' />
-    <input type='text'      name='username' id='username' placeholder='Login or email' />
-    <div id='message'></div>
-    <p>
-      <input type='button' id='btn_cancel' value='Cancel' onclick="parent.$.fn.colorbox.close();" />
-    	<input type='submit' id='btn_login'  value='Help Me Remember' onclick='send_forgot_password_link(); return false;' />
-    </p>
+    <form action="/login/forgot-password" method="POST" id="caboose-login-form">
+      <div class="field">
+        <label for="caboose-login-username">Username or Email Address</label>
+        <input type="text" name="username" id="caboose-login-username" />
+      </div>
+      <input type="hidden" name="return_url" value="<%= @return_url %>" />
+      <div class="caboose-links">
+        <% if @site.allow_self_registration %>
+          <a href="/register?return_url=<%= @return_url %>">Create an account</a>
+        <% end %>
+        <a href="/login?return_url=<%= @return_url %>" class="caboose-forgot-password">Back to login</a>
+      </div>
+      <input type="submit" class="btn" id="caboose-login-btn" value="Reset Password" onclick="caboose_user_forgot();return false;" />
+    </form>
+    <div id="caboose-login-message"></div>
   </div>
-</form>
+</div>
 
-<% content_for :caboose_css do %>
-<style type="text/css">
-#modal_content input[type="checkbox"] { position: relative; }
-</style>
+<% content_for :css do %>
+  <%= stylesheet_link_tag 'caboose/login' %>
 <% end %>
-<% content_for :caboose_js do %>
-<script type='text/javascript'>
-
-var modal = false;
-$(window).load(function() {
-  modal = new CabooseModal(400);
-});
 
-function send_forgot_password_link()
+<% content_for :js do %>
+<script type="text/javascript">
+function caboose_user_forgot() 
 {
-  modal.autosize("<p class='loading'>Retrieving info...</p>");
-	$.ajax({
-		url: '/login/forgot-password',
-		type: 'post',
-		data: $('#forgot_form').serialize(),
-		success: function(resp) {
-		  if (resp.error) modal.autosize("<p class='note error'>" + resp.error + "</p>");
-		  if (resp.success)
-		  {
-		    //modal.autosize("<p class='note success'>" + resp.success + "</p>");		    
-		    var div = $('<div/>')
-		      .append($('<p/>').addClass('note success').html(resp.success))
-		      .append($('<p/>').append($('<input/>').attr('type', 'button').val('Close').click(function() { modal.close(); })));
-		    $('#content3').empty().append(div);
-		    modal.autosize();
-		  }		    
-			//if (resp.redirect != false) <%= @modal ? "" : "parent." %>window.location = resp.redirect;
-			//else parent.location.reload(true);
-		},
-		error: function() {	
-			modal.autosize("<p class='note error'>Error</p>");			
-		}
-	});
+  $('#caboose-login-message').html("<p class='note loading'>Retrieving your account...</p>");
+  $.ajax({
+    url: '/login/forgot-password',
+    type: 'post',
+    data: $('#caboose-login-form').serialize(),
+    success: function(resp) {
+      if (resp.error) $('#caboose-login-message').html("<p class='note error'>" + resp.error + "</p>");
+      else if (resp.success) {
+        $('#caboose-login-form').slideUp();
+        $('#caboose-login-message').html("<p class='note success'>" + resp.success + "</p>");
+      }
+    }   
+  });
 }
 </script>
-<% end %>
-<%= content_for :caboose_css do %>
-<%= stylesheet_link_tag "caboose/login", :media => "all" %>
-<% end %>
+<% end %>

data/app/views/caboose/login/index.html.erb

@@ -1,70 +1,47 @@
-<form action="/login" method="post" id="login-form">
-	<div class="header">
-	  <% if @site.logo && !@site.logo.url.include?('placehold') %>
-	    <img src='<%= @site.logo.url(:thumb) %>' alt="<%= @site.description %>" />
-	  <% else %>
-		  <img src="/assets/caboose/caboose_logo.png" alt="Caboose">
-		  <h1>caboose</h1>
-		  <p>Coo Coo Ca Choo</p>
-		<% end %>		
-	</div>
-	
-	<input type="hidden"   name="return_url" value="<%= @return_url %>" />
-	<input type="text"     name="username" id="username" placeholder="Login or email" />
-	<input type="password" name="password" id="password" placeholder="Password" />
-	
-	<label>
-		<input type="checkbox" name="remember" id="remember" value="1" checked="true" /> Remember me
-	</label>
-	
-	<ul id="login-options">
-	  <% if @site.allow_self_registration %><li><a href="/register?return_url=<%= @return_url %>" class='register'>Need to register?</a></li><% end %>
-		<li><a href="/login/forgot-password?return_url=<%= @return_url %>" class='forgot'>Forgot your password?</a></li>
-	</ul>	
-	<div style='clear: both;' id="message"></div>	
-	<p class="buttons">
-	  <input type="button" class="btn" value="Cancel" onclick="parent.$.fn.colorbox.close();" />
-		<input type="submit" class="btn" value="Login" onclick='login(); return false;' />
-	</p>
-</form>
+<div class="caboose-login-wrapper">
+  <div class="caboose-login-form-wrapper">
+    <h5>User Login</h5>
+    <form action="/login" method="POST" id="caboose-login-form">
+      <div class="field">
+        <label for="caboose-login-username">Username or Email Address</label>
+        <input type="text" name="username" id="caboose-login-username" />
+      </div>
+      <div class="field">
+        <label for="caboose-login-password">Password</label>
+        <input type="password" name="password" id="caboose-login-password" />
+      </div>
+      <input type="hidden" name="return_url" value="<%= @return_url %>" />
+      <div class="caboose-links">
+        <% if @site.allow_self_registration %>
+          <a href="/register?return_url=<%= @return_url %>">Create an account</a>
+        <% end %>
+        <a href="/login/forgot-password?return_url=<%= @return_url %>">Forgot your password?</a>
+      </div>
+      <input type="submit" class="btn" id="caboose-login-btn" value="Login" onclick="caboose_user_login();return false;" />
+    </form>
+    <div id="caboose-login-message"></div>
+  </div>
+</div>
 
-<%= content_for :caboose_css do %>
-<%= stylesheet_link_tag "caboose/login", media: "all" %>		
-<style type="text/css">
-#modal_content input[type=checkbox] { position: relative; }
-</style>
+<% content_for :css do %>
+  <%= stylesheet_link_tag 'caboose/login' %>
 <% end %>
 
-<% content_for :caboose_js do %>
+<% content_for :js do %>
 <script type="text/javascript">
-var modal = false;
-	
-$(window).load(function() {
-  modal = new CabooseModal(400);
-});
-	
-function login() {
-  modal.autosize("<p class='loading'>Logging in...</p>");
-
-	$.ajax({
-		url: '/login',
-		type: 'post',
-		data: $('#login-form').serialize(),
-		success: function(response) {
-			if (response.error) modal.autosize("<p class='note error'>" + response.error + "</p>");			
-			else if (response.redirect != false)
-			{
-			  if (response.modal)
-			    window.location = response.redirect;
-			  else
-			    parent.window.location = response.redirect;
-			}
-			else parent.location.reload(true);
-		},
-		error: function() {	
-			modal.autosize("<p class='note error'>Error</p>");			
-		}
-	});
+function caboose_user_login() 
+{
+  $('#caboose-login-message').html("<p class='note loading'>Logging in...</p>");
+  $.ajax({
+    url: '/login',
+    type: 'post',
+    data: $('#caboose-login-form').serialize(),
+    success: function(resp) {
+      if (resp.error) $('#caboose-login-message').html("<p class='note error'>" + resp.error + "</p>");     
+      else if (resp.redirect != false) window.location = resp.redirect;
+      else window.location.reload(true);
+    }   
+  });
 }
 </script>
-<% end %>
+<% end %>

data/app/views/caboose/login/reset_password_form.html.erb

@@ -1,46 +1,46 @@
-<h1>Reset Password</h1>
+<div class="caboose-login-wrapper">
+  <div class="caboose-login-form-wrapper">
+    <% if @user.nil? %>
+      <p class='note error'>The given reset ID is invalid.</p>
+    <% else %>
+      <h5>Reset Password</h5>
+      <p>Please enter a new password for your account.</p>
+      <form action="/login/reset-password" method="POST" id="caboose-reset-form">
+        <input type='hidden' name='id' id='id' value='<%= @reset_id %>' />
+        <div class="field">
+          <label for="caboose-register-password1">Password</label>
+          <input type="password" name="pass1" id="caboose-register-password1" />
+        </div>
+        <div class="field">
+          <label for="caboose-register-password2">Confirm Password</label>
+          <input type="password" name="pass2" id="caboose-register-password2" />
+        </div>
+        <input type="submit" class="btn" id="caboose-login-btn" value="Reset Password" onclick="caboose_user_reset();return false;" />
+      </form>
+      <div id="caboose-login-message"></div>
+    <% end %>
+  </div>
+</div>
 
-<% if @user.nil? %>
-  <p class='note error'>The given reset ID is invalid.</p>
-  <p class='buttons'><input type='button' value='Close' onclick="parent.window.location='/';" /></p>
-<% else %>
-  <form action='/login/reset-password' method='post' id='reset_password_form'>
-  <input type='hidden' name='id' id='id' value='<%= @reset_id %>' />		
-  <table cellpadding='4' cellspacing='0' border='0'>
-  <tr><td>New Password:	</td><td><input type='password' name='pass1' id='pass1' style='width: 250px;' /></td></tr>
-  <tr><td>Confirm:		  </td><td><input type='password' name='pass2' id='pass2' style='width: 250px;' /></td></tr>
-  </table><br />
-  <div id='message'></div>
-  <p class='buttons'>
-  <input type='submit' value='Reset Password' onclick='reset_password(); return false;' />
-  <input type='button' value='Cancel' 			  onclick="window.location='/';" />
-  </p>
-  </form>
+<% content_for :css do %>
+  <%= stylesheet_link_tag 'caboose/login' %>
 <% end %>
 
-<%= content_for :caboose_js do %>
-<script type='text/javascript'>
-
-var modal = false;
-$(window).load(function() {
-  modal = new CabooseModal(400);
-});
-
-<% if !@user.nil? %>
-function reset_password()
+<% content_for :js do %>
+<script type="text/javascript">
+function caboose_user_reset() 
 {
+  $('#caboose-login-message').html("<p class='note loading'>Resetting your password...</p>");
   $.ajax({
     url: '/login/reset-password',
     type: 'post',
-    data: $('#reset_password_form').serialize(),
+    data: $('#caboose-reset-form').serialize(),
     success: function(resp) {
-      if (resp.error) modal.autosize("<p class='note error'>" + resp.error + "</p>");
-      if (resp.redirect) window.location = resp.redirect;    
-    }
+      if (resp.error) $('#caboose-login-message').html("<p class='note error'>" + resp.error + "</p>");
+      else if (resp.redirect)
+        window.location = resp.redirect;
+    }   
   });
 }
-<% end %>
-
 </script>
-<% end %>
-
+<% end %>

data/app/views/caboose/register/index.html.erb

@@ -1,49 +1,56 @@
+<div class="caboose-login-wrapper">
+  <div class="caboose-login-form-wrapper">
+    <h5>Create an Account</h5>
+    <form action="/register" method="POST" id="caboose-register-form">
+      <div class="field">
+        <label for="caboose-register-firstname">First Name</label>
+        <input type="text" name="first_name" id="caboose-register-firstname" />
+      </div>
+      <div class="field">
+        <label for="caboose-register-lastname">Last Name</label>
+        <input type="text" name="last_name" id="caboose-register-lastname" />
+      </div>
+      <div class="field">
+        <label for="caboose-register-email">Email Address</label>
+        <input type="email" name="email" id="caboose-register-email" />
+      </div>
+      <div class="field">
+        <label for="caboose-register-password1">Password</label>
+        <input type="password" name="pass1" id="caboose-register-password1" />
+      </div>
+      <div class="field">
+        <label for="caboose-register-password2">Confirm Password</label>
+        <input type="password" name="pass2" id="caboose-register-password2" />
+      </div>
+      <input type="hidden" name="return_url" value="<%= @return_url %>" />
+      <div class="caboose-links">
+        <a href="/login?return_url=<%= @return_url %>">Login to an existing account</a>
+        <a href="/login/forgot-password?return_url=<%= @return_url %>">Forgot your password?</a>
+      </div>
+      <input type="submit" class="btn" id="caboose-login-btn" value="Register" onclick="caboose_user_register();return false;" />
+    </form>
+    <div id="caboose-login-message"></div>
+  </div>
+</div>
 
-<h1>Register</h1>
-
-<form action='/register' method='post' id='register_form'>
-<p class='other_options'>
-<a href='/login?return_url=<%= @return_url %>'>Already a member?</a>
-</p>
-<input type='hidden'    name='return_url' value='<%= @return_url %>' />
-<input type='text'      name='first_name' id='first_name' placeholder='First name' />
-<input type='text'      name='last_name'  id='last_name'  placeholder='Last name' />
-<input type='text'      name='email'      id='email'      placeholder='Email address' />
-<input type='text'      name='phone'      id='phone'      placeholder='Phone number' />
-<input type='password'  name='pass1'      id='pass1'      placeholder='Password' />
-<input type='password'  name='pass2'      id='pass2'      placeholder='Confirm password' />
-<div id='message'></div>
-<p>
-  <input type='button' id='btn_cancel'   value='Cancel'   onclick="parent.$.fn.colorbox.close();" />
-	<input type='submit' id='btn_register' value='Register' onclick='register(); return false;' />
-</p>
-</form>
+<% content_for :css do %>
+  <%= stylesheet_link_tag 'caboose/login' %>
+<% end %>
 
-<% content_for :caboose_js do %>
-<script type='text/javascript'>
-var modal = new CabooseModal(400);
-function register()
+<% content_for :js do %>
+<script type="text/javascript">
+function caboose_user_register() 
 {
-  modal.autosize("<p class='loading'>Registering...</p>");
-	$.ajax({
-		url: '/register',
-		type: 'post',
-		data: $('#register_form').serialize(),
-		success: function(resp) {
-		  if (resp.error)
-		    modal.autosize("<p class='note error'>" + resp.error + "</p>");
-			else if (resp.redirect != false)
-			  <%= @modal ? "" : "parent." %>window.location = resp.redirect;			  
-			else
-			  parent.location.reload(true);
-		},
-		error: function() {	
-		  modal.autosize("<p class='note error'>Error</p>"); 
-		}
-	});
+  $('#caboose-login-message').html("<p class='note loading'>Registering...</p>");
+  $.ajax({
+    url: '/register',
+    type: 'post',
+    data: $('#caboose-register-form').serialize(),
+    success: function(resp) {
+      if (resp.error) $('#caboose-login-message').html("<p class='note error'>" + resp.error + "</p>");     
+      else if (resp.redirect != false) window.location = resp.redirect;
+    }   
+  });
 }
 </script>
-<% end %>
-<%= content_for :caboose_css do %>
-<%= stylesheet_link_tag "caboose/register", :media => "all" %>
-<% end %>
+<% end %>