mirror of
https://github.com/owncloud/bookmarks.git
synced 2024-12-02 06:24:11 +01:00
Merge branch 'master' into gallery
This commit is contained in:
Robin Appelman
commit
a84d17da2c
27
ajax/import.php
Normal file
27
ajax/import.php
Normal file
@ -0,0 +1,27 @@
|
||||
<?php
|
||||
|
||||
OCP\App::checkAppEnabled('bookmarks');
|
||||
|
||||
|
||||
$l = new OC_l10n('bookmarks');
|
||||
|
||||
if (isset($_FILES['bm_import'])) {
|
||||
$error = array();
|
||||
|
||||
$file = $_FILES['bm_import']['tmp_name'];
|
||||
if($_FILES['bm_import']['type'] =='text/html') {
|
||||
$error = OC_Bookmarks_Bookmarks::importFile($file);
|
||||
if( empty($errors) ) {
|
||||
OCP\JSON::success();
|
||||
//force charset as not set by OC_JSON
|
||||
header('Content-Type: application/json; charset=utf-8');
|
||||
exit();
|
||||
}
|
||||
} else {
|
||||
$error[]= $l->t('Unsupported file type for import');
|
||||
}
|
||||
}
|
||||
OC_JSON::error(array('data'=>$error));
|
||||
//force charset as not set by OC_JSON
|
||||
header('Content-Type: application/json; charset=utf-8');
|
||||
exit();
|
||||
@ -17,7 +17,6 @@ OCP\App::addNavigationEntry( array( 'id' => 'bookmarks_index',
|
||||
'name' => $l->t('Bookmarks')
|
||||
));
|
||||
|
||||
OCP\App::registerPersonal('bookmarks', 'settings');
|
||||
OCP\Util::addscript('bookmarks', 'bookmarksearch');
|
||||
|
||||
OC_Search::registerProvider('OC_Search_Provider_Bookmarks');
|
||||
|
||||
@ -333,4 +333,41 @@ li:hover em { display : none; }
|
||||
position: absolute;
|
||||
right: 1em;
|
||||
top: auto;
|
||||
}
|
||||
|
||||
#bookmark_settings {
|
||||
-moz-box-sizing: border-box;
|
||||
background: none repeat scroll 0 0 #EEEEEE;
|
||||
border-right: 1px solid #CCCCCC;
|
||||
border-top: 1px solid #CCCCCC;
|
||||
bottom: 0;
|
||||
height: 2.8em;
|
||||
margin: 0;
|
||||
overflow: visible;
|
||||
padding: 0;
|
||||
position: fixed;
|
||||
width: 20em;
|
||||
z-index: 2;
|
||||
}
|
||||
#leftcontent #bookmark_settings li{
|
||||
padding: 0;
|
||||
background-color:transparent;
|
||||
}
|
||||
#leftcontent #bookmark_settings li:hover{
|
||||
background-color:transparent;
|
||||
}
|
||||
|
||||
#bookmark_settings .controls {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
#bookmark_settings .controls > li:last-child button {
|
||||
margin-right: 0.3em;
|
||||
}
|
||||
#bookmark_settings button {
|
||||
height: 2.4em;
|
||||
margin: 0.15em 0 0 0.15em;
|
||||
padding: 0.2em 0.1em 0;
|
||||
width: 2.4em;
|
||||
}
|
||||
@ -9,6 +9,14 @@ $(document).ready(function() {
|
||||
$('.centercontent').click(clickSideBar);
|
||||
$('#view_type input').click(clickSwitchView);
|
||||
$('#bookmark_add_submit').click(addBookmark);
|
||||
$('#settingsbtn').on('click keydown', function() {
|
||||
try {
|
||||
OC.appSettings({appid:'bookmarks', loadJS:true, cache:false});
|
||||
} catch(e) {
|
||||
alert(e);
|
||||
}
|
||||
});
|
||||
|
||||
$(window).resize(function () {
|
||||
fillWindow($('.bookmarks_list'));
|
||||
});
|
||||
|
||||
57
js/settings.js
Normal file
57
js/settings.js
Normal file
@ -0,0 +1,57 @@
|
||||
$(document).ready(function() {
|
||||
$('#bm_import_submit').click(attachSettingEvent);
|
||||
});
|
||||
|
||||
|
||||
function attachSettingEvent(event) {
|
||||
event.preventDefault();
|
||||
fileUpload($(this).closest('form'), $('#upload'));
|
||||
}
|
||||
function fileUpload(form, result_div) {
|
||||
|
||||
var uploadEventHandler = function () {
|
||||
var data = {};
|
||||
try{
|
||||
data = $.parseJSON(iframe.contents().text());
|
||||
}catch (e){}
|
||||
if(data.status == 'error') {
|
||||
list = $("<ul></ul>").addClass('setting_error_list');
|
||||
console.log(data);
|
||||
$.each(data.data,function(index, item){
|
||||
list.append($( "<li></li>" ).text(item));
|
||||
});
|
||||
result_div.html(list);
|
||||
} else {
|
||||
result_div.text(t('bookmark', 'Import completed successfully.'));
|
||||
}
|
||||
};
|
||||
|
||||
// Create the iframe...
|
||||
var iframe;
|
||||
if($('#upload_iframe').length === 1)
|
||||
iframe = $('#upload_iframe')
|
||||
else {
|
||||
iframe = $('<iframe></iframe>').attr({
|
||||
id: 'upload_iframe',
|
||||
name: 'upload_iframe',
|
||||
width: '0',
|
||||
height: '0',
|
||||
border: '0',
|
||||
style: 'display:none'
|
||||
}).bind('load',uploadEventHandler);
|
||||
form.append(iframe);
|
||||
}
|
||||
|
||||
// Set properties of form...
|
||||
form.attr({
|
||||
target: 'upload_iframe',
|
||||
method: 'post',
|
||||
enctype: 'multipart/form-data',
|
||||
encoding: 'multipart/form-data'
|
||||
});
|
||||
|
||||
// Submit the form...
|
||||
form.submit();
|
||||
|
||||
result_div.text(t('bookmark', 'Uploading...'));
|
||||
}
|
||||
@ -13,6 +13,9 @@
|
||||
"Save" => "Desa",
|
||||
"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Arrossegueu-ho al navegador i feu-hi un clic quan volgueu marcar ràpidament una adreça d'interès:",
|
||||
"Read later" => "Llegeix més tard",
|
||||
"Edit" => "Edita",
|
||||
"Delete" => "Esborra",
|
||||
"Cancel" => "Cancel·la",
|
||||
"Address" => "Adreça",
|
||||
"Add bookmark" => "Afegeix una adreça d'interès",
|
||||
"List" => "Llista",
|
||||
@ -21,12 +24,8 @@
|
||||
"Show" => "Mostra",
|
||||
"Related Tags" => "Etiquetes relacionades",
|
||||
"You have no bookmarks" => "No teniu adreces d'interès",
|
||||
"Edit" => "Edita",
|
||||
"Delete" => "Esborra",
|
||||
"Cancel" => "Cancel·la",
|
||||
"Bookmarklet <br />" => "Bookmarklet <br />",
|
||||
"Import bookmarks" => "Importa les adreces d'interès",
|
||||
"Bookmark html file" => "Adreça d'interès en fitxer html",
|
||||
"Import" => "Importa",
|
||||
"Export bookmarks" => "Exporta adreces d'interès",
|
||||
"Export" => "Exporta"
|
||||
|
||||
@ -13,6 +13,9 @@
|
||||
"Save" => "Uložit",
|
||||
"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Přetáhněte do Vašeho prohlížeče a klikněte, pokud si přejete rychle uložit stránku do záložek:",
|
||||
"Read later" => "Přečíst později",
|
||||
"Edit" => "Upravit",
|
||||
"Delete" => "Smazat",
|
||||
"Cancel" => "Zrušit",
|
||||
"Address" => "Adresa",
|
||||
"Add bookmark" => "Přidat záložku",
|
||||
"List" => "Seznam",
|
||||
@ -21,12 +24,8 @@
|
||||
"Show" => "Zobrazit",
|
||||
"Related Tags" => "Podobné značky",
|
||||
"You have no bookmarks" => "Nemáte žádné záložky",
|
||||
"Edit" => "Upravit",
|
||||
"Delete" => "Smazat",
|
||||
"Cancel" => "Zrušit",
|
||||
"Bookmarklet <br />" => "Záložky <br />",
|
||||
"Import bookmarks" => "Importovat záložky",
|
||||
"Bookmark html file" => "Html soubor záložek",
|
||||
"Import" => "Importovat",
|
||||
"Export bookmarks" => "Exportovat záložky",
|
||||
"Export" => "Exportovat"
|
||||
|
||||
@ -13,6 +13,9 @@
|
||||
"Save" => "Gem",
|
||||
"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Træk denne til dine browserbogmærker pg klik på den, når du ønsker at lynoprette et bogmærke til hjemmesiden:",
|
||||
"Read later" => "Læs senere",
|
||||
"Edit" => "Rediger",
|
||||
"Delete" => "Slet",
|
||||
"Cancel" => "Annuller",
|
||||
"Address" => "Adresser",
|
||||
"Add bookmark" => "Tilføj bogmærke",
|
||||
"List" => "Liste",
|
||||
@ -21,12 +24,8 @@
|
||||
"Show" => "Vis",
|
||||
"Related Tags" => "Relaterede Tags",
|
||||
"You have no bookmarks" => "Du har ingen bogmærker",
|
||||
"Edit" => "Rediger",
|
||||
"Delete" => "Slet",
|
||||
"Cancel" => "Annuller",
|
||||
"Bookmarklet <br />" => "Bookmarklet <br />",
|
||||
"Import bookmarks" => "Importer bogmærker",
|
||||
"Bookmark html file" => "Bogmærke html fil",
|
||||
"Import" => "Importer",
|
||||
"Export bookmarks" => "Exporter bogmærker",
|
||||
"Export" => "Exporter"
|
||||
|
||||
@ -13,6 +13,9 @@
|
||||
"Save" => "Speichern",
|
||||
"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Ziehe dies zu Deinen Browser-Lesezeichen und klicke darauf, wenn Du eine Website schnell den Lesezeichen hinzufügen willst.",
|
||||
"Read later" => "Später lesen",
|
||||
"Edit" => "Bearbeiten",
|
||||
"Delete" => "Löschen",
|
||||
"Cancel" => "Abbrechen",
|
||||
"Address" => "Adresse",
|
||||
"Add bookmark" => "Lesezeichen hinzufügen",
|
||||
"List" => "Liste",
|
||||
@ -21,12 +24,8 @@
|
||||
"Show" => "Anzeigen",
|
||||
"Related Tags" => "Verwandte Schlagworte",
|
||||
"You have no bookmarks" => "Du hast keine Lesezeichen",
|
||||
"Edit" => "Bearbeiten",
|
||||
"Delete" => "Löschen",
|
||||
"Cancel" => "Abbrechen",
|
||||
"Bookmarklet <br />" => "Bookmarklet <br />",
|
||||
"Import bookmarks" => "Lesezeichen importieren",
|
||||
"Bookmark html file" => "HTML-Lesezeichen-Datei",
|
||||
"Import" => "Importieren",
|
||||
"Export bookmarks" => "Lesezeichen exportieren",
|
||||
"Export" => "Exportieren"
|
||||
|
||||
@ -13,6 +13,9 @@
|
||||
"Save" => "Speichern",
|
||||
"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Ziehen Sie dies zu Ihren Browser-Lesezeichen und klicken Sie darauf, wenn Sie eine Website schnell den Lesezeichen hinzufügen wollen.",
|
||||
"Read later" => "Später lesen",
|
||||
"Edit" => "Bearbeiten",
|
||||
"Delete" => "Löschen",
|
||||
"Cancel" => "Abbrechen",
|
||||
"Address" => "Adresse",
|
||||
"Add bookmark" => "Lesezeichen hinzufügen",
|
||||
"List" => "Liste",
|
||||
@ -21,12 +24,8 @@
|
||||
"Show" => "Anzeigen",
|
||||
"Related Tags" => "Verwandte Schlagworte",
|
||||
"You have no bookmarks" => "Sie haben keine Lesezeichen",
|
||||
"Edit" => "Bearbeiten",
|
||||
"Delete" => "Löschen",
|
||||
"Cancel" => "Abbrechen",
|
||||
"Bookmarklet <br />" => "Bookmarklet <br />",
|
||||
"Import bookmarks" => "Lesezeichen importieren",
|
||||
"Bookmark html file" => "HTML-Lesezeichen-Datei",
|
||||
"Import" => "Importieren",
|
||||
"Export bookmarks" => "Lesezeichen exportieren",
|
||||
"Export" => "Exportieren"
|
||||
|
||||
@ -13,6 +13,9 @@
|
||||
"Save" => "Αποθήκευση",
|
||||
"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Σύρετε αυτό στους σελιδοδείκτες του περιηγητή σας και κάντε κλικ επάνω του, όταν θέλετε να προσθέσετε σύντομα μια ιστοσελίδα ως σελιδοδείκτη:",
|
||||
"Read later" => "Ανάγνωση αργότερα",
|
||||
"Edit" => "Επεξεργασία",
|
||||
"Delete" => "Διαγραφή",
|
||||
"Cancel" => "Ακύρωση",
|
||||
"Address" => "Διεύθυνση",
|
||||
"Add bookmark" => "Προσθήκη σελιδοδείκτη",
|
||||
"List" => "Λίστα",
|
||||
@ -21,12 +24,8 @@
|
||||
"Show" => "Εμφάνιση",
|
||||
"Related Tags" => "Σχετικές ετικέτες",
|
||||
"You have no bookmarks" => "Δεν έχετε σελιδοδείκτες",
|
||||
"Edit" => "Επεξεργασία",
|
||||
"Delete" => "Διαγραφή",
|
||||
"Cancel" => "Ακύρωση",
|
||||
"Bookmarklet <br />" => "Εφαρμογίδιο Σελιδοδεικτών <br />",
|
||||
"Import bookmarks" => "Εισαγωγή σελιδοδεικτών",
|
||||
"Bookmark html file" => "HTML αρχείο σελιδοδείκτη",
|
||||
"Import" => "Εισαγωγή",
|
||||
"Export bookmarks" => "Εξαγωγή σελιδοδεικτών",
|
||||
"Export" => "Εξαγωγή"
|
||||
|
||||
@ -13,6 +13,9 @@
|
||||
"Save" => "Konservi",
|
||||
"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Ŝovu tion ĉi al la legosignoj de via TTT-legilo kaj klaku ĝin, se vi volas rapide legosignigi TTT-paĝon:",
|
||||
"Read later" => "Legi poste",
|
||||
"Edit" => "Redakti",
|
||||
"Delete" => "Forigi",
|
||||
"Cancel" => "Nuligi",
|
||||
"Address" => "Adreso",
|
||||
"Add bookmark" => "Aldoni legosignon",
|
||||
"List" => "Listo",
|
||||
@ -21,12 +24,8 @@
|
||||
"Show" => "Montri",
|
||||
"Related Tags" => "Rilataj etikedoj",
|
||||
"You have no bookmarks" => "Vi havas neniun legosignon",
|
||||
"Edit" => "Redakti",
|
||||
"Delete" => "Forigi",
|
||||
"Cancel" => "Nuligi",
|
||||
"Bookmarklet <br />" => "Kodosigno <br />",
|
||||
"Import bookmarks" => "Enporti legosignojn",
|
||||
"Bookmark html file" => "Legosignigi HTML-dosieron",
|
||||
"Import" => "Enporti",
|
||||
"Export bookmarks" => "Elporti legosignojn",
|
||||
"Export" => "Elporti"
|
||||
|
||||
@ -13,6 +13,9 @@
|
||||
"Save" => "Guardar",
|
||||
"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Arrastra desde aquí a los marcadores de tu navegador, y haz clic cuando quieras marcar una página web rápidamente:",
|
||||
"Read later" => "Leer después",
|
||||
"Edit" => "Editar",
|
||||
"Delete" => "Eliminar",
|
||||
"Cancel" => "Cancelar",
|
||||
"Address" => "Dirección",
|
||||
"Add bookmark" => "Agregar Marcador",
|
||||
"List" => "Lista",
|
||||
@ -21,12 +24,8 @@
|
||||
"Show" => "Mostrar",
|
||||
"Related Tags" => "Tags relacionados",
|
||||
"You have no bookmarks" => "No tienes marcadores",
|
||||
"Edit" => "Editar",
|
||||
"Delete" => "Eliminar",
|
||||
"Cancel" => "Cancelar",
|
||||
"Bookmarklet <br />" => "Bookmarklet <br />",
|
||||
"Import bookmarks" => "Importar marcadores",
|
||||
"Bookmark html file" => "Marcadores en archivo HTML",
|
||||
"Import" => "Importart",
|
||||
"Export bookmarks" => "Exportar marcadores",
|
||||
"Export" => "Exportar"
|
||||
|
||||
@ -26,7 +26,6 @@
|
||||
"You have no bookmarks" => "No tenés marcadores",
|
||||
"Bookmarklet <br />" => "Bookmarklet <br />",
|
||||
"Import bookmarks" => "Importar marcadores",
|
||||
"Bookmark html file" => "Agregar a marcadores archivo html",
|
||||
"Import" => "Importar",
|
||||
"Export bookmarks" => "Exportar marcadores",
|
||||
"Export" => "Exportar"
|
||||
|
||||
@ -13,6 +13,9 @@
|
||||
"Save" => "Salvesta",
|
||||
"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Lohista see oma veebilehitseja järjehoidjatesse ja kliki sellele, kui sa soovid veebilehte kiirelt lisada:",
|
||||
"Read later" => "Loe hiljem",
|
||||
"Edit" => "Muuda",
|
||||
"Delete" => "Kustuta",
|
||||
"Cancel" => "Loobu",
|
||||
"Address" => "Aadress",
|
||||
"Add bookmark" => "Lisa järjehoidja",
|
||||
"List" => "Nimekiri",
|
||||
@ -21,12 +24,8 @@
|
||||
"Show" => "Näita",
|
||||
"Related Tags" => "Seotud sildid",
|
||||
"You have no bookmarks" => "Sul pole järjehoidjaid",
|
||||
"Edit" => "Muuda",
|
||||
"Delete" => "Kustuta",
|
||||
"Cancel" => "Loobu",
|
||||
"Bookmarklet <br />" => "Järjehoidja vidin <br />",
|
||||
"Import bookmarks" => "Impordi järjehoidjaid",
|
||||
"Bookmark html file" => "Järjehoidjate HTML-fail",
|
||||
"Import" => "Impordi",
|
||||
"Export bookmarks" => "Ekspordi järjehoidjaid",
|
||||
"Export" => "Ekspordi"
|
||||
|
||||
@ -13,6 +13,9 @@
|
||||
"Save" => "Gorde",
|
||||
"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Web orri bat laster-marketara azkar gehitzeko, arrastratu hau zure arakatzailearen laster-marketara eta klikatu bertan:",
|
||||
"Read later" => "Irakurri geroago",
|
||||
"Edit" => "Editatu",
|
||||
"Delete" => "Ezabatu",
|
||||
"Cancel" => "Ezeztatu",
|
||||
"Address" => "Helbidea",
|
||||
"Add bookmark" => "Gehitu laster-marka",
|
||||
"List" => "Zerrenda",
|
||||
@ -21,12 +24,8 @@
|
||||
"Show" => "Bistaratu",
|
||||
"Related Tags" => "Erlazionatutako etiketak",
|
||||
"You have no bookmarks" => "Ez duzu laster-markarik",
|
||||
"Edit" => "Editatu",
|
||||
"Delete" => "Ezabatu",
|
||||
"Cancel" => "Ezeztatu",
|
||||
"Bookmarklet <br />" => "Bookmarklet <br />",
|
||||
"Import bookmarks" => "Inportatu laster-markak",
|
||||
"Bookmark html file" => "Egin html fitxategi baten laster marka",
|
||||
"Import" => "Inportatu",
|
||||
"Export bookmarks" => "Exportatu laster-markak",
|
||||
"Export" => "Exportatu"
|
||||
|
||||
@ -13,6 +13,9 @@
|
||||
"Save" => "Tallenna",
|
||||
"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Vedä tämä selaimesi kirjanmerkkipalkkiin ja napsauta sitä, kun haluat lisätä kirjanmerkin nopeasti:",
|
||||
"Read later" => "Lue myöhemmin",
|
||||
"Edit" => "Muokkaa",
|
||||
"Delete" => "Poista",
|
||||
"Cancel" => "Peru",
|
||||
"Address" => "Osoite",
|
||||
"Add bookmark" => "Lisää kirjanmerkki",
|
||||
"List" => "Lista",
|
||||
@ -21,9 +24,6 @@
|
||||
"Show" => "Näytä",
|
||||
"Related Tags" => "Vastaavanlaiset tunnisteet",
|
||||
"You have no bookmarks" => "Sinulla ei ole kirjanmerkkejä",
|
||||
"Edit" => "Muokkaa",
|
||||
"Delete" => "Poista",
|
||||
"Cancel" => "Peru",
|
||||
"Bookmarklet <br />" => "Kirjanmerkitsin <br />",
|
||||
"Import bookmarks" => "Tuo kirjanmerkkejä",
|
||||
"Import" => "Tuo",
|
||||
|
||||
@ -13,6 +13,9 @@
|
||||
"Save" => "Sauvegarder",
|
||||
"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Glissez ceci dans les favoris de votre navigateur, et cliquer dessus lorsque vous souhaitez ajouter la page en cours à vos marques-pages :",
|
||||
"Read later" => "Lire plus tard",
|
||||
"Edit" => "Modifier",
|
||||
"Delete" => "Supprimer",
|
||||
"Cancel" => "Annuler",
|
||||
"Address" => "Adresse",
|
||||
"Add bookmark" => "Ajouter le favori",
|
||||
"List" => "Lister",
|
||||
@ -21,12 +24,8 @@
|
||||
"Show" => "Afficher",
|
||||
"Related Tags" => "Étiquettes similaires",
|
||||
"You have no bookmarks" => "Vous n'avez aucun favori",
|
||||
"Edit" => "Modifier",
|
||||
"Delete" => "Supprimer",
|
||||
"Cancel" => "Annuler",
|
||||
"Bookmarklet <br />" => "Gestionnaire de favoris <br />",
|
||||
"Import bookmarks" => "Importer des favoris",
|
||||
"Bookmark html file" => "Mettre en favoris un fichier HTML",
|
||||
"Import" => "Importer",
|
||||
"Export bookmarks" => "Exporter les favoris",
|
||||
"Export" => "Exporter"
|
||||
|
||||
@ -5,15 +5,15 @@
|
||||
"The title of the page" => "judul laman",
|
||||
"Save" => "simpan",
|
||||
"Read later" => "baca nanti",
|
||||
"Edit" => "ubah",
|
||||
"Delete" => "hapus",
|
||||
"Cancel" => "batal",
|
||||
"Address" => "alamat",
|
||||
"List" => "daftar",
|
||||
"Image" => "gambar",
|
||||
"Hide" => "sembunyikan",
|
||||
"Show" => "tampilkan",
|
||||
"Related Tags" => "label terkait",
|
||||
"Edit" => "ubah",
|
||||
"Delete" => "hapus",
|
||||
"Cancel" => "batal",
|
||||
"Import" => "mengimpor",
|
||||
"Export" => "mengekspor"
|
||||
);
|
||||
|
||||
@ -13,6 +13,9 @@
|
||||
"Save" => "Salva",
|
||||
"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Quando vuoi creare rapidamente un segnalibro, trascinalo sui segnalibri del browser e fai clic su di esso:",
|
||||
"Read later" => "Leggi dopo",
|
||||
"Edit" => "Modifica",
|
||||
"Delete" => "Elimina",
|
||||
"Cancel" => "Annulla",
|
||||
"Address" => "Indirizzo",
|
||||
"Add bookmark" => "Aggiungi segnalibro",
|
||||
"List" => "Elenco",
|
||||
@ -21,12 +24,8 @@
|
||||
"Show" => "Mostra",
|
||||
"Related Tags" => "Tag correlati",
|
||||
"You have no bookmarks" => "Non hai segnalibri",
|
||||
"Edit" => "Modifica",
|
||||
"Delete" => "Elimina",
|
||||
"Cancel" => "Annulla",
|
||||
"Bookmarklet <br />" => "Bookmarklet <br />",
|
||||
"Import bookmarks" => "Importa segnalibri",
|
||||
"Bookmark html file" => "File html di segnalibri",
|
||||
"Import" => "Importa",
|
||||
"Export bookmarks" => "Esporta segnalibri",
|
||||
"Export" => "Esporta"
|
||||
|
||||
@ -13,6 +13,9 @@
|
||||
"Save" => "保存",
|
||||
"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Webページをすぐにブックマークしたい場合は、これをブラウザのブックマークにドラッグし、クリックしてください:",
|
||||
"Read later" => "後で確認",
|
||||
"Edit" => "編集",
|
||||
"Delete" => "削除",
|
||||
"Cancel" => "キャンセル",
|
||||
"Address" => "アドレス",
|
||||
"Add bookmark" => "ブックマークを追加",
|
||||
"List" => "一覧",
|
||||
@ -21,12 +24,8 @@
|
||||
"Show" => "表示",
|
||||
"Related Tags" => "関連タグ",
|
||||
"You have no bookmarks" => "ブックマークがありません",
|
||||
"Edit" => "編集",
|
||||
"Delete" => "削除",
|
||||
"Cancel" => "キャンセル",
|
||||
"Bookmarklet <br />" => "ブックマークレット <br />",
|
||||
"Import bookmarks" => "ブックマークをインポート",
|
||||
"Bookmark html file" => "ブックマークのHTMLファイル",
|
||||
"Import" => "インポート",
|
||||
"Export bookmarks" => "ブックマークをエクスポート",
|
||||
"Export" => "エクスポート"
|
||||
|
||||
@ -26,7 +26,6 @@
|
||||
"You have no bookmarks" => "თქვენ არ გაქვთ ბუქმარკები",
|
||||
"Bookmarklet <br />" => "Bookmarklet <br />",
|
||||
"Import bookmarks" => "ბუქმარქების იმპორტი",
|
||||
"Bookmark html file" => "ბუქმარქ html ფაილი",
|
||||
"Import" => "იმპორტი",
|
||||
"Export bookmarks" => "ბუქმარქების ექსპორტი",
|
||||
"Export" => "ექსპორტი"
|
||||
|
||||
@ -1,9 +1,32 @@
|
||||
<?php $TRANSLATIONS = array(
|
||||
"Bookmarks" => "Bokmerker",
|
||||
"Tags" => "Etikett",
|
||||
"Edit bookmark" => "Endre bokmerke",
|
||||
"Are you sure you want to remove this tag from every entry?" => "Er du sikker på at du vil slette denne taggen fra alle oppføringene?",
|
||||
"Warning" => "Advarsel",
|
||||
"Bookm." => "Bokmrk.",
|
||||
"Add a bookmark" => "Legg til et bokmerke",
|
||||
"Close" => "Lukk",
|
||||
"The title of the page" => "Tittel for siden",
|
||||
"The address of the page" => "Adressen til siden",
|
||||
"Description of the page" => "Beskrivelse av siden",
|
||||
"Save" => "Lagre",
|
||||
"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Dra denne over din nettlesers bokmerker og klikk den, hvis du ønsker å hurtig legge til bokmerke for en nettside",
|
||||
"Read later" => "Les senere",
|
||||
"Edit" => "Endre",
|
||||
"Delete" => "Slett",
|
||||
"Cancel" => "Avbryt",
|
||||
"Address" => "Adresse",
|
||||
"Add bookmark" => "Legg til bokmerke",
|
||||
"List" => "Liste",
|
||||
"Image" => "Bilde",
|
||||
"Hide" => "Skjul",
|
||||
"Show" => "Vis",
|
||||
"Related Tags" => "Relaterte tagger",
|
||||
"You have no bookmarks" => "Du har ingen bokmerker",
|
||||
"Bookmarklet <br />" => "Bokmerke <br />"
|
||||
"Bookmarklet <br />" => "Bokmerke <br />",
|
||||
"Import bookmarks" => "Importer bokmerker",
|
||||
"Import" => "Importer",
|
||||
"Export bookmarks" => "Eksporter bokmerker",
|
||||
"Export" => "Eksporter"
|
||||
);
|
||||
|
||||
@ -26,7 +26,6 @@
|
||||
"You have no bookmarks" => "U heeft geen bladwijzers",
|
||||
"Bookmarklet <br />" => "Bookmarklet <br />",
|
||||
"Import bookmarks" => "Importeer bladwijzers",
|
||||
"Bookmark html file" => "Bladwijzer html bestand",
|
||||
"Import" => "Importeer",
|
||||
"Export bookmarks" => "Exporteer bladwijzers",
|
||||
"Export" => "Exporteer"
|
||||
|
||||
@ -13,6 +13,9 @@
|
||||
"Save" => "Zapisz",
|
||||
"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Przeciągnij to do ulubionych przeglądarki i kliknij go, gdy użytkownik chce szybko dodać zakładkę strony sieci Web:",
|
||||
"Read later" => "Czytaj później",
|
||||
"Edit" => "Edytuj",
|
||||
"Delete" => "Usuń",
|
||||
"Cancel" => "Anuluj",
|
||||
"Address" => "Adres",
|
||||
"Add bookmark" => "Dodaj zakładkę",
|
||||
"List" => "Lista",
|
||||
@ -21,12 +24,8 @@
|
||||
"Show" => "Pokaż",
|
||||
"Related Tags" => "Powiązane Tagi",
|
||||
"You have no bookmarks" => "Nie masz żadnych zakładek",
|
||||
"Edit" => "Edytuj",
|
||||
"Delete" => "Usuń",
|
||||
"Cancel" => "Anuluj",
|
||||
"Bookmarklet <br />" => "Skryptozakładka <br />",
|
||||
"Import bookmarks" => "Importuj zakładki",
|
||||
"Bookmark html file" => "Plik HTML zakładek",
|
||||
"Import" => "Import",
|
||||
"Export bookmarks" => "Eksportuj zakładki",
|
||||
"Export" => "Export"
|
||||
|
||||
@ -13,6 +13,9 @@
|
||||
"Save" => "Salvar",
|
||||
"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Arraste isso para os favoritos do seu navegador web e clique nele quando você quiser marcar/favoritar uma página rapidamente:",
|
||||
"Read later" => "Ler depois",
|
||||
"Edit" => "Editar",
|
||||
"Delete" => "Excluir",
|
||||
"Cancel" => "Cancelar",
|
||||
"Address" => "Endereço",
|
||||
"Add bookmark" => "Adicionar bookmark",
|
||||
"List" => "Listar",
|
||||
@ -21,12 +24,8 @@
|
||||
"Show" => "Exibir",
|
||||
"Related Tags" => "Tags relacionadas",
|
||||
"You have no bookmarks" => "Você não tem marcadores",
|
||||
"Edit" => "Editar",
|
||||
"Delete" => "Excluir",
|
||||
"Cancel" => "Cancelar",
|
||||
"Bookmarklet <br />" => "Bookmarklet <br />",
|
||||
"Import bookmarks" => "Importar bookmarks",
|
||||
"Bookmark html file" => "Arquivo HTML de bookmark",
|
||||
"Import" => "Importar",
|
||||
"Export bookmarks" => "Exportar bookmarks",
|
||||
"Export" => "Exportar"
|
||||
|
||||
@ -13,6 +13,9 @@
|
||||
"Save" => "Guardar",
|
||||
"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Arraste isto para o seu navegador, e click nele quando quiser guardar a página rapidamente com um marcador.",
|
||||
"Read later" => "Ler mais tarde",
|
||||
"Edit" => "Editar",
|
||||
"Delete" => "Apagar",
|
||||
"Cancel" => "Cancelar",
|
||||
"Address" => "Endereço",
|
||||
"Add bookmark" => "Acrescentar marcador",
|
||||
"List" => "Lista",
|
||||
@ -21,12 +24,8 @@
|
||||
"Show" => "Mostrar",
|
||||
"Related Tags" => "Etiquetas relacionadas",
|
||||
"You have no bookmarks" => "Não tem marcadores",
|
||||
"Edit" => "Editar",
|
||||
"Delete" => "Apagar",
|
||||
"Cancel" => "Cancelar",
|
||||
"Bookmarklet <br />" => "Marcador",
|
||||
"Import bookmarks" => "Importar marcadores",
|
||||
"Bookmark html file" => "Ficheiro html de marcadores",
|
||||
"Import" => "Importar",
|
||||
"Export bookmarks" => "Exportar marcadores",
|
||||
"Export" => "Exportar"
|
||||
|
||||
@ -26,7 +26,6 @@
|
||||
"You have no bookmarks" => "У вас нет закладок",
|
||||
"Bookmarklet <br />" => "Быстрые закладки<br />",
|
||||
"Import bookmarks" => "Импортировать закладки",
|
||||
"Bookmark html file" => "Добавить html-файл в закладки",
|
||||
"Import" => "Импорт",
|
||||
"Export bookmarks" => "Экспортировать закладки",
|
||||
"Export" => "Экспорт"
|
||||
|
||||
@ -13,6 +13,9 @@
|
||||
"Save" => "Сохранить",
|
||||
"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Перетащите это в закладки Вашего браузера и кликните на него, когда захотите быстро добавить страницу в закладки:",
|
||||
"Read later" => "Прочитать позже",
|
||||
"Edit" => "Редактировать",
|
||||
"Delete" => "Удалить",
|
||||
"Cancel" => "Отмена",
|
||||
"Address" => "Адрес",
|
||||
"Add bookmark" => "Добавить закладку",
|
||||
"List" => "Список",
|
||||
@ -21,12 +24,8 @@
|
||||
"Show" => "Показать",
|
||||
"Related Tags" => "Связанные теги",
|
||||
"You have no bookmarks" => "У Вас нет закладок",
|
||||
"Edit" => "Редактировать",
|
||||
"Delete" => "Удалить",
|
||||
"Cancel" => "Отмена",
|
||||
"Bookmarklet <br />" => "Bookmarklet <br />",
|
||||
"Import bookmarks" => "Импорт закладок",
|
||||
"Bookmark html file" => "Добавить html-файл в закладки ",
|
||||
"Import" => "Импортировать",
|
||||
"Export bookmarks" => "Экспорт закладок",
|
||||
"Export" => "Экспортировать"
|
||||
|
||||
@ -26,7 +26,6 @@
|
||||
"You have no bookmarks" => "පිටු සළකුනු නොමැත",
|
||||
"Bookmarklet <br />" => "පිටුසන<br />",
|
||||
"Import bookmarks" => "පිටුසනයන් ආයාත කරන්න",
|
||||
"Bookmark html file" => "html ගොනුව පිටුසන් කරන්න",
|
||||
"Import" => "ආයාත කරන්න",
|
||||
"Export bookmarks" => "පිටුසනයන් නිර්යාත කරන්න",
|
||||
"Export" => "නිර්යාත කරන්න"
|
||||
|
||||
@ -26,7 +26,6 @@
|
||||
"You have no bookmarks" => "Nemáte záložky",
|
||||
"Bookmarklet <br />" => "Záložky <br />",
|
||||
"Import bookmarks" => "Importovať záložky",
|
||||
"Bookmark html file" => "Html súbor záložiek",
|
||||
"Import" => "Import",
|
||||
"Export bookmarks" => "Export záložiek",
|
||||
"Export" => "Export"
|
||||
|
||||
@ -26,7 +26,6 @@
|
||||
"You have no bookmarks" => "Nimate zaznamkov",
|
||||
"Bookmarklet <br />" => "Vstavek za zaznamke <br />",
|
||||
"Import bookmarks" => "Uvozi zaznamke",
|
||||
"Bookmark html file" => "Datoteka zaznamkov HTML",
|
||||
"Import" => "Uvozi",
|
||||
"Export bookmarks" => "Izvozi zaznamke",
|
||||
"Export" => "Izvozi"
|
||||
|
||||
@ -13,6 +13,9 @@
|
||||
"Save" => "Spara",
|
||||
"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Dra till din webbläsares bokmärken och klicka på det när du vill bokmärka en webbsida snabbt:",
|
||||
"Read later" => "Läs senare",
|
||||
"Edit" => "Redigera",
|
||||
"Delete" => "Radera",
|
||||
"Cancel" => "Avbryt",
|
||||
"Address" => "Adress",
|
||||
"Add bookmark" => "Lägg till bokmärke",
|
||||
"List" => "Lista",
|
||||
@ -21,12 +24,8 @@
|
||||
"Show" => "Visa",
|
||||
"Related Tags" => "Relaterade taggar",
|
||||
"You have no bookmarks" => "Du har inga bokmärken",
|
||||
"Edit" => "Redigera",
|
||||
"Delete" => "Radera",
|
||||
"Cancel" => "Avbryt",
|
||||
"Bookmarklet <br />" => "Skriptbokmärke <br />",
|
||||
"Import bookmarks" => "Importera bokmärken",
|
||||
"Bookmark html file" => "Bokmärkets html-fil",
|
||||
"Import" => "Importera",
|
||||
"Export bookmarks" => "Exportera bokmärken",
|
||||
"Export" => "Exportera"
|
||||
|
||||
@ -13,6 +13,9 @@
|
||||
"Save" => "บันทึก",
|
||||
"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "ลากสิ่งนี้ไปไว้ที่รายการโปรดในโปรแกรมบราวเซอร์ของคุณ แล้วคลิกที่นั่น, เมื่อคุณต้องการเก็บหน้าเว็บเพจเข้าไปไว้ในรายการโปรดอย่างรวดเร็ว",
|
||||
"Read later" => "อ่านภายหลัง",
|
||||
"Edit" => "แก้ไข",
|
||||
"Delete" => "ลบ",
|
||||
"Cancel" => "ยกเลิก",
|
||||
"Address" => "ที่อยู่",
|
||||
"Add bookmark" => "เพิ่มรายการโปรด",
|
||||
"List" => "รายการ",
|
||||
@ -21,12 +24,8 @@
|
||||
"Show" => "แสดง",
|
||||
"Related Tags" => "ป้ายกำกับอื่นๆที่เกี่ยวข้อง",
|
||||
"You have no bookmarks" => "คุณยังไม่มีรายการโปรด",
|
||||
"Edit" => "แก้ไข",
|
||||
"Delete" => "ลบ",
|
||||
"Cancel" => "ยกเลิก",
|
||||
"Bookmarklet <br />" => "Bookmarklet <br />",
|
||||
"Import bookmarks" => "นำเข้ารายการโปรด",
|
||||
"Bookmark html file" => "ไฟล์รายการโปรดในรูปแบบ html",
|
||||
"Import" => "นำเข้า",
|
||||
"Export bookmarks" => "ส่งออกรายการโปรด",
|
||||
"Export" => "ส่งออก"
|
||||
|
||||
@ -13,6 +13,9 @@
|
||||
"Save" => "保存",
|
||||
"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "拖动此物到您的浏览器书签栏，在您想要快速订阅某网页时点击：",
|
||||
"Read later" => "稍后阅读",
|
||||
"Edit" => "编辑",
|
||||
"Delete" => "删除",
|
||||
"Cancel" => "取消",
|
||||
"Address" => "网址",
|
||||
"Add bookmark" => "添加书签",
|
||||
"List" => "列表",
|
||||
@ -21,12 +24,8 @@
|
||||
"Show" => "显示",
|
||||
"Related Tags" => "相关标签",
|
||||
"You have no bookmarks" => "您没有书签",
|
||||
"Edit" => "编辑",
|
||||
"Delete" => "删除",
|
||||
"Cancel" => "取消",
|
||||
"Bookmarklet <br />" => "小书签 <br />",
|
||||
"Import bookmarks" => "导入书签",
|
||||
"Bookmark html file" => "书签 html 文件",
|
||||
"Import" => "导入",
|
||||
"Export bookmarks" => "导出书签",
|
||||
"Export" => "导出"
|
||||
|
||||
@ -26,7 +26,6 @@
|
||||
"You have no bookmarks" => "您暂无书签",
|
||||
"Bookmarklet <br />" => "书签应用",
|
||||
"Import bookmarks" => "导入书签",
|
||||
"Bookmark html file" => "书签HTML文件",
|
||||
"Import" => "导入",
|
||||
"Export bookmarks" => "导出书签",
|
||||
"Export" => "导出"
|
||||
|
||||
24
settings.php
24
settings.php
@ -8,25 +8,5 @@
|
||||
|
||||
OCP\App::checkAppEnabled('bookmarks');
|
||||
|
||||
if (isset($_POST['bm_import'])) {
|
||||
$error = array();
|
||||
|
||||
$file = $_FILES['bm_import']['tmp_name'];
|
||||
if($_FILES['bm_import']['type'] =='text/html') {
|
||||
$error = OC_Bookmarks_Bookmarks::importFile($file);
|
||||
|
||||
} else {
|
||||
$error[]= array('error' => 'Unsupported file type for import',
|
||||
'hint' => '');
|
||||
}
|
||||
|
||||
$tmpl = new OCP\Template('bookmarks', 'settings');
|
||||
// Any problems?
|
||||
if(count($error)) {
|
||||
$tmpl->assign('error', $error);
|
||||
}
|
||||
return $tmpl->fetchPage();
|
||||
} else {
|
||||
$tmpl = new OCP\Template( 'bookmarks', 'settings');
|
||||
return $tmpl->fetchPage();
|
||||
}
|
||||
$tmpl = new OCP\Template('bookmarks', 'settings');
|
||||
$tmpl->printPage();
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<form class="addBm" method="post" action="<?php echo OCP\Util::linkTo('bookmarks', 'ajax/editBookmark.php');?>">
|
||||
<?php if(!isset($embedded) || !$embedded):?>
|
||||
<script>
|
||||
<script type="text/javascript">
|
||||
var fullTags = <?php echo $_['tags'];?>;
|
||||
$(document).ready(function() {
|
||||
$('body').bookmark_dialog({
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
function createBookmarklet() {
|
||||
$l = OC_L10N::get('bookmarks');
|
||||
echo '<small>' . $l->t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:') . '</small>'
|
||||
echo '<small>' . $l->t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:') . '</small><br />'
|
||||
. '<a class="button bookmarklet" href="javascript:(function(){var a=window,b=document,c=encodeURIComponent,e=document.title,d=a.open(\'' . OCP\Util::linkToAbsolute('bookmarks', 'addBm.php') . '?output=popup&url=\'+c(b.location)+\'&title=\'+e,\'bkmk_popup\',\'left=\'+((a.screenX||a.screenLeft)+10)+\',top=\'+((a.screenY||a.screenTop)+10)+\',height=400px,width=550px,resizable=1,alwaysRaised=1\');a.setTimeout(function(){d.focus()},300);})();">'
|
||||
. $l->t('Read later') . '</a>';
|
||||
}
|
||||
|
||||
@ -31,6 +31,17 @@
|
||||
<ul class="tag_list">
|
||||
</ul>
|
||||
|
||||
|
||||
<div id="bookmark_settings">
|
||||
<ul class="controls">
|
||||
<li style="float: right">
|
||||
<button id="settingsbtn" title="<?php echo $l->t('Settings'); ?>">
|
||||
<img class="svg" src="<?php echo OCP\Util::imagePath('core', 'actions/settings.png'); ?>"
|
||||
alt="<?php echo $l->t('Settings'); ?>" /></button>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div id="rightcontent" class="rightcontent">
|
||||
<div class="bookmarks_list"></div>
|
||||
@ -41,6 +52,7 @@
|
||||
require_once OC_App::getAppPath('bookmarks') .'/templates/bookmarklet.php' ;
|
||||
createBookmarklet();
|
||||
?>
|
||||
<div id="appsettings" class="popup bottomleft hidden"></div>
|
||||
</div>
|
||||
<script>
|
||||
var fullTags = <?php echo $_['tags'];?>;
|
||||
|
||||
@ -6,29 +6,29 @@
|
||||
* See the COPYING-README file.
|
||||
*/
|
||||
?>
|
||||
<form id="bookmarks">
|
||||
<fieldset class="personalblock">
|
||||
<span class="bold"><?php echo $l->t('Bookmarklet <br />');?></span>
|
||||
<?php
|
||||
require_once 'bookmarklet.php';
|
||||
createBookmarklet();
|
||||
?>
|
||||
</fieldset>
|
||||
</form>
|
||||
|
||||
<form id="import_bookmark" action="#" method="post" enctype="multipart/form-data">
|
||||
<fieldset class="personalblock">
|
||||
<legend><strong><?php echo $l->t('Bookmarklet <br />');?></strong></legend>
|
||||
<?php
|
||||
require_once 'bookmarklet.php';
|
||||
createBookmarklet();
|
||||
?>
|
||||
</fieldset>
|
||||
|
||||
<form id="import_bookmark" action="<?php echo OCP\Util::linkTo( "bookmarks", "ajax/import.php" );?>"
|
||||
method="post" enctype="multipart/form-data">
|
||||
<fieldset class="personalblock">
|
||||
<?php if(isset($_['error'])): ?>
|
||||
<h3><?php echo $_['error']['error']; ?></h3>
|
||||
<p><?php echo $_['error']['hint']; ?></p>
|
||||
<?php endif; ?>
|
||||
|
||||
<legend><strong><?php echo $l->t('Import bookmarks');?></strong></legend>
|
||||
<p><input type="file" id="bm_import" name="bm_import" style="width:280px;">
|
||||
<label for="bm_import"> <?php echo $l->t('Bookmark html file');?></label>
|
||||
</p>
|
||||
<input type="submit" name="bm_import" value="<?php echo $l->t('Import'); ?>" />
|
||||
|
||||
<legend><strong><?php echo $l->t('Import bookmarks');?></strong></legend>
|
||||
<p><input type="file" id="bm_import" name="bm_import" style="width:280px;">
|
||||
<label for="bm_import"> <?php echo $l->t('html bookmarks file');?></label>
|
||||
</p>
|
||||
<input type="button" name="bm_import_btn" id="bm_import_submit" value="<?php echo $l->t('Import'); ?>" />
|
||||
<div id="upload"></div>
|
||||
|
||||
<legend><strong><?php echo $l->t('Export bookmarks');?></strong></legend>
|
||||
<p><a href="<?php echo OCP\Util::linkTo('bookmarks', 'export.php') ;?>"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user