[Svn] r4176 - in trunk/roundcubemail: program/steps/addressbook program/steps/mail program/steps/settings skins/default/templates

trac at roundcube.net trac at roundcube.net
Thu Nov 4 10:59:55 CET 2010


Author: alec
Date: 2010-11-04 04:59:55 -0500 (Thu, 04 Nov 2010)
New Revision: 4176

Added:
   trunk/roundcubemail/skins/default/templates/contact.html
   trunk/roundcubemail/skins/default/templates/contactadd.html
   trunk/roundcubemail/skins/default/templates/contactedit.html
   trunk/roundcubemail/skins/default/templates/identityedit.html
   trunk/roundcubemail/skins/default/templates/messageprint.html
Removed:
   trunk/roundcubemail/skins/default/templates/addcontact.html
   trunk/roundcubemail/skins/default/templates/editcontact.html
   trunk/roundcubemail/skins/default/templates/editidentity.html
   trunk/roundcubemail/skins/default/templates/printmessage.html
   trunk/roundcubemail/skins/default/templates/showcontact.html
Modified:
   trunk/roundcubemail/program/steps/addressbook/edit.inc
   trunk/roundcubemail/program/steps/addressbook/show.inc
   trunk/roundcubemail/program/steps/mail/show.inc
   trunk/roundcubemail/program/steps/settings/edit_identity.inc
Log:
- Unify template files naming


Modified: trunk/roundcubemail/program/steps/addressbook/edit.inc
===================================================================
--- trunk/roundcubemail/program/steps/addressbook/edit.inc	2010-11-04 09:51:20 UTC (rev 4175)
+++ trunk/roundcubemail/program/steps/addressbook/edit.inc	2010-11-04 09:59:55 UTC (rev 4176)
@@ -79,15 +79,15 @@
     global $CONTACTS, $EDIT_FORM, $RCMAIL;
 
     $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",
             'task' => $RCMAIL->task, 'action' => 'save',
@@ -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');

Modified: trunk/roundcubemail/program/steps/addressbook/show.inc
===================================================================
--- trunk/roundcubemail/program/steps/addressbook/show.inc	2010-11-04 09:51:20 UTC (rev 4175)
+++ trunk/roundcubemail/program/steps/addressbook/show.inc	2010-11-04 09:59:55 UTC (rev 4176)
@@ -126,4 +126,4 @@
 //$OUTPUT->framed = $_framed;
 $OUTPUT->add_handler('contactdetails', 'rcmail_contact_details');
 
-$OUTPUT->send('showcontact');
+$OUTPUT->send('contact');

Modified: trunk/roundcubemail/program/steps/mail/show.inc
===================================================================
--- trunk/roundcubemail/program/steps/mail/show.inc	2010-11-04 09:51:20 UTC (rev 4175)
+++ trunk/roundcubemail/program/steps/mail/show.inc	2010-11-04 09:59:55 UTC (rev 4176)
@@ -149,7 +149,7 @@
 function rcmail_message_attachments($attrib)
 {
   global $PRINT_MODE, $MESSAGE;
-  
+
   $out = $ol = '';
 
   if (sizeof($MESSAGE->attachments)) {
@@ -182,27 +182,27 @@
     }
 
     $out = html::tag('ul', $attrib, $ol, html::$common_attrib);
-  } 
-  
+  }
+
   return $out;
 }
 
 function rcmail_remote_objects_msg($attrib)
 {
   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) {
     $msg .= ' ' . html::a(array('href' => "#alwaysload", 'onclick' => JS_OBJECT_NAME.".command('always-load')", 'style' => "white-space:nowrap"),
       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);
 }
@@ -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

Modified: trunk/roundcubemail/program/steps/settings/edit_identity.inc
===================================================================
--- trunk/roundcubemail/program/steps/settings/edit_identity.inc	2010-11-04 09:51:20 UTC (rev 4175)
+++ trunk/roundcubemail/program/steps/settings/edit_identity.inc	2010-11-04 09:59:55 UTC (rev 4176)
@@ -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');
 
 

Deleted: trunk/roundcubemail/skins/default/templates/addcontact.html
===================================================================
--- trunk/roundcubemail/skins/default/templates/addcontact.html	2010-11-04 09:51:20 UTC (rev 4175)
+++ trunk/roundcubemail/skins/default/templates/addcontact.html	2010-11-04 09:59:55 UTC (rev 4176)
@@ -1,22 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-<script type="text/javascript" src="/functions.js"></script>
-</head>
-<body class="iframe">
-
-<div id="contact-title" class="boxtitle"><roundcube:label name="addcontact" /></div>
-<div id="contact-details" class="boxcontent">
-  <roundcube:object name="contacteditform" size="40" />
-  <p>
-    <input type="button" value="<roundcube:label name="cancel" />" class="button" onclick="history.back()" /> 
-    <roundcube:button command="save" type="input" class="button mainaction" label="save" />
-  </p>
-</form>
-</div>
-<script type="text/javascript">rcube_init_tabs('contact-details')</script>
-
-</body>
-</html>

Copied: trunk/roundcubemail/skins/default/templates/contact.html (from rev 4164, trunk/roundcubemail/skins/default/templates/showcontact.html)
===================================================================
--- trunk/roundcubemail/skins/default/templates/contact.html	                        (rev 0)
+++ trunk/roundcubemail/skins/default/templates/contact.html	2010-11-04 09:59:55 UTC (rev 4176)
@@ -0,0 +1,20 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<script type="text/javascript" src="/functions.js"></script>
+</head>
+<body class="iframe">
+
+<div id="contact-title" class="boxtitle"><roundcube:label name="contactproperties" /></div>
+<div id="contact-details" class="boxcontent">
+  <roundcube:object name="contactdetails" />
+  <p>
+    <roundcube:button command="edit" type="input" class="button" label="editcontact" condition="!ENV:readonly" />
+  </p>
+</div>
+<script type="text/javascript">rcube_init_tabs('contact-details')</script>
+
+</body>
+</html>

Copied: trunk/roundcubemail/skins/default/templates/contactadd.html (from rev 4164, trunk/roundcubemail/skins/default/templates/addcontact.html)
===================================================================
--- trunk/roundcubemail/skins/default/templates/contactadd.html	                        (rev 0)
+++ trunk/roundcubemail/skins/default/templates/contactadd.html	2010-11-04 09:59:55 UTC (rev 4176)
@@ -0,0 +1,22 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<script type="text/javascript" src="/functions.js"></script>
+</head>
+<body class="iframe">
+
+<div id="contact-title" class="boxtitle"><roundcube:label name="addcontact" /></div>
+<div id="contact-details" class="boxcontent">
+  <roundcube:object name="contacteditform" size="40" />
+  <p>
+    <input type="button" value="<roundcube:label name="cancel" />" class="button" onclick="history.back()" /> 
+    <roundcube:button command="save" type="input" class="button mainaction" label="save" />
+  </p>
+</form>
+</div>
+<script type="text/javascript">rcube_init_tabs('contact-details')</script>
+
+</body>
+</html>

Copied: trunk/roundcubemail/skins/default/templates/contactedit.html (from rev 4164, trunk/roundcubemail/skins/default/templates/editcontact.html)
===================================================================
--- trunk/roundcubemail/skins/default/templates/contactedit.html	                        (rev 0)
+++ trunk/roundcubemail/skins/default/templates/contactedit.html	2010-11-04 09:59:55 UTC (rev 4176)
@@ -0,0 +1,22 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<script type="text/javascript" src="/functions.js"></script>
+</head>
+<body class="iframe">
+
+<div id="contact-title" class="boxtitle"><roundcube:label name="editcontact" /></div>
+<div id="contact-details" class="boxcontent">
+  <roundcube:object name="contacteditform" size="40" />
+  <p>
+    <roundcube:button command="show" type="input" class="button" label="cancel" /> 
+    <roundcube:button command="save" type="input" class="button mainaction" label="save" />
+  </p>
+</form>
+</div>
+<script type="text/javascript">rcube_init_tabs('contact-details')</script>
+
+</body>
+</html>

Deleted: trunk/roundcubemail/skins/default/templates/editcontact.html
===================================================================
--- trunk/roundcubemail/skins/default/templates/editcontact.html	2010-11-04 09:51:20 UTC (rev 4175)
+++ trunk/roundcubemail/skins/default/templates/editcontact.html	2010-11-04 09:59:55 UTC (rev 4176)
@@ -1,22 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-<script type="text/javascript" src="/functions.js"></script>
-</head>
-<body class="iframe">
-
-<div id="contact-title" class="boxtitle"><roundcube:label name="editcontact" /></div>
-<div id="contact-details" class="boxcontent">
-  <roundcube:object name="contacteditform" size="40" />
-  <p>
-    <roundcube:button command="show" type="input" class="button" label="cancel" /> 
-    <roundcube:button command="save" type="input" class="button mainaction" label="save" />
-  </p>
-</form>
-</div>
-<script type="text/javascript">rcube_init_tabs('contact-details')</scrip