Return-Path: 
 <commits-return-13973-apmail-struts-commits-archive=struts.apache.org@struts.apache.org>
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 11427104A2
	for <apmail-struts-commits-archive@minotaur.apache.org>;
 Wed, 31 Dec 2014 17:17:39 +0000 (UTC)
Received: (qmail 20301 invoked by uid 500); 31 Dec 2014 17:17:26 -0000
Delivered-To: apmail-struts-commits-archive@struts.apache.org
Received: (qmail 20207 invoked by uid 500); 31 Dec 2014 17:17:26 -0000
Mailing-List: contact commits-help@struts.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@struts.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@struts.apache.org>
List-Post: <mailto:commits@struts.apache.org>
List-Id: <commits.struts.apache.org>
Reply-To: dev@struts.apache.org
Delivered-To: mailing list commits@struts.apache.org
Received: (qmail 19820 invoked by uid 99); 31 Dec 2014 17:17:25 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Dec 2014 17:17:25 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 95F4AA3B0CA; Wed, 31 Dec 2014 17:17:25 +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: Wed, 31 Dec 2014 17:18:04 -0000
Message-Id: <0a3d78f571794178a77972b2596fa07d@git.apache.org>
In-Reply-To: <31f1c5a94f5a4b3998befe32d5a9acc4@git.apache.org>
References: <31f1c5a94f5a4b3998befe32d5a9acc4@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [42/50] [abbrv] struts git commit: WW-4434 Adds basic version of
 missing ftl

WW-4434 Adds basic version of missing ftl


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/9bca437b
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/9bca437b
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/9bca437b

Branch: refs/heads/master
Commit: 9bca437b9aeea7e5d7eabc2291a47b1dded5cf30
Parents: 6423490
Author: Lukasz Lenart <lukaszlenart@apache.org>
Authored: Tue Dec 30 20:47:46 2014 +0100
Committer: Lukasz Lenart <lukaszlenart@apache.org>
Committed: Tue Dec 30 20:47:46 2014 +0100

----------------------------------------------------------------------
 .../main/resources/template/simple/datetext.ftl | 21 ++++++++++++++++++
 .../main/resources/template/xhtml/datetext.ftl  | 23 ++++++++++++++++++++
 2 files changed, 44 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/9bca437b/core/src/main/resources/template/simple/datetext.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/simple/datetext.ftl b/core/src/main/resources/template/simple/datetext.ftl
new file mode 100644
index 0000000..6d8396c
--- /dev/null
+++ b/core/src/main/resources/template/simple/datetext.ftl
@@ -0,0 +1,21 @@
+<#--
+/*
+ * 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.
+ */
+-->
+<#lt/><div>Tag <pre style="display: inline-block">&lt;s:datetext/&gt;</pre> works only with the JavaTemplates Plugin!</div><#rt/>

http://git-wip-us.apache.org/repos/asf/struts/blob/9bca437b/core/src/main/resources/template/xhtml/datetext.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/xhtml/datetext.ftl b/core/src/main/resources/template/xhtml/datetext.ftl
new file mode 100644
index 0000000..d15b24a
--- /dev/null
+++ b/core/src/main/resources/template/xhtml/datetext.ftl
@@ -0,0 +1,23 @@
+<#--
+/*
+ * 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.
+ */
+-->
+<#include "/${parameters.templateDir}/${parameters.expandTheme}/controlheader.ftl" />
+<#include "/${parameters.templateDir}/simple/datetext.ftl" />
+<#include "/${parameters.templateDir}/${parameters.expandTheme}/controlfooter.ftl" />