Author: sletellier Date: 2011-11-14 10:41:05 +0100 (Mon, 14 Nov 2011) New Revision: 77 Url: http://forge.codelutin.com/repositories/revision/echobase/77 Log: - Allow static method access for strtus ongl - Update files headers Added: trunk/echobase-ui/src/main/resources/struts.properties Modified: trunk/echobase-ui/src/main/resources/struts.xml trunk/echobase-ui/src/main/resources/template/css_xhtml/checkbox.ftl trunk/echobase-ui/src/main/resources/template/css_xhtml/controlheader-core.ftl trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/import.jsp Added: trunk/echobase-ui/src/main/resources/struts.properties =================================================================== --- trunk/echobase-ui/src/main/resources/struts.properties (rev 0) +++ trunk/echobase-ui/src/main/resources/struts.properties 2011-11-14 09:41:05 UTC (rev 77) @@ -0,0 +1,36 @@ +### +# #%L +# EchoBase :: UI +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2011 Ifremer, Codelutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### +struts.ognl.allowStaticMethodAccess=true + +# Help debugging +struts.devMode=true +struts.ognl.logMissingProperties=true +struts.el.throwExceptionOnFailure=true +struts.i18n.reload=true +struts.custom.i18n.resources=resources +struts.configuration.xml.reload=true + +# Performance tuning +# see http://struts.apache.org/2.2.3/docs/performance-tuning.html +struts.freemarker.templatesCache=true \ No newline at end of file Modified: trunk/echobase-ui/src/main/resources/struts.xml =================================================================== --- trunk/echobase-ui/src/main/resources/struts.xml 2011-11-14 09:27:09 UTC (rev 76) +++ trunk/echobase-ui/src/main/resources/struts.xml 2011-11-14 09:41:05 UTC (rev 77) @@ -109,7 +109,7 @@ </package> <package name="applicationDefault" extends="default" namespace="/"> - <default-action-ref name="home" /> + <default-action-ref name="home"/> <!-- go to home --> <action name="home" class="fr.ifremer.echobase.ui.actions.EchoBaseActionSupport"> Modified: trunk/echobase-ui/src/main/resources/template/css_xhtml/checkbox.ftl =================================================================== --- trunk/echobase-ui/src/main/resources/template/css_xhtml/checkbox.ftl 2011-11-14 09:27:09 UTC (rev 76) +++ trunk/echobase-ui/src/main/resources/template/css_xhtml/checkbox.ftl 2011-11-14 09:41:05 UTC (rev 77) @@ -1,4 +1,27 @@ <#-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% +--> +<#-- NOTE: The 'header' stuff that follows is in this one file for checkbox due to the fact that for checkboxes we do not want the label field to show up as checkboxes handle their own lables Modified: trunk/echobase-ui/src/main/resources/template/css_xhtml/controlheader-core.ftl =================================================================== --- trunk/echobase-ui/src/main/resources/template/css_xhtml/controlheader-core.ftl 2011-11-14 09:27:09 UTC (rev 76) +++ trunk/echobase-ui/src/main/resources/template/css_xhtml/controlheader-core.ftl 2011-11-14 09:41:05 UTC (rev 77) @@ -1,4 +1,27 @@ <#-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% +--> +<#-- Only show message if errors are available. This will be done if ActionSupport is used. --> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/import.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/import.jsp 2011-11-14 09:27:09 UTC (rev 76) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/import.jsp 2011-11-14 09:41:05 UTC (rev 77) @@ -51,7 +51,7 @@ <s:file name="importModel.typeEchoSpeciesImport" key="echobase.importFile.typeEchoSpecies"/> - <s:textarea name="importModel.comment" key="echobase.common.comment"/> + <s:textarea name="importModel.comment" rows="4" cols="50" key="echobase.common.comment"/> </fieldset> <br/>