From ea2b3b2f762a323ca5a7a820857c4bea51d22637 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 24 Oct 2015 15:57:46 +0200 Subject: [PATCH 1/2] move html from crepair.php to template --- mod/crepair.php | 26 +++++++++++++++----------- view/templates/crepair.tpl | 11 +++++++++++ 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/mod/crepair.php b/mod/crepair.php index 686be3948f..4f00190990 100644 --- a/mod/crepair.php +++ b/mod/crepair.php @@ -137,16 +137,10 @@ function crepair_content(&$a) { $contact = $r[0]; - $msg1 = t('Repair Contact Settings'); + $warning = t('WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working.'); + $info = t('Please use your browser \'Back\' button now if you are uncertain what to do on this page.'); - $msg2 = t('WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working.'); - $msg3 = t('Please use your browser \'Back\' button now if you are uncertain what to do on this page.'); - - $o .= '

' . $msg1 . '

'; - - $o .= '
' . $msg2 . EOL . EOL. $msg3 . '
'; - - $o .= EOL . '' . t('Return to contact editor') . '' . 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'], @@ -189,7 +193,7 @@ function crepair_content(&$a) { '$poll' => $contact['poll'], '$contact_attag' => $contact['attag'], '$lbl_submit' => t('Submit') - )); + )); return $o; diff --git a/view/templates/crepair.tpl b/view/templates/crepair.tpl index 5b3a6281eb..91c85303ce 100644 --- a/view/templates/crepair.tpl +++ b/view/templates/crepair.tpl @@ -1,3 +1,14 @@ + +{{include file="section_title.tpl"}} + +
+ {{$warning}} + {{$info}}
+
+ {{$return}} +
+
+

{{$contact_name}}

From eb33698556350fde10a4a2f9bba7c52971f6212d Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 24 Oct 2015 16:01:55 +0200 Subject: [PATCH 2/2] some minor changes in crepair.tpl --- view/templates/crepair.tpl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/view/templates/crepair.tpl b/view/templates/crepair.tpl index 91c85303ce..d500f04720 100644 --- a/view/templates/crepair.tpl +++ b/view/templates/crepair.tpl @@ -1,10 +1,9 @@ {{include file="section_title.tpl"}} -
- {{$warning}} - {{$info}}
-
+
{{$warning}}

+
+ {{$info}}
{{$return}}