Return-Path: X-Original-To: apmail-struts-commits-archive@minotaur.apache.org Delivered-To: apmail-struts-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A3171183EF for ; Fri, 30 Oct 2015 08:22:17 +0000 (UTC) Received: (qmail 8806 invoked by uid 500); 30 Oct 2015 08:22:17 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 8696 invoked by uid 500); 30 Oct 2015 08:22: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 8520 invoked by uid 99); 30 Oct 2015 08:22:17 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Oct 2015 08:22:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D63CEDFAF1; Fri, 30 Oct 2015 08:22:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lukaszlenart@apache.org To: commits@struts.apache.org Date: Fri, 30 Oct 2015 08:22:16 -0000 Message-Id: <0cbc91ee54d64e56a2f2a0242362c3fe@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/4] struts git commit: WW-4556 Extracts tooltips into dedicated template file (cherry picked from commit c708876) Repository: struts Updated Branches: refs/heads/master b44fa2934 -> 146b44e2e WW-4556 Extracts tooltips into dedicated template file (cherry picked from commit c708876) Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/5bf1b62d Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/5bf1b62d Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/5bf1b62d Branch: refs/heads/master Commit: 5bf1b62dd3e53e230d8a6ba63bfe22037591c691 Parents: b44fa29 Author: Lukasz Lenart Authored: Tue Oct 27 08:25:36 2015 +0100 Committer: Lukasz Lenart Committed: Tue Oct 27 09:07:37 2015 +0100 ---------------------------------------------------------------------- .../template/simple/form-close-tooltips.ftl | 30 ++++++++++++++++++++ .../resources/template/simple/form-close.ftl | 11 +------ 2 files changed, 31 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/5bf1b62d/core/src/main/resources/template/simple/form-close-tooltips.ftl ---------------------------------------------------------------------- diff --git a/core/src/main/resources/template/simple/form-close-tooltips.ftl b/core/src/main/resources/template/simple/form-close-tooltips.ftl new file mode 100644 index 0000000..a84eb24 --- /dev/null +++ b/core/src/main/resources/template/simple/form-close-tooltips.ftl @@ -0,0 +1,30 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> + +<#-- + Code that will add javascript needed for tooltips +--><#t/> +<#if (parameters.hasTooltip!false)><#t/> + <#lt/> + <#lt/> + <#lt/>"/> + +<#t/> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts/blob/5bf1b62d/core/src/main/resources/template/simple/form-close.ftl ---------------------------------------------------------------------- diff --git a/core/src/main/resources/template/simple/form-close.ftl b/core/src/main/resources/template/simple/form-close.ftl index 14b99cb..e8defdf 100644 --- a/core/src/main/resources/template/simple/form-close.ftl +++ b/core/src/main/resources/template/simple/form-close.ftl @@ -101,13 +101,4 @@ - -<#-- - Code that will add javascript needed for tooltips ---><#t/> -<#if (parameters.hasTooltip!false)><#t/> - <#lt/> - <#lt/> - <#lt/>"/> - -<#t/> \ No newline at end of file +<#include "/${parameters.templateDir}/${parameters.expandTheme}/form-close-tooltips.ftl" />