From a8e4ec7801b5ca8c986febed1f95124b412e92f9 Mon Sep 17 00:00:00 2001
From: Mike Macgirvin <mike@macgirvin.com>
Date: Tue, 19 Oct 2010 20:52:05 -0700
Subject: use browser geolocation when desired

---
 view/atom_feed.tpl           | 3 ++-
 view/atom_item.tpl           | 1 +
 view/jot-header.tpl          | 1 +
 view/jot.tpl                 | 1 +
 view/settings.tpl            | 8 ++++++++
 view/theme/default/style.css | 7 ++++++-
 6 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/atom_feed.tpl b/view/atom_feed.tpl
index da1d53e39..142119f49 100644
--- a/view/atom_feed.tpl
+++ b/view/atom_feed.tpl
@@ -4,7 +4,8 @@
       xmlns:at="http://purl.org/atompub/tombstones/1.0"
       xmlns:media="http://purl.org/syndication/atommedia"
       xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0" 
-      xmlns:as="http://activitystrea.ms/spec/1.0/" >
+      xmlns:as="http://activitystrea.ms/spec/1.0/"
+      xmlns:georss="http://www.georss.org/georss" >
 
   <id>$feed_id</id>
   <title>$feed_title</title>
diff --git a/view/atom_item.tpl b/view/atom_item.tpl
index 401441e16..b26ba2e69 100644
--- a/view/atom_item.tpl
+++ b/view/atom_item.tpl
@@ -19,6 +19,7 @@
 		<content type="$type" >$content</content>
 		<link rel="alternate" href="$alt" />
 		<dfrn:location>$location</dfrn:location>
+		<georss:point>$coord</georss:point>
 		<dfrn:comment-allow>$comment_allow</dfrn:comment-allow>
 		<as:verb>$verb</as:verb>
 		$actobj
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index b07ffb1f6..bdf0cb610 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -118,6 +118,7 @@ tinyMCE.init({
 		}
 	}
 
+	$geotag
 
 </script>
 
diff --git a/view/jot.tpl b/view/jot.tpl
index 0dfad3f5e..363c4617f 100644
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -11,6 +11,7 @@
 		<input type="hidden" name="profile_uid" value="$profile_uid" />
 		<input type="hidden" name="return" value="$return_path" />
 		<input type="hidden" name="location" id="jot-location" value="$defloc" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
 
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea>
 
diff --git a/view/settings.tpl b/view/settings.tpl
index e06671d37..eeb683c76 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -34,6 +34,14 @@ $zoneselect
 </div>
 <div id="settings-defloc-end" ></div>
 
+<div id="settings-allowloc-wrapper" >
+<label id="settings-allowloc-label" for="settings-allowloc" >Use Browser Location: </label>
+<input type="checkbox" name="allow_location" id="settings-allowloc" value="1" $loc_checked />
+</div>
+<div id="settings-allowloc-end" ></div>
+
+
+
 
 <div id="settings-theme-select">
 <label id="settings-theme-label" for="theme-select" >Display Theme: </label>
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index 237264df4..066456e54 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -105,7 +105,9 @@ blockquote:before {
 	text-decoration: none;
 	cursor: pointer;
 }
-
+.smalltext {
+	font-size: 0.7em;
+}
 #sysmsg {
 	width: 600px;
 	margin-bottom: 10px;
@@ -439,6 +441,7 @@ input#dfrn-url {
 #settings-email-end,
 #settings-nick-end,
 #settings-defloc-end,
+#settings-allowloc-end,
 #settings-timezone-end,
 #settings-theme-end,
 #settings-password-end,
@@ -456,6 +459,7 @@ input#dfrn-url {
 #settings-email-label,
 #settings-nick-label,
 #settings-defloc-label,
+#settings-allowloc-label,
 #settings-timezone-label,
 #settings-theme-label,
 #settings-password-label,
@@ -473,6 +477,7 @@ input#dfrn-url {
 #settings-email,
 #settings-nick,
 #settings-defloc,
+#settings-allowloc,
 #timezone-select,
 #theme-select,
 #settings-password,
-- 
cgit v1.2.3