Changeset 4176 in subversion

Timestamp:

Nov 4, 2010 5:59:55 AM (3 years ago)

Author:

alec

Message:

• Unify template files naming

Location:

trunk/roundcubemail

Files:

• program/steps/addressbook/edit.inc (modified) (2 diffs)
• program/steps/addressbook/show.inc (modified) (1 diff)
• program/steps/mail/show.inc (modified) (5 diffs)
• program/steps/settings/edit_identity.inc (modified) (1 diff)
• skins/default/templates/contact.html (moved) (moved from trunk/roundcubemail/skins/default/templates/showcontact.html)
• skins/default/templates/contactadd.html (moved) (moved from trunk/roundcubemail/skins/default/templates/addcontact.html)
• skins/default/templates/contactedit.html (moved) (moved from trunk/roundcubemail/skins/default/templates/editcontact.html)
• skins/default/templates/identityedit.html (moved) (moved from trunk/roundcubemail/skins/default/templates/editidentity.html)
• skins/default/templates/messageprint.html (moved) (moved from trunk/roundcubemail/skins/default/templates/printmessage.html)

trunk/roundcubemail/program/steps/addressbook/edit.inc

@@ -80 +80 @@
 
     $form_start = $form_end = '';
-  
+
     if (empty($EDIT_FORM)) {
         $hiddenfields = new html_hiddenfield(array(
             'name' => '_source', 'value' => get_input_value('_source', RCUBE_INPUT_GPC)));
         $hiddenfields->add(array('name' => '_gid', 'value' => $CONTACTS->group_id));
-    
+
         if (($result = $CONTACTS->get_result()) && ($record = $result->first()))
             $hiddenfields->add(array('name' => '_cid', 'value' => $record['ID']));
-    
+
         $form_start = $RCMAIL->output->request_form(array(
             'name' => "form", 'method' => "post",
@@ -106 +106 @@
 $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');

trunk/roundcubemail/program/steps/addressbook/show.inc

@@ -127 +127 @@
 $OUTPUT->add_handler('contactdetails', 'rcmail_contact_details');
 
-$OUTPUT->send('showcontact');
+$OUTPUT->send('contact');

trunk/roundcubemail/program/steps/mail/show.inc

@@ -150 +150 @@
 {
   global $PRINT_MODE, $MESSAGE;
-  
+
   $out = $ol = '';
 
@@ -183 +183 @@
 
     $out = html::tag('ul', $attrib, $ol, html::$common_attrib);
-  } 
-  
+  }
+
   return $out;
 }
@@ -191 +191 @@
 {
   global $MESSAGE, $RCMAIL;
-  
+
   if (!$attrib['id'])
     $attrib['id'] = 'rcmremoteobjmsg';
-  
+
   $msg = Q(rcube_label('blockedimages')) . ' ';
   $msg .= html::a(array('href' => "#loadimages", 'onclick' => JS_OBJECT_NAME.".command('load-images')"), Q(rcube_label('showimages')));
-  
+
   // add link to save sender in addressbook and reload message
   if ($MESSAGE->sender['mailto'] && $RCMAIL->config->get('show_images') == 1) {
@@ -203 +203 @@
       Q(rcube_label(array('name' => 'alwaysshow', 'vars' => array('sender' => $MESSAGE->sender['mailto'])))));
   }
-  
+
   $RCMAIL->output->add_gui_object('remoteobjectsmsg', $attrib['id']);
   return html::div($attrib, $msg);
@@ -230 +230 @@
 
 
-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);

trunk/roundcubemail/program/steps/settings/edit_identity.inc

@@ -154 +154 @@
 $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');