analytics.js

VERSION

@@ -1 +1 @@
-Version 2.3.0 (2012-12-12 21:13:40) rc1
+Version 2.3.0 (2012-12-12 21:30:14) rc1

applications/welcome/models/menu.py

@@ -5,6 +5,8 @@
 ## Customize your APP title, subtitle and menus here
 #########################################################################
 
+response.logo = A(B('web',SPAN(2),'py'),XML('™ '),
+                  _class="brand",_href="http://www.web2py.com/")
 response.title = ' '.join(
     word.capitalize() for word in request.application.split('_'))
 response.subtitle = T('customize me!')
@@ -26,11 +28,12 @@ response.menu = [
     (T('Home'), False, URL('default', 'index'), [])
 ]
 
+DEVELOPMENT_MENU = True
+
 #########################################################################
 ## provide shortcuts for development. remove in production
 #########################################################################
 
-
 def _():
     # shortcuts
     app = request.application
@@ -133,4 +136,4 @@ def _():
                         ])
                 ]
          )]
-_()
+if DEVELOPMENT_MENU: _()

applications/welcome/views/layout.html

@@ -76,7 +76,7 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <a class="brand" href="http://www.web2py.com/"><b>web<span>2</span>py</b>&trade;&nbsp;</a>
+	{{=response.logo or ''}}
         <ul id="navbar" class="nav pull-right">{{='auth' in globals() and auth.navbar(mode="dropdown") or ''}}</ul>
         <div class="nav-collapse">
           {{is_mobile=request.user_agent().is_mobile}}
@@ -152,7 +152,14 @@
       <script src="{{=URL('static','js/dd_belatedpng.js')}}"></script>
       <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
       <![endif]-->
-  {{if response.google_analytics_id:}}<script type="text/javascript"> var _gaq = _gaq || []; _gaq.push(['_setAccount', '{{=response.google_analytics_id}}']); _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> {{pass}}
+  
+  {{if response.google_analytics_id:}}
+  <script src="{{=URL('static','js/analytics.js')}}"></script>
+  <script type="text/javascript">
+  analytics.initialize({
+    'Google Analytics':{trackingId:'{{=response.google_analytics_id}}'} 
+  });</script>
+  {{pass}}
   <script src="{{=URL('static','js/share.js',vars=dict(static=URL('static','images')))}}"></script>
 </body>
 </html>