aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2010-08-20 14:33:15 -0700
committerMike Macgirvin <mike@macgirvin.com>2010-08-20 14:33:15 -0700
commit709c86b2daec32ae0d5d6d0e7f88b8607e02edba (patch)
tree2975e62aebdda560502e3e2454153020e6377db6 /view
parent82174bbfa8ae45cebd75efbf597abf8623caa4b7 (diff)
downloadvolse-hubzilla-709c86b2daec32ae0d5d6d0e7f88b8607e02edba.tar.gz
volse-hubzilla-709c86b2daec32ae0d5d6d0e7f88b8607e02edba.tar.bz2
volse-hubzilla-709c86b2daec32ae0d5d6d0e7f88b8607e02edba.zip
added location tagging
Diffstat (limited to 'view')
-rw-r--r--view/atom_feed.tpl3
-rw-r--r--view/atom_item.tpl1
-rw-r--r--view/jot-header.tpl8
-rw-r--r--view/jot.tpl4
-rw-r--r--view/theme/default/style.css6
5 files changed, 20 insertions, 2 deletions
diff --git a/view/atom_feed.tpl b/view/atom_feed.tpl
index fc2816ef9..b77b14646 100644
--- a/view/atom_feed.tpl
+++ b/view/atom_feed.tpl
@@ -2,7 +2,8 @@
<feed xmlns="http://www.w3.org/2005/Atom"
xmlns:thr="http://purl.org/syndication/thread/1.0"
xmlns:at="http://purl.org/atompub/tombstones/1.0"
- xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0" >
+ xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0"
+ xmlns:as="http://activitystrea.ms/spec/1.0/" >
<id>$feed_id</id>
<title>$feed_title</title>
diff --git a/view/atom_item.tpl b/view/atom_item.tpl
index 16581fc89..99b18e05f 100644
--- a/view/atom_item.tpl
+++ b/view/atom_item.tpl
@@ -15,5 +15,6 @@
<published>$published</published>
<updated>$updated</updated>
<content>$content</content>
+ <as:place>$location</as:place>
<dfrn:comment-allow>$comment_allow</dfrn:comment-allow>
</entry>
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index b13a324bb..39f8adc6e 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -80,6 +80,14 @@ tinyMCE.init({
}
}
+ function jotGetLocation() {
+ reply = prompt("Where are you right now?");
+ if(reply && reply.length) {
+ $('#jot-location').val(reply);
+ }
+ }
+
+
function linkdropper(event) {
var linkFound = event.dataTransfer.types.contains("text/uri-list");
if(linkFound)
diff --git a/view/jot.tpl b/view/jot.tpl
index 481ab125b..5ceb79503 100644
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -9,6 +9,7 @@
<input type="hidden" name="type" value="wall" />
<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="" />
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea>
@@ -24,6 +25,9 @@
<div id="profile-youtube-wrapper" style="display: $visitor;" >
<img id="profile-video" src="images/youtube_icon.gif" alt="Insert YouTube video" title="Insert YouTube video" onclick="jotGetVideo();" />
</div>
+ <div id="profile-location-wrapper" style="display: $visitor;" >
+ <img id="profile-location" src="images/globe.gif" alt="Set your location" title="Set your lcoation" onclick="jotGetLocation();" />
+ </div>
<div id="profile-rotator-wrapper" style="display: $visitor;" >
<img id="profile-rotator" src="images/rotator.gif" alt="Please wait" title="Please wait" style="display: none;" />
</div>
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index 872fb1f61..57d2888f4 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -720,10 +720,14 @@ input#dfrn-url {
float: left;
margin-left: 20px;
}
+#profile-location-wrapper {
+ float: left;
+ margin-left: 20px;
+}
#profile-jot-perms {
float: left;
- margin-left: 250px;
+ margin-left: 200px;
}
#profile-jot-perms-end {