strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

pull some template strings

Browse source
This commit is contained in:
Friendika 2010-11-16 23:26:14 -08:00
parent f9d5aafe9c
commit c2086ec50e
5 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/auth.php
View file

@ -69,7 +69,16 @@ else {
if(x($_POST,'password')) if(x($_POST,'password'))
$encrypted = hash('whirlpool',trim($_POST['password'])); $encrypted = hash('whirlpool',trim($_POST['password']));
else {
if((x($_POST,'auth-params')) && $_POST['auth-params'] === 'login') {
require_once('library/openid.php');
$openid = new LightOpenID;
$openid->identity = trim($_POST['login-name']);
$a = get_app();
$openid->returnUrl = $a->get_baseurl() . '/openid';
goaway($openid->authUrl());
}
}
if((x($_POST,'auth-params')) && $_POST['auth-params'] === 'login') { if((x($_POST,'auth-params')) && $_POST['auth-params'] === 'login') {
// process login request // process login request

8
mod/contacts.php
View file

@ -198,7 +198,14 @@ function contacts_content(&$a) {
} }
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$header' => t('Contact Editor'),
'$visit' => t('Visit $name's profile'),
'$blockunblock' => t('Block/Unblock contact'),
'$ignorecont' => t('Ignore contact'),
'$delete' => t('Delete contact'),
'$poll_interval' => contact_poll_interval($r[0]['priority']), '$poll_interval' => contact_poll_interval($r[0]['priority']),
'$lastupdtext' => t('Last updated: '),
'$updpub' => t('Update public posts: '),
'$last_update' => (($r[0]['last-update'] == '0000-00-00 00:00:00') '$last_update' => (($r[0]['last-update'] == '0000-00-00 00:00:00')
? t('Never') ? t('Never')
: datetime_convert('UTC',date_default_timezone_get(),$r[0]['last-update'],'D, j M Y, g:i A')), : datetime_convert('UTC',date_default_timezone_get(),$r[0]['last-update'],'D, j M Y, g:i A')),
@ -235,6 +242,7 @@ function contacts_content(&$a) {
$tpl = load_view_file("view/contacts-top.tpl"); $tpl = load_view_file("view/contacts-top.tpl");
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$header' => t('Contacts'),
'$hide_url' => ((strlen($sql_extra)) ? 'contacts/all' : 'contacts' ), '$hide_url' => ((strlen($sql_extra)) ? 'contacts/all' : 'contacts' ),
'$hide_text' => ((strlen($sql_extra)) ? t('Show Blocked Connections') : t('Hide Blocked Connections')), '$hide_text' => ((strlen($sql_extra)) ? t('Show Blocked Connections') : t('Hide Blocked Connections')),
'$search' => $search, '$search' => $search,

2
view/en/contacts-top.tpl → view/contacts-top.tpl
View file

@ -1,4 +1,4 @@
<h1>Contacts</h1> <h1>$header</h1>
$finding $finding

14
view/en/contact_edit.tpl
View file

@ -1,5 +1,5 @@
<h2>Contact Editor</h2> <h2>$header</h2>
<div id="contact-edit-banner-name">$name</div> <div id="contact-edit-banner-name">$name</div>
@ -9,23 +9,23 @@
<div id="contact-edit-photo-wrapper" > <div id="contact-edit-photo-wrapper" >
<img id="contact-edit-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" /> <img id="contact-edit-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
<div id="contact-edit-photo" > <div id="contact-edit-photo" >
<a href="$url" title="Visit $name's profile" /><img src="$photo" $sparkle alt="$name" /></a> <a href="$url" title="$visit" /><img src="$photo" $sparkle alt="$name" /></a>
</div> </div>
<div id="contact-edit-photo-end" ></div> <div id="contact-edit-photo-end" ></div>
</div> </div>
<div id="contact-edit-nav-wrapper" > <div id="contact-edit-nav-wrapper" >
<div id="contact-edit-links" > <div id="contact-edit-links" >
<a href="contacts/$contact_id/block" id="contact-edit-block-link" ><img src="images/b_block.gif" alt="Block/Unblock contact" title="$block_text"/></a> <a href="contacts/$contact_id/block" id="contact-edit-block-link" ><img src="images/b_block.gif" alt="$blockunblock" title="$block_text"/></a>
<a href="contacts/$contact_id/ignore" id="contact-edit-ignore-link" ><img src="images/no.gif" alt="Ignore contact" title="$ignore_text"/></a> <a href="contacts/$contact_id/ignore" id="contact-edit-ignore-link" ><img src="images/no.gif" alt="$ignorecont" title="$ignore_text"/></a>
</div> </div>
<div id="contact-drop-links" > <div id="contact-drop-links" >
<a href="contacts/$contact_id/drop" id="contact-edit-drop-link" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="Delete contact" title="Delete contact" onmouseover="imgbright(this);" onmouseout="imgdull(this);" /></a> <a href="contacts/$contact_id/drop" id="contact-edit-drop-link" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" /></a>
</div> </div>
<div id="contact-edit-nav-end"></div> <div id="contact-edit-nav-end"></div>
<div id="contact-edit-poll-wrapper"> <div id="contact-edit-poll-wrapper">
<div id="contact-edit-last-update-text">Last updated: <span id="contact-edit-last-updated">$last_update</span</div> <div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span</div>
<div id="contact-edit-poll-text">Update public posts: </div> <div id="contact-edit-poll-text">$updpub</div>
$poll_interval $poll_interval
</div> </div>
</div> </div>

9
view/en/contact_self.tpl
View file

@ -1,9 +0,0 @@
<img src="$thumb" alt="$name" >
<p>$name</p>
<p>
This is you.
</p>
<hr />