vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-22 06:07:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/WISE-211-iconSupportOnLabels

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2014-04-26 21:15:57 -03:00
commit a42811630d
5 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wise-webapp/src/main/webapp/WEB-INF/app.properties
View File

@ -1,4 +1,3 @@
##################################################################################
# Database Configuration
##################################################################################
@ -93,7 +92,7 @@ admin.user = admin@wisemapping.org
# Base URL where WiseMapping is deployed. By default, It will be automatically inferred.
# If you are planning to put wisemapping behind an Apache using an Apache Proxy setup, you must enable this property.
#site.baseurl = http:///example.com:8080/wisemapping
#site.baseurl = http://example.com:8080/wisemapping
# Site Homepage URL. This will be used as URL for homepage location.
@ -129,9 +128,9 @@ security.ldap.server.password=password
security.ldap.basedn=dc=wisemapping,dc=com
# This will be concatenated as part of the DN. In this case, I will be ou="people".
# This will be concatenated as part of the DN. In this case, I will be "ou=people".
# In case this need to be changed, modify the wisemapping-security-ldap.xml.
security.ldap.subDn=people
security.ldap.subDn=ou=people
# Attribute used as authentication login (Eg: in this case, the user email will be used)
security.ldap.auth.attribute=mail

2
wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-ldap.xml
View File

@ -45,7 +45,7 @@
<bean id="ldapUserSearch"
class="org.springframework.security.ldap.search.FilterBasedLdapUserSearch">
<constructor-arg index="0" value="ou=${security.ldap.subDn}"/>
<constructor-arg index="0" value="${security.ldap.subDn}"/>
<constructor-arg index="1" value="(${security.ldap.auth.attribute}={0})"/>
<constructor-arg index="2" ref="contextSource"/>
<property name="searchSubtree" value="true"/>

22
wise-webapp/src/main/webapp/jsp/googleAnalytics.jsf
View File

@ -1,19 +1,15 @@
<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<c:if test="${requestScope['google.analytics.enabled']}">
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', '${requestScope['google.analytics.account']}']);
_gaq.push(['_setDomainName', 'wisemapping.com']);
_gaq.push(['_trackPageview']);
(function () {
var ga = document.createElement('script');
ga.type = 'text/javascript';
ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(ga, s);
})();
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', '${requestScope['google.analytics.account']}', 'wisemapping.com');
ga('send', 'pageview');
</script>
</c:if>

20
wise-webapp/src/main/webapp/jsp/mindmapList.jsp
View File

@ -263,19 +263,15 @@
</div>
<div class="col-md-1" style="padding-top:25px">
<c:if test="${requestScope['google.ads.enabled']}">
<script type="text/javascript"><!--
google_ad_client = "ca-pub-7564778578019285";
/* WiseMapping Mindmap List */
google_ad_slot = "4071968444";
google_ad_width = 120;
google_ad_height = 600;
//-->
<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
<!-- WiseMapping Mindmap List -->
<ins class="adsbygoogle"
style="display:inline-block;width:120px;height:600px"
data-ad-client="ca-pub-7564778578019285"
data-ad-slot="4071968444"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
<div style="margin-top:5px;">
<script type="text/javascript"
src="https://pagead2.googlesyndication.com/pagead/show_ads.js">
</script>
</div>
</c:if>
</div>
</div>

35
wise-webapp/src/main/webapp/jsp/template.jsp
View File

@ -55,28 +55,37 @@
<div class="container">
<div class="row">
<div class="col-md-offset-1 col-md-10">
<div class="jumbotron" style="margin:40px 0 100px 0;padding: 10px 60px;">
<div class="jumbotron" style="margin:40px 0 15px 0;padding: 10px 60px;">
<tiles:insertAttribute name="body"/>
</div>
</div>
<div class="col-md-1" style="padding-top:25px">
<c:if test="${requestScope['google.ads.enabled']}">
<script type="text/javascript"><!--
google_ad_client = "ca-pub-7564778578019285";
/* WiseMapping Mindmap List */
google_ad_slot = "4071968444";
google_ad_width = 120;
google_ad_height = 600;
//-->
<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
<!-- Wise: Lateral Image (Small) -->
<ins class="adsbygoogle"
style="display:inline-block;width:120px;height:240px"
data-ad-client="ca-pub-7564778578019285"
data-ad-slot="6751959325"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
<div style="margin-top:5px;">
<script type="text/javascript"
src="https://pagead2.googlesyndication.com/pagead/show_ads.js">
</script>
</div>
</c:if>
</div>
</div>
<c:if test="${requestScope['google.ads.enabled']}">
<div class="row" style="text-align: center;">
<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
<!-- Wise: Pages Footer (All pages) -->
<ins class="adsbygoogle"
style="display:inline-block;width:728px;height:90px"
data-ad-client="ca-pub-7564778578019285"
data-ad-slot="3798492923"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
</div>
</c:if>
</div>
<jsp:include page="footer.jsp"/>