From 59525e1e321d4cdac668bfc79dd5de0962ab5f56 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 27 Sep 2011 05:24:26 -0700
Subject: restore privacy icons after theme upgrade

---
 view/theme/duepuntozero/wall_item.tpl     | 2 +-
 view/theme/duepuntozero/wallwall_item.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/duepuntozero/wall_item.tpl
index a4508b067..32820fb7c 100644
--- a/view/theme/duepuntozero/wall_item.tpl
+++ b/view/theme/duepuntozero/wall_item.tpl
@@ -16,7 +16,7 @@
 			</div>
 			<div class="wall-item-photo-end"></div>
 			<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
-				$lock
+			{{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock"></span>{{ endif }}	
 				<div class="wall-item-location" id="wall-item-location-$id">$location</div>				
 			</div>
 		</div>
diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl
index daad6ad14..58d5e16f6 100644
--- a/view/theme/duepuntozero/wallwall_item.tpl
+++ b/view/theme/duepuntozero/wallwall_item.tpl
@@ -21,7 +21,7 @@
 			</div>
 			<div class="wall-item-photo-end"></div>
 			<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
-				$lock
+				{{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock"></span>{{ endif }}	
 				<div class="wall-item-location" id="wall-item-location-$id">$location</div>
 			</div>
 		</div>
-- 
cgit v1.2.3


From 75af366122fa472c28a4105553646c53ec0a16e7 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 27 Sep 2011 06:50:18 -0700
Subject: zot/salmon new key format for batch keys

---
 view/xrd_host.tpl   | 4 ++++
 view/xrd_person.tpl | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/xrd_host.tpl b/view/xrd_host.tpl
index ee687ffa9..d27f948ac 100644
--- a/view/xrd_host.tpl
+++ b/view/xrd_host.tpl
@@ -21,5 +21,9 @@
         type="http://purl.org/zot/1.0/accept"
         zot:accept="application/atom+xml" />
 
+	<Property xmlns:mk="http://salmon-protocol.org/ns/magic-key"
+          type="http://salmon-protocol.org/ns/magic-key"
+          mk:key_id="1">$bigkey</Property>
+
 
 </XRD>
diff --git a/view/xrd_person.tpl b/view/xrd_person.tpl
index 7373499bf..2b5af3d0d 100644
--- a/view/xrd_person.tpl
+++ b/view/xrd_person.tpl
@@ -5,7 +5,7 @@
 	<Alias>$accturi</Alias>
     <Alias>$profile_url</Alias>
  
-    <Link rel="http://purl.org/zot/1.0/post" 
+    <Link rel="http://purl.org/zot/1.0/post/$nick" 
           href="$zot_post" />
 
     <Property xmlns:zot="http://purl.og/zot/1.0"
@@ -40,4 +40,8 @@
     <Link rel="magic-public-key" 
           href="$modexp" />
  
+	<Property xmlns:mk="http://salmon-protocol.org/ns/magic-key"
+          type="http://salmon-protocol.org/ns/magic-key"
+          mk:key_id="1">$bigkey</Property>
+
 </XRD>
-- 
cgit v1.2.3


From 44d7c6aac3548e94e35aed87ba7c06b04f374fc2 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 27 Sep 2011 22:03:07 -0700
Subject: connect button overlapping profile details

---
 view/theme/duepuntozero/style.css | 4 ++++
 view/theme/loozah/style.css       | 1 +
 2 files changed, 5 insertions(+)

(limited to 'view')

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index b0aa99a97..1bdd4a99f 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -507,6 +507,10 @@ input#dfrn-url {
 	margin-bottom: 30px;
 }
 
+#profile-extra-links {
+	clear: both;
+}
+
 #profile-extra-links ul {
 	list-style-type: none;
 	padding: 0px;
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 9289c9354..962d08fc0 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -406,6 +406,7 @@ nav {
 }
 
 #profile-extra-links {
+	clear: both;
 	margin-top: 20px;
 	margin-bottom: 20px;
 	margin-left: 20px;
-- 
cgit v1.2.3