You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by br...@apache.org on 2013/11/16 13:54:10 UTC
svn commit: r1542502 - in
/continuum/branches/CONTINUUM-2713/continuum-webapp: ./ src/main/resources/
src/main/resources/template/default/ src/main/webapp/WEB-INF/
src/main/webapp/WEB-INF/jsp/ src/main/webapp/css/ src/main/webapp/struts/
src/main/webap...
Author: brett
Date: Sat Nov 16 12:54:08 2013
New Revision: 1542502
URL: http://svn.apache.org/r1542502
Log:
[CONTINUUM-2713] use default xhtml style
Remove customised style to make upgrading between struts versions easier.
Note that one customisation was dropped - forms drop the header backgrounds
(th is now td.tdLabel; class=“b” removed from row)
Removed:
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/a-close.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/a.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/actionerror.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/actionmessage.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/checkbox.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/checkboxlist.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/combobox.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/controlfooter.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/controlheader-core.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/controlheader.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/datepicker.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/debug.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/doubleselect.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/empty.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/file.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/form-close-validate.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/form-close.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/form-validate.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/form.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/head.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/hidden.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/label.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/optiontransferselect.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/password.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/radiomap.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/reset.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/richtexteditor.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/select.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/styles.css
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/submit.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/text.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/textarea.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/theme.properties
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/tooltip.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/updownselect.ftl
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/template/default/validation.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/AdapterRegistry.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/debug.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/debug/Firebug.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/debug/arrow_hide.gif
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/debug/arrow_show.gif
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/debug/console.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/debug/deep.html
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/debug/spacer.gif
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/dojo.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/dom.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/event/__package__.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/event/browser.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/event/common.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/event/topic.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/string/Builder.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/string/__package__.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/string/common.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/string/extras.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/text/__package__.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/text/textDirectory.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/validate.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/validate/__package__.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/validate/check.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/validate/common.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/validate/creditCard.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/validate/datetime.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/validate/de.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/validate/jp.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/validate/us.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojo/validate/web.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/dojoRequire.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/optiontransferselect.js
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/struts/validation.js
Modified:
continuum/branches/CONTINUUM-2713/continuum-webapp/pom.xml
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/struts.properties
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/web.xml
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/css/tigris.css
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/pom.xml?rev=1542502&r1=1542501&r2=1542502&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/pom.xml (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/pom.xml Sat Nov 16 12:54:08 2013
@@ -314,9 +314,6 @@
<copy todir="${project.build.directory}/appserver-base">
<fileset dir="src/appserver-base" />
</copy>
- <copy todir="src/main/webapp/template">
- <fileset file="src/main/resources/template/default/validation.js" />
- </copy>
</tasks>
</configuration>
</execution>
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/struts.properties
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/struts.properties?rev=1542502&r1=1542501&r2=1542502&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/struts.properties (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/struts.properties Sat Nov 16 12:54:08 2013
@@ -20,10 +20,8 @@
struts.objectFactory = org.codehaus.plexus.spring.Struts2PlexusInSpringObjectFactory
#struts.tag.altSyntax = true
-# Theme
-struts.ui.theme = default
-
-struts.serve.static = false
+# TODO: Need to extract updated resources from struts2-core into webapp to enable this
+#struts.serve.static = false
# Locale
#struts.locale=en_EN
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp?rev=1542502&r1=1542501&r2=1542502&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp Sat Nov 16 12:54:08 2013
@@ -132,9 +132,7 @@
</table>
</td>
<td colspan="2" align="right">
- <table cellpadding="0" cellspacing="0">
- <s:submit value="%{getText('projectGroup.members.users.search.button')}"/>
- </table>
+ <s:submit value="%{getText('projectGroup.members.users.search.button')}" theme="simple"/>
</td>
</tr>
</s:form>
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/web.xml?rev=1542502&r1=1542501&r2=1542502&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/web.xml Sat Nov 16 12:54:08 2013
@@ -90,7 +90,9 @@
<!-- TODO: some Spring technique for this? -->
<listener-class>org.apache.continuum.web.startup.ContinuumStartup</listener-class>
</listener>
-
+ <listener>
+ <listener-class>org.apache.struts2.dispatcher.ng.listener.StrutsListener</listener-class>
+ </listener>
<context-param>
<param-name>contextClass</param-name>
<param-value>org.codehaus.plexus.spring.PlexusWebApplicationContext</param-value>
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/css/tigris.css
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/css/tigris.css?rev=1542502&r1=1542501&r2=1542502&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/css/tigris.css (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/css/tigris.css Sat Nov 16 12:54:08 2013
@@ -797,6 +797,7 @@ dd {
color: gray;
font-weight: bold;
font-size: 11px;
+ font-style: normal;
padding: 0px 0px 1px 19px;
}