Fisheye: Tag 8729 refers to a dead (removed) revision in file `trunk/themes/default2007/platform/mailing_list/unsubscribe_error.tpl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/themes/default2007/platform/mailing_list/subscribe.tpl
===================================================================
diff -u -r8714 -r8729
--- trunk/themes/default2007/platform/mailing_list/subscribe.tpl	(.../subscribe.tpl)	(revision 8714)
+++ trunk/themes/default2007/platform/mailing_list/subscribe.tpl	(.../subscribe.tpl)	(revision 8729)
@@ -1,33 +1,29 @@
 <inp2:m_DefineElement name="sidebar">
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator" design="blue_box" data_exists="1"/>
 	<inp2:m_RenderElements
 		elements="
 			platform/elements/side_boxes/login,
 			platform/elements/side_boxes/recommend_site,
 		"
 		design="blue_box"/>
-
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_sellers_products" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_Subscribe" templates="platform/mailing_list/subscribe"/>
+	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_SubscribeConfirm" templates="platform/mailing_list/subscribe"/>
 
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_SubscribeConfirm"/>
 		</inp2:m_Capture>
 
 		<inp2:m_Phrase label="lu_subscribe_confirm_prompt" />
-		<br />
+		<br /><br />
+
 		<form method="POST" action="<inp2:m_FormAction />">
-			<input class="button" name="events[u][OnSubscribeUser]" type="submit" style="width: 80px;" value="<inp2:m_Phrase label="lu_comm_Yes"/>" />&nbsp;
-			<input class="button" type="button" value="<inp2:m_Phrase label="lu_Cancel"/>" onClick="window.location.href='<inp2:m_Link template="index"/>'" />&nbsp;
+			<input class="button" name="events[u][OnSubscribeUser]" type="submit" value="<inp2:m_Phrase label="lu_btn_Yes"/>" />&nbsp;
+			<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_No"/>" onclick="redirect('<inp2:m_Link template="index"/>');" />&nbsp;
 			<input type="hidden" name="subscribe_ok_template" value="platform/mailing_list/subscribe_ok"/>
-			<input type="hidden" name="subscribe_fail_template" value="platform/mailing_list/subscribe_error"/>
 		</form>
-
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
-<inp2:m_include template="platform/designs/default_design" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design" pass_params="1"/>
\ No newline at end of file
Index: trunk/themes/default2007/platform/mailing_list/unsubscribe_ok.tpl
===================================================================
diff -u -r8714 -r8729
--- trunk/themes/default2007/platform/mailing_list/unsubscribe_ok.tpl	(.../unsubscribe_ok.tpl)	(revision 8714)
+++ trunk/themes/default2007/platform/mailing_list/unsubscribe_ok.tpl	(.../unsubscribe_ok.tpl)	(revision 8729)
@@ -1,13 +1,10 @@
 <inp2:m_DefineElement name="sidebar">
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator" design="blue_box" data_exists="1"/>
 	<inp2:m_RenderElements
 		elements="
 			platform/elements/side_boxes/login,
 			platform/elements/side_boxes/recommend_site,
 		"
 		design="blue_box"/>
-
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_sellers_products" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
@@ -19,16 +16,10 @@
 		</inp2:m_Capture>
 
 		<inp2:m_Phrase label="lu_TextUnsubscribe"/>
-		<br />
-		<input class="button" type="button" value="<inp2:m_Phrase label="lu_comm_Ok"/>" onClick="window.location.href='<inp2:m_Link template="index"/>'" />&nbsp;
+		<br /><br />
 
+		<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_Ok"/>" onClick="window.location.href='<inp2:m_Link template="index"/>'" />&nbsp;
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
-<inp2:m_include template="platform/designs/default_design" pass_params="1"/>
-
-
-
-
-
-
+<inp2:m_include template="platform/designs/default_design" pass_params="1"/>
\ No newline at end of file
Index: trunk/core/units/users/users_event_handler.php
===================================================================
diff -u -r8620 -r8729
--- trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 8620)
+++ trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 8729)
@@ -692,16 +692,23 @@
 			$event->redirect = false;
 		}
 
+		/**
+		 * Validate subscriber's email & store it to session -> redirect to confirmation template
+		 *
+		 * @param kEvent $event
+		 */
 		function OnSubscribeQuery(&$event)
 		{
 			$user_email = $this->Application->GetVar('subscriber_email');
-			if ( preg_match("/^[_a-zA-Z0-9-\.]+@[a-zA-Z0-9-\.]+\.[a-z]{2,4}$/", $user_email) ){
+			if (preg_match("/^[_a-zA-Z0-9-\.]+@[a-zA-Z0-9-\.]+\.[a-z]{2,4}$/", $user_email)) {
 
-				$object = &$this->Application->recallObject($this->Prefix.'.subscriber', null, Array('skip_autoload' => true));
+				$object =& $this->Application->recallObject($this->Prefix.'.subscriber', null, Array('skip_autoload' => true));
+				/* @var $object UsersItem */
 
 				$this->Application->StoreVar('SubscriberEmail', $user_email);
 
-				if( $object->Load(array('Email'=>$user_email)) ){
+				$object->Load($user_email, 'Email');
+				if ($object->isLoaded()) {
 					$group_info = $this->GetGroupInfo($object->GetID());
 					$event->redirect = $this->Application->GetVar($group_info ? 'unsubscribe_template' : 'subscribe_template');
 				}
@@ -717,19 +724,24 @@
 				$object->FieldErrors['SubscribeEmail']['pseudo'] = 'invalid_email';
 				$event->status = erFAIL;
 			}
-			//subscribe_query_ok_template
 		}
 
-		function OnSubscribeUser(&$event){
-
+		/**
+		 * Subscribe/Unsubscribe user based on email stored in previous step
+		 *
+		 * @param kEvent $event
+		 */
+		function OnSubscribeUser(&$event)
+		{
 			$object = &$this->Application->recallObject($this->Prefix.'.subscriber', null, Array('skip_autoload' => true));
+			/* @var $object UsersItem */
 
 			$user_email = $this->Application->RecallVar('SubscriberEmail');
-
-			if (preg_match("/^[_a-zA-Z0-9-\.]+@[a-zA-Z0-9-\.]+\.[a-z]{2,4}$/", $user_email)){
+			if (preg_match("/^[_a-zA-Z0-9-\.]+@[a-zA-Z0-9-\.]+\.[a-z]{2,4}$/", $user_email)) {
 				$this->RemoveRequiredFields($object);
-				if($object->Load(array('Email'=>$user_email))){
+				$object->Load($user_email, 'Email');
 
+				if ($object->isLoaded()) {
 					$group_info = $this->GetGroupInfo($object->GetID());
 
 					if ($group_info){
@@ -744,17 +756,13 @@
 						}
 
 						$event->redirect = $this->Application->GetVar('unsubscribe_ok_template');
-
 					}
 					else {
 						$this->AddSubscriberGroup($object->GetID(), 0);
 						$event->redirect = $this->Application->GetVar('subscribe_ok_template');
 					}
-
-
 				}
 				else {
-
 					$object->SetField('Email', $user_email);
 					$object->SetField('Login', $user_email);
 					$object->SetDBField('dob', 1);
@@ -766,20 +774,13 @@
 					$this->Application->SetVar('IsSubscriber', 1);
 
 					if ($object->Create()) {
-
 						$this->AddSubscriberGroup($object->GetID(), 1);
 						$event->redirect = $this->Application->GetVar('subscribe_ok_template');
 					}
 
 					$this->Application->SetVar('IsSubscriber', 0);
 				}
 			}
-			else {
-				// error handling here
-				$event->redirect = $this->Application->GetVar('subscribe_fail_template');
-			}
-
-
 		}
 
 		function AddSubscriberGroup($user_id, $is_primary){
@@ -802,13 +803,18 @@
 
 		}
 
-		function GetGroupInfo($user_id){
-
-			$group_info = $this->Conn->GetRow('SELECT * FROM '.TABLE_PREFIX.'UserGroup
-										WHERE PortalUserId='.$user_id.'
-										AND GroupId='.$this->Application->ConfigValue('User_SubscriberGroup'));
-			return $group_info;
-
+		/**
+		 * Allows to detect user subscription status (subscribed or not)
+		 *
+		 * @param int $user_id
+		 * @return bool
+		 */
+		function GetGroupInfo($user_id)
+		{
+			$sql = 'SELECT *
+					FROM '.TABLE_PREFIX.'UserGroup
+					WHERE (PortalUserId = '.$user_id.') AND (GroupId = '.$this->Application->ConfigValue('User_SubscriberGroup').')';
+			return $this->Conn->GetRow($sql);
 		}
 
 		function OnForgotPassword(&$event)
Index: trunk/themes/default2007/platform/mailing_list/unsubscribe.tpl
===================================================================
diff -u -r8714 -r8729
--- trunk/themes/default2007/platform/mailing_list/unsubscribe.tpl	(.../unsubscribe.tpl)	(revision 8714)
+++ trunk/themes/default2007/platform/mailing_list/unsubscribe.tpl	(.../unsubscribe.tpl)	(revision 8729)
@@ -1,34 +1,29 @@
 <inp2:m_DefineElement name="sidebar">
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator" design="blue_box" data_exists="1"/>
 	<inp2:m_RenderElements
 		elements="
 			platform/elements/side_boxes/login,
 			platform/elements/side_boxes/recommend_site,
 		"
 		design="blue_box"/>
-
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_sellers_products" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_Unsubscribe" templates="platform/mailing_list/unsubscribe"/>
+	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_UnsubscribeConfirm" templates="platform/mailing_list/unsubscribe"/>
 
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_UnsubscribeConfirm"/>
 		</inp2:m_Capture>
 
 		<inp2:m_Phrase label="lu_unsubscribe_confirm_prompt" />
-		<br />
+		<br /><br />
+
 		<form method="POST" action="<inp2:m_FormAction />">
-			<input class="button" name="events[u][OnSubscribeUser]" type="submit" style="width: 80px;" value="<inp2:m_Phrase label="lu_comm_Yes"/>" />&nbsp;
-			<input class="button" type="button" value="<inp2:m_Phrase label="lu_Cancel"/>" onClick="window.location.href='<inp2:m_Link template="index"/>'" />&nbsp;
+			<input class="button" name="events[u][OnSubscribeUser]" type="submit" value="<inp2:m_Phrase label="lu_btn_Yes"/>" />&nbsp;
+			<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_No"/>" onclick="redirect('<inp2:m_Link template="index"/>');" />&nbsp;
 			<input type="hidden" name="unsubscribe_ok_template" value="platform/mailing_list/unsubscribe_ok"/>
-			<input type="hidden" name="unsubscribe_fail_template" value="platform/mailing_list/unsubscribe_error"/>
 		</form>
-
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
-<inp2:m_include template="platform/designs/default_design" pass_params="1"/>
-
+<inp2:m_include template="platform/designs/default_design" pass_params="1"/>
\ No newline at end of file
Index: trunk/themes/default2007/phrases_edit.tpl
===================================================================
diff -u -r8693 -r8729
--- trunk/themes/default2007/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 8693)
+++ trunk/themes/default2007/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 8729)
@@ -16,25 +16,38 @@
 			<inp2:m_phrase name="lu_title_MissingPhraseAdding"/>
 		</inp2:m_Capture>
 
+		<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
+
 		<inp2:m_if check="phrases_HasError" field="any">
-			<span class="field-required"><inp2:m_phrase name="lu_AProblemInForm"/></span><br />
+			<inp2:m_RenderElement name="error_message" />
 		</inp2:m_if>
 
-		<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br />
 		<form method="post" action="<inp2:m_FormAction/>">
-			<table class="form-data">
+			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
+
+			<table class="form-data fullwidth">
 				<inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation" title="lu_fld_primary_translation"/>
 				<inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" title="lu_fld_phrase" style="width: 300px;"/>
 				<inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Translation" title="lu_fld_translation" style="width: 300px;"/>
-				<inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module" title="lu_fld_module"/>
+				<inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module" title="lu_fld_module" is_last="1"/>
 
 				<tr>
-					<td colspan="3" valign="bottom" height="35">
+					<td colspan="2">
+						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" />
+					</td>
+				</tr>
+				<tr>
+					<td style="width:150px">
+						&nbsp;
+					</td>
+					<td>
+						<br />
 						<input type="hidden" id="phrases_label" name="phrases_label" value="<inp2:m_get var="phrases_label"/>" />
 						<input type="hidden" name="<inp2:phrases_InputName field="LanguageId"/>" value="<inp2:phrases_Field name="LanguageId"/>" />
 						<input type="hidden" name="<inp2:phrases_InputName field="PhraseType"/>" value="0" />
 
 						<input class="button" type="submit" name="events[phrases][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Create"/>"/>
+						<br /><br />
 					</td>
 				</tr>
 			</table>
Fisheye: Tag 8729 refers to a dead (removed) revision in file `trunk/themes/default2007/platform/mailing_list/subscribe_error.tpl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/themes/default2007/platform/mailing_list/subscribe_ok.tpl
===================================================================
diff -u -r8714 -r8729
--- trunk/themes/default2007/platform/mailing_list/subscribe_ok.tpl	(.../subscribe_ok.tpl)	(revision 8714)
+++ trunk/themes/default2007/platform/mailing_list/subscribe_ok.tpl	(.../subscribe_ok.tpl)	(revision 8729)
@@ -1,13 +1,10 @@
 <inp2:m_DefineElement name="sidebar">
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator" design="blue_box" data_exists="1"/>
 	<inp2:m_RenderElements
 		elements="
 			platform/elements/side_boxes/login,
 			platform/elements/side_boxes/recommend_site,
 		"
 		design="blue_box"/>
-
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_sellers_products" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
@@ -19,16 +16,10 @@
 		</inp2:m_Capture>
 
 		<inp2:m_Phrase label="lu_ThankForSubscribing"/>
-		<br />
-		<input class="button" type="button" value="<inp2:m_Phrase label="lu_comm_Ok"/>" onClick="window.location.href='<inp2:m_Link template="index"/>'" />&nbsp;
+		<br /><br />
 
+		<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_Ok"/>" onClick="window.location.href='<inp2:m_Link template="index"/>'" />&nbsp;
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
-<inp2:m_include template="platform/designs/default_design" pass_params="1"/>
-
-
-
-
-
-
+<inp2:m_include template="platform/designs/default_design" pass_params="1"/>
\ No newline at end of file
Index: trunk/themes/default2007/platform/elements/side_boxes/mailing_list.tpl
===================================================================
diff -u -r8712 -r8729
--- trunk/themes/default2007/platform/elements/side_boxes/mailing_list.tpl	(.../mailing_list.tpl)	(revision 8712)
+++ trunk/themes/default2007/platform/elements/side_boxes/mailing_list.tpl	(.../mailing_list.tpl)	(revision 8729)
@@ -4,13 +4,14 @@
 
 <form method="POST" action="<inp2:m_FormAction />" name="mailing_list_form">
 	<inp2:m_Phrase label="lu_EnterEmailToSubscribe"/><br />
-	<input type="text" name="subscriber_email" />
-	<br /><img src="img/s.gif" alt="" width="5" height="10" border="0" /><br />
+	<input type="text" name="subscriber_email" class="input-text" /><br />
 	<inp2:m_if check="u_HasError" field="any">
-		<span class="error"><inp2:u_Error field="SubscribeEmail"/></span><br />
+		<span class="field-error"><inp2:u_Error field="SubscribeEmail"/></span><br />
 	</inp2:m_if>
-	<input class="button" name="events[u][OnSubscribeQuery]" type="submit" value="<inp2:m_Phrase label="lu_comm_Subscribe"/>" />
-	<input class="button" name="events[u][OnSubscribeQuery]" type="submit" value="<inp2:m_Phrase label="lu_comm_Unsubscribe" />" />
+
+	<br />
+	<input class="button" name="events[u][OnSubscribeQuery]" type="submit" value="<inp2:m_Phrase label="lu_btn_Subscribe"/>" />
+	<input class="button" name="events[u][OnSubscribeQuery]" type="submit" value="<inp2:m_Phrase label="lu_btn_Unsubscribe" />" />
 	&nbsp;
 	<input type="text" style="display: none" />
 	<input type="hidden" name="subscribe_template" value="platform/mailing_list/subscribe"/>