Index: branches/1.0.x/elements/content_boxes.elm.tpl
===================================================================
diff -u -N -r14788 -r14794
--- branches/1.0.x/elements/content_boxes.elm.tpl	(.../content_boxes.elm.tpl)	(revision 14788)
+++ branches/1.0.x/elements/content_boxes.elm.tpl	(.../content_boxes.elm.tpl)	(revision 14794)
@@ -92,7 +92,7 @@
 			<p>
 				Was this review helpful to you?&nbsp;&nbsp;<a href="<inp2:HelpfulLink helpful='1'/>" class="yes">Yes</a>&nbsp;&nbsp;<em class="yes-count">(<inp2:Field name="HelpfulCount"/>)</em>&nbsp;&nbsp;<a href="<inp2:HelpfulLink helpful='0'/>" class="no">No</a>&nbsp;&nbsp;<em class="no-count">(<inp2:Field name="NotHelpfulCount"/>)</em>
 			</p>
-			<p><a href="<inp2:ItemLink template='my_account/spam_report' width='720' height='350'/>" class="thickbox">Is this Review Inappropriate?</a></p>
+			<p><a href="<inp2:ItemLink template='elements/ajax/spam_report' width='720' height='350'/>" class="thickbox">Is this Review Inappropriate?</a></p>
 
 			<inp2:m_if check="Field" name="Rating" db="db">
 				<p class="rat">
Index: branches/1.0.x/products/details.tpl
===================================================================
diff -u -N -r14793 -r14794
--- branches/1.0.x/products/details.tpl	(.../details.tpl)	(revision 14793)
+++ branches/1.0.x/products/details.tpl	(.../details.tpl)	(revision 14794)
@@ -176,7 +176,7 @@
 						<p class="title">Reviews for <inp2:p_Field name="Name" html_escape="1" cut_first="60"/> (<inp2:rev_TotalRecords/>):</p>
 
 						<!--<p class="but-review"><a href="" onclick="TINY.box.show({iframe:'addreview-success.html',width:600,height:340}); return false;" class="addreview">Add a Review</a></p>-->
-						<p class="but-review"><a href="<inp2:p_ProductLink template='products/add_review' width='600' height='340'/>" class="thickbox addreview">Add a Review</a></p>
+						<p class="but-review"><a href="<inp2:p_ProductLink template='elements/ajax/add_review' width='600' height='340'/>" class="thickbox addreview">Add a Review</a></p>
 
 						<div class="sortby">
 							Sort by:
Index: branches/1.0.x/my_account/spam_report.tpl
===================================================================
diff -u -N
--- branches/1.0.x/my_account/spam_report.tpl	(revision 14788)
+++ branches/1.0.x/my_account/spam_report.tpl	(revision 0)
@@ -1,58 +0,0 @@
-<!--##
-<NAME>Spam Report Form</NAME>
-<SECTION>My Account</SECTION>
-##-->
-<inp2:m_NoDebug/>
-
-<inp2:spam-report_PresetFormFields/>
-
-<inp2:m_Include template="elements/forms.elm" strip_nl="2"/>
-
-<script type="text/javascript">
-	FormManager.resetFields('spam-report');
-</script>
-
-<div class="profile registerpage">
-	<div class="profile-title">
-		<h1>Report Review</h1>
-		<p class="req">Required fields are marked by <span class="star">*</span></p>
-		<div class="clear"></div>
-	</div>
-
-	<form method="post" id="spam_report_form" action="<inp2:m_FormAction/>" class="form profile-form">
-		<inp2:m_if check="m_Get" name="rev_id">
-			<input type="hidden" name="item_prefix" value="rev"/>
-			<input type="hidden" name="rev_id" value="<inp2:m_Get name='rev_id'/>"/>
-		</inp2:m_if>
-
-		<inp2:m_RenderElement name="inp_edit_textarea" prefix="spam-report" field="MessageText" title="lu_fld_MessageText" style="width: 100%; height: 170px;" is_last="1"/>
-
-		<inp2:m_RenderElement design="inp_edit_buttons" no_editing="1">
-			<input type="submit" value="Submit" id="submit" class="green-button" disabled/>
-		</inp2:m_RenderElement>
-	</form>
-</div>
-
-<script type="text/javascript">
-	$(document).ready(
-		function() {
-			FormManager.registerForm(
-				{
-					prefix: 'spam-report',
-					save_event: 'OnNewReport',
-					id: <inp2:spam-report_Field name='ReportId'/>,
-					form_id: 'spam_report_form'/*,
-					next_template: 'my_account/spam-report-confirm'*/
-				}
-			);
-
-			$('#spam_report_form').submit(
-				function ($e) {
-					FormManager.submitForm('spam-report');
-
-					return false;
-				}
-			);
-		}
-	);
-</script>
\ No newline at end of file
Index: branches/1.0.x/login/register.tpl
===================================================================
diff -u -N
--- branches/1.0.x/login/register.tpl	(revision 14766)
+++ branches/1.0.x/login/register.tpl	(revision 0)
@@ -1,81 +0,0 @@
-<!--<link rel="stylesheet" type="text/css" href="<inp2:m_Compress files='inc/profile.css'/>" charset="<inp2:lang.current_Field name='Charset'/>"/>-->
-
-<script type="text/javascript">
-	FormManager.resetFields('u.register');
-</script>
-
-<inp2:m_Include template="elements/forms.elm" strip_nl="2"/>
-<inp2:u.register_FormName name="registration"/>
-
-<div class="profile registerpage">
-	<div class="profile-title">
-		<h1>Registration</h1>
-		<p class="req">Required fields are marked by <span class="star">*</span></p>
-		<div class="clear"></div>
-	</div>
-
-	<form method="post" action="<inp2:m_FormAction/>" id="register_form" class="form profile-form">
-		<div class="halfcol">
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="FirstName"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="LastName"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Company"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Email"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="u.register" field="SubscribeToMailing"/>
-			<inp2:m_RenderElement name="inp_edit_password" prefix="u.register" field="Password"/>
-		</div>
-
-		<div class="halfcol halfcol-last">
-			<inp2:m_RenderElement name="inp_edit_address" prefix="u.register" field="Street" field2="Street2" title="lu_fld_Address"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="u.register" field="Country" has_empty="1" empty_label="lu_opt_SelectCountry"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="u.register" field="State" has_empty="1"/>
-
-			<!-- TODO: preload states by country -->
-
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Zip" row_class="alt2"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Phone"/>
-		</div>
-		<div class="clear"></div>
-
-		<div class="terms">
-			<label><input type="checkbox" id="terms" name="terms" value="yes" checked="true" />&nbsp;I Agree to Terms and Conditions</label>
-		</div>
-
-		<inp2:m_RenderElement design="inp_edit_buttons">
-			<input type="submit" value="Register" class="green-button" disabled/>&nbsp;&nbsp;&nbsp;
-			<input type="reset" value="Cancel" class="grey-button" />
-		</inp2:m_RenderElement>
-
-		<input type="hidden" name="forms[u.register]" value="<inp2:u.register_FormName/>"/>
-	</form>
-</div>
-
-<script type="text/javascript">
-	$(document).ready(
-		function () {
-			FormManager.registerForm(
-				{
-					prefix: 'u.register',
-					save_event: 'OnRegisterAjax',
-					id: '<inp2:u.register_Field name="PortalUserId"/>',
-					form_id: 'register_form'
-				}
-			);
-
-			$('#register_form').submit(
-				function ($e) {
-					FormManager.submitForm('u.register');
-
-					return false;
-				}
-			);
-
-			$('input[type=reset]', '#register_form').click(
-				function ($e) {
-					FormManager.closeForm('u.register');
-
-					return false;
-				}
-			);
-		}
-	);
-</script>
Index: branches/1.0.x/elements/login.elm.tpl
===================================================================
diff -u -N -r14770 -r14794
--- branches/1.0.x/elements/login.elm.tpl	(.../login.elm.tpl)	(revision 14770)
+++ branches/1.0.x/elements/login.elm.tpl	(.../login.elm.tpl)	(revision 14794)
@@ -21,7 +21,7 @@
 	</div>
 <inp2:m_else/>
 	<div class="txt">
-		Welcome! Please <a href="<inp2:m_Link template='login/register' width='850' height='630'/>" class="thickbox">Register</a> for an account or
+		Welcome! Please <a href="<inp2:m_Link template='elements/ajax/register' width='850' height='630'/>" class="thickbox">Register</a> for an account or
 		<div class="login">
 			<a href="" id="login">Log In</a>
 		</div>
Index: branches/1.0.x/products/add_review.tpl
===================================================================
diff -u -N
--- branches/1.0.x/products/add_review.tpl	(revision 14770)
+++ branches/1.0.x/products/add_review.tpl	(revision 0)
@@ -1,64 +0,0 @@
-<script type="text/javascript">
-	FormManager.resetFields('rev');
-</script>
-
-<inp2:rev_PresetFormFields/>
-
-<inp2:m_Include template="elements/forms.elm" strip_nl="2"/>
-
-<div class="review">
-	<div class="profile-title">
-		<h1>Add a Review</h1>
-		<div class="clear"></div>
-	</div>
-
-	<!--<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="FirstName"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="LastName"/>-->
-
-	<form method="post" action="<inp2:m_FormAction/>" id="add_review_form" class="form profile-form left">
-		<p><label for="name">Your Name</label><input type="text" id="name" name="name" value="Anonymous" class="field" /></p>
-
-		<!--<p><label>Rating</label><span><img src="i/star-small.jpg" width="18" height="18" alt="" /><img src="i/star-small.jpg" width="18" height="18" alt="" /><img src="i/star-small.jpg" width="18" height="18" alt="" /><img src="i/star-small.jpg" width="18" height="18" alt="" /><img src="i/star-small.jpg" width="18" height="18" alt="" /></span></p>
-		<p><label for="review">Your Review</label><textarea id="review" rows="10" cols="100" class="field"></textarea></p>-->
-
-		<inp2:m_RenderElement name="inp_edit_rating" prefix="rev" field="Rating"/>
-		<inp2:m_RenderElement name="inp_edit_textarea" prefix="rev" field="ReviewText" title="lu_fld_YourReview" rows="10" cols="100" style="height: 70px;"/>
-
-		<inp2:m_RenderElement design="inp_edit_buttons">
-			<input type="submit" value="Submit" id="submit" class="green-button" disabled/>
-			<em class="optinfo">(maximum of 1,000 words)</em>
-		</inp2:m_RenderElement>
-	</form>
-</div>
-
-<script type="text/javascript">
-	$(document).ready(
-		function () {
-			FormManager.registerForm(
-				{
-					prefix: 'rev',
-					url: '<inp2:p_ProductLink template="#TEMPLATE#" js_escape="1" __NO_REWRITE__="1" no_amp="1"/>',
-					save_event: 'OnCreate',
-					id: '<inp2:rev_Field name="ReviewId"/>',
-					form_id: 'add_review_form'
-				}
-			);
-
-			$('#add_review_form').submit(
-				function ($e) {
-					FormManager.submitForm('rev');
-
-					return false;
-				}
-			);
-
-			/*$('input[type=reset]', '#add_review_form').click(
-				function ($e) {
-					FormManager.closeForm('rev');
-
-					return false;
-				}
-			);*/
-		}
-	);
-</script>