From 7ee577c400c5e776bd05f36afa9d00fc11f935a5 Mon Sep 17 00:00:00 2001
From: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date: Fri, 18 Apr 2014 19:48:09 -0300
Subject: [PATCH] Update ads codes.

---
 .../src/main/webapp/jsp/mindmapList.jsp       | 20 +++++------
 wise-webapp/src/main/webapp/jsp/template.jsp  | 35 ++++++++++++-------
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
index 2f5566cb..bceaafa0 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
@@ -257,19 +257,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>
diff --git a/wise-webapp/src/main/webapp/jsp/template.jsp b/wise-webapp/src/main/webapp/jsp/template.jsp
index c5b87b61..03dcdde7 100644
--- a/wise-webapp/src/main/webapp/jsp/template.jsp
+++ b/wise-webapp/src/main/webapp/jsp/template.jsp
@@ -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>
+                <!-- Template Page (All pages) -->
+                <ins class="adsbygoogle"
+                     style="display:inline-block;width:728px;height:90px;text-align: center;"
+                     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"/>