Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/arkiwi.js
This commit is contained in:
cek 2015-09-12 19:53:34 +02:00
commit 66eb61e305
5 changed files with 75 additions and 68 deletions

11
.gitignore vendored
View file

@ -1,3 +1,14 @@
# ignore all bin directories
# matches "bin" in any subfolder
bin/
# ignore all target directories
target/
# ignore all files ending with ~
*~
.tmp
bower_components
node_modules

21
Doc Normal file
View file

@ -0,0 +1,21 @@
to do:
-schermata base dei file: audio e video e.. testo?
-create, comando per creare una sessione (che quindi fa parlare il cliente con l'access store)
-upload, invia un file all'access store
-metadata, crea o sovrascrive un metadata sull'AS [non va]
-removemetadata, cancella un metadatato dall' AS [non va]
-close, comando per chidere la sessione col server
-path, chiede all'aggregatore i metadati di un fileo cartella
-search, esegue una ricerca sull'aggregatore (pagliaio>>aggregatore)
#cercare nel codice ii commenti del cek
Cose da interfacciare:
- la ricerca
- il modifica metadati
- il visualizza metadati
- il carica un file, scrivi i metadati online

View file

@ -22,6 +22,7 @@
<!-- endbower -->
<!-- endbuild -->
<!-- build:css(.tmp) styles/main.css -->
<link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.css">
<link rel="stylesheet" href="styles/main.css">
<!-- endbuild -->

View file

@ -1,36 +1,44 @@
/*------------------------------------------------------------------------------------------------------------------------
@package: arkiwiJsBoilerplate
@author: cek
@www: arkiwi.oeg
@copyright: COPYRIGHT 18 cek
@license: MIT
=============================================================================
Filename: main.js
=============================================================================
This file is the main entry point for js on the arkiwiJsBoilerplate app.
--------------------------------------------------------------------------------------------------------------------- */
$(document).ready(function () {
var arkiwi = new ARKIWI.Arkiwi('http://www.arkiwi.org');
$.get("templates/list.txt", function (template) {
arkiwi.path("XM24", function (listone) {
var dioporco = Mustache.render(template, listone);
/*------------------------------------------------------------------------------------------------------------------------
@package: arkiwiJsBoilerplate
@author: cek
@www: arkiwi.oeg
@copyright: COPYRIGHT 18 cek
@license: MIT
=============================================================================
Filename: main.js
=============================================================================
This file is the main entry point for js on the arkiwiJsBoilerplate app.
--------------------------------------------------------------------------------------------------------------------- */
$(document).ready(function () {
var arkiwi = new ARKIWI.Arkiwi('http://www.arkiwi.org');
$.get("templates/list.txt", function (template) {
arkiwi.path("XM24", function (listone) {
var dioporco = Mustache.render(template, listone);
$(".row").append(dioporco);
},true);
});
var arkiwi = new ARKIWI.Arkiwi('http://www.arkiwi.org');
arkiwi.search('Ampioraggio', function (result) {
console.log('Ricerca...');
console.log(result);
});
arkiwi.path('XM24', function (result) {
console.log('Lettura cartella...');
console.log(result);
}, true);
});
});
arkiwi.search('Ampioraggio', function (result) {
console.log('Ricerca...');
console.log(result);
});
arkiwi.path('XM24', function (result) {
console.log('Lettura cartella...');
console.log(result);
}, true);
});

View file

@ -1,34 +0,0 @@
/*------------------------------------------------------------------------------------------------------------------------
@package: arkiwiJsBoilerplate
@author: cek
@www: arkiwi.oeg
@copyright: COPYRIGHT 18 cek
@license: MIT
=============================================================================
Filename: main.js
=============================================================================
This file is the main entry point for js on the arkiwiJsBoilerplate app.
--------------------------------------------------------------------------------------------------------------------- */
$(document).ready(function () {
var arkiwi = new ARKIWI.Arkiwi('http://www.arkiwi.org');
$.get("templates/list.txt", function (template) {
arkiwi.path("XM24", function (listone) {
var dioporco = Mustache.render(template, listone);
});
});
var arkiwi = new ARKIWI.Arkiwi('http://www.arkiwi.org');
arkiwi.search('Ampioraggio', function (result) {
console.log('Ricerca...');
console.log(result);
});
arkiwi.path('XM24', function (result) {
console.log('Lettura cartella...');
console.log(result);
}, true);
});