From commits-return-19756-archive-asf-public=cust-asf.ponee.io@struts.apache.org Sun Jun 27 07:17:19 2021 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mxout1-he-de.apache.org (mxout1-he-de.apache.org [95.216.194.37]) by mx-eu-01.ponee.io (Postfix) with ESMTPS id 97C27180663 for ; Sun, 27 Jun 2021 09:17:19 +0200 (CEST) Received: from mail.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mxout1-he-de.apache.org (ASF Mail Server at mxout1-he-de.apache.org) with SMTP id 9E02E607B4 for ; Sun, 27 Jun 2021 07:17:18 +0000 (UTC) Received: (qmail 64242 invoked by uid 500); 27 Jun 2021 07:17:17 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 64220 invoked by uid 99); 27 Jun 2021 07:17:16 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Jun 2021 07:17:16 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 7E0F1823D8; Sun, 27 Jun 2021 07:17:16 +0000 (UTC) Date: Sun, 27 Jun 2021 07:17:17 +0000 To: "commits@struts.apache.org" Subject: [struts] 01/01: Merge pull request #490 from apache/WW-5132-labelposition MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: lukaszlenart@apache.org In-Reply-To: <162477823631.6620.13817197648532792005@gitbox.apache.org> References: <162477823631.6620.13817197648532792005@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: struts X-Git-Refname: refs/heads/struts-2-5-x X-Git-Reftype: branch X-Git-Rev: 90ea4d8aa1ca1ecc488137deab968e1bc873bdcd X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20210627071716.7E0F1823D8@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch struts-2-5-x in repository https://gitbox.apache.org/repos/asf/struts.git commit 90ea4d8aa1ca1ecc488137deab968e1bc873bdcd Merge: d04ed76 f1824b5 Author: Lukasz Lenart AuthorDate: Sun Jun 27 09:17:10 2021 +0200 Merge pull request #490 from apache/WW-5132-labelposition [WW-5132] [WW-5123] labelposition .../ajaxErrorContainers/controlheader-core.ftl | 12 +++++------ .../org/apache/struts2/components/Checkbox.java | 17 +++++++++++++++ .../java/org/apache/struts2/components/UIBean.java | 24 ++++++++++++++++------ .../apache/struts2/views/jsp/ui/AbstractUITag.java | 17 ++++++++++----- .../apache/struts2/views/jsp/ui/CheckboxTag.java | 7 +++---- .../template/archive/xhtml/controlheader.vm | 6 +++--- .../main/resources/template/css_xhtml/checkbox.ftl | 20 +++++++++--------- .../resources/template/css_xhtml/controlfooter.ftl | 12 +++++------ .../template/css_xhtml/controlheader-core.ftl | 14 ++++++------- .../resources/template/css_xhtml/controlheader.ftl | 11 +++++----- .../main/resources/template/css_xhtml/reset.ftl | 12 +++++------ .../resources/template/css_xhtml/submit-close.ftl | 10 ++++----- .../main/resources/template/css_xhtml/submit.ftl | 10 ++++----- .../src/main/resources/template/xhtml/checkbox.ftl | 20 +++++++++--------- .../template/xhtml/controlheader-core.ftl | 12 +++++------ core/src/site/resources/tags/a.html | 10 ++++++++- core/src/site/resources/tags/actionerror.html | 10 ++++++++- core/src/site/resources/tags/actionmessage.html | 10 ++++++++- core/src/site/resources/tags/checkbox.html | 10 ++++++++- core/src/site/resources/tags/checkboxlist.html | 10 ++++++++- core/src/site/resources/tags/combobox.html | 10 ++++++++- core/src/site/resources/tags/component.html | 10 ++++++++- core/src/site/resources/tags/datetextfield.html | 10 ++++++++- core/src/site/resources/tags/debug.html | 10 ++++++++- core/src/site/resources/tags/doubleselect.html | 10 ++++++++- core/src/site/resources/tags/fielderror.html | 10 ++++++++- core/src/site/resources/tags/file.html | 10 ++++++++- core/src/site/resources/tags/form.html | 10 ++++++++- core/src/site/resources/tags/head.html | 10 ++++++++- core/src/site/resources/tags/hidden.html | 10 ++++++++- .../site/resources/tags/inputtransferselect.html | 10 ++++++++- core/src/site/resources/tags/label.html | 10 ++++++++- .../site/resources/tags/optiontransferselect.html | 10 ++++++++- core/src/site/resources/tags/password.html | 10 ++++++++- core/src/site/resources/tags/radio.html | 10 ++++++++- core/src/site/resources/tags/reset.html | 10 ++++++++- core/src/site/resources/tags/select.html | 10 ++++++++- core/src/site/resources/tags/submit.html | 10 ++++++++- core/src/site/resources/tags/textarea.html | 10 ++++++++- core/src/site/resources/tags/textfield.html | 10 ++++++++- core/src/site/resources/tags/token.html | 10 ++++++++- core/src/site/resources/tags/updownselect.html | 10 ++++++++- 42 files changed, 362 insertions(+), 112 deletions(-)