Index: branches/1.1.x/platform/categories/suggest_pending_confirm.tpl
===================================================================
--- branches/1.1.x/platform/categories/suggest_pending_confirm.tpl	(revision 13997)
+++ branches/1.1.x/platform/categories/suggest_pending_confirm.tpl	(revision 13998)
@@ -1,52 +1,51 @@
 <!--##
 <NAME>Suggestion Pending</NAME>
 <DESC></DESC>
 <SECTION>Platform||Suggest Category</SECTION>
 ##-->
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_phrase name="lu_title_SuggestCategoryPendingConfirm" no_editing="1"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
 	<div class="movable-area">
 		<div class="movable-element">
 			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
 		</div>
 		<div class="movable-element">
 			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
 		</div>
 		<div class="movable-element">
 			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
 		</div>
 		<div class="movable-element">
 			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
 		</div>
 	</div>
 </inp2:m_DefineElement>
 <!--## //SIDE-BAR ELEMENT ##-->
 
 <inp2:m_DefineElement name="content">
 	<div class="movable-area">
 		<div class="movable-element">
 			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_SuggestCategoryPendingConfirm" templates="platform/categories/suggest_pending_confirm" show_category="1"/>
 		</div>
 		<div class="movable-element">
 			<!-- suggest category pending confirm -->
 			<inp2:m_RenderElement design="content_box">
 				<inp2:m_Capture to_var="header">
 					<inp2:m_phrase name="lu_title_SuggestCategoryPendingConfirm"/>
 				</inp2:m_Capture>
 
-				<inp2:m_phrase name="lu_text_SuggestCategoryPendingConfirm"/><br /><br />
-				<a href="<inp2:c_CategoryLink template="__default__" cat_id="current" />"><inp2:c_Field name="Name"/></a>
+				<inp2:m_phrase name="lu_text_SuggestCategoryPendingConfirm"/><br />
 			</inp2:m_RenderElement>
 			<!-- // suggest category pending confirm -->
 		</div>
 	</div>
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/1.1.x/platform/categories/suggest_category.tpl
===================================================================
--- branches/1.1.x/platform/categories/suggest_category.tpl	(revision 13997)
+++ branches/1.1.x/platform/categories/suggest_category.tpl	(revision 13998)
@@ -1,75 +1,75 @@
 <!--##
 <NAME>Suggest Category</NAME>
 <DESC></DESC>
 <SECTION>Platform</SECTION>
 ##-->
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_phrase name="lu_title_SuggestCategory" no_editing="1"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
 	<div class="movable-area">
 		<div class="movable-element">
 			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
 		</div>
 		<div class="movable-element">
 			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
 		</div>
 		<div class="movable-element">
 			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
 		</div>
 		<div class="movable-element">
 			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
 		</div>
 	</div>
 </inp2:m_DefineElement>
 <!--## //SIDE-BAR ELEMENT ##-->
 
 <inp2:m_DefineElement name="content">
 	<div class="movable-area">
 		<div class="movable-element">
 			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_SuggestCategory" templates="platform/categories/suggest_category" show_category="1"/>
 		</div>
 		<div class="movable-element">
 			<!-- suggest category -->
 			<inp2:m_RenderElement design="content_box">
 				<inp2:m_Capture to_var="header">
 					<inp2:m_phrase name="lu_title_SuggestCategory"/>
 				</inp2:m_Capture>
 
 				<inp2:m_if check="c_HasPermission" permissions="CATEGORY.ADD|CATEGORY.ADD.PENDING">
-					<inp2:c_PresetFormFields/>
+					<inp2:c.suggest_PresetFormFields/>
 					<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
 
-					<inp2:m_if check="c_HasError" field="any">
+					<inp2:m_if check="c.suggest_HasError" field="any">
 						<inp2:m_RenderElement name="error_message" />
 					</inp2:m_if>
 
 					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
 
 					<form method="post" action="<inp2:m_FormAction/>">
 						<table class="form-data fullwidth">
-							<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="Name" title="lu_fld_Name"/>
-							<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="Description" cols="30" rows="5" title="lu_fld_Description" is_last="1"/>
+							<inp2:m_RenderElement name="inp_edit_box" prefix="c.suggest" field="Name" title="lu_fld_Name"/>
+							<inp2:m_RenderElement name="inp_edit_textarea" prefix="c.suggest" field="Description" cols="30" rows="5" title="lu_fld_Description" is_last="1"/>
 
 							<inp2:m_RenderElement design="inp_edit_buttons">
 								<input type="hidden" name="suggest_confirm_template" value="platform/categories/suggest_confirm"/>
 								<input type="hidden" name="suggest_pending_confirm_template" value="platform/categories/suggest_pending_confirm"/>
-								<input class="button" type="submit" name="events[c][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Create" no_editing="1"/>"/>
+								<input class="button" type="submit" name="events[c.suggest][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Create" no_editing="1"/>"/>
 							</inp2:m_RenderElement>
 						</table>
 					</form>
 				<inp2:m_else/>
 					<inp2:m_phrase name="lu_text_NoSuggestCategoryPermission"/>
 				</inp2:m_if>
 			</inp2:m_RenderElement>
 			<!-- // suggest category -->
 		</div>
 	</div>
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/1.1.x/platform/categories/suggest_confirm.tpl
===================================================================
--- branches/1.1.x/platform/categories/suggest_confirm.tpl	(revision 13997)
+++ branches/1.1.x/platform/categories/suggest_confirm.tpl	(revision 13998)
@@ -1,52 +1,51 @@
 <!--##
 <NAME>Confirmation</NAME>
 <DESC></DESC>
 <SECTION>Platform||Suggest Category</SECTION>
 ##-->
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_phrase name="lu_title_SuggestCategoryConfirm" no_editing="1"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
 	<div class="movable-area">
 		<div class="movable-element">
 			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
 		</div>
 		<div class="movable-element">
 			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
 		</div>
 		<div class="movable-element">
 			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
 		</div>
 		<div class="movable-element">
 			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
 		</div>
 	</div>
 </inp2:m_DefineElement>
 <!--## //SIDE-BAR ELEMENT ##-->
 
 <inp2:m_DefineElement name="content">
 	<div class="movable-area">
 		<div class="movable-element">
 			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_SuggestCategoryConfirm" templates="platform/categories/suggest_confirm" show_category="1"/>
 		</div>
 		<div class="movable-element">
 			<!-- suggest category confirm -->
 			<inp2:m_RenderElement design="content_box">
 				<inp2:m_Capture to_var="header">
 					<inp2:m_phrase name="lu_title_SuggestCategoryConfirm"/>
 				</inp2:m_Capture>
 
-				<inp2:m_phrase name="lu_text_SuggestCategoryConfirm"/><br /><br />
-				<a href="<inp2:c_CategoryLink template="__default__" cat_id="current" />"><inp2:c_Field name="Name"/></a>
+				<inp2:m_phrase name="lu_text_SuggestCategoryConfirm"/><br />
 			</inp2:m_RenderElement>
 			<!-- // suggest category confirm -->
 		</div>
 	</div>
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file