Changeset 27787

Timestamp:

01/02/09 22:46:17 (4 years ago)

Author:

everes

Message:

Google系機能追加

Location:

lang/python/every_resources/trunk

Files:

• everes_core/context_processors.py (modified) (1 diff)
• everes_core/models.py (modified) (1 diff)
• everes_core/templates/everes_core/contentsmeta_detail.html (modified) (1 diff)
• everes_theme_default/templates/404.html (added)
• everes_theme_default/templates/500.html (added)
• everes_theme_default/templates/index.html (modified) (3 diffs)
• settings.py (modified) (2 diffs)

lang/python/every_resources/trunk/everes_core/context_processors.py

@@ -72 +72 @@
     """
     """
-    return {'google_api_key': settings.GOOGLE_API_KEY}
+    return {'google_api_key': settings.GOOGLE_API_KEY,
+            'google_analytics_key': settings.GOOGLE_ANALYTICS,
+            'google_search_key': settings.GOOGLE_SEARCH,
+            'google_adsense_key': settings.GOOGLE_ADSENSE,
+            'google_as_slot_key': settings.GOOGLE_AD_SLOT}

lang/python/every_resources/trunk/everes_core/models.py

@@ -291 +291 @@
 
 def clear_tag_cache(sender, **kwargs):
+    cache.delete('everes_sitemap')
     cache.delete('everes_tags')
     for tag in Tag.objects.all():

lang/python/every_resources/trunk/everes_core/templates/everes_core/contentsmeta_detail.html

@@ -61 +61 @@
     {% endblock %}
     {% block after_summary %}{% endblock %}
+  {% if google_adsense_key %}
+  <script type="text/javascript"><!--
+    google_ad_client = "{{ google_adsense_key }}";
+    /* 728x90, 作成済み 09/01/02 */
+    google_ad_slot = "{{ google_ad_slot }}";
+    google_ad_width = 728;
+    google_ad_height = 90;
+    //-->
+    </script>
+    <script type="text/javascript"
+    src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+    </script>
+  {% endif %}
   </div>
   <div class="pr">

lang/python/every_resources/trunk/everes_theme_default/templates/index.html

@@ -10 +10 @@
   {% block additional_js %}{% endblock %}
   {% block additional_css %}{% endblock %}
-  <style type="text/css">{% block custom_css %}{% endblock %}</style>
+  <style type="text/css">{% if google_search_key %}#google_search { }{% endif %}
+  {% block custom_css %}{% endblock %}
+  </style>
   <script type="text/javascript"><!-- 
   {% block custom_js %}{% endblock %}
@@ -19 +21 @@
   <div id="header">
     <h1><a href="/">{{ current_site.name }}</a></h1>
+    {% if google_search_key %}
+    <div id="google_search">
+        <form action="http://www.google.co.jp/cse" id="cse-search-box">
+          <div>
+            <input type="hidden" name="cx" value="" />
+            <input type="hidden" name="ie" value="UTF-8" />
+            <input type="text" name="q" size="10" />
+            <input type="submit" name="sa" value="&#x691c;&#x7d22;" />
+          </div>
+        </form>
+        <script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=cse-search-box&amp;lang=ja"></script>
+    </div>
+    {% endif %}
     <ul>
         <li><a href="{% url everes_about %}">about</a></li>
@@ -60 +75 @@
   </div>
   {% endif %}
-</body>
+  {% if google_analytics_key %}
+  <script type="text/javascript">
+  var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+  document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+  </script>
+  <script type="text/javascript">
+  try {
+  var pageTracker = _gat._getTracker("{{ google_analytics_key }}");
+  pageTracker._trackPageview();
+  } catch(err) {}</script>
+  {% endif %}
+ </body>
 </html>

lang/python/every_resources/trunk/settings.py

@@ -113 +113 @@
 
 GOOGLE_API_KEY = 'ABQIAAAAqqFWuvyrfIOifreBS0pD6BQCULP4XOMyhPd8d_NrQQEO8sT8XBTc4moQjlQsvb09T-mbSfECKD_dzQ'
+GOOGLE_ANALYTICS = None
+GOOGLE_SEARCH    = None
+GOOGLE_ADSENSE   = None
+GOOGLE_AD_SLOT   = None
 
 RESTRUCTUREDTEXT_FILTER_SETTINGS = {
@@ -126 +130 @@
 #### photo settings ####
 ADDITIONAL_IMAGES = (('thumb', (128,128)), ('listing', (320, 80)), )
+