svn commit: r1671319 - in /continuum/trunk/continuum-webapp/src/main: resources/template/simple/actionerror.ftl resources/template/simple/actionmessage.ftl webapp/css/continuum.css

[ba...@apache.org]

Author: batkinson
Date: Sat Apr  4 20:45:18 2015
New Revision: 1671319

URL: http://svn.apache.org/r1671319
Log:
Overriding struts actionmessages/errors tags to generate semantic tags with styles.

Added:
    continuum/trunk/continuum-webapp/src/main/resources/template/simple/actionerror.ftl
    continuum/trunk/continuum-webapp/src/main/resources/template/simple/actionmessage.ftl
Modified:
    continuum/trunk/continuum-webapp/src/main/webapp/css/continuum.css

Added: continuum/trunk/continuum-webapp/src/main/resources/template/simple/actionerror.ftl
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/template/simple/actionerror.ftl?rev=1671319&view=auto
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/template/simple/actionerror.ftl (added)
+++ continuum/trunk/continuum-webapp/src/main/resources/template/simple/actionerror.ftl Sat Apr  4 20:45:18 2015
@@ -0,0 +1,43 @@
+<#--
+/*
+ * $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 (actionErrors?? && actionErrors?size > 0)>
+	<messages<#rt/>
+<#if parameters.id?if_exists != "">
+ id="${parameters.id?html}"<#rt/>
+</#if>            
+<#if parameters.cssClass??>
+ class="${parameters.cssClass?html}"<#rt/>
+<#else>
+ class="errorMessage"<#rt/>
+</#if>
+<#if parameters.cssStyle??>
+ style="${parameters.cssStyle?html}"<#rt/>
+</#if>
+>
+	<#list actionErrors as error>
+		<#if error?if_exists != "">
+            <message class="errormark"><#if parameters.escape>${error!?html}<#else>${error!}</#if></message>
+        </#if>
+	</#list>
+	</messages>
+</#if>
\ No newline at end of file

Added: continuum/trunk/continuum-webapp/src/main/resources/template/simple/actionmessage.ftl
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/template/simple/actionmessage.ftl?rev=1671319&view=auto
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/template/simple/actionmessage.ftl (added)
+++ continuum/trunk/continuum-webapp/src/main/resources/template/simple/actionmessage.ftl Sat Apr  4 20:45:18 2015
@@ -0,0 +1,43 @@
+<#--
+/*
+ * $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 (actionMessages?? && actionMessages?size > 0 && !parameters.isEmptyList)>
+	<messages<#rt/>
+<#if parameters.id?if_exists != "">
+ id="${parameters.id?html}"<#rt/>
+</#if>
+<#if parameters.cssClass??>
+ class="${parameters.cssClass?html}"<#rt/>
+<#else>
+ class="actionMessage"<#rt/>
+</#if>
+<#if parameters.cssStyle??>
+ style="${parameters.cssStyle?html}"<#rt/>
+</#if>
+>
+		<#list actionMessages as message>
+            <#if message?if_exists != "">
+                <message class="infomark"><#if parameters.escape>${message!?html}<#else>${message!}</#if></message>
+            </#if>
+		</#list>
+	</messages>
+</#if>
\ No newline at end of file

Modified: continuum/trunk/continuum-webapp/src/main/webapp/css/continuum.css
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/css/continuum.css?rev=1671319&r1=1671318&r2=1671319&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/css/continuum.css (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/css/continuum.css Sat Apr  4 20:45:18 2015
@@ -65,4 +65,8 @@ table.releasePhases td:nth-child(1) {
 }
 table.releasePhases td:nth-child(2) {
   width: 100%;
+}
+
+message {
+  display: block;
 }
\ No newline at end of file