7 files changed, 39 insertions, 8 deletions
diff --git a/view/dfrn_request.tpl b/view/dfrn_request.tpl
index df935ae2a..c1a7b1d9b 100644
--- a/view/dfrn_request.tpl
+++ b/view/dfrn_request.tpl
@@ -2,13 +2,14 @@
 <h1>Personal Introduction</h1>
 
 <p id="dfrn-request-intro">
-You may introduce yourself to this member if you have a valid <a href="http://dfrn.org">DFRN profile</a>.
+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>.
 </p>
 
 <form action="dfrn_request/$uid" method="post" />
 
 <div id="dfrn-request-url-wrapper" >
-	<label id="dfrn-url-label" for="dfrn-url" >Your DFRN Profile URL:</label>
+	<label id="dfrn-url-label" for="dfrn-url" >Your profile location:</label>
 	<input type="text" name="dfrn_url" id="dfrn-url" size="32" />
 	<div id="dfrn-request-url-end"></div>
 </div>
diff --git a/view/head.tpl b/view/head.tpl
index 8ffd63933..b384d6fc0 100644
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -7,3 +7,20 @@
 <![endif]-->
 <script type="text/javascript" src="$baseurl/include/jquery.js" ></script>
 <script type="text/javascript" src="$baseurl/include/main.js" ></script>
+
+<script type="text/javascript">
+//	$(document).ready(function() { setTimeout(NavUpdate,10 * 1000); });
+
+function NavUpdate()
+	{
+		$.get("ping",function(data)
+			{
+			$(data).find('result').each(function() {
+				var net = $(this).find('net').text();
+			alert(net);
+			});
+		}) ;
+		setTimeout(NavUpdate,10 * 1000);
+	}
+</script>
+
diff --git a/view/profile.php b/view/profile.php
index d95edb952..e8de331e1 100644
--- a/view/profile.php
+++ b/view/profile.php
@@ -20,7 +20,7 @@
 
 	<div id="profile-extra-links">
 
-	<a id="dfrn-request-link" href="dfrn_request/<?php echo $profile['uid']; ?>">Introductions</a>
+	<a id="dfrn-request-link" href="dfrn_request/<?php echo $profile['nickname']; ?>">Introductions</a>
 
 	</div>
 
diff --git a/view/settings.tpl b/view/settings.tpl
index d73e45a41..baf117844 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -1,5 +1,8 @@
 <h1>Account Settings</h1>
 
+$nickname_block
+
+
 <form action="settings" id="settings-form" method="post" >
 
 <div id="settings-username-wrapper" >
@@ -14,7 +17,6 @@
 </div>
 <div id="settings-email-end" ></div>
 
-$nickname_block
 
 
 <div id="settings-timezone-wrapper" >
diff --git a/view/settings_nick_set.tpl b/view/settings_nick_set.tpl
index 8b110457c..3524fc1bc 100644
--- a/view/settings_nick_set.tpl
+++ b/view/settings_nick_set.tpl
@@ -1,10 +1,10 @@
 
 <div id="settings-nick-wrapper" >
 <p id="settings-nickname-desc">
-Your nickname cannot be changed. It is set to <strong>$nickname</strong>.<br />
-Your profile is located at <strong>'$baseurl/profile/$nickname'</strong>,<br />
-and you may use this as your profile URL when communicating with other<br />
-sites or simply <strong>'$nickname@$basepath'</strong>.
+Your site nickname is <strong>$nickname</strong> and cannot be changed.<br />
+Your profile locator is <strong>'$nickname@$basepath'</strong>.
 </p>
+$subdir
+
 </div>
 <div id="settings-nick-end" ></div>
diff --git a/view/settings_nick_subdir.tpl b/view/settings_nick_subdir.tpl
new file mode 100644
index 000000000..401a6fd4b
--- /dev/null
+++ b/view/settings_nick_subdir.tpl
@@ -0,0 +1,7 @@
+<p>
+It appears that your website is located in a subdirectory of the<br />
+$hostname website and 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>
+\ No newline at end of file
diff --git a/view/style.css b/view/style.css
index 128464b1d..58579ae48 100644
--- a/view/style.css
+++ b/view/style.css
@@ -210,6 +210,10 @@ input#dfrn-url {
 	margin-left: 50px;
 }
 
+#settings-nick-wrapper {
+	margin-bottom: 30px;
+}
+
 #settings-username-end, #settings-email-end, #settings-nick-end, #settings-timezone-end, #settings-password-end, #settings-confirm-end {
 	margin-bottom: 5px;
 	clear: both;