diff options
| -rw-r--r-- | program/js/app.js | 4 | ||||
| -rw-r--r-- | program/localization/de_CH/labels.inc | 1 | ||||
| -rw-r--r-- | program/localization/de_DE/labels.inc | 1 | ||||
| -rw-r--r-- | program/localization/en_US/labels.inc | 1 | ||||
| -rw-r--r-- | skins/default/templates/addressbook.html | 4 |
5 files changed, 7 insertions, 4 deletions
diff --git a/program/js/app.js b/program/js/app.js index 3e49fc3b2..9a9865db4 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -1006,9 +1006,9 @@ function rcube_webmail() case 'export': if (this.contact_list.rowcount > 0) { - var add_url = ''; + var add_url = (this.env.source ? '_source='+urlencode(this.env.source)+'&' : ''); if (this.env.search_request) - add_url = '_search='+this.env.search_request; + add_url += '_search='+this.env.search_request; this.goto_url('export', add_url); } diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc index a5909b8ed..fc285b44b 100644 --- a/program/localization/de_CH/labels.inc +++ b/program/localization/de_CH/labels.inc @@ -178,6 +178,7 @@ $labels['composeto'] = 'Nachricht verfassen'; $labels['contactsfromto'] = 'Kontakte $from bis $to von $count'; $labels['print'] = 'Drucken'; $labels['export'] = 'Exportieren'; +$labels['exportvcards'] = 'Kontakte im vCard-Format exportieren'; $labels['previouspage'] = 'Eine Seite zurück'; $labels['firstpage'] = 'Erste Seite'; $labels['nextpage'] = 'Nächste Seite'; diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc index cfd811b39..409c18a3f 100644 --- a/program/localization/de_DE/labels.inc +++ b/program/localization/de_DE/labels.inc @@ -177,6 +177,7 @@ $labels['composeto'] = 'Nachricht verfassen'; $labels['contactsfromto'] = 'Kontakte $from bis $to von $count'; $labels['print'] = 'Drucken'; $labels['export'] = 'Exportieren'; +$labels['exportvcards'] = 'Kontakte im vCard-Format exportieren'; $labels['previouspage'] = 'Seite zurück'; $labels['firstpage'] = 'Erste Seite'; $labels['nextpage'] = 'Nächste Seite'; diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index ac43c85f9..dec9d4671 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -223,6 +223,7 @@ $labels['composeto'] = 'Compose mail to'; $labels['contactsfromto'] = 'Contacts $from to $to of $count'; $labels['print'] = 'Print'; $labels['export'] = 'Export'; +$labels['exportvcards'] = 'Export contacts in vCard format'; $labels['previouspage'] = 'Show previous set'; $labels['firstpage'] = 'Show first set'; diff --git a/skins/default/templates/addressbook.html b/skins/default/templates/addressbook.html index 6083ac66e..3f8e460a5 100644 --- a/skins/default/templates/addressbook.html +++ b/skins/default/templates/addressbook.html @@ -15,8 +15,8 @@ <roundcube:button command="add" imageSel="/images/buttons/add_contact_sel.png" imageAct="/images/buttons/add_contact_act.png" imagePas="/images/buttons/add_contact_pas.png" width="32" height="32" title="newcontact" /> <roundcube:button command="delete" imageSel="/images/buttons/delete_sel.png" imageAct="/images/buttons/delete_act.png" imagePas="/images/buttons/delete_pas.png" width="32" height="32" title="deletecontact" /> <roundcube:button command="compose" imageSel="/images/buttons/compose_sel.png" imageAct="/images/buttons/compose_act.png" imagePas="/images/buttons/compose_pas.png" width="32" height="32" title="composeto" /> -<roundcube:button command="import" imageSel="/images/buttons/download_sel.png" imageAct="/images/buttons/adr_import_act.png" imagePas="/images/buttons/adr_import_pas.png" width="32" height="32" title="importcontacts" /> -<roundcube:button command="export" imageSel="/images/buttons/download_sel.png" imageAct="/images/buttons/download_act.png" imagePas="/images/buttons/download_pas.png" width="32" height="32" title="export" /> +<roundcube:button command="import" imageSel="/images/buttons/adr_import_sel.png" imageAct="/images/buttons/adr_import_act.png" imagePas="/images/buttons/adr_import_pas.png" width="32" height="32" title="importcontacts" /> +<roundcube:button command="export" imageSel="/images/buttons/download_sel.png" imageAct="/images/buttons/download_act.png" imagePas="/images/buttons/download_pas.png" width="32" height="32" title="exportvcards" /> </div> <div id="quicksearchbar"> |