This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit d67523ed505a8d6ef90101e0199c79e7fd238f32 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 8 17:17:28 2014 +0000 prepare release 2.7 --- echobase-ui/src/main/assembly/lizmap-zip.xml | 20 ++++++++++++++++++++ .../echobase/ui/actions/dbeditor/DeleteEntity.java | 21 +++++++++++++++++++++ echobase-ui/src/main/resources/lizmap/www/js/map.js | 21 +++++++++++++++++++++ .../lizmap/www/themes/default/css/admin.css | 20 ++++++++++++++++++++ .../lizmap/www/themes/default/css/main.css | 20 ++++++++++++++++++++ .../resources/lizmap/www/themes/default/css/map.css | 20 ++++++++++++++++++++ .../lizmap/www/themes/default/css/media.css | 20 ++++++++++++++++++++ .../lizmap/www/themes/default/css/view.css | 20 ++++++++++++++++++++ 8 files changed, 162 insertions(+) diff --git a/echobase-ui/src/main/assembly/lizmap-zip.xml b/echobase-ui/src/main/assembly/lizmap-zip.xml index 26d66db..0a51f04 100644 --- a/echobase-ui/src/main/assembly/lizmap-zip.xml +++ b/echobase-ui/src/main/assembly/lizmap-zip.xml @@ -1,3 +1,23 @@ +<!-- + #%L + EchoBase :: UI + %% + Copyright (C) 2011 - 2014 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% + --> <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/DeleteEntity.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/DeleteEntity.java index 2d80957..06275e5 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/DeleteEntity.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/DeleteEntity.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.ui.actions.dbeditor; +/* + * #%L + * EchoBase :: UI + * %% + * Copyright (C) 2011 - 2014 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% + */ + import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; import fr.ifremer.echobase.services.service.DbEditorService; diff --git a/echobase-ui/src/main/resources/lizmap/www/js/map.js b/echobase-ui/src/main/resources/lizmap/www/js/map.js old mode 100755 new mode 100644 index 6732989..5f02b1b --- a/echobase-ui/src/main/resources/lizmap/www/js/map.js +++ b/echobase-ui/src/main/resources/lizmap/www/js/map.js @@ -15,6 +15,27 @@ var lizMap = function() { * {object} The map config */ var config = null; + +/* + * #%L + * EchoBase :: UI + * %% + * Copyright (C) 2011 - 2014 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% + */ /** * PRIVATE Property: capabilities * {object} The wms capabilities diff --git a/echobase-ui/src/main/resources/lizmap/www/themes/default/css/admin.css b/echobase-ui/src/main/resources/lizmap/www/themes/default/css/admin.css old mode 100755 new mode 100644 index 870b7ab..140afd2 --- a/echobase-ui/src/main/resources/lizmap/www/themes/default/css/admin.css +++ b/echobase-ui/src/main/resources/lizmap/www/themes/default/css/admin.css @@ -1,3 +1,23 @@ +/* + * #%L + * EchoBase :: UI + * %% + * Copyright (C) 2011 - 2014 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% + */ .jforms-error-list { background-color: #C43C35; background-image: -moz-linear-gradient(center top , #EE5F5B, #C43C35); diff --git a/echobase-ui/src/main/resources/lizmap/www/themes/default/css/main.css b/echobase-ui/src/main/resources/lizmap/www/themes/default/css/main.css old mode 100755 new mode 100644 index 124a050..30b47fb --- a/echobase-ui/src/main/resources/lizmap/www/themes/default/css/main.css +++ b/echobase-ui/src/main/resources/lizmap/www/themes/default/css/main.css @@ -1,3 +1,23 @@ +/* + * #%L + * EchoBase :: UI + * %% + * Copyright (C) 2011 - 2014 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% + */ body { background: #03497c; color : #ffec3e; diff --git a/echobase-ui/src/main/resources/lizmap/www/themes/default/css/map.css b/echobase-ui/src/main/resources/lizmap/www/themes/default/css/map.css old mode 100755 new mode 100644 index 3047a98..46d6345 --- a/echobase-ui/src/main/resources/lizmap/www/themes/default/css/map.css +++ b/echobase-ui/src/main/resources/lizmap/www/themes/default/css/map.css @@ -1,3 +1,23 @@ +/* + * #%L + * EchoBase :: UI + * %% + * Copyright (C) 2011 - 2014 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% + */ #title { right: 20%; diff --git a/echobase-ui/src/main/resources/lizmap/www/themes/default/css/media.css b/echobase-ui/src/main/resources/lizmap/www/themes/default/css/media.css old mode 100755 new mode 100644 index 1a7dd38..99df5e0 --- a/echobase-ui/src/main/resources/lizmap/www/themes/default/css/media.css +++ b/echobase-ui/src/main/resources/lizmap/www/themes/default/css/media.css @@ -1,3 +1,23 @@ +/* + * #%L + * EchoBase :: UI + * %% + * Copyright (C) 2011 - 2014 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% + */ /* #### Mobile Phones Portrait #### */ @media screen and (max-device-width: 480px) and (orientation: portrait){ /* some CSS here */ diff --git a/echobase-ui/src/main/resources/lizmap/www/themes/default/css/view.css b/echobase-ui/src/main/resources/lizmap/www/themes/default/css/view.css old mode 100755 new mode 100644 index b4008b8..a13d95a --- a/echobase-ui/src/main/resources/lizmap/www/themes/default/css/view.css +++ b/echobase-ui/src/main/resources/lizmap/www/themes/default/css/view.css @@ -1,3 +1,23 @@ +/* + * #%L + * EchoBase :: UI + * %% + * Copyright (C) 2011 - 2014 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% + */ .thumbnail { border: 1px solid #ffec3e; background: #03497c; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.