Index: branches/unlabeled/unlabeled-1.27.2/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -r7506 -r7538
--- branches/unlabeled/unlabeled-1.27.2/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 7506)
+++ branches/unlabeled/unlabeled-1.27.2/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 7538)
@@ -420,7 +420,7 @@
 			$oFCKeditor->Config = Array(
 				//'UserFilesPath' => $pathtoroot.'kernel/user_files',
 				'ProjectPath' => BASE_PATH.'/',
-				'CustomConfigurationsPath' => $this->Application->BaseURL().'core/cmseditor/inp_fckconfig.js',
+				'CustomConfigurationsPath' => $this->Application->BaseURL().'core/cmseditor/fckconfig.js',
 //				'EditorAreaCSS' => $this->Application->BaseURL().'/themes/inportal_site/inc/inportal.css', //GetThemeCSS(),
 				//'StylesXmlPath' => '../../inp_styles.xml',
 //				'Debug' => 1,
@@ -639,7 +639,7 @@
 			$popup_info = $this->Conn->GetRow($sql);
 			if (!$popup_info) {
 				$this->Application->InitParser();
-				$this->Application->Parser->ParseTemplate($t); // dies when SetPopupSize tag found & in ajax requrest
+				$this->Application->ParseBlock(array('name' => $t)); // dies when SetPopupSize tag found & in ajax requrest
 				return '750x400'; // tag SetPopupSize not found in template -> use default size
 			}
 			return $popup_info['PopupWidth'].'x'.$popup_info['PopupHeight'];
Index: branches/unlabeled/unlabeled-1.100.2/admin/install/langpacks/english.lang
===================================================================
diff -u -r6798 -r7538
--- branches/unlabeled/unlabeled-1.100.2/admin/install/langpacks/english.lang	(.../english.lang)	(revision 6798)
+++ branches/unlabeled/unlabeled-1.100.2/admin/install/langpacks/english.lang	(.../english.lang)	(revision 7538)
@@ -1,7 +1,8 @@
 <LANGUAGES>
-	<LANGUAGE PackName="English" Encoding="base64"><DATEFORMAT>m/d/Y</DATEFORMAT><TIMEFORMAT>g:i:s A</TIMEFORMAT><INPUTDATEFORMAT>m/d/Y</INPUTDATEFORMAT><INPUTTIMEFORMAT>g:i:s A</INPUTTIMEFORMAT><DECIMAL>.</DECIMAL><THOUSANDS>,</THOUSANDS><CHARSET>iso-8859-1</CHARSET><UNITSYSTEM>2</UNITSYSTEM>
+	<LANGUAGE PackName="English" Encoding="base64"><DATEFORMAT>m/d/Y</DATEFORMAT><TIMEFORMAT>g:i:s A</TIMEFORMAT><INPUTDATEFORMAT>m/d/Y</INPUTDATEFORMAT><INPUTTIMEFORMAT>g:i:s A</INPUTTIMEFORMAT><DECIMAL>,</DECIMAL><THOUSANDS>.</THOUSANDS><CHARSET>iso-8859-1</CHARSET><UNITSYSTEM>2</UNITSYSTEM>
 		<PHRASES>
 			<PHRASE Label=" lu_resetpw_confirm_text" Module="In-Portal" Type="0">WW91ciBwYXNzd29yZCBoYXMgYmVlbiByZXNldC4gWW91IHdpbGwgcmVjZWl2ZSB5b3VyIG5ldyBwYXNzd29yZCBpbiB0aGUgZW1haWwgc2hvcnRseS4=</PHRASE>
+			<PHRASE Label="cust_shipping_addr_block" Module="In-Portal" Type="1">QmxvY2sgU2hpcHBpbmcgQWRkcmVzcyBFZGl0aW5n</PHRASE>
 			<PHRASE Label="la_Active" Module="In-Portal" Type="1">QWN0aXZl</PHRASE>
 			<PHRASE Label="la_added" Module="In-Portal" Type="1">QWRkZWQ=</PHRASE>
 			<PHRASE Label="la_AddTo" Module="In-Portal" Type="1">QWRkIFRv</PHRASE>
@@ -117,6 +118,9 @@
 			<PHRASE Label="la_col_PrimaryGroup" Module="In-Portal" Type="1">UHJpbWFyeSBHcm91cA==</PHRASE>
 			<PHRASE Label="la_col_PrimaryValue" Module="In-Portal" Type="1">UHJpbWFyeSBWYWx1ZQ==</PHRASE>
 			<PHRASE Label="la_col_Prompt" Module="In-Portal" Type="1">RmllbGQgUHJvbXB0</PHRASE>
+			<PHRASE Label="la_col_PurchaseDate" Module="In-Portal" Type="1">RGF0ZQ==</PHRASE>
+			<PHRASE Label="la_col_RebateAmount" Module="In-Portal" Type="1">JA==</PHRASE>
+			<PHRASE Label="la_col_RebatePercent" Module="In-Portal" Type="1">JQ==</PHRASE>
 			<PHRASE Label="la_col_RelationshipType" Module="In-Portal" Type="1">UmVsYXRpb24gVHlwZQ==</PHRASE>
 			<PHRASE Label="la_col_ReviewedBy" Module="In-Portal" Type="1">UmV2aWV3ZWQgQnk=</PHRASE>
 			<PHRASE Label="la_col_ReviewText" Module="In-Portal" Type="1">UmV2aWV3IFRleHQ=</PHRASE>
@@ -301,6 +305,7 @@
 			<PHRASE Label="la_fld_AddressLine" Module="In-Portal" Type="1">QWRkcmVzcyBMaW5l</PHRASE>
 			<PHRASE Label="la_fld_AdvancedCSS" Module="In-Portal" Type="1">QWR2YW5jZWQgQ1NT</PHRASE>
 			<PHRASE Label="la_fld_AltValue" Module="In-Portal" Type="1">QWx0IFZhbHVl</PHRASE>
+			<PHRASE Label="la_fld_AssignedCoupon" Module="In-Portal" Type="1">QXNzaWduZWQgQ291cG9u</PHRASE>
 			<PHRASE Label="la_fld_AutomaticFilename" Module="In-Portal" Type="1">QXV0b21hdGljIEZpbGVuYW1l</PHRASE>
 			<PHRASE Label="la_fld_AvailableColumns" Module="In-Portal" Type="1">QXZhaWxhYmxlIENvbHVtbnM=</PHRASE>
 			<PHRASE Label="la_fld_Background" Module="In-Portal" Type="1">QmFja2dyb3VuZA==</PHRASE>
@@ -1327,6 +1332,7 @@
 			<PHRASE Label="la_title_Censorship" Module="In-Portal" Type="1">Q2Vuc29yc2hpcA==</PHRASE>
 			<PHRASE Label="la_title_Community" Module="In-Portal" Type="1">Q29tbXVuaXR5</PHRASE>
 			<PHRASE Label="la_title_Configuration" Module="In-Portal" Type="1">Q29uZmlndXJhdGlvbg==</PHRASE>
+			<PHRASE Label="la_title_CouponSelector" Module="In-Portal" Type="1">Q291cG9uIFNlbGVjdG9y</PHRASE>
 			<PHRASE Label="la_title_Custom" Module="In-Portal" Type="1">Q3VzdG9t</PHRASE>
 			<PHRASE Label="la_title_CustomFields" Module="In-Portal" Type="1">Q3VzdG9tIEZpZWxkcw==</PHRASE>
 			<PHRASE Label="la_title_Done" Module="In-Portal" Type="1">RG9uZQ==</PHRASE>
@@ -2339,7 +2345,7 @@
 			<EVENT MessageType="text" Event="USER.SUGGEST" Type="1">WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogVGhlIHNpdGUgaGFzIGJlZW4gc3VnZ2VzdGVkCgpBIHZpc2l0b3Igc3VnZ2VzdGVkIHlvdXIgc2l0ZSB0byBhIGZyaWVuZC4=</EVENT>
 			<EVENT MessageType="text" Event="USER.UNSUBSCRIBE" Type="0">WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogWW91IGhhdmUgYmVlbiB1bnN1YnNjcmliZWQKCllvdSBoYXZlIHN1Y2Nlc3NmdWxseSB1bnN1YnNyaWJlZCBmcm9tIDxpbnA6bV9wYWdlX3RpdGxlIC8+IG1haWxpbmcgbGlzdC4=</EVENT>
 			<EVENT MessageType="text" Event="USER.UNSUBSCRIBE" Type="1">WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogVXNlciB1bnN1YnNyaWJlZAoKQSB1c2VyIGhhcyB1bnN1YnNjcmliZWQu</EVENT>
-			<EVENT MessageType="text" Event="USER.VALIDATE" Type="0">WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogSW4tcG9ydGFsIHJlZ2lzdHJhdGlvbgoKV2VsY29tZSB0byBJbi1wb3J0YWwhDQpZb3VyIHVzZXIgcmVnaXN0cmF0aW9uIGhhcyBiZWVuIGFwcHJvdmVkLiBZb3VyIHVzZXIgbmFtZSBpcyAiPGlucDp0b3VzZXIgX0ZpZWxkPSJVc2VyTmFtZSIgLz4iIGFuZCB5b3VyIHBhc3N3b3JkIGlzICI8aW5wOnRvdXNlciBfRmllbGQ9InBhc3N3b3JkIiAvPiIuDQo=</EVENT>
+			<EVENT MessageType="text" Event="USER.VALIDATE" Type="0">WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IEluLXBvcnRhbCByZWdpc3RyYXRpb24KCldlbGNvbWUgdG8gSW4tcG9ydGFsIQ0KWW91ciB1c2VyIHJlZ2lzdHJhdGlvbiBoYXMgYmVlbiBhcHByb3ZlZC4gWW91ciB1c2VyIG5hbWUgaXMgIjxpbnA6dG91c2VyIF9GaWVsZD0iVXNlck5hbWUiIC8+IiBhbmQgeW91ciBwYXNzd29yZCBpcyAiPGlucDp0b3VzZXIgX0ZpZWxkPSJwYXNzd29yZCIgLz4iLg0K</EVENT>
 			<EVENT MessageType="text" Event="USER.VALIDATE" Type="1">WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogVXNlciB2YWxpZGF0ZWQKClVzZXIgIjxpbnA6dG91c2VyIF9GaWVsZD0iVXNlck5hbWUiIC8+IiBoYXMgYmVlbiB2YWxpZGF0ZWQu</EVENT>
 		</EVENTS>
 	</LANGUAGE>
Index: branches/unlabeled/unlabeled-1.26.8/core/kernel/parser/template_parser.php
===================================================================
diff -u -r7532 -r7538
--- branches/unlabeled/unlabeled-1.26.8/core/kernel/parser/template_parser.php	(.../template_parser.php)	(revision 7532)
+++ branches/unlabeled/unlabeled-1.26.8/core/kernel/parser/template_parser.php	(.../template_parser.php)	(revision 7538)
@@ -342,7 +342,7 @@
 		}
 
 		if ($opening_tag == '<!--') {
-			if (preg_match('/<inp/', $tag)) {
+			if ($this->Application->IsAdmin()) {
 				$this->AppendOutput('<!-- '.htmlspecialchars($tag). '-->');
 			}
 			else {
Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl
===================================================================
diff -u -r6787 -r7538
--- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl	(.../item_selector_catalog.tpl)	(revision 6787)
+++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl	(.../item_selector_catalog.tpl)	(revision 7538)
@@ -42,8 +42,8 @@
 		<td width="100%" valign="middle">
 			<img height="15" src="img/arrow.gif" width="15" align="absmiddle" border="0"><span id="category_path"></span>
 		</td>
-		<td align="right">
-			<table cellspacing="0" cellpadding="0" border="0">
+		<td align="right" class="search-cell" >
+			<table cellspacing="0" cellpadding="0" border="0" style="width: 270px">
 				<tr>
 					<td>Search:&nbsp;</td>
 					<td>
Index: branches/unlabeled/unlabeled-1.3.2/kernel/admin_templates/item_selector/item_selector_catalog.tpl
===================================================================
diff -u -r6787 -r7538
--- branches/unlabeled/unlabeled-1.3.2/kernel/admin_templates/item_selector/item_selector_catalog.tpl	(.../item_selector_catalog.tpl)	(revision 6787)
+++ branches/unlabeled/unlabeled-1.3.2/kernel/admin_templates/item_selector/item_selector_catalog.tpl	(.../item_selector_catalog.tpl)	(revision 7538)
@@ -42,8 +42,8 @@
 		<td width="100%" valign="middle">
 			<img height="15" src="img/arrow.gif" width="15" align="absmiddle" border="0"><span id="category_path"></span>
 		</td>
-		<td align="right">
-			<table cellspacing="0" cellpadding="0" border="0">
+		<td align="right" class="search-cell" >
+			<table cellspacing="0" cellpadding="0" border="0" style="width: 270px">
 				<tr>
 					<td>Search:&nbsp;</td>
 					<td>
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/phrases_edit.tpl
===================================================================
diff -u -r7368 -r7538
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 7368)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 7538)
@@ -17,7 +17,7 @@
 						}
 					) );
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-						cancel_edit('phrases','OnCancelEdit','<inp2:st_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
+						cancel_edit('phrases','OnCancelEdit','<inp2:phrases_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
 						}
 				 ) );