Index: trunk/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r8364 -r8397
--- trunk/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 8364)
+++ trunk/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 8397)
@@ -1,6 +1,5 @@
-<inp2:m_DefineElement name="combined_header" module="">
-	<inp2:adm_SectionInfo section="$section" info="perm_section" result_to_var="perm_section"/>
-	<inp2:m_RequireLogin permissions="{$perm_section}.view" system="1"/>
+<inp2:m_DefineElement name="combined_header" permission_type="view"  module="">
+	<inp2:m_RequireLogin permissions="{$section}.{$permission_type}" system="1"/>
 	<inp2:m_if check="m_Param" name="prefix" inverse="1"><inp2:adm_SectionInfo section="$section" info="SectionPrefix" result_to_var="prefix"/></inp2:m_if>
 	<inp2:m_if check="m_get" var="m_wid" inverse="1">
 		<table cellpadding="0" cellspacing="0" border="0" width="100%">
@@ -19,7 +18,7 @@
 	<table cellpadding="0" cellspacing="0" width="100%">
 		<tr>
 			<td class="tablenav">
-				<table border="0" cellpadding="2" cellspacing="0" class="tableborder_full" width="100%" height="30">
+				<table border="0" cellpadding="2" cellspacing="0" class="bordered-no-bottom" width="100%" height="30">
 					<tr>
 						<td class="header_left_bg" nowrap valign="middle">
 							<inp2:adm_SectionInfo section="$section" info="label" result_to_var="default_title"/>
@@ -47,7 +46,7 @@
 			</td>
 		</tr>
 	</table>
-	
+
 </inp2:m_DefineElement>
 
 <inp2:m_block name="section_header"/>
@@ -75,7 +74,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_block name="blue_bar" module="" icon="" pagination="0"/>
-	<table border="0" cellpadding="2" cellspacing="0" class="tableborder_full" width="100%" height="30">
+	<table border="0" cellpadding="2" cellspacing="0" class="bordered-no-bottom" 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" pass_params="true"/></span>
@@ -125,7 +124,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_label" is_last="" as_label="" currency="" is_last=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<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 valign="top"><span class="text"><inp2:$prefix_Field field="$field" as_label="$as_label" currency="$currency"/></span></td>
     	<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
@@ -143,7 +142,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_box" subfield="" class="" is_last="" maxlength="" onblur="" size="" onkeyup=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$title" is_last="$is_last"/>
 		<td>
 			<input type="text" name="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>" id="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>" value="<inp2:$prefix_Field field="$field" subfield="$subfield"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>" onkeyup="<inp2:m_Param name="onkeyup"/>">
@@ -157,7 +156,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_DefineElement name="inp_edit_password" class="" size="">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<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"/>" />
@@ -171,7 +170,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_block name="inp_edit_upload" class="" size="" is_last=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<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="file" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>">
@@ -188,7 +187,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_box_ml" class="" size="" maxlength=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td class="text" valign="top">
 			<span class="<inp2:m_if prefix="$prefix" function="HasError" field="$field"/>error<inp2:m_endif/>">
 			<inp2:m_phrase label="$title"/><inp2:m_if prefix="$prefix" function="IsRequired" field="$field"/><span class="error"> *</span></inp2:m_if>:</span><br>
@@ -209,7 +208,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_date" class="" is_last=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<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/>core/admin_templates/img/calendar_icon.gif">&nbsp;<span class="small">(<inp2:$prefix_Format field="{$field}_date" input_format="1" human="true"/>)</span>
@@ -231,7 +230,7 @@
 		<td class="control-cell">
 			<input type="text" name="<inp2:$prefix_InputName field="{$field}_time"/>" id="<inp2:$prefix_InputName field="{$field}_time"/>" value="<inp2:$prefix_Field field="{$field}_time" format="_regional_InputTimeFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_time" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>">&nbsp;
 			<span class="small">(<inp2:$prefix_Format field="{$field}_time" input_format="1" human="true"/>)</span>
-			
+
 			<input type="hidden" name="<inp2:$prefix_InputName field="{$field}_date"/>" id="<inp2:$prefix_InputName field="{$field}_date" input_format="1"/>" value="">
 		</td>
 		<td class="error"><inp2:$prefix_Error field="{$field}_time"/>&nbsp;</td>
@@ -242,7 +241,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_block name="inp_edit_date_time" class="" is_last=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<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"/>"> -->
@@ -261,7 +260,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_textarea" class="" allow_html="allow_html"/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td class="text" valign="top">
 			<span class="<inp2:m_if prefix="$prefix" function="HasError" field="$field"/>error<inp2:m_endif/>">
 			<inp2:m_phrase label="$title"/><inp2:m_if prefix="$prefix" function="IsRequired" field="$field"/><span class="error"> *</span><inp2:m_endif/>:</span><br>
@@ -280,7 +279,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_textarea_ml" class=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td class="text" valign="top">
 			<span class="<inp2:m_if prefix="$prefix" function="HasError" field="$field"/>error<inp2:m_endif/>">
 			<inp2:m_phrase label="$title"/><inp2:m_if prefix="$prefix" function="IsRequired" field="$field"/><span class="error"> *</span><inp2:m_endif/>:</span><br>
@@ -298,7 +297,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_user" class="" size="" is_last="" old_style="0" onkeyup=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<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"/>" id="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>" onkeyup="<inp2:m_Param name="onkeyup"/>">
@@ -327,7 +326,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_options" is_last="" has_empty="0" empty_value=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<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>
 			<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" onchange="<inp2:m_Param name="onchange"/>">
@@ -345,6 +344,26 @@
 	</tr>
 <inp2:m_blockend/>
 
+<inp2:m_block name="inp_edit_multioptions" is_last="" has_empty="0" empty_value=""/>
+	<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>
+			<select multiple tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:$prefix_InputName field="$field"/>_select" onchange="update_multiple_options('<inp2:$prefix_InputName field="$field"/>');">
+				<inp2:m_if prefix="m" function="ParamEquals" name="use_phrases" value="1"/>
+					<inp2:$prefix_PredefinedOptions field="$field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
+				<inp2:m_else/>
+					<inp2:$prefix_PredefinedOptions field="$field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
+				<inp2:m_endif/>
+			</select>
+			<input type="hidden" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field"/>"/>
+		</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_blockend/>
+
 <inp2:m_block name="inp_radio_item" onclick="" onchange=""/>
 	<input type="radio" <inp2:m_param name="checked"/> name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>" onclick="<inp2:m_param name="onclick"/>" onchange="<inp2:m_param name="onchange"/>"><label for="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_param name="option"/></label>&nbsp;
 <inp2:m_blockend/>
@@ -354,7 +373,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_radio" is_last="" pass_tabindex="" onclick="" onchange="" use_phrases="1"/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<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>
 			<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1">
@@ -371,7 +390,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_checkbox" is_last="" field_class="" onchange="" onclick=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<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" NamePrefix="_cb_"/>
 		<td>
 			<input type="hidden" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" db="db"/>">
@@ -396,7 +415,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_checkboxes" is_last=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<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>
 			<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1">
@@ -414,7 +433,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_checkbox_allow_html"/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td colspan="2">
 			<label for="_cb_<inp2:m_param name="field"/>"><inp2:m_phrase label="la_enable_html"/></label>
 			<input type="hidden" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field"/>">
@@ -428,7 +447,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_weight" subfield="" class="" is_last="" maxlength=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$title" is_last="$is_last"/>
 		<td>
 			<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="1">
@@ -451,8 +470,8 @@
 
 
 <inp2:m_DefineElement name="ajax_progress_bar">
-	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-		<tr class="table_color1">
+	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
+		<tr class="table-color1">
 			<td colspan="2">
 				<img src="img/spacer.gif" height="10" width="1" alt="" /><br />
 				<!-- progress bar paddings: begin -->
@@ -490,26 +509,42 @@
 				<img src="img/spacer.gif" height="10" width="1" alt="" /><br />
 			</td>
 		</tr>
-		<tr class="table_color2">
+		<tr class="table-color2">
 			<td width="50%" align="right"><inp2:m_phrase name="la_fld_PercentsCompleted"/>:</td>
 			<td id="progress_display[percents_completed]">0%</td>
 		</tr>
-		<tr class="table_color1">
+		<tr class="table-color1">
 			<td align="right"><inp2:m_phrase name="la_fld_ElapsedTime"/>:</td>
 			<td id="progress_display[elapsed_time]">00:00</td>
 		</tr>
-		<tr class="table_color2">
+		<tr class="table-color2">
 			<td align="right"><inp2:m_phrase name="la_fld_EstimatedTime"/>:</td>
 			<td id="progress_display[Estimated_time]">00:00</td>
 		</tr>
-		<tr class="table_color1">
+		<tr class="table-color1">
 			<td align="center" colspan="2">
 				<input type="button" class="button" onclick="<inp2:m_param name="cancel_action"/>" value="<inp2:m_phrase name="la_Cancel"/>" />
 			</td>
 		</tr>
 	</table>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="edit_navigation" toolbar="a_toolbar">
+	<inp2:m_if check="{$prefix}_IsTopmostPrefix">
+		<inp2:m_if check="{$prefix}_IsSingle">
+			<inp2:m_param name="toolbar"/>.HideButton('prev');
+			<inp2:m_param name="toolbar"/>.HideButton('next');
+		<inp2:m_else/>
+			<inp2:m_if check="{$prefix}_IsLast">
+				<inp2:m_param name="toolbar"/>.DisableButton('next');
+			</inp2:m_if>
+			<inp2:m_if check="{$prefix}_IsFirst">
+				<inp2:m_param name="toolbar"/>.DisableButton('prev');
+			</inp2:m_if>
+		</inp2:m_if>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+				
 <inp2:m_DefineElement name="ml_selector" prefix="">
 
 </inp2:m_DefineElement>