Author: tchemit Date: 2012-04-13 02:39:14 +0200 (Fri, 13 Apr 2012) New Revision: 534 Url: http://forge.codelutin.com/repositories/revision/echobase/534 Log: svn properties + use fluido skin (with our javascript to load stuffs...) Added: trunk/src/site/resources/maven-site-forge.codelutin.com.js Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/src/doc/reunions/reunion-2012-04-12.txt trunk/src/site/resources/images/argouml-logo.png trunk/src/site/resources/images/jrst-logo.png trunk/src/site/resources/images/restructuredtext-logo.png trunk/src/site/resources/images/struts2-logo.png trunk/src/site/resources/images/topia-logo.png trunk/src/site/resources/model/dataCategory.png trunk/src/site/resources/model/dataEchotype.png trunk/src/site/resources/model/dataLengthAgeKey.png trunk/src/site/resources/model/dataLengthWeightKey.png trunk/src/site/site_fr.xml Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-04-13 00:37:12 UTC (rev 533) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-04-13 00:39:14 UTC (rev 534) @@ -4,6 +4,7 @@ echobase.action.newLibreOfficeQuery=New Libre office request echobase.action.newQuery=New request echobase.action.saveSqlQuery=Update query +echobase.action.show.embedded.documentation=Show embedded application documentation echobase.action.show.import.documentation=Show import documentation echobase.action.toEnglish=Use english version echobase.action.toFrench=Use the french version @@ -18,7 +19,6 @@ echobase.confirm.delete.query=Confirm to delete export query echobase.error.bad.password=Bad password echobase.error.email.already.used=Email already used -echobase.action.show.embedded.documentation=Show embedded application documentation echobase.error.export.sqlQuery.forbidden.alter.word=Export query contains a forbidden word 'ALTER' echobase.error.export.sqlQuery.forbidden.delete.word=Export query contains a forbidden word 'DELETE' echobase.error.export.sqlQuery.forbidden.drop.word=Export query contains a forbidden word 'DROP' Modified: trunk/src/doc/reunions/reunion-2012-04-12.txt =================================================================== --- trunk/src/doc/reunions/reunion-2012-04-12.txt 2012-04-13 00:37:12 UTC (rev 533) +++ trunk/src/doc/reunions/reunion-2012-04-12.txt 2012-04-13 00:39:14 UTC (rev 534) @@ -17,11 +17,23 @@ - redonner des fichiers de traductions à Mathieu - chiffrage lot 2 +A chiffrer (lot 2) +------------------ -Action ------- +Lister par ordre de priorité +1. lissage données anciennes +2. gestion des imports plus fine : suppression des imports +3. choix d'une base de travail +4. Lien avec SIH : export indicateurs +5. tableau de bord de la base : quelles données sont dedans pour quel voyage? +6. module cartographique + -> Cartographie simple (visualisation web, export KML) + -> Spatialisation pour interrogation par SIG (3j) +7. réduction taille base embarquée + -> Voir si possible de faire mieux gestion des index + -> Filtre par DataProcessing -Prochaine réunion : - - - Vendredi 13 Avril à 10h00 \ No newline at end of file +Gestion + -> reunion + -> doc \ No newline at end of file Property changes on: trunk/src/doc/reunions/reunion-2012-04-12.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/src/site/resources/images/argouml-logo.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/images/jrst-logo.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/images/restructuredtext-logo.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/images/struts2-logo.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/images/topia-logo.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/site/resources/maven-site-forge.codelutin.com.js =================================================================== --- trunk/src/site/resources/maven-site-forge.codelutin.com.js (rev 0) +++ trunk/src/site/resources/maven-site-forge.codelutin.com.js 2012-04-13 00:39:14 UTC (rev 534) @@ -0,0 +1,75 @@ +/* + * #%L + * EchoBase + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ +$(document).ready(function () { + + var metas = $('#projectMetas'); + var piwikEnabled = metas.attr('piwikEnabled'); + if (piwikEnabled) { + //Piwik Tracking Code + var piwikId = metas.attr('piwikId'); + if (!!piwikId) { + + // default piwikId for forge.codelutin.com + piwikId = 4; + } + + console.log("use Piwik with id = " + piwikId); + var pkBaseURL = "https:" == document.location.protocol ? + "https://piwik.codelutin.com/" : + "http://piwik.codelutin.com/"; + $.getScript(pkBaseURL + "piwik.js", function (data, textStatus, jqxhr) { + var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", piwikId); + piwikTracker.trackPageView(); + piwikTracker.enableLinkTracking(); + console.log("piwikTracker loaded = " + piwikTracker); + }); + //Piwik Tracking Code + } + var scmwebeditorenabled = metas.attr('scmwebeditorenabled'); + var scm = metas.attr('scm'); + if (scmwebeditorenabled && scm.indexOf("/trunk") > -1) { + + // allow scmwebeditor is enabled and on trunk + + var scmurl = metas.attr('scmwebeditorurl'); + var projectId = metas.attr('projectId'); + var siteSourcesType = metas.attr('siteSourcesType'); + var path; + var pathname = document.location.pathname; + if (pathname.indexOf('target/site') > 0) { + path = pathname.substr(pathname.indexOf('/site')).replace('/site/', ''); + } else { + path = pathname.substr(pathname.indexOf('/' + projectId)).replace('/' + projectId, ''); + } + path = path.replace('.html', '.' + siteSourcesType); + var url = scmurl + "?address=" + scm + "/src/site/" + siteSourcesType + "/" + path; + console.log("Add scmwebeditor with url = " + url); + var html = "<li class='pull-right'><a href='" + url + + "'>Éditer la page</a></li>" + + "<li class='divider pull-right'>|</li>"; + var ul = $('#publishDate'); + ul.prepend(html); + + } +}); \ No newline at end of file Property changes on: trunk/src/site/resources/maven-site-forge.codelutin.com.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/src/site/resources/model/dataCategory.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/model/dataEchotype.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/model/dataLengthAgeKey.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/model/dataLengthWeightKey.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-04-13 00:37:12 UTC (rev 533) +++ trunk/src/site/site_fr.xml 2012-04-13 00:39:14 UTC (rev 534) @@ -40,6 +40,7 @@ <src>./images/echobase-logo.png</src> <href>/index.html</href> </topBarIcon--> + <googleSearch/> <sideBarEnabled>false</sideBarEnabled> <searchEnabled>true</searchEnabled> <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> @@ -52,6 +53,8 @@ <href>index.html</href> </bannerLeft> + <publishDate position="right" /> + <version position="right" /> <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> @@ -94,15 +97,9 @@ <item name="Roadmap" href="http://forge.codelutin.com/projects/echobase/roadmap"/> - <!-- TODO --> - <!--<item name="Historique des versions" href="changes-report.html"/>--> + <item name="Historique des versions" href="changes-report.html"/> </menu> - <!--menu name="Modélisation"> - <item name="Télécharger le modèle" href="model/echobase-persistence.zargo"/> - <item name="Données thématiques" href="model.html#donn-es-th-matiques"/> - <item name="Données référentiel" href="model.html#r-f-rentiel"/> - </menu--> <menu name="Développeur"> <item name="A faire" href="todo.html"/> @@ -114,6 +111,20 @@ <footer> - </footer> + <script type="text/javascript" src="./maven-site-forge.codelutin.com.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.url}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> </body> </project>