From c16f314ec348205f4741e0171335168720e652d2 Mon Sep 17 00:00:00 2001
From: Mike Macgirvin <mike@macgirvin.com>
Date: Mon, 25 Oct 2010 21:52:30 -0700
Subject: two-way subscriptions working with federated social accounts

---
 view/atom_feed.tpl           |  3 ++-
 view/auto_request.tpl        |  4 ++--
 view/dfrn_request.tpl        |  6 +++---
 view/follow.tpl              | 10 ++++++++++
 view/follow_slap.tpl         | 24 ++++++++++++++++++++++++
 view/magicsig.tpl            |  8 ++++----
 view/theme/default/style.css | 17 +++++++++++++++--
 7 files changed, 60 insertions(+), 12 deletions(-)
 create mode 100644 view/follow.tpl
 create mode 100644 view/follow_slap.tpl

(limited to 'view')

diff --git a/view/atom_feed.tpl b/view/atom_feed.tpl
index 142119f49..60522eb50 100644
--- a/view/atom_feed.tpl
+++ b/view/atom_feed.tpl
@@ -5,7 +5,8 @@
       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:georss="http://www.georss.org/georss" >
+      xmlns:georss="http://www.georss.org/georss" 
+      xmlns:poco="http://portablecontacts.net/spec/1.0" >
 
   <id>$feed_id</id>
   <title>$feed_title</title>
diff --git a/view/auto_request.tpl b/view/auto_request.tpl
index 57c4995d9..fe6e70a46 100644
--- a/view/auto_request.tpl
+++ b/view/auto_request.tpl
@@ -5,7 +5,7 @@
 Please enter your profile address from one of the following supported social networks:<br />
 <ul id="dfrn-request-networks">
 <li><a href="http://dfrn.org">Mistpark/DFRN</a> (fully supported)</li>
-<li><a href="http://ostatus.org">Federation/OStatus/Diaspora/GNU-social</a> (limited - experimental)</li>
+<li><a href="http://ostatus.org">StatusNet/GNU-social/Federation</a> (limited - experimental)</li>
 </ul>
 </p>
 
@@ -13,7 +13,7 @@ Please enter your profile address from one of the following supported social net
 
 <div id="dfrn-request-url-wrapper" >
 	<label id="dfrn-url-label" for="dfrn-url" >Your profile address:</label>
-	<input type="text" name="dfrn_url" id="dfrn-url" size="32" />
+	<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="$myaddr" />
 	<div id="dfrn-request-url-end"></div>
 </div>
 
diff --git a/view/dfrn_request.tpl b/view/dfrn_request.tpl
index df7e3830c..6cc965597 100644
--- a/view/dfrn_request.tpl
+++ b/view/dfrn_request.tpl
@@ -6,7 +6,7 @@ You may request a connection with this member if you have a valid profile addres
 on one of the following social networks:<br />
 <ul id="dfrn-request-networks">
 <li><a href="http://dfrn.org">Mistpark/DFRN</a> (fully supported)</li>
-<li><a href="http://ostatus.org">Federation/OStatus/Diaspora/GNU-social</a> (limited - experimental)</li>
+<li><a href="http://ostatus.org">StatusNet/GNU-social/Federation</a> (limited - experimental)</li>
 </ul>
 </p>
 
@@ -14,7 +14,7 @@ on one of the following social networks:<br />
 
 <div id="dfrn-request-url-wrapper" >
 	<label id="dfrn-url-label" for="dfrn-url" >Your profile address:</label>
-	<input type="text" name="dfrn_url" id="dfrn-url" size="32" />
+	<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="$myaddr" />
 	<div id="dfrn-request-url-end"></div>
 </div>
 
@@ -25,7 +25,7 @@ Please answer the following:
 <div id="dfrn-request-info-wrapper" >
 
 <p id="doiknowyou">
-Do I know you?
+Does $name know you?
 </p>
 
 		<div id="dfrn-request-know-yes-wrapper">
diff --git a/view/follow.tpl b/view/follow.tpl
new file mode 100644
index 000000000..49bebee8b
--- /dev/null
+++ b/view/follow.tpl
@@ -0,0 +1,10 @@
+<div class="side-follow-wrapper" id="side-follow-wrapper" >
+<form action="follow" method="post" />
+<label id="side-follow-label" for="side-follow-url" >$label</label>
+<input id="side-follow-url" type="text" name="url" size="24" title="$hint" />
+<div class="side-follow-input-end"></div>
+<input id="side-follow-submit" type="submit" name="submit" value="$follow" />
+</form>
+</div>
+<div class="side-follow-end"></div>
+
diff --git a/view/follow_slap.tpl b/view/follow_slap.tpl
new file mode 100644
index 000000000..1c4a5f7ce
--- /dev/null
+++ b/view/follow_slap.tpl
@@ -0,0 +1,24 @@
+	<entry>
+		<author>
+			<name>$name</name>
+			<uri>$profile_page</uri>
+			<link rel="photo"  type="image/jpeg" media:width="80" media:height="80" href="$thumb" />
+			<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="$thumb" />
+		</author>
+
+		<id>$item_id</id>
+		<title>$title</title>
+		<published>$published</published>
+		<content type="$type" >$content</content>
+
+		<as:actor>
+		<as:object-type>http://activitystrea.ms/schema/1.0/person</as:object-type>
+		<id>$profile_page</id>
+		<title></title>
+ 		<link rel="avatar" type="image/jpeg" media:width="175" media:height="175" href="$photo"/>
+		<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="$thumb"/>
+		<poco:preferredUsername>$nick</poco:preferredUsername>
+		<poco:displayName>$name</poco:displayName>
+		</as:actor>
+ 		<as:verb>$verb</as:verb>
+	</entry>
diff --git a/view/magicsig.tpl b/view/magicsig.tpl
index 46b4d4ea4..6707493ca 100644
--- a/view/magicsig.tpl
+++ b/view/magicsig.tpl
@@ -1,9 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<me:env xmlns:me='http://salmon-protocol.org/ns/magic-env'>
-<me:data type='application/atom+xml'>
+<?xml version="1.0" encoding="UTF-8"?>
+<me:env xmlns:me="http://salmon-protocol.org/ns/magic-env">
+<me:data type="application/atom+xml">
 $data
 </me:data>
 <me:encoding>$encoding</me:encoding>
-<me:alg>$algorithm</me:/alg>
+<me:alg>$algorithm</me:alg>
 <me:sig keyash="$keyhash">$signature</me:sig>
 </me:env>
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index ca4891a76..191f2d50f 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -32,9 +32,12 @@ input, select {
 	border: 1px solid #858585;
 }
 input:hover {
+
 	background-color: #29BBF2;
-	color: #F5F6FB;
-	border: 1px solid #F5F6FB;
+/*	background-color: #49dbFa; */
+	color: black;
+/*	color: #F5F6FB; */
+/*	border: 1px solid #F5F6FB; */
 	cursor: pointer;
 }
 option {
@@ -1550,6 +1553,16 @@ a.mail-list-link:hover {
 	margin-top: 10px;
 }
 
+#side-follow-wrapper {
+	margin-top: 20px;
+}
+#side-follow-url {
+	margin-top: 5px;
+}
+#side-follow-submit {
+	margin-top: 15px;
+}
+
 .photo-album-image-wrapper {
 	float: left;
 	margin-top: 15px;
-- 
cgit v1.2.3