mistpark 2.0 infrasturcture lands

8 files changed, 117 insertions, 17 deletions

diff --git a/view/acl_selectors.php b/view/acl_selectors.php
index b22099ddf..42cd7a981 100644
--- a/view/acl_selectors.php
+++ b/view/acl_selectors.php
@@ -38,7 +38,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 	// to one recipient. By default our selector allows multiple selects amongst all contacts.
 
 	if($privmail) {
-		$sql_extra = " AND `issued-id` != '' AND `dfrn-id` != '' ";
+		$sql_extra = sprintf(" AND `rel` = %d ", intval(DIRECTION_BOTH));
 		$o .= "<select name=\"$selname\" class=\"$selclass\" size=\"$size\" />\r\n";
 	}
 	else {
diff --git a/view/atom_cmnt.tpl b/view/atom_cmnt.tpl
index 1d00fd158..59dff9efa 100644
--- a/view/atom_cmnt.tpl
+++ b/view/atom_cmnt.tpl
@@ -2,7 +2,7 @@
 		<author>
 			<name>$name</name>
 			<uri>$profile_page</uri>
-			<dfrn:avatar>$thumb</dfrn:avatar>  
+			<link rel="photo" type="image/jpeg" href="$thumb" />
 		</author>
 
 		<thr:in-reply-to ref="$parent_id" />
@@ -10,7 +10,9 @@
 		<title>$title</title>
 		<published>$published</published>
 		<updated>$updated</updated>
-		<content>$content</content>
+		<content type="$type" >$content</content>
 		<dfrn:comment-allow>$comment_allow</dfrn:comment-allow>
+		<as:verb>$verb</as:verb>
+		$actobj
 	</entry>
 
diff --git a/view/atom_item.tpl b/view/atom_item.tpl
index 8104cfaa5..d1eadb4af 100644
--- a/view/atom_item.tpl
+++ b/view/atom_item.tpl
@@ -5,8 +5,8 @@
 			<link rel="photo" type="image/jpeg" href="$thumb" />
 		</author>
 		<dfrn:owner>
-			<dfrn:name>$owner_name</dfrn:name>
-			<dfrn:uri>$owner_profile_page</dfrn:uri>
+			<name>$owner_name</name>
+			<uri>$owner_profile_page</uri>
 			<link rel="photo" type="image/jpeg" href="$owner_thumb" />
 		</dfrn:owner>
 
@@ -17,4 +17,7 @@
 		<content type="$type" >$content</content>
 		<dfrn:location>$location</dfrn:location>
 		<dfrn:comment-allow>$comment_allow</dfrn:comment-allow>
+		<as:verb>$verb</as:verb>
+		$actobj
+
 	</entry>
diff --git a/view/intros.tpl b/view/intros.tpl
index 75739005b..1ce8b372b 100644
--- a/view/intros.tpl
+++ b/view/intros.tpl
@@ -1,21 +1,38 @@
 
 <div class="intro-wrapper" id="intro-$contact-id" >
-<hr class="intro-top" />
+
 <p class="intro-desc">Notification type: Introduction</p>
 <div class="intro-fullname" id="intro-fullname-$contact-id" >$fullname</div>
 <a class="intro-url-link" id="intro-url-link-$contact-id" href="$url" ><img id="photo-$contact-id" class="intro-photo" src="$photo" width="175" height=175" name="$fullname" alt="fullname" /></a>
 <div class="intro-knowyou">Presumably known to you? <strong>$knowyou</strong></div>
 <div class="intro-note" id="intro-note-$contact-id">$note</div>
 <div class="intro-wrapper-end" id="intro-wrapper-end-$contact-id"></div>
+<form class="intro-form" action="notifications/$intro_id" method="post">
+<input class="intro-submit-ignore" type="submit" name="submit" value="Ignore" />
+<input class="intro-submit-discard" type="submit" name="submit" value="Discard" />
+</form>
+<div class="intro-form-end"></div>
 
 <form class="intro-approve-form" action="dfrn_confirm" method="post">
 <input type="hidden" name="dfrn_id" value="$dfrn-id" >
 <input type="hidden" name="intro_id" value="$intro_id" >
+
+<div class="intro-approve-as-friend-desc">Approve as: </div>
+
+<div class="intro-approve-as-friend-wrapper">
+	<label class="intro-approve-as-friend-label" for="intro-approve-as-friend-$intro_id">Friend</label>
+	<input type="radio" name="duplex" id="intro-approve-as-friend-$intro_id" class="intro-approve-as-friend" checked="checked" value="1" />
+	<div class="intro-approve-friend-break" ></div>	
+</div>
+<div class="intro-approve-as-friend-end"></div>
+<div class="intro-approve-as-fan-wrapper">
+	<label class="intro-approve-as-fan-label" for="intro-approve-as-fan-$intro_id">Fan/Admirer</label>
+	<input type="radio" name="duplex" id="intro-approve-as-fan-$intro_id" class="intro-approve-as-fan" $fan_selected value="0"  />
+	<div class="intro-approve-fan-break"></div>
+</div>
+<div class="intro-approve-as-end"></div>
+
 <input class="intro-submit-approve" type="submit" name="submit" value="Approve" />
 </form>
-<form class="intro-form" action="notifications/$intro_id" method="post">
-<input class="intro-submit-ignore" type="submit" name="submit" value="Ignore" />
-<input class="intro-submit-discard" type="submit" name="submit" value="Discard" />
-</form>
 </div>
 <div class="intro-end"></div>
diff --git a/view/profile_advanced.php b/view/profile_advanced.php
index 098143381..1f917f663 100644
--- a/view/profile_advanced.php
+++ b/view/profile_advanced.php
@@ -29,7 +29,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00 00:00:00')) {
+if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) {
 $o .= <<< EOT
 <div id="advanced-profile-dob-wrapper" >
 <div id="advanced-profile-dob-text">Birthday:</div>
diff --git a/view/settings_nick_set.tpl b/view/settings_nick_set.tpl
index 3524fc1bc..096d991d2 100644
--- a/view/settings_nick_set.tpl
+++ b/view/settings_nick_set.tpl
@@ -1,8 +1,7 @@
 
 <div id="settings-nick-wrapper" >
 <p id="settings-nickname-desc">
-Your site nickname is <strong>$nickname</strong> and cannot be changed.<br />
-Your profile locator is <strong>'$nickname@$basepath'</strong>.
+<span class="error-message">Your profile locator is <strong>'$nickname@$basepath'</strong></span>
 </p>
 $subdir
 
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index 92fb93887..3f169905d 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -383,16 +383,37 @@ input#dfrn-url {
 	padding: 30px;
 }
 
-.intro-approve-form, .intro-form {
+.intro-form {
 	float: left;
 }
+.intro-approve-form {
+	clear: both;
+}
+.intro-approve-as-friend-end {
+	clear: both;
+}
 .intro-submit-approve, .intro-submit-ignore {
 	margin-right: 20px;
 }
-.intro-top {
-	width: 500px;
-	margin-bottom: 30px;
+.intro-approve-as-friend-label, .intro-approve-as-fan-label {
+	float: left;
+	width: 100px;
+	margin-left: 20px;
 }
+.intro-approve-as-friend, .intro-approve-as-fan {
+	float: left;
+}
+.intro-form-end {
+	clear: both;
+}
+.intro-approve-as-friend-desc {
+	margin-top: 15px;
+}
+.intro-approve-as-end {
+	clear: both;
+	margin-bottom: 10px;
+}
+
 .intro-end {
 	clear: both;
 	margin-bottom: 30px;
diff --git a/view/theme/goldenrod/style.css b/view/theme/goldenrod/style.css
new file mode 100644
index 000000000..4f5773a4a
--- /dev/null
+++ b/view/theme/goldenrod/style.css
@@ -0,0 +1,58 @@
+@import url('../default/style.css');
+
+body { 
+	background: #FFDDAA;
+	color: #444444;
+}
+
+.nav-link {
+	color: #444444;
+	background: #FFCC55;
+}
+
+.nav-commlink {
+	color: #444444;
+	background: #FFCC55;
+}
+
+.profile-tabs {
+	color: #444444;
+	background: #FFCC55;
+
+}
+
+a, a:visited {
+	color: #8888FF;
+	text-decoration: none;
+}
+
+a:hover {
+	color: #0000FF;
+	text-decoration: underline;
+}
+.wall-item-content-wrapper.comment {
+	background: #FFCC55;
+}
+
+.comment-edit-wrapper {
+	background: #FFCC55;
+}
+
+.comment-wwedit-wrapper {
+	background: #FFCC55;
+}
+
+#photos-upload-perms-menu, #photos-upload-perms-menu:visited {
+	color: #8888FF;
+}
+
+#photos-upload-perms-menu:hover {
+	color: #0000FF;
+}
+#settings-default-perms-menu, #settings-default-perms-menu:visited {
+	color: #8888FF;
+}
+
+#settings-default-perms-menu:hover {
+	color: #0000FF;
+}