Changeset 27446

Timestamp:

12/26/08 19:13:30 (4 years ago)

Author:

everes

Message:

地図が出るようにした

Location:

lang/python/every_resources/trunk

Files:

• everes_core/admin.py (modified) (3 diffs)
• everes_core/context_processors.py (modified) (2 diffs)
• everes_core/models.py (modified) (1 diff)
• everes_core/templates/everes_core/contentsmeta_detail.html (modified) (3 diffs)
• everes_theme_default/templates/static/styles/basic.css (modified) (1 diff)
• settings.py (modified) (2 diffs)

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

@@ -32 +32 @@
 #
 
+from django.conf import settings
 from django.contrib import admin
 from django import forms
@@ -110 +111 @@
         
         js = '''
-        <script type="text/javascript" charset="utf-8" src="http://www.google.com/jsapi?key=ABQIAAAAqqFWuvyrfIOifreBS0pD6BQCULP4XOMyhPd8d_NrQQEO8sT8XBTc4moQjlQsvb09T-mbSfECKD_dzQ&hl=ja"></script>
+        <script type="text/javascript" charset="utf-8" src="http://www.google.com/jsapi?key=%(google_api_key)s&hl=ja"></script>
         <script type="text/javascript">
         google.load("maps", "2");
@@ -158 +159 @@
         }
         </script>
-        ''' % dict(name=name, lat=lat, lng=lng)
+        ''' % dict(name=name, lat=lat, lng=lng, google_api_key=settings.GOOGLE_API_KEY)
         html = self.inner_widget.render("%s" % name, "%f,%f" % (lat,lng), dict(id='id_%s' % name))
         html += "<div id=\"map_%s\" class=\"gmap\" style=\"width: %dpx; height: %dpx\"></div>" % (name, self.map_width, self.map_height)

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

@@ -32 +32 @@
 #
 
+from django.conf import settings
 from django.contrib.sites.models import Site
 from django.contrib.contenttypes.models import ContentType
@@ -70 +71 @@
         print 'set tag'
     return {'everes_tags': tag_list}
+
+def api_keys(request):
+    """
+    """
+    return {'google_api_key': settings.GOOGLE_API_KEY}

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

@@ -138 +138 @@
         return self.entity_app_label[len('everes_'):]
     
+    def _has_location(self):
+        print self.location
+        if self.location is None or self.location == '0.000000,0.000000':
+            return False
+        return True
+    
     app_name = property(_get_app_name)
+    has_location = property(_has_location)
 
 class FileContentsMeta(ContentsMeta):

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

@@ -3 +3 @@
 
 {% block additional_js %}
-<script type="text/javascript" src="http://www.google.com/jsapi"></script>
+<script type="text/javascript" src="http://www.google.com/jsapi?key={{ google_api_key }}&hl=ja"></script>
 <script type="text/javascript">google.load("jquery", "1.2.6");</script>
 <script type="text/javascript" src="{{ MEDIA_URL }}js/feedback.js"></script>
@@ -9 +9 @@
 
 {% block custom_js %}
+google.load("maps", "2");
 $(function() {
     $('#before_comment').click(Feedback.generate_comment_uuid);
     $('#before_trackback').click(Feedback.generate_trackback_uuid);
+    {% if object.has_location %}
+    var map;
+    google.setOnLoadCallback(function() {
+        if (GBrowserIsCompatible()) {
+            map = new GMap2(document.getElementById("map"));
+            map.addControl(new GSmallMapControl());
+            map.addControl(new GMapTypeControl());
+
+            var point = new GLatLng({{ object.location }});
+            map.setCenter(point, 8);
+            mrk = new GMarker(point, {draggable: true});
+            map.addOverlay(mrk);
+        }
+    });
+    {% endif %}
 });
 {% endblock %}
@@ -44 +60 @@
         <tr><th>Trackback</th><td>1</td><th>Comment</th><td>2</td><tr>
     </table>
+    {% if object.has_location %}
+    <div id="map" style="min-width:300px; min-height:150px;">&nbsp;</div>
+    {% endif %}
   </div>
   <div class="feedback">

lang/python/every_resources/trunk/everes_theme_default/templates/static/styles/basic.css

@@ -167 +167 @@
   border: 1px solid rgb(190, 190, 190);
 }
+div.post .article table {
+  width:90%;
+  border-top:1px solid #e5eff8;
+  border-right:1px solid #e5eff8;
+  margin:1em auto;
+  border-collapse:collapse;
+}
+div.post .article td {
+  color:#678197;
+  border-bottom:1px solid #e5eff8;
+  border-left:1px solid #e5eff8;
+  padding:.3em 1em;
+  text-align:center;
+}
+div.post .article tr.odd td {
+  background:#f7fbff
+}
+div.post .article tr.odd .column1 {
+  background:#f4f9fe;
+}
+div.post .article .column1 {
+  background:#f9fcfe;
+}
 div.post .article a:link, div.post .article a:visited { text-decoration: none; color: #D28225; }
 div.post_meta {

lang/python/every_resources/trunk/settings.py

@@ -18 +18 @@
 DATABASE_ENGINE = 'mysql'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
 DATABASE_NAME = 'tsuyukimakoto'             # Or path to database file if using sqlite3.
-#DATABASE_ENGINE = 'sqlite3'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-#DATABASE_NAME = 'test.data'             # Or path to database file if using sqlite3.
+DATABASE_ENGINE = 'sqlite3'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+DATABASE_NAME = 'test.data'             # Or path to database file if using sqlite3.
 DATABASE_USER = 'tsuyukimakoto'             # Not used with sqlite3.
 DATABASE_PASSWORD = 'tsuyukimakoto'         # Not used with sqlite3.
@@ -103 +103 @@
 TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + (
     'everes_core.context_processors.site',
+    'everes_core.context_processors.api_keys',
     'everes_core.context_processors.everes_apps',
     'everes_core.context_processors.everes_tags',
 )
+
+GOOGLE_API_KEY = 'ABQIAAAAqqFWuvyrfIOifreBS0pD6BQCULP4XOMyhPd8d_NrQQEO8sT8XBTc4moQjlQsvb09T-mbSfECKD_dzQ'
 
 RESTRUCTUREDTEXT_FILTER_SETTINGS = {