friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

simplify wording throughout application to concepts which do not need explanations.

This commit is contained in:
Mike Macgirvin 2010-09-19 20:52:39 -07:00
parent 2e35d7010b
commit 9a03834cef
7 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
view/dfrn_request.tpl
View File

@ -1,15 +1,16 @@
<h1>Personal Introduction</h1> <h1>Friend/Connection Request</h1>
<p id="dfrn-request-intro"> <p id="dfrn-request-intro">
You may introduce yourself to this member if you have a valid profile locator<br /> You may request a connection with this member if you have a valid profile address<br />
on the <a href="http://dfrn.org">Distributed Friends and Relations Network (DFRN)</a>. 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> </p>
<form action="dfrn_request/$nickname" method="post" /> <form action="dfrn_request/$nickname" method="post" />
<div id="dfrn-request-url-wrapper" > <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" /> <input type="text" name="dfrn_url" id="dfrn-url" size="32" />
<div id="dfrn-request-url-end"></div> <div id="dfrn-request-url-end"></div>
</div> </div>

2
view/intros-top.tpl
View File

@ -1,4 +1,4 @@
<h1>Pending Introductions / Notifications</h1> <h1>Pending Friend/Connect Notifications</h1>
<div id="notification-show-hide-wrapper" > <div id="notification-show-hide-wrapper" >
<a href="$hide_url" id="notification-show-hide-link">$hide_text</a> <a href="$hide_url" id="notification-show-hide-link">$hide_text</a>

2
view/intros.tpl
View File

@ -1,7 +1,7 @@
<div class="intro-wrapper" id="intro-$contact-id" > <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> <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> <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-knowyou">Presumably known to you? <strong>$knowyou</strong></div>

2
view/profile.php
View File

@ -21,7 +21,7 @@
<div id="profile-extra-links"> <div id="profile-extra-links">
<ul> <ul>
<?php if($profile['uid'] != $_SESSION['uid']) { ?> <?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 } ?>
<?php if(! $profile['hide-friends']) echo '<li><a id="viewcontacts-link" href="viewcontacts/' . $profile['nickname'] . '">View Contacts</a></li>'; ?> <?php if(! $profile['hide-friends']) echo '<li><a id="viewcontacts-link" href="viewcontacts/' . $profile['nickname'] . '">View Contacts</a></li>'; ?>

2
view/settings_nick_set.tpl
View File

@ -1,7 +1,7 @@
<div id="settings-nick-wrapper" > <div id="settings-nick-wrapper" >
<p id="settings-nickname-desc"> <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> </p>
$subdir $subdir

5
view/settings_nick_subdir.tpl
View File

@ -1,7 +1,6 @@
<p> <p>
It appears that your website is located in a subdirectory of the<br /> 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>
<p>If you have any issues, you may have better results using the profile<br /> <p>If you have any issues, you may have better results using the profile<br /> address '<strong>$baseurl/profile/$nickname</strong>'.
locator '<strong>$baseurl/profile/$nickname</strong>'.
</p> </p>

4
view/theme/default/style.css
View File

@ -1576,3 +1576,7 @@ input#dfrn-url {
margin-top: 18px; margin-top: 18px;
margin-left: 20px; margin-left: 20px;
} }
#dfrn-request-networks {
margin-bottom: 30px;
}