move html from crepair.php to template

diff --git a/mod/crepair.php b/mod/crepair.php
index 686be3948f26ac2ffcbe55fdc9859dd54e47bff7..4f00190990654b0a898aee8a0722ecfe1413f076 100644 (file)
--- 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('<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'],
@@ -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 5b3a6281ebf8af0dbdaf15c25067d05df356e434..91c85303ce13a5081b4b519ab6a65d0f753a41d4 100644 (file)
--- a/view/templates/crepair.tpl
+++ b/view/templates/crepair.tpl
@@ -1,3 +1,14 @@
+
+{{include file="section_title.tpl"}}
+
+<div class="error-message">
+       {{$warning}}
+       {{$info}}<br />
+       <br />
+       <a href="{{$returnaddr}}">{{$return}}</a>
+</div>
+<br />
+
 <form id="crepair-form" action="crepair/{{$contact_id}}" method="post" >
 
 <h4>{{$contact_name}}</h4>