Merge pull request #1977 from rabuzarus/crepair
move html from crepair.php to template
This commit is contained in:
commit
65403973c1
2 changed files with 25 additions and 11 deletions
|
@ -137,16 +137,10 @@ function crepair_content(&$a) {
|
|||
|
||||
$contact = $r[0];
|
||||
|
||||
$msg1 = t('Repair Contact Settings');
|
||||
$warning = t('<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working.');
|
||||
$info = t('Please use your browser \'Back\' button <strong>now</strong> if you are uncertain what to do on this page.');
|
||||
|
||||
$msg2 = t('<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working.');
|
||||
$msg3 = t('Please use your browser \'Back\' button <strong>now</strong> if you are uncertain what to do on this page.');
|
||||
|
||||
$o .= '<h2>' . $msg1 . '</h2>';
|
||||
|
||||
$o .= '<div class="error-message">' . $msg2 . EOL . EOL. $msg3 . '</div>';
|
||||
|
||||
$o .= EOL . '<a href="contacts/' . $cid . '">' . t('Return to contact editor') . '</a>' . EOL;
|
||||
$returnaddr = "contacts/$cid";
|
||||
|
||||
$allow_remote_self = get_config('system','allow_users_remote_self');
|
||||
|
||||
|
@ -165,6 +159,11 @@ function crepair_content(&$a) {
|
|||
|
||||
$tpl = get_markup_template('crepair.tpl');
|
||||
$o .= replace_macros($tpl, array(
|
||||
'$title' => t('Repair Contact Settings'),
|
||||
'$warning' => $warning,
|
||||
'$info' => $info,
|
||||
'$returnaddr' => $returnaddr,
|
||||
'$return' => t('Return to contact editor'),
|
||||
'$update_profile' => update_profile,
|
||||
'$udprofilenow' => t('Refetch contact data'),
|
||||
'$label_name' => t('Name'),
|
||||
|
@ -178,7 +177,12 @@ function crepair_content(&$a) {
|
|||
'$label_photo' => t('New photo from this URL'),
|
||||
'$label_remote_self' => t('Remote Self'),
|
||||
'$allow_remote_self' => $allow_remote_self,
|
||||
'$remote_self' => array('remote_self', t('Mirror postings from this contact'), $contact['remote_self'], t('Mark this contact as remote_self, this will cause friendica to repost new entries from this contact.'), $remote_self_options),
|
||||
'$remote_self' => array('remote_self',
|
||||
t('Mirror postings from this contact'),
|
||||
$contact['remote_self'],
|
||||
t('Mark this contact as remote_self, this will cause friendica to repost new entries from this contact.'),
|
||||
$remote_self_options
|
||||
),
|
||||
'$contact_name' => htmlentities($contact['name']),
|
||||
'$contact_nick' => htmlentities($contact['nick']),
|
||||
'$contact_id' => $contact['id'],
|
||||
|
|
|
@ -1,3 +1,13 @@
|
|||
|
||||
{{include file="section_title.tpl"}}
|
||||
|
||||
<div class="crepair-error-message">{{$warning}}</div><br>
|
||||
<div class="crepair-return">
|
||||
{{$info}}<br>
|
||||
<a href="{{$returnaddr}}">{{$return}}</a>
|
||||
</div>
|
||||
<br />
|
||||
|
||||
<form id="crepair-form" action="crepair/{{$contact_id}}" method="post" >
|
||||
|
||||
<h4>{{$contact_name}}</h4>
|
||||
|
|
Loading…
Reference in a new issue