aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2010-10-17 20:04:17 -0700
committerMike Macgirvin <mike@macgirvin.com>2010-10-17 20:04:17 -0700
commit0f47ac282c30c61dbc13e42c4f53b2fc14d65593 (patch)
treeb56358665636f78c6e9a62f2abebfb75049cf447 /view
parentf5a8a92df101cbf37fedb9ac3f7702f60a40772e (diff)
downloadvolse-hubzilla-0f47ac282c30c61dbc13e42c4f53b2fc14d65593.tar.gz
volse-hubzilla-0f47ac282c30c61dbc13e42c4f53b2fc14d65593.tar.bz2
volse-hubzilla-0f47ac282c30c61dbc13e42c4f53b2fc14d65593.zip
celebrity/group/community pages about 75% implemented
Diffstat (limited to 'view')
-rw-r--r--view/intro_complete_eml.tpl34
-rw-r--r--view/login.tpl2
-rw-r--r--view/lostpass.tpl2
-rw-r--r--view/xrd_person.tpl1
4 files changed, 16 insertions, 23 deletions
diff --git a/view/intro_complete_eml.tpl b/view/intro_complete_eml.tpl
index 1ac27a855..a60745ec5 100644
--- a/view/intro_complete_eml.tpl
+++ b/view/intro_complete_eml.tpl
@@ -1,27 +1,19 @@
Dear $username,
- I've got good news and bad news... first the good news.
-'$fn' at '$dfrn_url' has accepted your connection request at
-'$sitename'.
-
-The bad news is that '$fn' did not make you a "full friend",
-but rather accepted you as a "fan". [Maybe you were expecting this,
-maybe not.]
-
-What this means is that '$fn' can communicate with you at any
-time and comment on your activities, but your communications to
-'$fn' may be restricted. In particular, you do NOT have the
-ability to exchange private mail. You are only able to communicate
-with '$fn' via your own status updates.
-
-In the future, '$fn' MAY decide to seek a full connection and make
-a reciprocal request. If you approve such a request, you will then be
-considered mutual friends with full communication ability.
-
-The network at $sitename allows many types of relationships -
-as opposed to older social networks where friendship is either
-"yes" or "no" - with nothing in between.
+ '$fn' at '$dfrn_url' has accepted
+your connection request at '$sitename'.
+
+ '$fn' has chosen to accept you a "fan", which restricts
+some forms of communication - such as private messaging and some profile
+interactions. If this is a celebrity or community page, these settings were
+applied automatically.
+
+ '$fn' may choose to extend this into a two-way or more permissive
+relationship in the future.
+
+ You will start receiving public status updates from '$fn',
+which will appear on your 'Network' page at
$siteurl
diff --git a/view/login.tpl b/view/login.tpl
index 39fadb123..8fe09e7d3 100644
--- a/view/login.tpl
+++ b/view/login.tpl
@@ -2,7 +2,7 @@
<form action="" method="post" >
<input type="hidden" name="auth-params" value="login" />
<div id="login-name-wrapper">
- <label for="login-name" id="label-login-name">Username or Email: </label>
+ <label for="login-name" id="label-login-name">Nickname or Email: </label>
<input type="text" maxlength="60" name="login-name" id="login-name" value="" />
</div>
<div id="login-name-end" ></div>
diff --git a/view/lostpass.tpl b/view/lostpass.tpl
index 9de0a2acf..a7040c149 100644
--- a/view/lostpass.tpl
+++ b/view/lostpass.tpl
@@ -6,7 +6,7 @@ Enter your email address and submit to have your password reset. Then check your
<form action="lostpass" method="post" >
<div id="login-name-wrapper">
- <label for="login-name" id="label-login-name">Email address: </label>
+ <label for="login-name" id="label-login-name">Nickname or Email: </label>
<input type="text" maxlength="60" name="login-name" id="login-name" value="" />
</div>
<div id="login-extra-end"></div>
diff --git a/view/xrd_person.tpl b/view/xrd_person.tpl
index 24bf9449a..b99f7c1fc 100644
--- a/view/xrd_person.tpl
+++ b/view/xrd_person.tpl
@@ -17,6 +17,7 @@
type="text/html"
href="$profile_url" />
<Link rel="http://webfinger.net/rel/avatar"
+ type="image/jpeg"
href="$photo" />
<Link rel="salmon"
href="$salmon" />