From ba83e30ce5378712d50d382aec298bfa8c098077 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Fri, 14 Dec 2012 19:09:41 +0100 Subject: [PATCH 1/4] Contacts: Change to black upload icon. --- css/contacts.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/contacts.css b/css/contacts.css index 864c4972..653a33ef 100644 --- a/css/contacts.css +++ b/css/contacts.css @@ -348,7 +348,7 @@ ul.propertylist { width: 450px; } z-index: 1001; } .import-upload-button { - background-image: url("%webroot%/core/img/actions/upload-white.svg"); + background-image: url("%webroot%/core/img/actions/upload.svg"); background-position: center center; background-repeat: no-repeat; cursor: pointer; From fa452fd0ea5d16b8b233183c4171454b1947ca07 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Fri, 14 Dec 2012 19:10:22 +0100 Subject: [PATCH 2/4] Contacts: Prevent adding new group while editing one. --- js/app.js | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/js/app.js b/js/app.js index e5407902..c9f589da 100644 --- a/js/app.js +++ b/js/app.js @@ -460,6 +460,10 @@ GroupList.prototype.deleteGroup = function(groupid, cb) { GroupList.prototype.editGroup = function(id) { var self = this; + if(this.$editelem) { + console.log('Already editing, returning'); + return; + } // NOTE: Currently this only works for adding, not renaming var saveChanges = function($elem, $input) { console.log('saveChanges', $input.val()); @@ -474,6 +478,7 @@ GroupList.prototype.editGroup = function(id) { $elem.prepend(name).removeClass('editing').attr('data-id', response.id); $input.next('.checked').remove() $input.remove() + self.$editelem = null; } else { $input.prop('disabled', false); OC.notify({message:response.message}); @@ -484,17 +489,17 @@ GroupList.prototype.editGroup = function(id) { if(typeof id === 'undefined') { // Add new group var tmpl = this.$groupListItemTemplate; - var $elem = (tmpl).octemplate({ + self.$editelem = (tmpl).octemplate({ id: 'new', type: 'category', num: 0, name: '', }); var $input = $(''); - $elem.prepend($input).addClass('editing'); - $elem.data('contacts', []); - this.$groupList.find('h3.group[data-type="category"]').first().before($elem); - this.selectGroup({element:$elem}); + self.$editelem.prepend($input).addClass('editing'); + self.$editelem.data('contacts', []); + this.$groupList.find('h3.group[data-type="category"]').first().before(self.$editelem); + this.selectGroup({element:self.$editelem}); $input.on('input', function(event) { if($(this).val().length > 0) { $(this).next('.checked').removeClass('disabled'); @@ -505,9 +510,10 @@ GroupList.prototype.editGroup = function(id) { $input.on('keyup', function(event) { var keyCode = Math.max(event.keyCode, event.which); if(keyCode === 13) { - saveChanges($elem, $(this)); + saveChanges(self.$editelem, $(this)); } else if(keyCode === 27) { - $elem.remove(); + self.$editelem.remove(); + self.$editelem = null; } }); $input.next('.checked').on('click keydown', function(event) { @@ -515,7 +521,7 @@ GroupList.prototype.editGroup = function(id) { if(wrongKey(event)) { return; } - saveChanges($elem, $input); + saveChanges(self.$editelem, $input); }); $input.focus(); } else if(utils.isUInt(id)) { From 1f9e4034dad17d07ee155fc961cd5fd2e4ffcde3 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sat, 15 Dec 2012 00:10:22 +0100 Subject: [PATCH 3/4] [tx-robot] updated from transifex --- l10n/ca.php | 2 ++ l10n/cs_CZ.php | 2 ++ l10n/de_DE.php | 2 ++ l10n/fi_FI.php | 1 + l10n/it.php | 2 ++ l10n/ja_JP.php | 2 ++ 6 files changed, 11 insertions(+) diff --git a/l10n/ca.php b/l10n/ca.php index 680cbfcc..fb507325 100644 --- a/l10n/ca.php +++ b/l10n/ca.php @@ -49,6 +49,7 @@ "Couldn't load temporary image: " => "No s'ha pogut carregar la imatge temporal: ", "No file was uploaded. Unknown error" => "No s'ha carregat cap fitxer. Error desconegut", "Contacts" => "Contactes", +"%d_selected_contacts" => "%d_contactes_selecionats", "Contact is already in this group." => "El contacte ja és en aquest grup.", "Contacts are already in this group." => "Els contactes ja són en aquest grup", "Couldn't get contact list." => "No s'ha pogut obtenir la llista de contactes.", @@ -159,6 +160,7 @@ "OK" => "D'acord", "(De-)select all" => "(Des-)selecciona'ls tots", "New Contact" => "Contate nou", +"Download Contact(s)" => "Baixa contacte(s)", "Groups" => "Grups", "Favorite" => "Preferits", "Delete Contact" => "Elimina contacte", diff --git a/l10n/cs_CZ.php b/l10n/cs_CZ.php index 317db650..baf09ec3 100644 --- a/l10n/cs_CZ.php +++ b/l10n/cs_CZ.php @@ -49,6 +49,7 @@ "Couldn't load temporary image: " => "Nelze načíst dočasný obrázek: ", "No file was uploaded. Unknown error" => "Soubor nebyl odeslán. Neznámá chyba", "Contacts" => "Kontakty", +"%d_selected_contacts" => "%d_vybranych_kontaktu", "Contact is already in this group." => "Kontakt je již v této skupině.", "Contacts are already in this group." => "Kontakty jsou již v této skupině.", "Couldn't get contact list." => "Nelze získat seznam kontaktů.", @@ -159,6 +160,7 @@ "OK" => "OK", "(De-)select all" => "Vybrat (odznačit) vše", "New Contact" => "Nový kontakt", +"Download Contact(s)" => "Stáhnout kontakt(y)", "Groups" => "Skupiny", "Favorite" => "Oblíbit", "Delete Contact" => "Smazat kontakt", diff --git a/l10n/de_DE.php b/l10n/de_DE.php index e1d94444..66670c5f 100644 --- a/l10n/de_DE.php +++ b/l10n/de_DE.php @@ -159,6 +159,7 @@ "OK" => "OK", "(De-)select all" => "Alle (ab-)wählen", "New Contact" => "Neuer Kontakt", +"Download Contact(s)" => "Kontakte herunterladen", "Groups" => "Gruppen", "Favorite" => "Favorit", "Delete Contact" => "Kontakt löschen", @@ -194,6 +195,7 @@ "Enter organization" => "Organisation eingeben", "Birthday" => "Geburtstag", "Notes go here..." => "Notizen hier hinein...", +"Export as VCF" => "Als VCF exportieren", "Add" => "Hinzufügen", "Phone" => "Telefon", "Email" => "E-Mail", diff --git a/l10n/fi_FI.php b/l10n/fi_FI.php index 47f25a9e..64c10bcb 100644 --- a/l10n/fi_FI.php +++ b/l10n/fi_FI.php @@ -168,6 +168,7 @@ "Organization" => "Organisaatio", "Birthday" => "Syntymäpäivä", "Notes go here..." => "Muistiinpanot kuuluvat tähän...", +"Export as VCF" => "Vie VCF-muodossa", "Add" => "Lisää", "Phone" => "Puhelin", "Email" => "Sähköposti", diff --git a/l10n/it.php b/l10n/it.php index b7ae2529..97cac3a5 100644 --- a/l10n/it.php +++ b/l10n/it.php @@ -49,6 +49,7 @@ "Couldn't load temporary image: " => "Impossibile caricare l'immagine temporanea: ", "No file was uploaded. Unknown error" => "Nessun file è stato inviato. Errore sconosciuto", "Contacts" => "Contatti", +"%d_selected_contacts" => "%d_contatti_selezionati", "Contact is already in this group." => "Il contatto è già in questo gruppo.", "Contacts are already in this group." => "I contatti sono già in questo gruppo.", "Couldn't get contact list." => "Impossibile ottenere l'elenco dei contatti.", @@ -159,6 +160,7 @@ "OK" => "OK", "(De-)select all" => "(De)seleziona tutto", "New Contact" => "Nuovo contatto", +"Download Contact(s)" => "Scarica contatto(i)", "Groups" => "Gruppi", "Favorite" => "Preferito", "Delete Contact" => "Elimina contatto", diff --git a/l10n/ja_JP.php b/l10n/ja_JP.php index f5fb21d6..1a2579b5 100644 --- a/l10n/ja_JP.php +++ b/l10n/ja_JP.php @@ -49,6 +49,7 @@ "Couldn't load temporary image: " => "一時的な画像の読み込みができませんでした: ", "No file was uploaded. Unknown error" => "ファイルは何もアップロードされていません。不明なエラー", "Contacts" => "連絡先", +"%d_selected_contacts" => "%d個の選択された連絡先", "Contact is already in this group." => "連絡先はすでにこのグループに存在します。", "Contacts are already in this group." => "連絡先はすでにこのグループに存在します。", "Couldn't get contact list." => "連絡先リストを取得できませんでした。", @@ -159,6 +160,7 @@ "OK" => "OK", "(De-)select all" => "すべての選択を解除", "New Contact" => "新しい連絡先", +"Download Contact(s)" => "連絡先をダウンロード", "Groups" => "グループ", "Favorite" => "お気に入り", "Delete Contact" => "連絡先を削除", From dfd84425119cc61852c95259d6ac568a71ba3cb6 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sun, 16 Dec 2012 00:10:32 +0100 Subject: [PATCH 4/4] [tx-robot] updated from transifex --- l10n/ru.php | 2 ++ l10n/sl.php | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/l10n/ru.php b/l10n/ru.php index 764b7bc0..b5bc53b8 100644 --- a/l10n/ru.php +++ b/l10n/ru.php @@ -49,6 +49,7 @@ "Couldn't load temporary image: " => "Не удалось загрузить временное изображение:", "No file was uploaded. Unknown error" => "Файл не был загружен. Неизвестная ошибка", "Contacts" => "Контакты", +"%d_selected_contacts" => "%d_выбранные_контакты", "Contact is already in this group." => "Контакт уже находятся в этой группе.", "Contacts are already in this group." => "Контакты уже находятся в этой группе.", "Couldn't get contact list." => "Не удалось получить список контактов.", @@ -159,6 +160,7 @@ "OK" => "ОК", "(De-)select all" => "(Отменить) отметить все", "New Contact" => "Новый контакт", +"Download Contact(s)" => "Загрузить контакт(ы)", "Groups" => "Группы", "Favorite" => "Избранное", "Delete Contact" => "Удалить контакт", diff --git a/l10n/sl.php b/l10n/sl.php index 0881be5f..caeff455 100644 --- a/l10n/sl.php +++ b/l10n/sl.php @@ -49,6 +49,7 @@ "Couldn't load temporary image: " => "Začasne slike ni mogoče naložiti: ", "No file was uploaded. Unknown error" => "Nobena datoteka ni naložena. Neznana napaka.", "Contacts" => "Stiki", +"%d_selected_contacts" => "%d_selected_contacts", "Contact is already in this group." => "Stik je že v tej skupini.", "Contacts are already in this group." => "Stiki so že v tej skupini.", "Couldn't get contact list." => "Ne morem dobiti seznama stikov.", @@ -159,6 +160,7 @@ "OK" => "V redu", "(De-)select all" => "(Od-)izberi vse", "New Contact" => "Nov stik", +"Download Contact(s)" => "Prenesi stike", "Groups" => "Skupine", "Favorite" => "Priljubljen", "Delete Contact" => "Izbriši stik", @@ -189,9 +191,12 @@ "Nickname" => "Vzdevek", "Enter nickname" => "Vnos vzdevka", "Title" => "Ime", +"Enter title" => "Vnesite naziv", "Organization" => "Ustanova", +"Enter organization" => "Vnesite organizacijo", "Birthday" => "Rojstni dan", "Notes go here..." => "Prostor za opombe ...", +"Export as VCF" => "Izvozi kot VCF", "Add" => "Dodaj", "Phone" => "Telefon", "Email" => "Elektronska pošta", @@ -218,6 +223,7 @@ "Your city" => "Vaše mesto", "City" => "Mesto", "Some region" => "Neka regija", +"State or province" => "Zvezna država ali provinca", "Your country" => "Vaša država", "Country" => "Država", "Instant Messenger" => "Hipni sporočilnik",