Index: branches/unlabeled/unlabeled-1.9.2/core/admin_templates/stylesheets/block_style_edit.tpl
===================================================================
diff -u -r8079 -r8254
--- branches/unlabeled/unlabeled-1.9.2/core/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 8079)
+++ branches/unlabeled/unlabeled-1.9.2/core/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 8254)
@@ -85,7 +85,7 @@
 		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="selectors" field="Description" title="!la_fld_Description!" rows="10" cols="40"/>
 		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="selectors" field="AdvancedCSS" title="!la_fld_AdvancedCSS!" rows="10" cols="40"/>
 
-		<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_inc param="tab_index" by="1"/>
 			<td class="text" valign="top">
 				<inp2:m_phrase name="la_fld_SelectorData"/>:<br>
Index: branches/unlabeled/unlabeled-1.3.2/kernel/admin_templates/incs/image_blocks.tpl
===================================================================
diff -u -r5440 -r8254
--- branches/unlabeled/unlabeled-1.3.2/kernel/admin_templates/incs/image_blocks.tpl	(.../image_blocks.tpl)	(revision 5440)
+++ branches/unlabeled/unlabeled-1.3.2/kernel/admin_templates/incs/image_blocks.tpl	(.../image_blocks.tpl)	(revision 8254)
@@ -3,7 +3,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="thumbnail_section" prefix="">
-	<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">
 			<inp2:m_phrase label="la_fld_Location"/><br>
 			<span class="error"><inp2:$prefix_Error field="ThumbPath"/><inp2:$prefix_Error field="ThumbUrl"/></span>&nbsp;
@@ -46,7 +46,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="fullsize_section" prefix="">
-	<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">
 			<inp2:m_phrase label="la_fld_Location"/><br>
 			<span class="error"><inp2:$prefix_Error field="LocalPath"/><inp2:$prefix_Error field="Url"/></span>&nbsp;
Index: branches/unlabeled/unlabeled-1.1.2/core/install/step_templates/root_password.tpl
===================================================================
diff -u -r6734 -r8254
--- branches/unlabeled/unlabeled-1.1.2/core/install/step_templates/root_password.tpl	(.../root_password.tpl)	(revision 6734)
+++ branches/unlabeled/unlabeled-1.1.2/core/install/step_templates/root_password.tpl	(.../root_password.tpl)	(revision 8254)
@@ -1,12 +1,12 @@
-<tr class="table_color2">  
+<tr class="table-color2">  
 	<td class="text">
 		<b>Root Password<span class="error">*</span>:</b>
 	</td>
 	<td>
 		<input type="password" name="root_password" class="text">
 	</td>
 </tr>
-<tr class="table_color2">  
+<tr class="table-color2">  
 	<td class="text">
 		<b>Confirm Root Password<span class="error">*</span>:</b>
 	</td>
Index: branches/unlabeled/unlabeled-1.11.2/core/admin_templates/incs/custom_blocks.tpl
===================================================================
diff -u -r8107 -r8254
--- branches/unlabeled/unlabeled-1.11.2/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 8107)
+++ branches/unlabeled/unlabeled-1.11.2/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 8254)
@@ -79,7 +79,7 @@
 			</inp2:m_if>
 		</tr>
 	</inp2:m_if>
-	<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="grid_data_label_ml_td" grid="$grid" SourcePrefix="$SourcePrefix" virtual_field="$virtual_field" value_field="$value_field" ElementTypeField="ElementType" field="Prompt" PrefixSpecial="$PrefixSpecial"/>
 		<td valign="top" class="text">
 			<inp2:ConfigFormElement field="Value" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList" />
Index: branches/unlabeled/unlabeled-1.2.2/core/install/step_templates/install_setup.tpl
===================================================================
diff -u -r7698 -r8254
--- branches/unlabeled/unlabeled-1.2.2/core/install/step_templates/install_setup.tpl	(.../install_setup.tpl)	(revision 7698)
+++ branches/unlabeled/unlabeled-1.2.2/core/install/step_templates/install_setup.tpl	(.../install_setup.tpl)	(revision 8254)
@@ -1,17 +1,17 @@
-<tr class="table_color2">
+<tr class="table-color2">
 	<td colspan="2">
 		In order to use the installation tool, please provide your Intechnic account information:
 	</td>
 </tr>
-<tr class="table_color2"> 
+<tr class="table-color2"> 
 	<td class="text">
 		<b>Username<span class="error">*</span>:</b>
 	</td>
 	<td width="80%">
 		<input type="text" name="login" value="" class="text" />
 	</td>
 </tr>
-<tr class="table_color2"> 
+<tr class="table-color2"> 
 	<td class="text">
 		<b>Password<span class="error">*</span>:</b>
 	</td>
@@ -46,11 +46,11 @@
 		unset($options['upgrade']);
 	}
 				
-	$td_class = 'table_color1';			
+	$td_class = 'table-color1';			
 	foreach ($options as $option_key => $option_title) {
 		$checked = $this->GetVar('next_preset') == $option_key ? ' checked' : '';
 		echo sprintf($option_tpl, $option_key, $checked, $option_title, $td_class);
-		$td_class = ($td_class == 'table_color1') ? 'table_color2' : 'table_color1';
+		$td_class = ($td_class == 'table-color1') ? 'table-color2' : 'table-color1';
 	}
 	
 ?>
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.11.2/core/admin_templates/groups/groups_edit_permissions.tpl
===================================================================
diff -u -r7638 -r8254
--- branches/unlabeled/unlabeled-1.11.2/core/admin_templates/groups/groups_edit_permissions.tpl	(.../groups_edit_permissions.tpl)	(revision 7638)
+++ branches/unlabeled/unlabeled-1.11.2/core/admin_templates/groups/groups_edit_permissions.tpl	(.../groups_edit_permissions.tpl)	(revision 8254)
@@ -73,7 +73,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="tree_element">
-	<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>
 	 		<img src="img/spacer.gif" height="1" width="<inp2:g-perm_LevelIndicator level="$deep_level" multiply="20"/>" alt="" border="0"/>
 
@@ -112,7 +112,7 @@
 <inp2:g-perm_LoadPermissions/>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table_color1"/>
+	<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table-color1"/>
 
 	<tr class="subsectiontitle">
 		<td><inp2:m_phrase label="la_col_PermissionName"/></td>
Index: branches/unlabeled/unlabeled-1.2.2/core/kernel/utility/formatters/unit_formatter.php
===================================================================
diff -u -r7698 -r8254
--- branches/unlabeled/unlabeled-1.2.2/core/kernel/utility/formatters/unit_formatter.php	(.../unit_formatter.php)	(revision 7698)
+++ branches/unlabeled/unlabeled-1.2.2/core/kernel/utility/formatters/unit_formatter.php	(.../unit_formatter.php)	(revision 8254)
@@ -29,6 +29,7 @@
 	{
 		if( !isset($options['master_field']) )
 		{
+			if ($value == -1) return; // for infinity setting, otherwise infinity is incorrectly converted back to Kg
 			$regional =& $this->Application->recallObject('lang.current');
 			switch( $regional->GetDBField('UnitSystem') )
 			{
Index: branches/unlabeled/unlabeled-1.34.2/core/kernel/globals.php
===================================================================
diff -u -r8214 -r8254
--- branches/unlabeled/unlabeled-1.34.2/core/kernel/globals.php	(.../globals.php)	(revision 8214)
+++ branches/unlabeled/unlabeled-1.34.2/core/kernel/globals.php	(.../globals.php)	(revision 8254)
@@ -335,6 +335,9 @@
 				curl_setopt($ch, CURLOPT_POST, 1);
 				curl_setopt($ch, CURLOPT_POSTFIELDS, $post);
 			}
+			elseif ($request_type == 'GET' && isset($post) && strlen($post) > 0) {
+				curl_setopt($ch, CURLOPT_URL, preg_match('/\?/', $url) ? $url.'&'.$post : $url.'?'.$post);
+			}
 
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 
Index: branches/unlabeled/unlabeled-1.5.2/kernel/admin_templates/catalog_tab.tpl
===================================================================
diff -u -r6789 -r8254
--- branches/unlabeled/unlabeled-1.5.2/kernel/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 6789)
+++ branches/unlabeled/unlabeled-1.5.2/kernel/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 8254)
@@ -61,7 +61,7 @@
 		</inp2:m_DefineElement>
 
 		<table width="100%" border="0" cellspacing="2" cellpadding="4">
-			<inp2:m_set c.showall_sequence="1" odd_even="table_color1"/>
+			<inp2:m_set c.showall_sequence="1" odd_even="table-color1"/>
 			<inp2:c.showall_PrintList2 block="category_td" no_special="1" IdField="CategoryId" empty_cell_render_as="wg_empty_cell" direction="V" columns="2"/>
 		</table>
 
Index: branches/unlabeled/unlabeled-1.7.2/core/units/general/xml_helper.php
===================================================================
diff -u -r8120 -r8254
--- branches/unlabeled/unlabeled-1.7.2/core/units/general/xml_helper.php	(.../xml_helper.php)	(revision 8120)
+++ branches/unlabeled/unlabeled-1.7.2/core/units/general/xml_helper.php	(.../xml_helper.php)	(revision 8254)
@@ -167,7 +167,8 @@
 				return $child;
 			}
 		}
-		return false;
+		$false = false;
+		return $false;
 	}
 
 	function FindChildValue($name, $attr=null)
Index: branches/unlabeled/unlabeled-1.5.2/kernel/admin_templates/regional/languages_export_step2.tpl
===================================================================
diff -u -r5154 -r8254
--- branches/unlabeled/unlabeled-1.5.2/kernel/admin_templates/regional/languages_export_step2.tpl	(.../languages_export_step2.tpl)	(revision 5154)
+++ branches/unlabeled/unlabeled-1.5.2/kernel/admin_templates/regional/languages_export_step2.tpl	(.../languages_export_step2.tpl)	(revision 8254)
@@ -12,7 +12,7 @@
 	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>	
 
 	
-	<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>
 			<inp2:m_phrase label="la_DownloadLanguageExport"/>
 		<td>
@@ -21,7 +21,7 @@
 		<td class="error">&nbsp;</td>
 	</tr>
 	
-	<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="3" align="left">
 			<a href="javascript:submit_event('lang','OnGoBack');"><inp2:m_phrase label="la_Continue"/></a>
 		</td>
Index: branches/unlabeled/unlabeled-1.10.2/core/admin_templates/stylesheets/style_editor.tpl
===================================================================
diff -u -r6670 -r8254
--- branches/unlabeled/unlabeled-1.10.2/core/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 6670)
+++ branches/unlabeled/unlabeled-1.10.2/core/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 8254)
@@ -49,7 +49,7 @@
 </table>
 
 <inp2:m_block name="inp_edit_color"/>
-	<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_phrase="$title_phrase" title="$title" is_last="$is_last"/>
 		<td>
 			<input	type="text"
@@ -72,7 +72,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_options_style"/>
-	<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_phrase="$title_phrase" title="$title" is_last="$is_last"/>
 		<td>
 			<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>" id="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>" onchange="<inp2:m_Param name="onchange"/>">
Index: branches/unlabeled/unlabeled-1.1.2/core/install/step_templates/db_config.tpl
===================================================================
diff -u -r6734 -r8254
--- branches/unlabeled/unlabeled-1.1.2/core/install/step_templates/db_config.tpl	(.../db_config.tpl)	(revision 6734)
+++ branches/unlabeled/unlabeled-1.1.2/core/install/step_templates/db_config.tpl	(.../db_config.tpl)	(revision 8254)
@@ -1,4 +1,4 @@
-<tr class="table_color2">
+<tr class="table-color2">
 	<td class="text"><b>Server Type<span class="error">*</span>:</b></td>
   	<td align="left"> 
     	<select name="DBType">
@@ -15,35 +15,35 @@
 	</td>
 </tr>
 
-<tr class="table_color2">
+<tr class="table-color2">
 	<td class="text"><b>Hostname<span class="error">*</span>:</b></td>
 	<td align="left"> 
 		<input type="text" name="DBHost" class="text" value="<?php echo $this->systemConfig['Database']['DBHost']; ?>" />
 	</td>
 </tr>
 				            				            				            
-<tr class="table_color2">
+<tr class="table-color2">
 	<td class="text"><b>Database Name<span class="error">*</span>:</b></td>
 	<td align="left"> 
 		<input type="text" name="DBName" class="text" value="<?php echo $this->systemConfig['Database']['DBName']; ?>" />
 	</td>
 </tr>
 
-<tr class="table_color2">
+<tr class="table-color2">
   <td class="text"><b>Database User Name<span class="error">*</span>:</b></td>
   <td align="left"> 
 	<input type="text" name="DBUser" class="text" value="<?php echo $this->systemConfig['Database']['DBUser']; ?>" />
   </td>
 </tr>	
 			            				            				            				            
-<tr class="table_color2">
+<tr class="table-color2">
   <td class="text"><b>Database User Password:</b></td>
   <td align="left"> 
 	<input type="password" name="DBUserPassword" class="text" value="<?php echo $this->systemConfig['Database']['DBUserPassword']; ?>" />
   </td>
 </tr>
 	
-<tr class="table_color2">
+<tr class="table-color2">
   <td class="text"><b>Table Name Prefix:</b></td>
   <td align="left"> 
 	<input type="text" name="TablePrefix" class="text" maxlength="7" value="<?php echo $this->systemConfig['Database']['TablePrefix']; ?>" />
Index: branches/unlabeled/unlabeled-1.9.2/core/admin_templates/groups/permissions_selector.tpl
===================================================================
diff -u -r5450 -r8254
--- branches/unlabeled/unlabeled-1.9.2/core/admin_templates/groups/permissions_selector.tpl	(.../permissions_selector.tpl)	(revision 5450)
+++ branches/unlabeled/unlabeled-1.9.2/core/admin_templates/groups/permissions_selector.tpl	(.../permissions_selector.tpl)	(revision 8254)
@@ -35,7 +35,7 @@
 <inp2:g_SaveWarning name="grid_save_warning"/>
 
 <inp2:m_DefineElement name="permission_element" prefix="g-perm">
-	<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>
 			<inp2:m_param name="section_name"/>.<inp2:m_param name="perm_name"/>
 		</td>
@@ -48,7 +48,7 @@
 
 
 <inp2:m_DefineElement name="old_permission_element" prefix="g-perm">
-	<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>
 			<inp2:m_phrase name="$label"/>
 		</td>
@@ -62,7 +62,7 @@
 <inp2:g-perm_LoadPermissions/>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table_color1"/>
+	<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table-color1"/>
 	
 	<tr class="subsectiontitle">
 		<td><inp2:m_phrase label="la_col_PermissionName"/></td>
Index: branches/unlabeled/unlabeled-1.11.2/admin/include/style.css
===================================================================
diff -u -r5303 -r8254
--- branches/unlabeled/unlabeled-1.11.2/admin/include/style.css	(.../style.css)	(revision 5303)
+++ branches/unlabeled/unlabeled-1.11.2/admin/include/style.css	(.../style.css)	(revision 8254)
@@ -204,10 +204,10 @@
 .permissions6_cell {
    FONT-WEIGHT: bold; FONT-SIZE: 12px; COLOR: black; FONT-FAMILY: verdana, arial; BACKGROUND-COLOR: #339900; TEXT-DECORATION: none
 }
-.table_color1 {
+.table-color1 {
    FONT-WEIGHT: normal; FONT-SIZE: 14px; COLOR: black; FONT-FAMILY: verdana, arial; BACKGROUND-COLOR: #f6f6f6; TEXT-DECORATION: none
 }
-.table_color2 {
+.table-color2 {
    FONT-WEIGHT: normal; FONT-SIZE: 14px; COLOR: black; FONT-FAMILY: verdana, arial; BACKGROUND-COLOR: #ebebeb; TEXT-DECORATION: none
 }
 .head_version {
Index: branches/unlabeled/unlabeled-1.2.2/core/install/step_templates/upgrade_modules.tpl
===================================================================
diff -u -r7698 -r8254
--- branches/unlabeled/unlabeled-1.2.2/core/install/step_templates/upgrade_modules.tpl	(.../upgrade_modules.tpl)	(revision 7698)
+++ branches/unlabeled/unlabeled-1.2.2/core/install/step_templates/upgrade_modules.tpl	(.../upgrade_modules.tpl)	(revision 8254)
@@ -1,7 +1,7 @@
 <?php
 	ob_start();
 ?>
-<tr class="table_color2">  
+<tr class="table-color2">  
 	<td class="text" colspan="2" valign="middle">
 		<table cellpadding="0" cellspacing="0">
 			<tr>
@@ -23,7 +23,7 @@
 		echo sprintf($module_tpl, $module_name, $module_title);
 	}
 ?>
-<tr class="table_color1">
+<tr class="table-color1">
 	<td class="hint" colspan="2" valign="middle">
 		<img src="incs/img/icon_warning.gif" width="14" height="14" align="absmiddle" />
 		Your data will be modified during the upgrade. We strongly recommend that you make a backup of your database. Proceed with the upgrade ?
Index: branches/unlabeled/unlabeled-1.1.2/core/install/step_templates/finish.tpl
===================================================================
diff -u -r6734 -r8254
--- branches/unlabeled/unlabeled-1.1.2/core/install/step_templates/finish.tpl	(.../finish.tpl)	(revision 6734)
+++ branches/unlabeled/unlabeled-1.1.2/core/install/step_templates/finish.tpl	(.../finish.tpl)	(revision 8254)
@@ -1,4 +1,4 @@
-<tr class="table_color2">
+<tr class="table-color2">
 	<td align="left" class="text" colspan="2">
 		In-portal has successfully been installed on your server. 
 		Click the button below to log into the site administration 
Index: branches/unlabeled/unlabeled-1.6.2/kernel/admin_templates/incs/config_blocks.tpl
===================================================================
diff -u -r8118 -r8254
--- branches/unlabeled/unlabeled-1.6.2/kernel/admin_templates/incs/config_blocks.tpl	(.../config_blocks.tpl)	(revision 8118)
+++ branches/unlabeled/unlabeled-1.6.2/kernel/admin_templates/incs/config_blocks.tpl	(.../config_blocks.tpl)	(revision 8254)
@@ -54,7 +54,7 @@
 	   		</td>
 		</tr>
 	</inp2:m_if>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:field field="$IdField"/>" header_label="<inp2:Field name="heading"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:field field="$IdField"/>" header_label="<inp2:Field name="heading"/>">
 		<td>
 			<inp2:Field field="prompt" as_label="1" />
 			<inp2:m_if check="m_IsDebugMode">
@@ -82,7 +82,7 @@
 	   		</td>
 		</tr>
 	</inp2:m_if>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="$IdField"/>" header_label="<inp2:Field name="heading"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="$IdField"/>" header_label="<inp2:Field name="heading"/>">
 		<td>
 			<inp2:Field field="prompt" as_label="1" />
 			<inp2:m_if check="m_IsDebugMode">
Index: branches/unlabeled/unlabeled-1.7.2/core/admin_templates/incs/style.css
===================================================================
diff -u -r8202 -r8254
--- branches/unlabeled/unlabeled-1.7.2/core/admin_templates/incs/style.css	(.../style.css)	(revision 8202)
+++ branches/unlabeled/unlabeled-1.7.2/core/admin_templates/incs/style.css	(.../style.css)	(revision 8254)
@@ -49,6 +49,15 @@
    display: inline;
 }
 
+.bordered, table.bordered, .bordered-no-bottom {
+	border: 1px solid #000000;
+	border-collapse: collapse;
+}
+
+.bordered-no-bottom {
+	border-bottom: none;
+}
+
 .text {
 	font-family: verdana, arial;
 	font-size: 12px;
Index: branches/unlabeled/unlabeled-1.5.2/core/admin_templates/categories/ci_blocks.tpl
===================================================================
diff -u -r6789 -r8254
--- branches/unlabeled/unlabeled-1.5.2/core/admin_templates/categories/ci_blocks.tpl	(.../ci_blocks.tpl)	(revision 6789)
+++ branches/unlabeled/unlabeled-1.5.2/core/admin_templates/categories/ci_blocks.tpl	(.../ci_blocks.tpl)	(revision 8254)
@@ -25,7 +25,7 @@
 
 <inp2:m_DefineElement name="no_perm_grid" prefix="" perm_label="">
 	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder_full" height="200">
-		<tr class="table_color1">
+		<tr class="table-color1">
 			<td align="center" valign="middle" class="text">
 				<inp2:m_phrase name="$perm_label"/>
 			</td>
@@ -34,7 +34,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_relation">
-	<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 valign="top" class="text">
 			<inp2:m_if check="{$prefix}_Field" field="$field">
Index: branches/unlabeled/unlabeled-1.9.2/core/admin_templates/stylesheets/base_style_edit.tpl
===================================================================
diff -u -r8079 -r8254
--- branches/unlabeled/unlabeled-1.9.2/core/admin_templates/stylesheets/base_style_edit.tpl	(.../base_style_edit.tpl)	(revision 8079)
+++ branches/unlabeled/unlabeled-1.9.2/core/admin_templates/stylesheets/base_style_edit.tpl	(.../base_style_edit.tpl)	(revision 8254)
@@ -75,7 +75,7 @@
 		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="selectors" field="Description" title="!la_fld_Description!" rows="10" cols="40"/>
 		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="selectors" field="AdvancedCSS" title="!la_fld_AdvancedCSS!" rows="10" cols="40"/>
 
-		<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_inc param="tab_index" by="1"/>
 			<td class="text" valign="top">
 				<inp2:m_phrase name="la_fld_SelectorData"/>:<br>
Index: branches/unlabeled/unlabeled-1.8.2/kernel/admin_templates/categories/permissions_tab.tpl
===================================================================
diff -u -r7664 -r8254
--- branches/unlabeled/unlabeled-1.8.2/kernel/admin_templates/categories/permissions_tab.tpl	(.../permissions_tab.tpl)	(revision 7664)
+++ branches/unlabeled/unlabeled-1.8.2/kernel/admin_templates/categories/permissions_tab.tpl	(.../permissions_tab.tpl)	(revision 8254)
@@ -13,7 +13,7 @@
 	</inp2:m_if>
 	#separator#
 	<inp2:m_DefineElement name="permission_element">
-		<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>
 				<inp2:m_phrase name="$Description"/> [<inp2:m_param name="PermissionName"/>]
 			</td>
@@ -61,7 +61,7 @@
 		</tr>
 	</inp2:m_DefineElement>
 	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder_full">
-		<inp2:m_set odd_even="table_color1"/>
+		<inp2:m_set odd_even="table-color1"/>
 		<thead class="subsectiontitle">
 			<td><inp2:m_phrase name="la_col_Description"/></td>
 			<td><inp2:m_phrase name="la_col_Inherited"/></td>
Index: branches/unlabeled/unlabeled-1.3.2/core/install/incs/install.tpl
===================================================================
diff -u -r7648 -r8254
--- branches/unlabeled/unlabeled-1.3.2/core/install/incs/install.tpl	(.../install.tpl)	(revision 7648)
+++ branches/unlabeled/unlabeled-1.3.2/core/install/incs/install.tpl	(.../install.tpl)	(revision 8254)
@@ -92,7 +92,7 @@
 												<!-- step body: end -->
 												
 												<!-- step error message: begin -->
-												<tr class="table_color2">
+												<tr class="table-color2">
 													<td colspan="2">
 														<p class="error">
 															<?php echo $this->errorMessage; ?>
Index: branches/unlabeled/unlabeled-1.10.2/kernel/admin_templates/regional/languages_edit.tpl
===================================================================
diff -u -r5297 -r8254
--- branches/unlabeled/unlabeled-1.10.2/kernel/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 5297)
+++ branches/unlabeled/unlabeled-1.10.2/kernel/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 8254)
@@ -77,7 +77,7 @@
 		<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="lang" field="Enabled" title="!la_fld_Enabled!"/>
 		<inp2:m_ParseBlock name="inp_edit_options" prefix="lang" field="UnitSystem" title="!la_fld_UnitSystem!" use_phrases="1"/>
 	<inp2:m_if check="lang_IsNewMode">
-	<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_inc param="tab_index" by="1"/>
 		<td class="text">
 			<inp2:m_phrase name="la_fld_CopyLabels"/>:
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/emails/send_complete.tpl
===================================================================
diff -u -r8227 -r8254
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/emails/send_complete.tpl	(.../send_complete.tpl)	(revision 8227)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/emails/send_complete.tpl	(.../send_complete.tpl)	(revision 8254)
@@ -6,7 +6,7 @@
 
 <table class="edit-form">
 	<inp2:m_ParseBlock name="subsection" title="la_prompt_EmailCompleteMessage"/>
-	<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="3" align="center">
 			<input type="button" value="<inp2:m_phrase name="la_Close"/>" class="button" onclick="window.close();"/>
 		</td>
Index: branches/unlabeled/unlabeled-1.1.2/core/install/step_templates/check_paths.tpl
===================================================================
diff -u -r6734 -r8254
--- branches/unlabeled/unlabeled-1.1.2/core/install/step_templates/check_paths.tpl	(.../check_paths.tpl)	(revision 6734)
+++ branches/unlabeled/unlabeled-1.1.2/core/install/step_templates/check_paths.tpl	(.../check_paths.tpl)	(revision 8254)
@@ -1,7 +1,7 @@
 <?php
 	ob_start();
 ?>
-<tr class="table_color2">
+<tr class="table-color2">
 	<td class="text"><b>%s</b></td>
   	<td align="left">%s</td>
 </tr>
Index: branches/unlabeled/unlabeled-1.9.2/kernel/admin_templates/stylesheets/block_style_edit.tpl
===================================================================
diff -u -r8079 -r8254
--- branches/unlabeled/unlabeled-1.9.2/kernel/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 8079)
+++ branches/unlabeled/unlabeled-1.9.2/kernel/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 8254)
@@ -85,7 +85,7 @@
 		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="selectors" field="Description" title="!la_fld_Description!" rows="10" cols="40"/>
 		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="selectors" field="AdvancedCSS" title="!la_fld_AdvancedCSS!" rows="10" cols="40"/>
 
-		<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_inc param="tab_index" by="1"/>
 			<td class="text" valign="top">
 				<inp2:m_phrase name="la_fld_SelectorData"/>:<br>
Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/incs/image_blocks.tpl
===================================================================
diff -u -r5440 -r8254
--- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/incs/image_blocks.tpl	(.../image_blocks.tpl)	(revision 5440)
+++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/incs/image_blocks.tpl	(.../image_blocks.tpl)	(revision 8254)
@@ -3,7 +3,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="thumbnail_section" prefix="">
-	<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">
 			<inp2:m_phrase label="la_fld_Location"/><br>
 			<span class="error"><inp2:$prefix_Error field="ThumbPath"/><inp2:$prefix_Error field="ThumbUrl"/></span>&nbsp;
@@ -46,7 +46,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="fullsize_section" prefix="">
-	<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">
 			<inp2:m_phrase label="la_fld_Location"/><br>
 			<span class="error"><inp2:$prefix_Error field="LocalPath"/><inp2:$prefix_Error field="Url"/></span>&nbsp;
Index: branches/unlabeled/unlabeled-1.11.2/kernel/admin_templates/incs/custom_blocks.tpl
===================================================================
diff -u -r8107 -r8254
--- branches/unlabeled/unlabeled-1.11.2/kernel/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 8107)
+++ branches/unlabeled/unlabeled-1.11.2/kernel/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 8254)
@@ -79,7 +79,7 @@
 			</inp2:m_if>
 		</tr>
 	</inp2:m_if>
-	<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="grid_data_label_ml_td" grid="$grid" SourcePrefix="$SourcePrefix" virtual_field="$virtual_field" value_field="$value_field" ElementTypeField="ElementType" field="Prompt" PrefixSpecial="$PrefixSpecial"/>
 		<td valign="top" class="text">
 			<inp2:ConfigFormElement field="Value" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList" />
Index: branches/unlabeled/unlabeled-1.178.2/core/kernel/application.php
===================================================================
diff -u -r8233 -r8254
--- branches/unlabeled/unlabeled-1.178.2/core/kernel/application.php	(.../application.php)	(revision 8233)
+++ branches/unlabeled/unlabeled-1.178.2/core/kernel/application.php	(.../application.php)	(revision 8254)
@@ -325,6 +325,7 @@
 			return false;
 		}
 		$modules_helper =& $this->recallObject('ModulesHelper');
+		$this->ModuleInfo = $this->Conn->Query('SELECT * FROM '.TABLE_PREFIX.'Modules WHERE Loaded = 1 ORDER BY LoadOrder', 'Name');
 		$sql = 'SELECT *
 				FROM '.TABLE_PREFIX.'Modules
 				WHERE '.$modules_helper->getWhereClause().'
Index: branches/unlabeled/unlabeled-1.9.2/kernel/admin_templates/config/config_search.tpl
===================================================================
diff -u -r5450 -r8254
--- branches/unlabeled/unlabeled-1.9.2/kernel/admin_templates/config/config_search.tpl	(.../config_search.tpl)	(revision 5450)
+++ branches/unlabeled/unlabeled-1.9.2/kernel/admin_templates/config/config_search.tpl	(.../config_search.tpl)	(revision 8254)
@@ -67,7 +67,7 @@
 		</tr>
 	</inp2:m_if>
 	
-	<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">
 			<inp2:Field field="DisplayName" as_label="true" />
 			<inp2:m_if check="m_IsDebugMode">
@@ -87,14 +87,14 @@
    		</td>
 	</tr>
 	
-	<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="4">
 			<inp2:m_phrase name="la_prompt_required_field_increase"/>
 			<input type="text" size="3" name="conf[SearchRel_Increase_<inp2:m_param name="module_key" />][VariableValue]" VALUE="<inp2:Field field="SearchRel_Increase_{$module_key}" />">%
 		</td>
 	</tr>
 	
-	<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="4">
 			<inp2:m_phrase name="la_prompt_relevence_percent"/> 
 			<input type="text" size="3" name="conf[SearchRel_Keyword_<inp2:m_param name="module_key" />][VariableValue]" value="<inp2:Field field="SearchRel_Keyword_{$module_key}" />">% <inp2:Field field="SearchRel_Keyword_{$module_key}_prompt" as_label="1" /> &nbsp;&nbsp;&nbsp;
@@ -110,7 +110,7 @@
 	   		</td>
 		</tr>
 		
-		<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" width="120"><inp2:Field field="Search_ShowMultiple_{$module_key}_prompt" as_label="1"/></td>
 			<td class="text" colspan="3">
 				<input type="checkbox" name="_cb_conf[Search_ShowMultiple_<inp2:m_param name="module_key" />][VariableValue]" <inp2:Field field="Search_ShowMultiple_{$module_key}" checked="checked" db="db"/> id="_cb_conf[Search_ShowMultiple_<inp2:m_param name="module_key" />][VariableValue]" onclick="update_checkbox(this, document.getElementById('conf[Search_ShowMultiple_<inp2:m_param name="module_key" />][VariableValue]'))" >
Index: branches/unlabeled/unlabeled-1.5.2/kernel/admin_templates/no_permission.tpl
===================================================================
diff -u -r5154 -r8254
--- branches/unlabeled/unlabeled-1.5.2/kernel/admin_templates/no_permission.tpl	(.../no_permission.tpl)	(revision 5154)
+++ branches/unlabeled/unlabeled-1.5.2/kernel/admin_templates/no_permission.tpl	(.../no_permission.tpl)	(revision 8254)
@@ -33,7 +33,7 @@
 </table>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<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 height="400" valign="middle" align="left">
 			<center><b>No Permission</b></center><br />
 			<inp2:m_if check="m_IsDebugMode">
Index: branches/unlabeled/unlabeled-1.11.2/kernel/admin_templates/groups/groups_edit_permissions.tpl
===================================================================
diff -u -r7638 -r8254
--- branches/unlabeled/unlabeled-1.11.2/kernel/admin_templates/groups/groups_edit_permissions.tpl	(.../groups_edit_permissions.tpl)	(revision 7638)
+++ branches/unlabeled/unlabeled-1.11.2/kernel/admin_templates/groups/groups_edit_permissions.tpl	(.../groups_edit_permissions.tpl)	(revision 8254)
@@ -73,7 +73,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="tree_element">
-	<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>
 	 		<img src="img/spacer.gif" height="1" width="<inp2:g-perm_LevelIndicator level="$deep_level" multiply="20"/>" alt="" border="0"/>
 
@@ -112,7 +112,7 @@
 <inp2:g-perm_LoadPermissions/>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table_color1"/>
+	<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table-color1"/>
 
 	<tr class="subsectiontitle">
 		<td><inp2:m_phrase label="la_col_PermissionName"/></td>
Index: branches/unlabeled/unlabeled-1.14.2/core/admin_templates/logs/visits/visits_list.tpl
===================================================================
diff -u -r7396 -r8254
--- branches/unlabeled/unlabeled-1.14.2/core/admin_templates/logs/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 7396)
+++ branches/unlabeled/unlabeled-1.14.2/core/admin_templates/logs/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 8254)
@@ -3,7 +3,7 @@
 
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
 
-<inp2:m_ParseBlock name="section_header" icon="icon46_visits" title="!la_title_Visits!"/>
+<inp2:m_ParseBlock name="section_header" module="in-portal" prefix="visits" icon="icon46_visits" title="!la_title_Visits!"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="visits" title_preset="visits_list" module="in-portal" icon="icon46_visits"/>
 
@@ -14,74 +14,74 @@
   	<td>
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
-  																		
+
 				function edit()
 	  			{
-					
+
 	  			}
-	  			
+
 	  			a_toolbar.AddButton( new ToolBarButton('search', '<inp2:m_phrase label="la_ToolTip_Search" escape="1"/>',
 						function() {
 							set_hidden_field('grid_name', 'Default');
 							submit_event('visits','OnSearch');
 						} ) );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('search_reset', '<inp2:m_phrase label="la_ToolTip_SearchReset" escape="1"/>',
 						function() {
 							set_hidden_field('grid_name', 'Default');
 							submit_event('visits','OnSearchReset');
-						} ) );	  			
-	  			
+						} ) );
+
 				a_toolbar.AddButton( new ToolBarButton('refresh', '<inp2:m_phrase label="la_ToolTip_Refresh" escape="1"/>', function() {
 							window.location.href = window.location.href;
 						}
 				) );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('reset', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
 							std_delete_items('visits');
 						}
 				) );
-	  			
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 							show_viewmenu(a_toolbar,'view');
 						}
 				) );
-				
+
 				a_toolbar.Render();
 			</script>
-			
+
 		</td>
 	</tr>
 </tbody>
 </table>
 <script type="text/javascript" src="js/calendar.js"></script>
 
 <inp2:m_DefineElement name="search_calendar_td" 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"/>">
 		<inp2:m_inc param="tab_index" by="1"/>
 		<td class="text"><inp2:m_phrase label="la_from_date"/>:</td>
-		
+
 		<td>
 			<input type="text" name="<inp2:SearchInputName field="$field" type="datefrom"/>" id="<inp2:SearchInputName field="$field" type="datefrom"/>" value="<inp2:SearchField field="$field" format="_regional_InputDateFormat" type="datefrom"/>" size="<inp2:SearchFormat field="{$field}_date" input_format="1" edit_size="1"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
 				<span class="small">(<inp2:SearchFormat field="{$field}_date" input_format="1" human="true"/>)</span>
 			<script type="text/javascript">
 				initCalendar("<inp2:SearchInputName field="$field" type="datefrom"/>", "<inp2:SearchFormat field="{$field}_date" input_format="1"/>");
 			</script>
-			
+
 		</td>
 		<td class="error"><inp2:SearchError field="$field" type="datefrom"/>&nbsp;</td>
 
-		<td class="text"><inp2:m_phrase label="la_to_date"/>:</td>	
-		
+		<td class="text"><inp2:m_phrase label="la_to_date"/>:</td>
+
 		<td>
 			<input type="text" name="<inp2:SearchInputName field="$field" type="dateto"/>" id="<inp2:SearchInputName field="$field" type="dateto"/>" value="<inp2:SearchField field="$field" format="_regional_InputDateFormat" type="dateto"/>" size="<inp2:SearchFormat field="{$field}_date" input_format="1" edit_size="1"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
 				<span class="small">(<inp2:SearchFormat field="{$field}_date" input_format="1" human="true"/>)</span>
 			<script type="text/javascript">
 				initCalendar("<inp2:SearchInputName field="$field" type="dateto"/>", "<inp2:SearchFormat field="{$field}_date" input_format="1"/>");
 			</script>
-			
+
 		</td>
 		<td class="error"><inp2:SearchError field="$field" type="dateto"/>&nbsp;</td>
 	</tr>
Index: branches/unlabeled/unlabeled-1.5.2/core/admin_templates/catalog_tab.tpl
===================================================================
diff -u -r6789 -r8254
--- branches/unlabeled/unlabeled-1.5.2/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 6789)
+++ branches/unlabeled/unlabeled-1.5.2/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 8254)
@@ -61,7 +61,7 @@
 		</inp2:m_DefineElement>
 
 		<table width="100%" border="0" cellspacing="2" cellpadding="4">
-			<inp2:m_set c.showall_sequence="1" odd_even="table_color1"/>
+			<inp2:m_set c.showall_sequence="1" odd_even="table-color1"/>
 			<inp2:c.showall_PrintList2 block="category_td" no_special="1" IdField="CategoryId" empty_cell_render_as="wg_empty_cell" direction="V" columns="2"/>
 		</table>
 
Index: branches/unlabeled/unlabeled-1.9.2/kernel/admin_templates/groups/permissions_selector.tpl
===================================================================
diff -u -r5450 -r8254
--- branches/unlabeled/unlabeled-1.9.2/kernel/admin_templates/groups/permissions_selector.tpl	(.../permissions_selector.tpl)	(revision 5450)
+++ branches/unlabeled/unlabeled-1.9.2/kernel/admin_templates/groups/permissions_selector.tpl	(.../permissions_selector.tpl)	(revision 8254)
@@ -35,7 +35,7 @@
 <inp2:g_SaveWarning name="grid_save_warning"/>
 
 <inp2:m_DefineElement name="permission_element" prefix="g-perm">
-	<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>
 			<inp2:m_param name="section_name"/>.<inp2:m_param name="perm_name"/>
 		</td>
@@ -48,7 +48,7 @@
 
 
 <inp2:m_DefineElement name="old_permission_element" prefix="g-perm">
-	<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>
 			<inp2:m_phrase name="$label"/>
 		</td>
@@ -62,7 +62,7 @@
 <inp2:g-perm_LoadPermissions/>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table_color1"/>
+	<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table-color1"/>
 	
 	<tr class="subsectiontitle">
 		<td><inp2:m_phrase label="la_col_PermissionName"/></td>
Index: branches/unlabeled/unlabeled-1.10.2/kernel/admin_templates/stylesheets/style_editor.tpl
===================================================================
diff -u -r6670 -r8254
--- branches/unlabeled/unlabeled-1.10.2/kernel/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 6670)
+++ branches/unlabeled/unlabeled-1.10.2/kernel/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 8254)
@@ -49,7 +49,7 @@
 </table>
 
 <inp2:m_block name="inp_edit_color"/>
-	<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_phrase="$title_phrase" title="$title" is_last="$is_last"/>
 		<td>
 			<input	type="text"
@@ -72,7 +72,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_options_style"/>
-	<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_phrase="$title_phrase" title="$title" is_last="$is_last"/>
 		<td>
 			<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>" id="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>" onchange="<inp2:m_Param name="onchange"/>">
Index: branches/unlabeled/unlabeled-1.5.2/kernel/admin_templates/config/config_general.tpl
===================================================================
diff -u -r6134 -r8254
--- branches/unlabeled/unlabeled-1.5.2/kernel/admin_templates/config/config_general.tpl	(.../config_general.tpl)	(revision 6134)
+++ branches/unlabeled/unlabeled-1.5.2/kernel/admin_templates/config/config_general.tpl	(.../config_general.tpl)	(revision 8254)
@@ -99,7 +99,7 @@
    		</td>
 	</tr>
 	
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" header_label="la_Text_RootCategory">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>" header_label="la_Text_RootCategory">
 		<td>
 			<span class="text"><inp2:m_phrase name="la_prompt_RootCategory" /></span>
 		</td>
Index: branches/unlabeled/unlabeled-1.9.2/kernel/admin_templates/stylesheets/base_style_edit.tpl
===================================================================
diff -u -r8079 -r8254
--- branches/unlabeled/unlabeled-1.9.2/kernel/admin_templates/stylesheets/base_style_edit.tpl	(.../base_style_edit.tpl)	(revision 8079)
+++ branches/unlabeled/unlabeled-1.9.2/kernel/admin_templates/stylesheets/base_style_edit.tpl	(.../base_style_edit.tpl)	(revision 8254)
@@ -75,7 +75,7 @@
 		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="selectors" field="Description" title="!la_fld_Description!" rows="10" cols="40"/>
 		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="selectors" field="AdvancedCSS" title="!la_fld_AdvancedCSS!" rows="10" cols="40"/>
 
-		<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_inc param="tab_index" by="1"/>
 			<td class="text" valign="top">
 				<inp2:m_phrase name="la_fld_SelectorData"/>:<br>
Index: branches/unlabeled/unlabeled-1.8.2/core/admin_templates/categories/permissions_tab.tpl
===================================================================
diff -u -r7664 -r8254
--- branches/unlabeled/unlabeled-1.8.2/core/admin_templates/categories/permissions_tab.tpl	(.../permissions_tab.tpl)	(revision 7664)
+++ branches/unlabeled/unlabeled-1.8.2/core/admin_templates/categories/permissions_tab.tpl	(.../permissions_tab.tpl)	(revision 8254)
@@ -13,7 +13,7 @@
 	</inp2:m_if>
 	#separator#
 	<inp2:m_DefineElement name="permission_element">
-		<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>
 				<inp2:m_phrase name="$Description"/> [<inp2:m_param name="PermissionName"/>]
 			</td>
@@ -61,7 +61,7 @@
 		</tr>
 	</inp2:m_DefineElement>
 	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder_full">
-		<inp2:m_set odd_even="table_color1"/>
+		<inp2:m_set odd_even="table-color1"/>
 		<thead class="subsectiontitle">
 			<td><inp2:m_phrase name="la_col_Description"/></td>
 			<td><inp2:m_phrase name="la_col_Inherited"/></td>
Index: branches/unlabeled/unlabeled-1.69.2/core/kernel/processors/main_processor.php
===================================================================
diff -u -r8248 -r8254
--- branches/unlabeled/unlabeled-1.69.2/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 8248)
+++ branches/unlabeled/unlabeled-1.69.2/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 8254)
@@ -564,7 +564,7 @@
 		}
 
 		$res = $BlockParser->ParseTemplate(	$t, 1, $params, isset($params['is_silent']) ? 1 : 0 );
-		
+
 		if ( !$BlockParser->DataExists && (isset($params['data_exists']) || isset($params['block_no_data'])) ) {
 			if ($block_no_data = getArrayValue($params, 'block_no_data')) {
 				if (isset($this->Application->PreParsedBlocks[$block_no_data]) ) {
@@ -580,7 +580,7 @@
 				$res = '';
 			}
 		}
-			
+
 		$this->Application->Parser =& $parser;
 		$this->Application->Parser->DataExists = $this->Application->Parser->DataExists || $BlockParser->DataExists;
 		return $res;
Index: branches/unlabeled/unlabeled-1.5.2/kernel/admin_templates/categories/ci_blocks.tpl
===================================================================
diff -u -r6789 -r8254
--- branches/unlabeled/unlabeled-1.5.2/kernel/admin_templates/categories/ci_blocks.tpl	(.../ci_blocks.tpl)	(revision 6789)
+++ branches/unlabeled/unlabeled-1.5.2/kernel/admin_templates/categories/ci_blocks.tpl	(.../ci_blocks.tpl)	(revision 8254)
@@ -25,7 +25,7 @@
 
 <inp2:m_DefineElement name="no_perm_grid" prefix="" perm_label="">
 	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder_full" height="200">
-		<tr class="table_color1">
+		<tr class="table-color1">
 			<td align="center" valign="middle" class="text">
 				<inp2:m_phrase name="$perm_label"/>
 			</td>
@@ -34,7 +34,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_relation">
-	<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 valign="top" class="text">
 			<inp2:m_if check="{$prefix}_Field" field="$field">
Index: branches/unlabeled/unlabeled-1.2.2/core/install/step_templates/choose_modules.tpl
===================================================================
diff -u -r7698 -r8254
--- branches/unlabeled/unlabeled-1.2.2/core/install/step_templates/choose_modules.tpl	(.../choose_modules.tpl)	(revision 7698)
+++ branches/unlabeled/unlabeled-1.2.2/core/install/step_templates/choose_modules.tpl	(.../choose_modules.tpl)	(revision 8254)
@@ -1,7 +1,7 @@
 <?php
 	ob_start();
 ?>
-<tr class="table_color2">  
+<tr class="table-color2">  
 	<td class="text" colspan="2" valign="middle">
 		<table cellpadding="0" cellspacing="0">
 			<tr>
Index: branches/unlabeled/unlabeled-1.14.2/kernel/admin_templates/visits/visits_list.tpl
===================================================================
diff -u -r7396 -r8254
--- branches/unlabeled/unlabeled-1.14.2/kernel/admin_templates/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 7396)
+++ branches/unlabeled/unlabeled-1.14.2/kernel/admin_templates/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 8254)
@@ -3,7 +3,7 @@
 
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
 
-<inp2:m_ParseBlock name="section_header" icon="icon46_visits" title="!la_title_Visits!"/>
+<inp2:m_ParseBlock name="section_header" module="in-portal" prefix="visits" icon="icon46_visits" title="!la_title_Visits!"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="visits" title_preset="visits_list" module="in-portal" icon="icon46_visits"/>
 
@@ -14,74 +14,74 @@
   	<td>
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
-  																		
+
 				function edit()
 	  			{
-					
+
 	  			}
-	  			
+
 	  			a_toolbar.AddButton( new ToolBarButton('search', '<inp2:m_phrase label="la_ToolTip_Search" escape="1"/>',
 						function() {
 							set_hidden_field('grid_name', 'Default');
 							submit_event('visits','OnSearch');
 						} ) );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('search_reset', '<inp2:m_phrase label="la_ToolTip_SearchReset" escape="1"/>',
 						function() {
 							set_hidden_field('grid_name', 'Default');
 							submit_event('visits','OnSearchReset');
-						} ) );	  			
-	  			
+						} ) );
+
 				a_toolbar.AddButton( new ToolBarButton('refresh', '<inp2:m_phrase label="la_ToolTip_Refresh" escape="1"/>', function() {
 							window.location.href = window.location.href;
 						}
 				) );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('reset', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
 							std_delete_items('visits');
 						}
 				) );
-	  			
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 							show_viewmenu(a_toolbar,'view');
 						}
 				) );
-				
+
 				a_toolbar.Render();
 			</script>
-			
+
 		</td>
 	</tr>
 </tbody>
 </table>
 <script type="text/javascript" src="js/calendar.js"></script>
 
 <inp2:m_DefineElement name="search_calendar_td" 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"/>">
 		<inp2:m_inc param="tab_index" by="1"/>
 		<td class="text"><inp2:m_phrase label="la_from_date"/>:</td>
-		
+
 		<td>
 			<input type="text" name="<inp2:SearchInputName field="$field" type="datefrom"/>" id="<inp2:SearchInputName field="$field" type="datefrom"/>" value="<inp2:SearchField field="$field" format="_regional_InputDateFormat" type="datefrom"/>" size="<inp2:SearchFormat field="{$field}_date" input_format="1" edit_size="1"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
 				<span class="small">(<inp2:SearchFormat field="{$field}_date" input_format="1" human="true"/>)</span>
 			<script type="text/javascript">
 				initCalendar("<inp2:SearchInputName field="$field" type="datefrom"/>", "<inp2:SearchFormat field="{$field}_date" input_format="1"/>");
 			</script>
-			
+
 		</td>
 		<td class="error"><inp2:SearchError field="$field" type="datefrom"/>&nbsp;</td>
 
-		<td class="text"><inp2:m_phrase label="la_to_date"/>:</td>	
-		
+		<td class="text"><inp2:m_phrase label="la_to_date"/>:</td>
+
 		<td>
 			<input type="text" name="<inp2:SearchInputName field="$field" type="dateto"/>" id="<inp2:SearchInputName field="$field" type="dateto"/>" value="<inp2:SearchField field="$field" format="_regional_InputDateFormat" type="dateto"/>" size="<inp2:SearchFormat field="{$field}_date" input_format="1" edit_size="1"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
 				<span class="small">(<inp2:SearchFormat field="{$field}_date" input_format="1" human="true"/>)</span>
 			<script type="text/javascript">
 				initCalendar("<inp2:SearchInputName field="$field" type="dateto"/>", "<inp2:SearchFormat field="{$field}_date" input_format="1"/>");
 			</script>
-			
+
 		</td>
 		<td class="error"><inp2:SearchError field="$field" type="dateto"/>&nbsp;</td>
 	</tr>
Index: branches/unlabeled/unlabeled-1.9.2/core/units/general/helpers/modules.php
===================================================================
diff -u -r8079 -r8254
--- branches/unlabeled/unlabeled-1.9.2/core/units/general/helpers/modules.php	(.../modules.php)	(revision 8079)
+++ branches/unlabeled/unlabeled-1.9.2/core/units/general/helpers/modules.php	(.../modules.php)	(revision 8254)
@@ -182,7 +182,7 @@
 		    else {
 		        $modules = array_keys($this->Application->ModuleInfo);
 		    }
-		    
+
 			array_push($modules, 'Core', 'Proj-base', 'Proj-CMS', 'Custom');
 		    return $modules;
 		}
Index: branches/unlabeled/unlabeled-1.2.2/core/install/incs/style.css
===================================================================
diff -u -r7698 -r8254
--- branches/unlabeled/unlabeled-1.2.2/core/install/incs/style.css	(.../style.css)	(revision 7698)
+++ branches/unlabeled/unlabeled-1.2.2/core/install/incs/style.css	(.../style.css)	(revision 8254)
@@ -161,7 +161,7 @@
 	text-decoration: none;
 }
 
-/*.table_color1 {
+/*.table-color1 {
 	font-weight: normal;
 	font-size: 14px;
 	color: black; 
@@ -170,7 +170,7 @@
 	text-decoration: none;
 }*/
 
-.table_color2 {
+.table-color2 {
 	font-weight: normal; 
 	font-size: 14px;
 	color: black;
Index: branches/unlabeled/unlabeled-1.8.2/kernel/admin_templates/regional/languages_export.tpl
===================================================================
diff -u -r4944 -r8254
--- branches/unlabeled/unlabeled-1.8.2/kernel/admin_templates/regional/languages_export.tpl	(.../languages_export.tpl)	(revision 4944)
+++ branches/unlabeled/unlabeled-1.8.2/kernel/admin_templates/regional/languages_export.tpl	(.../languages_export.tpl)	(revision 8254)
@@ -33,7 +33,7 @@
 	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
 
 
-	<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="phrases.export" field="LangFile" title="la_fld_ExportFileName"/>
 		<td>
 			<inp2:lang_ExportPath/> <input type="text" name="<inp2:phrases.export_InputName field="LangFile"/>" id="<inp2:phrases.export_InputName field="LangFile"/>" value="<inp2:phrases.export_Field field="LangFile"/>" />