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 9216118EB1 for ; Sun, 14 Jun 2015 13:45:15 +0000 (UTC) Received: (qmail 46912 invoked by uid 500); 14 Jun 2015 13:38:40 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 29326 invoked by uid 500); 14 Jun 2015 13:38:20 -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 19094 invoked by uid 99); 14 Jun 2015 10:53:13 -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; Sun, 14 Jun 2015 10:53:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 50327DFBDB; Sun, 14 Jun 2015 10:53:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jogep@apache.org To: commits@struts.apache.org Date: Sun, 14 Jun 2015 10:53:18 -0000 Message-Id: <6d1d8cda267d4f4f9b0cc82931b05135@git.apache.org> In-Reply-To: <8ea811a266944f6da0ed4a02359c1866@git.apache.org> References: <8ea811a266944f6da0ed4a02359c1866@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/16] struts-examples git commit: Unify artifact names and use "-" instead of "_" http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes-override/src/main/webapp/WEB-INF/template/simple/reset.ftl ---------------------------------------------------------------------- diff --git a/themes-override/src/main/webapp/WEB-INF/template/simple/reset.ftl b/themes-override/src/main/webapp/WEB-INF/template/simple/reset.ftl new file mode 100644 index 0000000..0ddba57 --- /dev/null +++ b/themes-override/src/main/webapp/WEB-INF/template/simple/reset.ftl @@ -0,0 +1,76 @@ +<#-- +/* + * $Id$ + * + * 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. + */ +--> +<#if parameters.type?? && parameters.type=="button"> + +<#else> + +<#if parameters.name??> + name="${parameters.name?html}"<#rt/> + +<#if parameters.nameValue??> + value="<@s.property value="parameters.nameValue"/>"<#rt/> + +<#if parameters.cssClass??> + class="${parameters.cssClass?html}"<#rt/> + +<#if parameters.cssStyle??> + style="${parameters.cssStyle?html}"<#rt/> + +<#if parameters.title??> + title="${parameters.title?html}"<#rt/> + +<#if parameters.disabled?default(false)> + disabled="disabled"<#rt/> + +<#include "/${parameters.templateDir}/${parameters.expandTheme}/scripting-events.ftl" /> +<#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" /> +<#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" /> +/> + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes-override/src/main/webapp/WEB-INF/template/simple/scripting-events.ftl ---------------------------------------------------------------------- diff --git a/themes-override/src/main/webapp/WEB-INF/template/simple/scripting-events.ftl b/themes-override/src/main/webapp/WEB-INF/template/simple/scripting-events.ftl new file mode 100644 index 0000000..c998e61 --- /dev/null +++ b/themes-override/src/main/webapp/WEB-INF/template/simple/scripting-events.ftl @@ -0,0 +1,64 @@ +<#-- +/* + * $Id$ + * + * 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. + */ +--> +<#if parameters.onclick??> + onclick="${parameters.onclick?html}"<#rt/> + +<#if parameters.ondblclick??> + ondblclick="${parameters.ondblclick?html}"<#rt/> + +<#if parameters.onmousedown??> + onmousedown="${parameters.onmousedown?html}"<#rt/> + +<#if parameters.onmouseup??> + onmouseup="${parameters.onmouseup?html}"<#rt/> + +<#if parameters.onmouseover??> + onmouseover="${parameters.onmouseover?html}"<#rt/> + +<#if parameters.onmousemove??> + onmousemove="${parameters.onmousemove?html}"<#rt/> + +<#if parameters.onmouseout??> + onmouseout="${parameters.onmouseout?html}"<#rt/> + +<#if parameters.onfocus??> + onfocus="${parameters.onfocus?html}"<#rt/> + +<#if parameters.onblur??> + onblur="${parameters.onblur?html}"<#rt/> + +<#if parameters.onkeypress??> + onkeypress="${parameters.onkeypress?html}"<#rt/> + +<#if parameters.onkeydown??> + onkeydown="${parameters.onkeydown?html}"<#rt/> + +<#if parameters.onkeyup??> + onkeyup="${parameters.onkeyup?html}"<#rt/> + +<#if parameters.onselect??> + onselect="${parameters.onselect?html}"<#rt/> + +<#if parameters.onchange??> + onchange="${parameters.onchange?html}"<#rt/> + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes-override/src/main/webapp/WEB-INF/template/simple/select.ftl ---------------------------------------------------------------------- diff --git a/themes-override/src/main/webapp/WEB-INF/template/simple/select.ftl b/themes-override/src/main/webapp/WEB-INF/template/simple/select.ftl new file mode 100644 index 0000000..74277e6 --- /dev/null +++ b/themes-override/src/main/webapp/WEB-INF/template/simple/select.ftl @@ -0,0 +1,140 @@ +<#-- +/* + * $Id$ + * + * 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. + */ +--> +<#setting number_format="#.#####"> + + name="${parameters.name?default("")?html}"<#rt/> +<#if parameters.get("size")??> + size="${parameters.get("size")?html}"<#rt/> + +<#if parameters.disabled?default(false)> + disabled="disabled"<#rt/> + +<#if parameters.tabindex??> + tabindex="${parameters.tabindex?html}"<#rt/> + +<#if parameters.id??> + id="${parameters.id?html}"<#rt/> + +<#include "/${parameters.templateDir}/${parameters.expandTheme}/css.ftl" /> +<#if parameters.title??> + title="${parameters.title?html}"<#rt/> + +<#if parameters.multiple?default(false)> + multiple="multiple"<#rt/> + +<#include "/${parameters.templateDir}/${parameters.expandTheme}/scripting-events.ftl" /> +<#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" /> +<#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" /> +> +<#if parameters.headerKey?? && parameters.headerValue??> + + +<#if parameters.emptyOption?default(false)> + + +<@s.iterator value="parameters.list"> + <#if parameters.listKey??> + <#if stack.findValue(parameters.listKey)??> + <#assign itemKey = stack.findValue(parameters.listKey)/> + <#assign itemKeyStr = stack.findString(parameters.listKey)/> + <#else> + <#assign itemKey = ''/> + <#assign itemKeyStr = ''/> + + <#else> + <#assign itemKey = stack.findValue('top')/> + <#assign itemKeyStr = stack.findString('top')> + + <#if parameters.listValue??> + <#if stack.findString(parameters.listValue)??> + <#assign itemValue = stack.findString(parameters.listValue)/> + <#else> + <#assign itemValue = ''/> + + <#else> + <#assign itemValue = stack.findString('top')/> + + <#if parameters.listCssClass??> + <#if stack.findString(parameters.listCssClass)??> + <#assign itemCssClass= stack.findString(parameters.listCssClass)/> + <#else> + <#assign itemCssClass = ''/> + + + <#if parameters.listCssStyle??> + <#if stack.findString(parameters.listCssStyle)??> + <#assign itemCssStyle= stack.findString(parameters.listCssStyle)/> + <#else> + <#assign itemCssStyle = ''/> + + + <#if parameters.listTitle??> + <#if stack.findString(parameters.listTitle)??> + <#assign itemTitle= stack.findString(parameters.listTitle)/> + <#else> + <#assign itemTitle = ''/> + + + <#lt/> + + +<#include "/${parameters.templateDir}/${parameters.expandTheme}/optgroup.ftl" /> + + + +<#if parameters.multiple?default(false)> + <#if (parameters.id?? && parameters.name??)> + + + <#if (parameters.id?? && !parameters.name??)> + + + <#if ( !parameters.id?? && parameters.name??)> + + + <#if ( !parameters.id?? && !parameters.name??)> + + + +<#if parameters.disabled?default(false)> + disabled="disabled"<#rt/> + + /> + http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes-override/src/main/webapp/WEB-INF/template/simple/submit-close.ftl ---------------------------------------------------------------------- diff --git a/themes-override/src/main/webapp/WEB-INF/template/simple/submit-close.ftl b/themes-override/src/main/webapp/WEB-INF/template/simple/submit-close.ftl new file mode 100644 index 0000000..2bb7347 --- /dev/null +++ b/themes-override/src/main/webapp/WEB-INF/template/simple/submit-close.ftl @@ -0,0 +1,6 @@ +<#if parameters.type?? && parameters.type=="button"> +<#if (parameters.body)?default("")?length gt 0>${parameters.body}<#elseif parameters.label??><@s.property value="parameters.label"/><#rt/> + +<#else> +${parameters.body}<#rt/> + http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes-override/src/main/webapp/WEB-INF/template/simple/submit.ftl ---------------------------------------------------------------------- diff --git a/themes-override/src/main/webapp/WEB-INF/template/simple/submit.ftl b/themes-override/src/main/webapp/WEB-INF/template/simple/submit.ftl new file mode 100644 index 0000000..95315ef --- /dev/null +++ b/themes-override/src/main/webapp/WEB-INF/template/simple/submit.ftl @@ -0,0 +1,93 @@ +<#-- +/* + * $Id$ + * + * 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. + */ +--> +<#if parameters.type?? && parameters.type=="button"> +