rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-01 13:24:10 +01:00
Code Issues Releases Activity

Merge branch 'master' into gallery

Browse Source
This commit is contained in:
Robin Appelman 2012-12-16 21:37:04 +01:00
commit caa3eaf768
10 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/contacts.css
View File

@ -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;

22
js/app.js
View File

@ -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 = $('<input type="text" class="active" /><a class="action checked disabled" />');
$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)) {

2
l10n/ca.php
View File

@ -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",

2
l10n/cs_CZ.php
View File

@ -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",

2
l10n/de_DE.php
View File

@ -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",

1
l10n/fi_FI.php
View File

@ -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",

2
l10n/it.php
View File

@ -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",

2
l10n/ja_JP.php
View File

@ -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" => "連絡先を削除",

2
l10n/ru.php
View File

@ -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" => "Удалить контакт",

6
l10n/sl.php
View File

@ -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",