From 9a03834cefca5026057b2316c52c2b71e0d07f49 Mon Sep 17 00:00:00 2001
From: Mike Macgirvin <mike@macgirvin.com>
Date: Sun, 19 Sep 2010 20:52:39 -0700
Subject: [PATCH] simplify wording throughout application to concepts which do
 not need explanations.

---
 view/dfrn_request.tpl         | 9 +++++----
 view/intros-top.tpl           | 2 +-
 view/intros.tpl               | 2 +-
 view/profile.php              | 2 +-
 view/settings_nick_set.tpl    | 2 +-
 view/settings_nick_subdir.tpl | 5 ++---
 view/theme/default/style.css  | 4 ++++
 7 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/view/dfrn_request.tpl b/view/dfrn_request.tpl
index 483cf6a6fd..0b02982d82 100644
--- a/view/dfrn_request.tpl
+++ b/view/dfrn_request.tpl
@@ -1,15 +1,16 @@
 
-<h1>Personal Introduction</h1>
+<h1>Friend/Connection Request</h1>
 
 <p id="dfrn-request-intro">
-You may introduce yourself to this member if you have a valid profile locator<br />
-on the <a href="http://dfrn.org">Distributed Friends and Relations Network (DFRN)</a>.
+You may request a connection with this member if you have a valid profile address<br />
+on one of the following social networks:<br />
+<ul id="dfrn-request-networks"><li><a href="http://dfrn.org">mistpark/DFRN</a></li></ul>
 </p>
 
 <form action="dfrn_request/$nickname" method="post" />
 
 <div id="dfrn-request-url-wrapper" >
-	<label id="dfrn-url-label" for="dfrn-url" >Your profile location:</label>
+	<label id="dfrn-url-label" for="dfrn-url" >Your profile address:</label>
 	<input type="text" name="dfrn_url" id="dfrn-url" size="32" />
 	<div id="dfrn-request-url-end"></div>
 </div>
diff --git a/view/intros-top.tpl b/view/intros-top.tpl
index 71007dbf6b..d8b7394a4a 100644
--- a/view/intros-top.tpl
+++ b/view/intros-top.tpl
@@ -1,4 +1,4 @@
-<h1>Pending Introductions / Notifications</h1>
+<h1>Pending Friend/Connect Notifications</h1>
 
 <div id="notification-show-hide-wrapper" >
 <a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
diff --git a/view/intros.tpl b/view/intros.tpl
index 1ce8b372b5..a56c7742d0 100644
--- a/view/intros.tpl
+++ b/view/intros.tpl
@@ -1,7 +1,7 @@
 
 <div class="intro-wrapper" id="intro-$contact-id" >
 
-<p class="intro-desc">Notification type: Introduction</p>
+<p class="intro-desc">Notification type: Friend/Connect Request</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>
diff --git a/view/profile.php b/view/profile.php
index a07a452202..5b092d1dc9 100644
--- a/view/profile.php
+++ b/view/profile.php
@@ -21,7 +21,7 @@
 	<div id="profile-extra-links">
 	<ul>
 	<?php if($profile['uid'] != $_SESSION['uid']) { ?>
-	<li><a id="dfrn-request-link" href="dfrn_request/<?php echo $profile['nickname']; ?>">Introductions</a></li>
+	<li><a id="dfrn-request-link" href="dfrn_request/<?php echo $profile['nickname']; ?>">Connect</a></li>
 	<?php } ?>
 	<?php if(! $profile['hide-friends']) echo '<li><a id="viewcontacts-link" href="viewcontacts/' . $profile['nickname'] . '">View Contacts</a></li>'; ?>
 
diff --git a/view/settings_nick_set.tpl b/view/settings_nick_set.tpl
index 096d991d29..a36b3b9a20 100644
--- a/view/settings_nick_set.tpl
+++ b/view/settings_nick_set.tpl
@@ -1,7 +1,7 @@
 
 <div id="settings-nick-wrapper" >
 <p id="settings-nickname-desc">
-<span class="error-message">Your profile locator is <strong>'$nickname@$basepath'</strong></span>
+<span class="error-message">Your profile address is <strong>'$nickname@$basepath'</strong></span>
 </p>
 $subdir
 
diff --git a/view/settings_nick_subdir.tpl b/view/settings_nick_subdir.tpl
index 401a6fd4bd..303c24df71 100644
--- a/view/settings_nick_subdir.tpl
+++ b/view/settings_nick_subdir.tpl
@@ -1,7 +1,6 @@
 <p>
 It appears that your website is located in a subdirectory of the<br />
-$hostname website and this setting may not work reliably.<br />
+$hostname website, so this setting may not work reliably.<br />
 </p>
-<p>If you have any issues, you may have better results using the profile<br />
-locator '<strong>$baseurl/profile/$nickname</strong>'.
+<p>If you have any issues, you may have better results using the profile<br /> address '<strong>$baseurl/profile/$nickname</strong>'.
 </p>
\ No newline at end of file
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index 9edb6424a6..21d95cd685 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -1576,3 +1576,7 @@ input#dfrn-url {
        margin-top: 18px;
        margin-left: 20px;
 }
+
+#dfrn-request-networks {
+	margin-bottom: 30px;
+}
\ No newline at end of file