AntonLV 10 năm trước cách đây
mục cha
commit
12707cadf9

+ 2 - 4
install/sql/system.sql

@@ -2160,7 +2160,6 @@ INSERT INTO `sys_form_inputs` (`object`, `module`, `name`, `value`, `values`, `c
 ('sys_login', 'system', 'ID', '', '', 0, 'text', '_sys_form_login_input_caption_system_id', '_sys_form_login_input_email', '', 1, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
 ('sys_login', 'system', 'Password', '', '', 0, 'password', '_sys_form_login_input_caption_system_password', '_sys_form_login_input_password', '', 1, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
 ('sys_login', 'system', 'rememberMe', '1', '', 0, 'switcher', '_sys_form_login_input_caption_system_remember_me', '_sys_form_login_input_remember_me', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
-('sys_login', 'system', 'submit_block', '', 'login,submit_text', 0, 'input_set', '_sys_form_login_input_caption_system_submit_block', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
 ('sys_login', 'system', 'login', '_sys_form_login_input_submit', '', 0, 'submit', '_sys_form_login_input_caption_system_submit', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
 ('sys_login', 'system', 'submit_text', '', '', 0, 'custom', '_sys_form_login_input_caption_system_submit_text', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
 
@@ -2216,9 +2215,8 @@ INSERT INTO `sys_form_display_inputs` (`display_name`, `input_name`, `visible_fo
 ('sys_login', 'ID', 2147483647, 1, 3),
 ('sys_login', 'Password', 2147483647, 1, 4),
 ('sys_login', 'rememberMe', 2147483647, 1, 5),
-('sys_login', 'submit_block', 2147483647, 1, 6),
-('sys_login', 'login', 2147483647, 1, 7),
-('sys_login', 'submit_text', 2147483647, 1, 8),
+('sys_login', 'login', 2147483647, 1, 6),
+('sys_login', 'submit_text', 2147483647, 1, 7),
 
 ('sys_account_create', 'name', 2147483647, 1, 1),
 ('sys_account_create', 'email', 2147483647, 1, 2),

+ 0 - 1
modules/boonex/english/data/langs/system/en.xml

@@ -1653,7 +1653,6 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_form_login_input_caption_system_remember_me"><![CDATA[Remember me]]></string>
 	<string name="_sys_form_login_input_caption_system_role"><![CDATA[Role]]></string>
 	<string name="_sys_form_login_input_caption_system_submit"><![CDATA[Submit]]></string>
-	<string name="_sys_form_login_input_caption_system_submit_block"><![CDATA[Submit Block]]></string>
 	<string name="_sys_form_login_input_caption_system_submit_text"><![CDATA[Submit Text]]></string>
 	<string name="_sys_form_login_input_email"><![CDATA[Email]]></string>
 	<string name="_sys_form_login_input_password"><![CDATA[Password]]></string>

+ 0 - 1
modules/boonex/russian/data/langs/system/ru.xml

@@ -1653,7 +1653,6 @@
 	<string name="_sys_form_login_input_caption_system_remember_me"><![CDATA[Запомнить меня]]></string>
 	<string name="_sys_form_login_input_caption_system_role"><![CDATA[Роль]]></string>
 	<string name="_sys_form_login_input_caption_system_submit"><![CDATA[Выполнить]]></string>
-	<string name="_sys_form_login_input_caption_system_submit_block"><![CDATA[Блок Отправки]]></string>
 	<string name="_sys_form_login_input_caption_system_submit_text"><![CDATA[Текст Отправки]]></string>
 	<string name="_sys_form_login_input_email"><![CDATA[Имейл]]></string>
 	<string name="_sys_form_login_input_password"><![CDATA[Пароль]]></string>

+ 3 - 1
template/css/common.css

@@ -414,9 +414,11 @@ body > .bx-popup-wrapper {
     margin-left:0;
 }
 button.bx-btn,
-input.bx-btn {    
+input.bx-btn {
 	padding-top:0px;
 	padding-bottom:0px;
+
+	text-transform: uppercase;
     font-size:1rem;
     color:#fff;
 }

+ 4 - 0
template/css/default.less

@@ -394,6 +394,10 @@
 	font-weight: 800;
 }
 
+.bx-def-font-align-center {
+	text-align: center;
+}
+
 h1,
 .bx-def-font-h1 {
     .font-size(@bx-font-size-h1);

+ 9 - 1
template/css/forms.css

@@ -327,8 +327,16 @@
     line-height:26px;
 }
 
+.bx-form-input-wrapper-submit {
+	text-align: center;
+}
 .bx-form-input-wrapper-submit .bx-btn {
-    float:none;
+	display: inline-block;
+    float: none;
+
+    width: 100%;
+    max-width: 450px;
+    max-width: 28rem;
 }
 
 .bx-form-input-wrapper-input_set .bx-btn {

+ 2 - 3
template/scripts/BxBaseFormLogin.php

@@ -51,10 +51,9 @@ class BxBaseFormLogin extends BxTemplFormView
 
     protected function genCustomInputSubmitText ($aInput)
     {
-        return '<div class="bx-form-right-line-aligned">
+        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>
-                <div class="clear_both"></div>';
+                </div>';
     }
 
     public function getRole()