Просмотр исходного кода

Ticket #4674 - Studio: Layout changes.

AntonLV 2 лет назад
Родитель
Сommit
2131d87de7

+ 7 - 3
modules/boonex/english/data/langs/system/en.xml

@@ -618,7 +618,7 @@
 	<string name="_adm_btn_download_submit"><![CDATA[Download]]></string>
 	<string name="_adm_btn_install_submit"><![CDATA[Install]]></string>
 	<string name="_adm_btn_installed_submit"><![CDATA[Installed]]></string>
-	<string name="_adm_btn_login_submit"><![CDATA[Enter]]></string>
+	<string name="_adm_btn_login_submit"><![CDATA[Sign in]]></string>
 	<string name="_adm_btn_queued_submit"><![CDATA[Queued]]></string>
         <string name="_adm_btn_settings_export"><![CDATA[Export]]></string>
 	<string name="_adm_btn_settings_import"><![CDATA[Import]]></string>
@@ -1888,8 +1888,12 @@
 	<string name="_adm_txt_confirm_ok"><![CDATA[OK]]></string>
 	<string name="_adm_txt_forgot_password"><![CDATA[Forgot password?]]></string>
 	<string name="_adm_txt_form_view_missing"><![CDATA[missing]]></string>
-	<string name="_adm_txt_login_password"><![CDATA[password]]></string>
-	<string name="_adm_txt_login_email"><![CDATA[email]]></string>
+	<string name="_adm_txt_login_password"><![CDATA[Password]]></string>
+        <string name="_adm_txt_login_password_placeholder"><![CDATA[your password]]></string>
+	<string name="_adm_txt_login_email"><![CDATA[Email address]]></string>
+        <string name="_adm_txt_login_email_placeholder"><![CDATA[operator@example.com]]></string>
+        <string name="_adm_txt_login_title"><![CDATA[Login]]></string>
+        <string name="_adm_txt_login_subtitle"><![CDATA[Enter your email and password to login to Studio.]]></string>
 	<string name="_adm_txt_module_custom"><![CDATA[Custom]]></string>
 	<string name="_adm_txt_module_skeletons"><![CDATA[Skeletons]]></string>
 	<string name="_adm_txt_module_system"><![CDATA[System]]></string>

+ 7 - 3
modules/boonex/russian/data/langs/system/ru.xml

@@ -616,7 +616,7 @@
 	<string name="_adm_btn_download_submit"><![CDATA[Скачать]]></string>
 	<string name="_adm_btn_install_submit"><![CDATA[Установить]]></string>
 	<string name="_adm_btn_installed_submit"><![CDATA[Установленные]]></string>
-	<string name="_adm_btn_login_submit"><![CDATA[Вход в Студию]]></string>
+	<string name="_adm_btn_login_submit"><![CDATA[Войти]]></string>
 	<string name="_adm_btn_queued_submit"><![CDATA[В очереди]]></string>
         <string name="_adm_btn_settings_export"><![CDATA[Экспортировать]]></string>
 	<string name="_adm_btn_settings_import"><![CDATA[Импортировать]]></string>
@@ -1863,8 +1863,12 @@
 	<string name="_adm_txt_confirm_ok"><![CDATA[OK]]></string>
 	<string name="_adm_txt_forgot_password"><![CDATA[Забыли пароль?]]></string>
 	<string name="_adm_txt_form_view_missing"><![CDATA[отсутствует]]></string>
-	<string name="_adm_txt_login_password"><![CDATA[пароль]]></string>
-	<string name="_adm_txt_login_email"><![CDATA[эл. адрес]]></string>
+	<string name="_adm_txt_login_password"><![CDATA[Пароль]]></string>
+        <string name="_adm_txt_login_password_placeholder"><![CDATA[ваш пароль]]></string>
+	<string name="_adm_txt_login_email"><![CDATA[Эл. адрес]]></string>
+        <string name="_adm_txt_login_email_placeholder"><![CDATA[operator@example.com]]></string>
+        <string name="_adm_txt_login_title"><![CDATA[Войти]]></string>
+        <string name="_adm_txt_login_subtitle"><![CDATA[Введите свой адрес электронной почты и пароль для входа в Студию.]]></string>
 	<string name="_adm_txt_module_custom"><![CDATA[Индивидуальный]]></string>
 	<string name="_adm_txt_module_skeletons"><![CDATA[Скелеты]]></string>
 	<string name="_adm_txt_module_system"><![CDATA[Система]]></string>

+ 5 - 21
studio/template/css/login.css

@@ -1,23 +1,7 @@
 div.bx-std-login-form {
-	width: 635px;
-	height: auto;
-}
-form.bx-std-login-form {
-    display: flex;
-}
-div.bx-std-login-form {}
-div.bx-std-lf-input {
-	position: relative;
-	width: 225px;
-	margin-right: 10px;
-}
-div.bx-std-lf-submit {
-	position: relative;
-    width: 125px;
-}
-div.bx-std-lf-submit .bx-btn {
-	width: 125px;
-	-moz-box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    box-sizing: border-box;
+    width: 28.75rem;
+    height: auto;
 }
+div.bx-std-login-form .bx-form-input-password {
+    padding: 0px;
+}

+ 1 - 1
studio/template/css/menu_top.css

@@ -27,7 +27,7 @@ div.bx-std-menu-top.bx-std-menu-top-right {
 }
 div.bx-std-menu-top.bx-std-menu-top-left,
 div.bx-std-menu-top.bx-std-menu-top-right {    
-    min-width: 12%;
+    min-width: 10%;
 }
 div.bx-std-menu-top.bx-std-menu-top-center {    
     -webkit-flex-grow: 1;

+ 48 - 19
studio/template/login_form.html

@@ -1,23 +1,52 @@
-<div class="bx-std-login-form bx-def-padding-sec">
-    <form class="bx-std-login-form" action="__action_url__" method="post" onsubmit="return validateLoginForm(this);">
-        <input type="hidden" name="role" value="__role__" />
-        <input type="hidden" name="csrf_token" value="__csrf_token__" />
-        <input type="hidden" name="relocate" value="__relocate_url__" />
-        <div class="bx-std-lf-input">
-            <input class="bx-def-font-inputs bx-form-input-text bx-def-color-ft-grayed-i" id="admin_email" type="text" name="ID" value="" placeholder="<bx_text_attribute:_adm_txt_login_email />" tabindex="1" />
-            <div class="bx-def-padding-sec-top">
-                <input class="form_input_checkbox" type="checkbox" name="rememberMe" id="login_box_form_input_rememberMe" tabindex="3"  /> <label for="login_box_form_input_rememberMe"><bx_text:_adm_txt_remember_me /></label>
-            </div>
+<div class="bx-std-login-form text-gray-800">
+    <div class="p-6">
+        <div class="bx-std-lf-header">
+            <div class="bx-std-lf-title text-2xl text-gray-900 font-semibold"><bx_text:_adm_txt_login_title /></div>
+            <div class="bx-std-lf-subtitle text-sm text-gray-500"><bx_text:_adm_txt_login_subtitle /></div>
         </div>
-        <div class="bx-std-lf-input">
-            <input class="bx-def-font-inputs bx-form-input-text bx-def-color-ft-grayed-i" id="admin_password" type="password" name="Password" value="" placeholder="<bx_text_attribute:_adm_txt_login_password />" tabindex="2" />
-            <div class="bx-def-padding-sec-top">
-                <a href="__forgot_password_url__"><bx_text:_adm_txt_forgot_password /></a>
-            </div>
+        <div class="bx-std-lf-form mt-6">
+            <form class="bx-std-login-form" action="__action_url__" method="post" onsubmit="return validateLoginForm(this);">
+                <input type="hidden" name="role" value="__role__" />
+                <input type="hidden" name="csrf_token" value="__csrf_token__" />
+                <input type="hidden" name="relocate" value="__relocate_url__" />
+                <div>
+                    <div id="bx-form-element-email" class="bx-form-element-wrapper">
+                        <div class="bx-form-element">
+                            <div class="bx-form-caption text-sm font-medium"><bx_text:_adm_txt_login_email /></div>
+                            <div class="bx-form-value">
+                                <div class="bx-form-input-wrapper bx-form-input-wrapper-text">
+                                    <input id="admin_email" type="text" name="ID" class="bx-def-font-inputs bx-form-input-text w-full" placeholder="<bx_text_attribute:_adm_txt_login_email_placeholder />" tabindex="1" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div id="bx-form-element-password" class="bx-form-element-wrapper mt-4">
+                        <div class="bx-form-element">
+                            <div class="bx-form-caption text-sm font-medium"><bx_text:_adm_txt_login_password /></div>
+                            <div class="bx-form-value">
+                                <div class="bx-form-input-wrapper bx-form-input-wrapper-password bx-inited">
+                                    <input id="admin_password" type="password" name="Password" class="bx-def-font-inputs bx-form-input-password" placeholder="<bx_text_attribute:_adm_txt_login_password_placeholder />" tabindex="2" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div id="bx-form-element-login" class="bx-form-element-wrapper mt-4">
+                        <div class="bx-form-element">
+                            <div class="bx-form-value">
+                                <div class="bx-form-input-wrapper bx-form-input-wrapper-submit">
+                                    <input id="admin_login_form_submit" type="submit" value="<bx_text_attribute:_adm_btn_login_submit />" name="login" class="bx-def-font-inputs bx-form-input-submit bx-btn bx-btn-primary justify-center w-full text-center" tabindex="3" />
+                                </div>
+                            </div>        
+                        </div>
+                    </div>
+                </div>
+            </form>
         </div>
-        <div class="bx-std-lf-submit">
-            <input class="bx-btn bx-btn-primary" id="admin_login_form_submit" type="submit" value="<bx_text:_adm_btn_login_submit />" tabindex="4"  />            
+    </div>
+    <div class="bx-def-hr"></div>
+    <div class="p-6">
+        <div class="bx-std-lf-forgot">
+            <a class="bx-btn w-full justify-center text-center" href="__forgot_password_url__" tabindex="4"><bx_text:_adm_txt_forgot_password /></a>
         </div>
-        <div class="bx-std-cb"></div>
-    </form>
+    </div>
 </div>