[Svn] r4268 - in branches/devel-addressbook: program/include program/localization/en_US program/steps/addressbook skins/default skins/default/templates

trac at roundcube.net trac at roundcube.net
Thu Nov 25 19:47:13 CET 2010


Author: thomasb
Date: 2010-11-25 12:47:13 -0600 (Thu, 25 Nov 2010)
New Revision: 4268

Modified:
   branches/devel-addressbook/program/include/rcube_addressbook.php
   branches/devel-addressbook/program/localization/en_US/labels.inc
   branches/devel-addressbook/program/steps/addressbook/groups.inc
   branches/devel-addressbook/skins/default/addressbook.css
   branches/devel-addressbook/skins/default/templates/login.html
Log:
Fix group creation; add texts for new address fields

Modified: branches/devel-addressbook/program/include/rcube_addressbook.php
===================================================================
--- branches/devel-addressbook/program/include/rcube_addressbook.php	2010-11-24 19:33:58 UTC (rev 4267)
+++ branches/devel-addressbook/program/include/rcube_addressbook.php	2010-11-25 18:47:13 UTC (rev 4268)
@@ -142,6 +142,10 @@
 
     /**
      * Create new contact records for every item in the record set
+     *
+     * @param object rcube_result_set Recordset to insert
+     * @param boolean True to check for duplicates first
+     * @return array List of created record IDs
      */
     function insertMultiple($recset, $check=false)
     {

Modified: branches/devel-addressbook/program/localization/en_US/labels.inc
===================================================================
--- branches/devel-addressbook/program/localization/en_US/labels.inc	2010-11-24 19:33:58 UTC (rev 4267)
+++ branches/devel-addressbook/program/localization/en_US/labels.inc	2010-11-25 18:47:13 UTC (rev 4268)
@@ -251,11 +251,32 @@
 $labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
 
 // address boook
-$labels['name']      = 'Display name';
-$labels['firstname'] = 'First name';
-$labels['surname']   = 'Last name';
-$labels['email']     = 'E-Mail';
+$labels['name']         = 'Display name';
+$labels['firstname']    = 'First name';
+$labels['surname']      = 'Last name';
+$labels['middlename']   = 'Middle name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Nickname';
+$labels['jobtitle']     = 'Job title';
+$labels['organization'] = 'Company';
+$labels['department']   = 'Department';
+$labels['gender']       = 'Gender';
+$labels['maidenname']   = 'Maiden name';
+$labels['email']        = 'E-Mail';
+$labels['phone']        = 'Phone';
+$labels['address']      = 'Address';
+$labels['street']       = 'Street';
+$labels['locality']     = 'City';
+$labels['zipcode']      = 'Zip code';
+$labels['region']       = 'Region';
+$labels['country']      = 'Country';
+$labels['birthday']     = 'Birthday';
+$labels['website']      = 'Website';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Notes';
 
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Add new contact';
 $labels['editcontact'] = 'Edit contact';
 $labels['contacts'] = 'Contacts';
@@ -276,9 +297,6 @@
 $labels['newcontactgroup'] = 'Create new contact group';
 $labels['groupactions']   = 'Actions for contact groups...';
 
-$labels['addfield'] = 'Add field...';
-$labels['notes'] = 'Notes';
-
 $labels['previouspage']   = 'Show previous set';
 $labels['firstpage']      = 'Show first set';
 $labels['nextpage']       = 'Show next set';

Modified: branches/devel-addressbook/program/steps/addressbook/groups.inc
===================================================================
--- branches/devel-addressbook/program/steps/addressbook/groups.inc	2010-11-24 19:33:58 UTC (rev 4267)
+++ branches/devel-addressbook/program/steps/addressbook/groups.inc	2010-11-25 18:47:13 UTC (rev 4268)
@@ -79,7 +79,7 @@
 
   if ($created && $OUTPUT->ajax_call) {
     $OUTPUT->show_message('groupcreated', 'confirmation');
-    $OUTPUT->command('insert_contact_group', array('source' => $created));
+    $OUTPUT->command('insert_contact_group', array('source' => $source) + $created);
   }
   else if (!$created) {
     $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error');

Modified: branches/devel-addressbook/skins/default/addressbook.css
===================================================================
--- branches/devel-addressbook/skins/default/addressbook.css	2010-11-24 19:33:58 UTC (rev 4267)
+++ branches/devel-addressbook/skins/default/addressbook.css	2010-11-25 18:47:13 UTC (rev 4268)
@@ -277,12 +277,12 @@
 
 .contactfieldgroup
 {
-	margin: 0.8em 0;
+	margin: 1em 0;
 }
 
 form .contactfieldgroup
 {
-	margin: 1.4em 0;
+	margin: 1.3em 0;
 }
 
 .contactfieldgroup .row
@@ -311,6 +311,7 @@
 	border: 0;
 	color: #666;
 	font-weight: bold;
+	padding-left: 0;
 }
 
 .contactfieldgroup .contactfieldcontent
@@ -336,3 +337,4 @@
 	vertical-align: middle;
 	margin-left: 0.5em;
 }
+

Modified: branches/devel-addressbook/skins/default/templates/login.html
===================================================================
--- branches/devel-addressbook/skins/default/templates/login.html	2010-11-24 19:33:58 UTC (rev 4267)
+++ branches/devel-addressbook/skins/default/templates/login.html	2010-11-25 18:47:13 UTC (rev 4268)
@@ -16,7 +16,7 @@
 <div class="boxcontent">
 
 <form name="form" action="./" method="post">
-<roundcube:object name="loginform" form="form" autocomplete="off" />
+<roundcube:object name="loginform" form="form" autocomplete="on" />
 
 <p style="text-align:center;"><input type="submit" class="button mainaction" value="<roundcube:label name='login' />" /></p>
 

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list