Explorar o código

Ticket #4777 - Submit button is fullwidth in all Account forms.

AntonLV %!s(int64=2) %!d(string=hai) anos
pai
achega
04d8416bd7

+ 12 - 10
modules/boonex/artificer/data/template/system/block_join.html

@@ -1,12 +1,14 @@
-<bx_if:show_auth>__content__</bx_if:show_auth>
-<bx_if:show_form>__content__</bx_if:show_form>
-<bx_if:show_login>
-    <hr class="bx-def-hr my-4" />
-    <div class="sys-jf-login">
-        <a class="bx-btn w-full justify-center text-center" href="__url__"><bx_text:_sys_txt_join_description_action /></a>
+<div class="sys-jf">
+    <bx_if:show_auth>__content__</bx_if:show_auth>
+    <bx_if:show_form>__content__</bx_if:show_form>
+    <bx_if:show_login>
+        <hr class="bx-def-hr my-4" />
+        <div class="sys-jf-login">
+            <a class="bx-btn w-full justify-center text-center" href="__url__"><bx_text:_sys_txt_join_description_action /></a>
+        </div>
+    </bx_if:show_login>
+    <div class="sys-jf-agreement -mx-4">
+        <hr class="bx-def-hr mt-4" />
+        <div class="sys-jf-agreement-cnt pt-4 px-4 text-xs text-gray-500">__agreement__</div>
     </div>
-</bx_if:show_login>
-<div class="sys-jf-agreement -mx-4">
-    <hr class="bx-def-hr mt-4" />
-    <div class="sys-jf-agreement-cnt pt-4 px-4 text-xs text-gray-500">__agreement__</div>
 </div>

+ 32 - 30
modules/boonex/artificer/data/template/system/block_login.html

@@ -1,32 +1,34 @@
-__custom_html_before__
-<bx_if:show_auth>__content__</bx_if:show_auth>
-<bx_if:show_form>__content__</bx_if:show_form>
-__custom_html_after__
-<bx_if:show_join>
-    <hr class="bx-def-hr my-4" />
-    <div class="sys-lf-join">
-        <a class="bx-btn w-full justify-center text-center" href="__url__"><bx_text:_sys_txt_login_description_action /></a>
+<div class="sys-lf">
+    __custom_html_before__
+    <bx_if:show_auth>__content__</bx_if:show_auth>
+    <bx_if:show_form>__content__</bx_if:show_form>
+    __custom_html_after__
+    <bx_if:show_join>
+        <hr class="bx-def-hr my-4" />
+        <div class="sys-lf-join">
+            <a class="bx-btn w-full justify-center text-center" href="__url__"><bx_text:_sys_txt_login_description_action /></a>
+        </div>
+    </bx_if:show_join>
+    <div class="sys-lf-agreement -mx-4">
+        <hr class="bx-def-hr mt-4" />
+        <div class="sys-lf-agreement-cnt pt-4 px-4 text-xs text-gray-500">__agreement__</div>
     </div>
-</bx_if:show_join>
-<div class="sys-lf-agreement -mx-4">
-    <hr class="bx-def-hr mt-4" />
-    <div class="sys-jf-agreement-cnt pt-4 px-4 text-xs text-gray-500">__agreement__</div>
-</div>
-<bx_if:show_js_code>
-    <script>
-        (bx_login_init_ajax_form = function () {
-            $('#sys-form-login').ajaxForm({
-                dataType: 'json',
-                success: function (oData) {
-                    if ('undefined' !== typeof(oData['res']) && 'OK' == oData['res']) {
-                        location.reload();
+    <bx_if:show_js_code>
+        <script>
+            (bx_login_init_ajax_form = function () {
+                $('#sys-form-login').ajaxForm({
+                    dataType: 'json',
+                    success: function (oData) {
+                        if ('undefined' !== typeof(oData['res']) && 'OK' == oData['res']) {
+                            location.reload();
+                        }
+                        else if ('undefined' !== typeof(oData['form'])) {
+                            $('#sys-form-login').replaceWith(oData['form']);
+                            bx_login_init_ajax_form();
+                        }
                     }
-                    else if ('undefined' !== typeof(oData['form'])) {
-                        $('#sys-form-login').replaceWith(oData['form']);
-                        bx_login_init_ajax_form();
-                    }
-                }
-            });
-        })();
-    </script>
-</bx_if:show_js_code>
+                });
+            })();
+        </script>
+    </bx_if:show_js_code>
+</div>

+ 2 - 2
modules/boonex/artificer/data/template/system/css/general.css

@@ -180,8 +180,8 @@ import url(../../../../../../../template/css/general.css);
 }
 
 /*--- Join/Login Forms ---*/
-#sys_account .bx-form-element .bx-form-input-submit.bx-btn,
-#sys-form-login .bx-form-element .bx-form-input-submit.bx-btn {
+.sys-jf .bx-form-advanced .bx-form-element .bx-form-input-submit.bx-btn,
+.sys-lf .bx-form-advanced .bx-form-element .bx-form-input-submit.bx-btn {
     width: 100%;
     -webkit-justify-content: center;
     justify-content: center;

+ 12 - 10
template/block_join.html

@@ -1,12 +1,14 @@
-<bx_if:show_auth>__content__</bx_if:show_auth>
-<bx_if:show_form>__content__</bx_if:show_form>
-<bx_if:show_login>
-    <hr class="bx-def-hr bx-def-margin-sec-topbottom" />
-    <div class="sys-jf-login">
-        <a class="bx-btn bx-def-font-align-center" href="__url__"><bx_text:_sys_txt_join_description_action /></a>
+<div class="sys-jf">
+    <bx_if:show_auth>__content__</bx_if:show_auth>
+    <bx_if:show_form>__content__</bx_if:show_form>
+    <bx_if:show_login>
+        <hr class="bx-def-hr bx-def-margin-sec-topbottom" />
+        <div class="sys-jf-login">
+            <a class="bx-btn bx-def-font-align-center" href="__url__"><bx_text:_sys_txt_join_description_action /></a>
+        </div>
+    </bx_if:show_login>
+    <div class="sys-jf-agreement bx-def-margin-leftright-neg">
+        <hr class="bx-def-hr bx-def-margin-top" />
+        <div class="sys-jf-agreement-cnt bx-def-padding-top bx-def-padding-leftright bx-def-font-small bx-def-font-grayed">__agreement__</div>
     </div>
-</bx_if:show_login>
-<div class="sys-jf-agreement bx-def-margin-leftright-neg">
-    <hr class="bx-def-hr bx-def-margin-top" />
-    <div class="sys-jf-agreement-cnt bx-def-padding-top bx-def-padding-leftright bx-def-font-small bx-def-font-grayed">__agreement__</div>
 </div>

+ 32 - 30
template/block_login.html

@@ -1,32 +1,34 @@
-__custom_html_before__
-<bx_if:show_auth>__content__</bx_if:show_auth>
-<bx_if:show_form>__content__</bx_if:show_form>
-__custom_html_after__
-<bx_if:show_join>
-    <hr class="bx-def-hr bx-def-margin-sec-topbottom" />
-    <div class="sys-lf-join">
-        <a class="bx-btn bx-def-font-align-center" href="__url__"><bx_text:_sys_txt_login_description_action /></a>
+<div class="sys-lf">
+    __custom_html_before__
+    <bx_if:show_auth>__content__</bx_if:show_auth>
+    <bx_if:show_form>__content__</bx_if:show_form>
+    __custom_html_after__
+    <bx_if:show_join>
+        <hr class="bx-def-hr bx-def-margin-sec-topbottom" />
+        <div class="sys-lf-join">
+            <a class="bx-btn bx-def-font-align-center" href="__url__"><bx_text:_sys_txt_login_description_action /></a>
+        </div>
+    </bx_if:show_join>
+    <div class="sys-lf-agreement bx-def-margin-leftright-neg">
+        <hr class="bx-def-hr bx-def-margin-top" />
+        <div class="sys-lf-agreement-cnt bx-def-padding-top bx-def-padding-leftright bx-def-font-small bx-def-font-grayed">__agreement__</div>
     </div>
-</bx_if:show_join>
-<div class="sys-lf-agreement bx-def-margin-leftright-neg">
-    <hr class="bx-def-hr bx-def-margin-top" />
-    <div class="sys-jf-agreement-cnt bx-def-padding-top bx-def-padding-leftright bx-def-font-small bx-def-font-grayed">__agreement__</div>
-</div>
-<bx_if:show_js_code>
-    <script>
-        (bx_login_init_ajax_form = function () {
-            $('#sys-form-login').ajaxForm({
-                dataType: 'json',
-                success: function (oData) {
-                    if ('undefined' !== typeof(oData['res']) && 'OK' == oData['res']) {
-                        location.reload();
+    <bx_if:show_js_code>
+        <script>
+            (bx_login_init_ajax_form = function () {
+                $('#sys-form-login').ajaxForm({
+                    dataType: 'json',
+                    success: function (oData) {
+                        if ('undefined' !== typeof(oData['res']) && 'OK' == oData['res']) {
+                            location.reload();
+                        }
+                        else if ('undefined' !== typeof(oData['form'])) {
+                            $('#sys-form-login').replaceWith(oData['form']);
+                            bx_login_init_ajax_form();
+                        }
                     }
-                    else if ('undefined' !== typeof(oData['form'])) {
-                        $('#sys-form-login').replaceWith(oData['form']);
-                        bx_login_init_ajax_form();
-                    }
-                }
-            });
-        })();
-    </script>
-</bx_if:show_js_code>
+                });
+            })();
+        </script>
+    </bx_if:show_js_code>
+</div>

+ 2 - 2
template/css/general.css

@@ -426,8 +426,8 @@ div.bx-account-unit-online {
 
 /* --------------- Join/Login Forms */
 
-#sys_account .bx-form-element .bx-form-input-submit.bx-btn,
-#sys-form-login .bx-form-element .bx-form-input-submit.bx-btn {
+.sys-jf .bx-form-advanced .bx-form-element .bx-form-input-submit.bx-btn,
+.sys-lf .bx-form-advanced .bx-form-element .bx-form-input-submit.bx-btn {
     width: 100%;
     -webkit-justify-content: center;
     justify-content: center;

+ 12 - 0
template/scripts/BxBaseMenu.php

@@ -91,6 +91,18 @@ class BxBaseMenu extends BxDolMenu
         ];
     }
 
+    /**
+     * Get menu short code API.
+     * @return array
+     */
+    public function getShortCodeAPI ()
+    {
+        return [
+            'object' => $this->_sObject, 
+            'params' => $this->getContentParams()
+        ];
+    }
+
     protected function _getCode($sTmplName, $aTmplVars)
     {
         return $this->_oTemplate->parseHtmlByName($this->getTemplateName($sTmplName), $aTmplVars);