Index: trunk/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -r6830 -r7391
--- trunk/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 6830)
+++ trunk/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 7391)
@@ -14,19 +14,19 @@
 
 <inp2:m_DefineElement name="section_header_new" module="#session#">
 		<table cellpadding="0" cellspacing="0" border="0" width="100%">
-			<tr style="background: url(<inp2:ModulePath module="$module"/>img/logo_bg.gif) no-repeat top right;">
-				<td valign="top" class="admintitle" align="left" style="padding-top: 2px; padding-bottom: 2px;">
+			<tr style="background: url(<inp2:ModulePath module="$module"/>img/logo_bg.gif) no-repeat top right; height: 65px;">
+				<td valign="top" class="admintitle" align="left" style="padding-top: 15px; padding-bottom: 15px;">
 		    		<img width="46" height="46" src="<inp2:ModulePath module="$module"/>img/icons/<inp2:adm_GetSectionIcon icon="$icon"/>.gif" align="absmiddle" title="<inp2:adm_GetSectionTitle phrase="$title"/>">&nbsp;<inp2:adm_GetSectionTitle phrase="$title"/>
 		   		</td>
 			</tr>
 		</table>
 </inp2:m_DefineElement>
 
-<inp2:m_block name="blue_bar" module="" icon=""/>
+<inp2:m_block name="blue_bar" module="" icon="" pagination="0"/>
 	<table border="0" cellpadding="2" cellspacing="0" class="tableborder_full" width="100%" height="30">
 		<tr>
 			<td class="header_left_bg" nowrap width="80%" valign="middle">
-				<span class="tablenav_link" id="blue_bar"><inp2:$prefix_SectionTitle title_preset="$title_preset" title="Invalid OR Missing title preset [#preset_name#]" cut_first="100"/></span>
+				<span class="tablenav_link" id="blue_bar"><inp2:$prefix_SectionTitle title_preset="$title_preset" title="Invalid OR Missing title preset [#preset_name#]" cut_first="100" pass_params="true"/></span>
 			</td>
 			<td align="right" class="tablenav" width="20%" valign="middle">
 				<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
@@ -39,6 +39,9 @@
 						<img src="img/blue_bar_help.gif" border="0">
 					</a>
 				</inp2:m_if>
+				<inp2:m_if check="m_Param" name="pagination">
+					<inp2:m_RenderElement name="grid_pagination_elem" grid="st" PrefixSpecial="$prefix" pass_params="1"/>
+				</inp2:m_if>
 			</td>
 		</tr>
 	</table>
@@ -100,6 +103,20 @@
 	</tr>
 <inp2:m_blockend/>
 
+<inp2:m_DefineElement name="inp_edit_password" class="" size="">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td>
+			<input type="password" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" value="" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>" />
+			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
+		</td>
+		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
+		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+		</inp2:m_if>
+	</tr>
+</inp2:m_DefineElement>
+
 <inp2:m_block name="inp_edit_upload" class="" is_last=""/>
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
@@ -139,14 +156,10 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_date" class="" is_last=""/>
-	<inp2:m_if check="m_GetEquals" name="calendar_included" value="1" inverse="inverse">
-		<script type="text/javascript" src="incs/calendar.js"></script>
-		<inp2:m_set calendar_included="1"/>
-	</inp2:m_if>
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td>
-			<input type="text" name="<inp2:$prefix_InputName field="{$field}_date"/>" id="<inp2:$prefix_InputName field="{$field}_date"/>" value="<inp2:$prefix_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">&nbsp;<span class="small">(<inp2:$prefix_Format field="{$field}_date" input_format="1" human="true"/>)</span>
+			<input type="text" name="<inp2:$prefix_InputName field="{$field}_date"/>" id="<inp2:$prefix_InputName field="{$field}_date"/>" value="<inp2:$prefix_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">&nbsp;<span class="small">(<inp2:$prefix_Format field="{$field}_date" input_format="1" human="true"/>)</span>
 			<script type="text/javascript">
 				initCalendar("<inp2:$prefix_InputName field="{$field}_date"/>", "<inp2:$prefix_Format field="{$field}_date" input_format="1"/>");
 			</script>
@@ -161,15 +174,11 @@
 
 
 <inp2:m_block name="inp_edit_date_time" class="" is_last=""/>
-	<inp2:m_if check="m_GetEquals" name="calendar_included" value="1" inverse="inverse">
-		<script type="text/javascript" src="incs/calendar.js"></script>
-		<inp2:m_set calendar_included="1"/>
-	</inp2:m_if>
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td>
 			<!-- <input type="hidden" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" db="db"/>"> -->
-			<input type="text" name="<inp2:$prefix_InputName field="{$field}_date"/>" id="<inp2:$prefix_InputName field="{$field}_date"/>" value="<inp2:$prefix_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
+			<input type="text" name="<inp2:$prefix_InputName field="{$field}_date"/>" id="<inp2:$prefix_InputName field="{$field}_date"/>" value="<inp2:$prefix_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">
 				<span class="small">(<inp2:$prefix_Format field="{$field}_date" input_format="1" human="true"/>)</span>
 			<script type="text/javascript">
 				initCalendar("<inp2:$prefix_InputName field="{$field}_date"/>", "<inp2:$prefix_Format field="{$field}_date" input_format="1"/>");
@@ -431,4 +440,8 @@
 			</td>
 		</tr>
 	</table>
-</inp2:m_DefineElement>
\ No newline at end of file
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="ml_selector" prefix="">
+
+</inp2:m_DefineElement>