- Unify template files naming

alecpl

2010-11-04 83ba22c77b8790d8cbea8c684c4e1a0c431b83d6

- Unify template files naming

 program/steps/addressbook/edit.inc

@@ -105,8 +105,8 @@

$OUTPUT->add_handler('contacteditform', 'rcmail_contact_editform');

if (!$CONTACTS->get_result() && $OUTPUT->template_exists('addcontact'))
    $OUTPUT->send('addcontact');
if (!$CONTACTS->get_result() && $OUTPUT->template_exists('contactadd'))
    $OUTPUT->send('contactadd');

// this will be executed if no template for addcontact exists
$OUTPUT->send('editcontact');
$OUTPUT->send('contactedit');

 program/steps/addressbook/show.inc

@@ -126,4 +126,4 @@
//$OUTPUT->framed = $_framed;
$OUTPUT->add_handler('contactdetails', 'rcmail_contact_details');

$OUTPUT->send('showcontact');
$OUTPUT->send('contact');

 program/steps/mail/show.inc

@@ -229,8 +229,8 @@
  'blockedobjects' => 'rcmail_remote_objects_msg'));


if ($RCMAIL->action=='print' && $OUTPUT->template_exists('printmessage'))
  $OUTPUT->send('printmessage', false);
if ($RCMAIL->action=='print' && $OUTPUT->template_exists('messageprint'))
  $OUTPUT->send('messageprint', false);
else if ($RCMAIL->action=='preview' && $OUTPUT->template_exists('messagepreview'))
  $OUTPUT->send('messagepreview', false);
else

 program/steps/settings/edit_identity.inc

@@ -153,9 +153,9 @@

$OUTPUT->set_pagetitle(rcube_label(($RCMAIL->action=='add-identity' ? 'newidentity' : 'edititem')));

if ($RCMAIL->action=='add-identity' && $OUTPUT->template_exists('addidentity'))
  $OUTPUT->send('addidentity');
if ($RCMAIL->action=='add-identity' && $OUTPUT->template_exists('identityadd'))
  $OUTPUT->send('identityadd');

$OUTPUT->send('editidentity');
$OUTPUT->send('identityedit');



 skins/default/templates/contact.html

 skins/default/templates/contactadd.html

 skins/default/templates/contactedit.html

 skins/default/templates/identityedit.html

 skins/default/templates/messageprint.html