Changeset 4268 in subversion

Timestamp:

Nov 25, 2010 1:47:13 PM (2 years ago)

Author:

thomasb

Message:

Fix group creation; add texts for new address fields

Location:

branches/devel-addressbook

Files:

• program/include/rcube_addressbook.php (modified) (1 diff)
• program/localization/en_US/labels.inc (modified) (2 diffs)
• program/steps/addressbook/groups.inc (modified) (1 diff)
• skins/default/addressbook.css (modified) (3 diffs)
• skins/default/templates/login.html (modified) (1 diff)

branches/devel-addressbook/program/include/rcube_addressbook.php

@@ -143 +143 @@
     /**
      * 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)

branches/devel-addressbook/program/localization/en_US/labels.inc

@@ -252 +252 @@
 
 // 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';
@@ -276 +297 @@
 $labels['newcontactgroup'] = 'Create new contact group';
 $labels['groupactions']   = 'Actions for contact groups...';
-
-$labels['addfield'] = 'Add field...';
-$labels['notes'] = 'Notes';
 
 $labels['previouspage']   = 'Show previous set';

branches/devel-addressbook/program/steps/addressbook/groups.inc

@@ -80 +80 @@
   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) {

branches/devel-addressbook/skins/default/addressbook.css

@@ -278 +278 @@
 .contactfieldgroup
 {
-        margin: 0.8em 0;
+        margin: 1em 0;
 }
 
 form .contactfieldgroup
 {
-        margin: 1.4em 0;
+        margin: 1.3em 0;
 }
 
@@ -312 +312 @@
         color: #666;
         font-weight: bold;
+        padding-left: 0;
 }
 
@@ -337 +338 @@
         margin-left: 0.5em;
 }
+

branches/devel-addressbook/skins/default/templates/login.html

@@ -17 +17 @@
 
 <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>