Author: echatellier Date: 2012-02-10 14:26:59 +0100 (Fri, 10 Feb 2012) New Revision: 977 Url: http://forge.codelutin.com/repositories/revision/coser/977 Log: #815 : Add google analytics code Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CoserAction.java trunk/coser-web/src/main/resources/i18n/coser-web_en_GB.properties trunk/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java 2012-02-09 11:32:10 UTC (rev 976) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java 2012-02-10 13:26:59 UTC (rev 977) @@ -81,6 +81,16 @@ return result; } + /** + * Get analytics id. + * + * @return analytics id + */ + public String getAnalyticsId() { + String result = getOption(CoserWebOption.ANALYTICS_ID.key); + return result; + } + public enum CoserWebOption { /** Context name for multiple deployment. */ @@ -91,7 +101,8 @@ APPLICATION_VERSION("coser.application.version", _("coser.config.application.version.description"), null), ADMIN_EMAIL("coser.admin.email", _("coser.config.config.file.description"), "harmonie@ifremer.fr"), ADMIN_LOGIN("coser.admin.login", _("coser.config.admin.login.description"), null), - ADMIN_PASSWORD("coser.admin.password", _("coser.config.admin.password.description"), null); + ADMIN_PASSWORD("coser.admin.password", _("coser.config.admin.password.description"), null), + ANALYTICS_ID("coser.analytics.id", _("coser.config.analytics.id.description"), "UA-27739588-1"); protected String key; protected String description; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CoserAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CoserAction.java 2012-02-09 11:32:10 UTC (rev 976) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CoserAction.java 2012-02-10 13:26:59 UTC (rev 977) @@ -64,4 +64,15 @@ String email = config.getApplicationVersion(); return email; } + + /** + * Get analytics id from configuration. + * + * @return analytics id + */ + public String getAnalyticsId() { + CoserWebConfig config = ServiceFactory.getCoserConfig(); + String id = config.getAnalyticsId(); + return id; + } } Modified: trunk/coser-web/src/main/resources/i18n/coser-web_en_GB.properties =================================================================== --- trunk/coser-web/src/main/resources/i18n/coser-web_en_GB.properties 2012-02-09 11:32:10 UTC (rev 976) +++ trunk/coser-web/src/main/resources/i18n/coser-web_en_GB.properties 2012-02-10 13:26:59 UTC (rev 977) @@ -1,4 +1,5 @@ coser.config.admin.login.description= coser.config.admin.password.description= +coser.config.analytics.id.description= coser.config.application.version.description= coser.config.config.file.description= Modified: trunk/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties =================================================================== --- trunk/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties 2012-02-09 11:32:10 UTC (rev 976) +++ trunk/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties 2012-02-10 13:26:59 UTC (rev 977) @@ -1,4 +1,5 @@ coser.config.admin.login.description= coser.config.admin.password.description= +coser.config.analytics.id.description= coser.config.application.version.description= coser.config.config.file.description= Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2012-02-09 11:32:10 UTC (rev 976) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2012-02-10 13:26:59 UTC (rev 977) @@ -34,10 +34,12 @@ <link rel="stylesheet" type="text/css" href="<s:url value='/styles/coser.css' />" /> <link rel="icon" type="image/png" href="<s:url value='/favicon.png' />" /> <decorator:head/> + + <s:if test="%{!analyticsId.trim().isEmpty()}" > <!-- Script for Google Analytics --> <script type="text/javascript"> var _gaq = _gaq || []; - _gaq.push(['_setAccount', 'UA-12982015-1']); + _gaq.push(['_setAccount', '<s:property value='analyticsId' />']); _gaq.push(['_trackPageview']); (function() { @@ -46,6 +48,7 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); </script> + </s:if> </head> <body> Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp 2012-02-09 11:32:10 UTC (rev 976) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp 2012-02-10 13:26:59 UTC (rev 977) @@ -34,10 +34,12 @@ <link rel="stylesheet" type="text/css" href="<s:url value='/styles/coser.css' />" /> <link rel="icon" type="image/png" href="<s:url value='/favicon.png' />" /> <decorator:head/> + + <s:if test="%{!analyticsId.trim().isEmpty()}" > <!-- Script for Google Analytics --> <script type="text/javascript"> var _gaq = _gaq || []; - _gaq.push(['_setAccount', 'UA-12982015-1']); + _gaq.push(['_setAccount', '<s:property value='analyticsId' />']); _gaq.push(['_trackPageview']); (function() { @@ -46,6 +48,7 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); </script> + </s:if> </head> <body>