Ticket #255 - Clean up: Login/Join forms.

modules/boonex/english/data/langs/system/en.xml

@@ -1619,7 +1619,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_et_txt_unsubscribe"><![CDATA[Unsubscribe]]></string>
 	<string name="_sys_form_account"><![CDATA[Account]]></string>
 	<string name="_sys_form_account_input_agreement"><![CDATA[]]></string>
-	<string name="_sys_form_account_input_agreement_value"><![CDATA[<div class="bx-def-font-align-center bx-def-font-small bx-def-font-grayed">By signing up, you agree to the <a href="{0}">Terms of Service</a> and <a href="{1}">Privacy Policy</a>.</div>]]></string>
+	<string name="_sys_form_account_input_agreement_value"><![CDATA[<div class="bx-def-font-small bx-def-font-grayed">By signing up, you agree to the <a href="{0}">Terms of Service</a> and <a href="{1}">Privacy Policy</a>.</div>]]></string>
 	<string name="_sys_form_account_input_captcha"><![CDATA[Security Image]]></string>
 	<string name="_sys_form_account_input_captcha_error"><![CDATA[Security image input failed. Please, try again.]]></string>
 	<string name="_sys_form_account_input_captcha_label_text_image"><![CDATA[Type the text:]]></string>
@@ -1677,7 +1677,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_form_display_comment_post"><![CDATA[Comment From Post]]></string>
 	<string name="_sys_form_display_confirm_email"><![CDATA[Email Confirmation]]></string>
 	<string name="_sys_form_display_forgot_password"><![CDATA[Forgot Password]]></string>
-	<string name="_sys_form_display_login"><![CDATA[Sign in]]></string>
+	<string name="_sys_form_display_login"><![CDATA[Log in]]></string>
 	<string name="_sys_form_display_report_post"><![CDATA[Report From Post]]></string>
 	<string name="_sys_form_display_unsubscribe_news"><![CDATA[Unsubscribe From Newsletters]]></string>
 	<string name="_sys_form_display_unsubscribe_updates"><![CDATA[Unsubscribe From Updates]]></string>
@@ -1689,7 +1689,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_form_forgot_password_input_submit"><![CDATA[Submit]]></string>
 	<string name="_sys_form_input_sys_location"><![CDATA[Location]]></string>
 	<string name="_sys_form_input_location"><![CDATA[Location]]></string>
-	<string name="_sys_form_login"><![CDATA[Sign in]]></string>
+	<string name="_sys_form_login"><![CDATA[Log in]]></string>
 	<string name="_sys_form_login_input_caption_system_agreement"><![CDATA[Agreement]]></string>
 	<string name="_sys_form_login_input_caption_system_captcha"><![CDATA[Captcha]]></string>
 	<string name="_sys_form_login_input_caption_system_delete_confirm"><![CDATA[Confirm Delete]]></string>
@@ -1710,7 +1710,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_form_login_input_email"><![CDATA[Email]]></string>
 	<string name="_sys_form_login_input_password"><![CDATA[Password]]></string>
 	<string name="_sys_form_login_input_remember_me"><![CDATA[Remember me]]></string>
-	<string name="_sys_form_login_input_submit"><![CDATA[Sign in]]></string>
+	<string name="_sys_form_login_input_submit"><![CDATA[Log in]]></string>
 	<string name="_sys_form_paceholder_profiles_suggestions"><![CDATA[Type name here...]]></string>
 	<string name="_sys_form_report"><![CDATA[Report]]></string>
 	<string name="_sys_form_report_input_caption_submit"><![CDATA[Post]]></string>
@@ -1882,8 +1882,8 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_menu_item_title_system_cmts_item_vote"><![CDATA[Plus]]></string>
 	<string name="_sys_menu_item_title_system_dashboard"><![CDATA[Dashboard]]></string>
 	<string name="_sys_menu_item_title_system_home"><![CDATA[Home]]></string>
-	<string name="_sys_menu_item_title_system_login"><![CDATA[Sign in]]></string>
-	<string name="_sys_menu_item_title_system_logout"><![CDATA[Sign out]]></string>
+	<string name="_sys_menu_item_title_system_login"><![CDATA[Log in]]></string>
+	<string name="_sys_menu_item_title_system_logout"><![CDATA[Log out]]></string>
 	<string name="_sys_menu_item_title_system_main_menu"><![CDATA[Main Menu]]></string>
 	<string name="_sys_menu_item_title_system_more"><![CDATA[More]]></string>
 	<string name="_sys_menu_item_title_system_orders"><![CDATA[Orders]]></string>
@@ -1973,9 +1973,9 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_page_block_title_dashboard"><![CDATA[Dashboard]]></string>
 	<string name="_sys_page_block_title_homepage_menu"><![CDATA[Content modules menu]]></string>
 	<string name="_sys_page_block_title_forgot_password"><![CDATA[Forgot Password]]></string>
-	<string name="_sys_page_block_system_title_login"><![CDATA[Sign in with Sign up link]]></string>
-	<string name="_sys_page_block_system_title_login_only"><![CDATA[Sign in]]></string>
-	<string name="_sys_page_block_title_login"><![CDATA[Sign in]]></string>
+	<string name="_sys_page_block_system_title_login"><![CDATA[Log in with Sign up link]]></string>
+	<string name="_sys_page_block_system_title_login_only"><![CDATA[Log in]]></string>
+	<string name="_sys_page_block_title_login"><![CDATA[Log in]]></string>
 	<string name="_sys_page_block_title_manage_tools"><![CDATA[Manage]]></string>
 	<string name="_sys_page_block_title_privacy"><![CDATA[Privacy Policy]]></string>
 	<string name="_sys_page_block_title_profile_stats"><![CDATA[Profile stats]]></string>
@@ -2002,7 +2002,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_page_title_dashboard"><![CDATA[Dashboard]]></string>
 	<string name="_sys_page_title_forgot_password"><![CDATA[Forgot Password]]></string>
 	<string name="_sys_page_title_home"><![CDATA[{site_title} :: Homepage]]></string>
-	<string name="_sys_page_title_login"><![CDATA[Sign in]]></string>
+	<string name="_sys_page_title_login"><![CDATA[Log in]]></string>
 	<string name="_sys_page_title_privacy"><![CDATA[Privacy Policy]]></string>
 	<string name="_sys_page_title_terms"><![CDATA[Terms of Service]]></string>
 	<string name="_sys_page_title_system_about"><![CDATA[About]]></string>
@@ -2017,7 +2017,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_page_title_system_dashboard"><![CDATA[Dashboard]]></string>
 	<string name="_sys_page_title_system_forgot_password"><![CDATA[Forgot Password]]></string>
 	<string name="_sys_page_title_system_home"><![CDATA[Homepage]]></string>
-	<string name="_sys_page_title_system_login"><![CDATA[Sign in]]></string>
+	<string name="_sys_page_title_system_login"><![CDATA[Log in]]></string>
 	<string name="_sys_page_title_system_privacy"><![CDATA[Privacy Policy]]></string>
 	<string name="_sys_page_title_system_terms"><![CDATA[Terms of Service]]></string>
 	<string name="_sys_page_title_system_unsubscribe_news"><![CDATA[Unsubscribe From Newsletters]]></string>
@@ -2179,7 +2179,7 @@ If it is not enabled then please consider implement this optimization, since it
 
     <string name="_sys_txt_homepage_cover"><![CDATA[Unity is strength... when there is teamwork and collaboration, wonderful things can be achieved.<br /><button class="bx-btn bx-hide-when-logged-in bx-def-margin-top" onclick="document.location='{0}'">Join Now!</button>]]></string>
     <string name="_sys_txt_join_description"><![CDATA[Already a member? <a href="{0}">Log in.</a>]]></string>
-	<string name="_sys_txt_login_description"><![CDATA[Not a member yet? <a href="{0}">Join now!</a>]]></string>
+	<string name="_sys_txt_login_description"><![CDATA[Not a member yet? <a href="{0}">Sign up.</a>]]></string>
 	<string name="_sys_txt_login_error"><![CDATA[Entered email or password is incorrect. Please try again.]]></string>
 	<string name="_sys_txt_login_invalid_role"><![CDATA[Access denied]]></string>
     <string name="_sys_txt_my_profiles"><![CDATA[<b>@</b> my profiles...</a>]]></string>

modules/boonex/russian/data/langs/system/ru.xml

@@ -1619,7 +1619,7 @@
 	<string name="_sys_et_txt_unsubscribe"><![CDATA[Отписаться]]></string>
 	<string name="_sys_form_account"><![CDATA[Аккаунт]]></string>
 	<string name="_sys_form_account_input_agreement"><![CDATA[]]></string>
-	<string name="_sys_form_account_input_agreement_value"><![CDATA[<div class="bx-def-font-align-center bx-def-font-small bx-def-font-grayed">Присоединяясь, Вы соглашаетесь с <a href="{0}">Правилами пользования</a> и <a href="{1}">Политикой конфиденциальности</a>.</div>]]></string>
+	<string name="_sys_form_account_input_agreement_value"><![CDATA[<div class="bx-def-font-small bx-def-font-grayed">Присоединяясь, Вы соглашаетесь с <a href="{0}">Правилами пользования</a> и <a href="{1}">Политикой конфиденциальности</a>.</div>]]></string>
 	<string name="_sys_form_account_input_captcha"><![CDATA[Капча]]></string>
 	<string name="_sys_form_account_input_captcha_error"><![CDATA[Проверка капчи не удалась. Попытайтесь ещё раз.]]></string>
 	<string name="_sys_form_account_input_captcha_label_text_image"><![CDATA[Введите текст:]]></string>
@@ -2180,7 +2180,7 @@
 
     <string name="_sys_txt_homepage_cover"><![CDATA[Сплоченность людей — нерушимая крепость.<br /><button class="bx-btn bx-hide-when-logged-in bx-def-margin-top" onclick="document.location='{0}'">Присоедениться!</button>]]></string>
     <string name="_sys_txt_join_description"><![CDATA[Уже зарегистрировались? <a href="{0}">Заходите.</a>]]></string>
-	<string name="_sys_txt_login_description"><![CDATA[Ещё нет аккаунта? <a href="{0}">Зарегистрируйтесь!</a>]]></string>
+	<string name="_sys_txt_login_description"><![CDATA[Ещё нет аккаунта? <a href="{0}">Зарегистрируйтесь.</a>]]></string>
 	<string name="_sys_txt_login_error"><![CDATA[Введённый имейл или пароль неправильны. Пожалуйста, попытайтесь снова.]]></string>
 	<string name="_sys_txt_login_invalid_role"><![CDATA[Доступ запрещён]]></string>
     <string name="_sys_txt_my_profiles"><![CDATA[<b>@</b> мои профили...</a>]]></string>

template/css/general.css

@@ -150,18 +150,3 @@
     vertical-align:middle;
     margin:0 0.2rem;
 }
-
-/* --------------- login form */
-#sys_account .bx-form-input-wrapper-submit,
-#sys-form-login .bx-form-input-wrapper-submit {
-	text-align: center;
-}
-#sys_account .bx-form-input-wrapper-submit .bx-btn,
-#sys-form-login .bx-form-input-wrapper-submit .bx-btn {
-	display: inline-block;
-    float: none;
-
-    width: 100%;
-    max-width: 450px;
-    max-width: 28rem;
-}

template/scripts/BxBaseFormAccount.php

@@ -69,11 +69,6 @@ class BxBaseFormAccount extends BxTemplFormView
 
     public function __construct($aInfo, $oTemplate)
     {
-    	if(isset($aInfo['inputs']['agreement'])) {
-    		$oPermalink = BxDolPermalinks::getInstance();
-    		$aInfo['inputs']['agreement']['content'] = _t('_sys_form_account_input_agreement_value', $oPermalink->permalink('page.php?i=terms'), $oPermalink->permalink('page.php?i=privacy'));
-    	} 
-
         parent::__construct($aInfo, $oTemplate);
         $this->_bSetPendingApproval = !(bool)getParam('sys_account_autoapproval');
     }
@@ -136,6 +131,12 @@ class BxBaseFormAccount extends BxTemplFormView
         return parent::update ($val, $aValsToAdd, $aTrackTextFieldsChanges);
     }
 
+	protected function genCustomInputAgreement ($aInput)
+    {
+    	$oPermalink = BxDolPermalinks::getInstance();
+        return '<div>' . _t('_sys_form_account_input_agreement_value', BX_DOL_URL_ROOT . $oPermalink->permalink('page.php?i=terms'), BX_DOL_URL_ROOT . $oPermalink->permalink('page.php?i=privacy')) . '</div>';
+    }
+    
     protected function _setCustomError ($s)
     {
         $this->aInputs['do_submit']['error'] = $s;

template/scripts/BxBaseFormLogin.php

@@ -51,9 +51,7 @@ class BxBaseFormLogin extends BxTemplFormView
 
     protected function genCustomInputSubmitText ($aInput)
     {
-        return '<div class="bx-def-font-align-center">
-                    <a href="' . BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=forgot-password') . '">' . _t("_sys_txt_forgot_pasword") . '</a>
-                </div>';
+        return '<div><a href="' . BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=forgot-password') . '">' . _t("_sys_txt_forgot_pasword") . '</a></div>';
     }
 
     public function getRole()

template/scripts/BxBaseServiceAccount.php

@@ -27,7 +27,7 @@ class BxBaseServiceAccount extends BxDol
     {
 	    $sLoginText = '';
         if (!isset($aParams['no_login_text']) || (int)$aParams['no_login_text'] == 1)
-            $sLoginText = '<hr class="bx-def-hr bx-def-margin-sec-topbottom" /><div class="bx-def-font-align-center">' . _t('_sys_txt_join_description', BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=login')) . '</div>';
+            $sLoginText = '<hr class="bx-def-hr bx-def-margin-sec-topbottom" /><div>' . _t('_sys_txt_join_description', BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=login')) . '</div>';
 
         return $this->_oAccountForms->createAccountForm($aParams) . $sLoginText;
     }

template/scripts/BxBaseServiceLogin.php

@@ -84,7 +84,7 @@ class BxBaseServiceLogin extends BxDol
 
         $sJoinText = '';
         if (strpos($sParams, 'no_join_text') === false) {
-            $sJoinText = '<hr class="bx-def-hr bx-def-margin-sec-topbottom" /><div class="bx-def-font-align-center">' . _t('_sys_txt_login_description', BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=create-account')) . '</div>';
+            $sJoinText = '<hr class="bx-def-hr bx-def-margin-sec-topbottom" /><div>' . _t('_sys_txt_login_description', BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=create-account')) . '</div>';
         }
 
         BxDolTemplate::getInstance()->addJs(array('jquery.form.min.js'));