From e08466526b0050287668a8f1bf7997470ff6877b Mon Sep 17 00:00:00 2001 From: cri Date: Sat, 12 Sep 2015 21:27:53 +0200 Subject: [PATCH 1/8] scritta html --- app/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/index.html b/app/index.html index b94d91c..cfc507b 100644 --- a/app/index.html +++ b/app/index.html @@ -46,7 +46,7 @@

App Generated with the html5 app generator

-

Now go develop

+

Example of the page Occupy Mordor

From 2f16eddcd812d633d224e93460330eaeec2b2cd5 Mon Sep 17 00:00:00 2001 From: cri Date: Sat, 12 Sep 2015 22:28:42 +0200 Subject: [PATCH 2/8] new html page for the widgets --- app/index.html | 19 ++++++++++-- app/wdg_list_item_home.html | 60 +++++++++++++++++++++++++++++++++++++ app/wdg_list_item_id.html | 60 +++++++++++++++++++++++++++++++++++++ 3 files changed, 136 insertions(+), 3 deletions(-) create mode 100644 app/wdg_list_item_home.html create mode 100644 app/wdg_list_item_id.html diff --git a/app/index.html b/app/index.html index cfc507b..3cfa1b7 100644 --- a/app/index.html +++ b/app/index.html @@ -46,7 +46,7 @@

App Generated with the html5 app generator

-

Example of the page Occupy Mordor

+

Example of the widget embed

@@ -59,7 +59,20 @@ - - + +
+

Iframe list items con id: +

iframe class="embed" data-id="42" height="400px" width="99%" frameBorder='1' seamless='seamless' src="./wdg_list_item_id.html"
+

+
+ + +

Iframe list items viz Arkiwi home page: +

iframe class="embed" height="400px" width="99%" frameBorder='1' seamless='seamless' src="./wdg_list_item_home.html"
+

+ +
+ +
diff --git a/app/wdg_list_item_home.html b/app/wdg_list_item_home.html new file mode 100644 index 0000000..c4222a2 --- /dev/null +++ b/app/wdg_list_item_home.html @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + arkiwiJsBoilerplate + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ diff --git a/app/wdg_list_item_id.html b/app/wdg_list_item_id.html new file mode 100644 index 0000000..36bf6db --- /dev/null +++ b/app/wdg_list_item_id.html @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + arkiwiJsBoilerplate + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ From 1b09675301a9b7f5ef675dfb33a0e4af7e389275 Mon Sep 17 00:00:00 2001 From: cri Date: Sat, 12 Sep 2015 22:29:38 +0200 Subject: [PATCH 3/8] add js for the widg --- app/scripts/main_list_item_home.js | 37 +++++++++++++++++++ app/scripts/{main.js => main_list_item_id.js} | 2 +- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 app/scripts/main_list_item_home.js rename app/scripts/{main.js => main_list_item_id.js} (95%) diff --git a/app/scripts/main_list_item_home.js b/app/scripts/main_list_item_home.js new file mode 100644 index 0000000..fcdc817 --- /dev/null +++ b/app/scripts/main_list_item_home.js @@ -0,0 +1,37 @@ +/*------------------------------------------------------------------------------------------------------------------------ + @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', 'http://upload.arkiwi.org'); + $.get("templates/list_item_home.txt", function (template) { + + arkiwi.path("XM24/Occupy_Mordor", function (listone) { + var dioporco = Mustache.render(template, listone); + $(".row").append(dioporco); + }, true); + + + }); + + arkiwi.search('Ampioraggio', function (result) { + console.log('Ricerca...'); + console.log(result); + + }); + + arkiwi.path('XM24/Occupy_Mordor', function (result) { + console.log('Lettura cartella...'); + console.log(result); + }, true); +}); diff --git a/app/scripts/main.js b/app/scripts/main_list_item_id.js similarity index 95% rename from app/scripts/main.js rename to app/scripts/main_list_item_id.js index 0ac98e1..25cebd2 100644 --- a/app/scripts/main.js +++ b/app/scripts/main_list_item_id.js @@ -14,7 +14,7 @@ --------------------------------------------------------------------------------------------------------------------- */ $(document).ready(function () { var arkiwi = new ARKIWI.Arkiwi('http://www.arkiwi.org', 'http://upload.arkiwi.org'); - $.get("templates/list.txt", function (template) { + $.get("templates/list_item_id.txt", function (template) { arkiwi.path("XM24/Occupy_Mordor", function (listone) { var dioporco = Mustache.render(template, listone); From fb9a51ca1a8ce2818b6132f2587b74fd21223490 Mon Sep 17 00:00:00 2001 From: cri Date: Sat, 12 Sep 2015 22:31:17 +0200 Subject: [PATCH 4/8] add template of mustache for wdg --- app/templates/list_item_home.txt | 20 ++++++++++++++++++++ app/templates/list_item_id.txt | 18 ++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 app/templates/list_item_home.txt create mode 100644 app/templates/list_item_id.txt diff --git a/app/templates/list_item_home.txt b/app/templates/list_item_home.txt new file mode 100644 index 0000000..e4771b0 --- /dev/null +++ b/app/templates/list_item_home.txt @@ -0,0 +1,20 @@ +{{#items}} +
+
+

{{item.title}}

+

{{#item.creator}}

by: {{item.creator}}{{/item.creator}} + ... +{{#item.player}} + +{{/item.player}} +
+

{{item.description}}

+

+ +[Download] + +

+
+
+ +{{/items}} diff --git a/app/templates/list_item_id.txt b/app/templates/list_item_id.txt new file mode 100644 index 0000000..44d7c69 --- /dev/null +++ b/app/templates/list_item_id.txt @@ -0,0 +1,18 @@ +{{#items}} +
+
+

{{#item.creator}}

by: {{item.creator}}{{/item.creator}} +{{#item.player}} + +{{/item.player}} +
+

{{item.description}}

+

+ +[Download] + +

+
+
+ +{{/items}} From 2b5f0e063b9c4fe2d69237ea5dfb1945b1570af1 Mon Sep 17 00:00:00 2001 From: cri Date: Sat, 12 Sep 2015 22:32:15 +0200 Subject: [PATCH 5/8] widg explain --- Doc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Doc b/Doc index aa13e13..99b7482 100644 --- a/Doc +++ b/Doc @@ -19,3 +19,12 @@ Cose da interfacciare: - il visualizza metadati - il carica un file, scrivi i metadati online + +widget/pagine differenti + + visualizzazione lista da id(senza login) wdg_list_item_id.html + visualizzazione lista con ricerca(senza login) wdg_list_item_search.html + upload e modifica metadati + ricerca e ricerca avanzata/visualizzazione risposte + visualizzazione singola (senza login) + From a40ac5ca4ccc879dba230efe2a66d68f5d561d46 Mon Sep 17 00:00:00 2001 From: cri Date: Sun, 13 Sep 2015 00:21:01 +0200 Subject: [PATCH 6/8] wdg list item id works --- Doc | 4 ++++ app/index.html | 6 +++--- app/index.html~ | 20 +++++++++++++++++--- app/scripts/main_list_item_id.js | 21 +++++++++++++++++---- app/styles/main.css | 21 +++++++++++++++++++-- app/templates/list.txt | 22 ---------------------- app/templates/list.txt~ | 15 +++++++-------- app/templates/list_item_id.txt | 14 ++++++++++---- app/wdg_list_item_id.html | 1 + 9 files changed, 78 insertions(+), 46 deletions(-) delete mode 100644 app/templates/list.txt diff --git a/Doc b/Doc index 99b7482..2b2c999 100644 --- a/Doc +++ b/Doc @@ -28,3 +28,7 @@ widget/pagine differenti ricerca e ricerca avanzata/visualizzazione risposte visualizzazione singola (senza login) + +todo: +in ricerche: escludi cartelle, se medatype:null + diff --git a/app/index.html b/app/index.html index 3cfa1b7..e45b7e0 100644 --- a/app/index.html +++ b/app/index.html @@ -62,14 +62,14 @@

Iframe list items con id: -

iframe class="embed" data-id="42" height="400px" width="99%" frameBorder='1' seamless='seamless' src="./wdg_list_item_id.html"
+
iframe class="embed" data-arkiwi-id="hack" height="400px" width="99%" frameBorder='1' seamless='seamless' src="./wdg_list_item_id.html"

- +

Iframe list items viz Arkiwi home page: -

iframe class="embed" height="400px" width="99%" frameBorder='1' seamless='seamless' src="./wdg_list_item_home.html"
+
iframe class="embed" height="400px" width="400px" frameBorder='1' seamless='seamless' src="./wdg_list_item_home.html"

diff --git a/app/index.html~ b/app/index.html~ index faf768d..9dbebd8 100644 --- a/app/index.html~ +++ b/app/index.html~ @@ -22,6 +22,7 @@ + @@ -45,7 +46,7 @@

App Generated with the html5 app generator

-

Now go develop

+

Example of the widget embed

@@ -58,7 +59,20 @@ - - + +
+

Iframe list items con id: +

iframe class="embed" data-arkiwi-id="hack" height="400px" width="99%" frameBorder='1' seamless='seamless' src="./wdg_list_item_id.html"
+

+
+ + +

Iframe list items viz Arkiwi home page: +

iframe class="embed" height="400px" width="400px" frameBorder='1' seamless='seamless' src="./wdg_list_item_home.html"
+

+ +
+ +
diff --git a/app/scripts/main_list_item_id.js b/app/scripts/main_list_item_id.js index 25cebd2..3705244 100644 --- a/app/scripts/main_list_item_id.js +++ b/app/scripts/main_list_item_id.js @@ -13,8 +13,14 @@ This file is the main entry point for js on the arkiwiJsBoilerplate app. --------------------------------------------------------------------------------------------------------------------- */ $(document).ready(function () { + + var iframe_id = $(window.frameElement).attr("data-arkiwi-id"); + console.log(iframe_id); + + + var arkiwi = new ARKIWI.Arkiwi('http://www.arkiwi.org', 'http://upload.arkiwi.org'); - $.get("templates/list_item_id.txt", function (template) { + /* $.get("templates/list_item_id.txt", function (template) { arkiwi.path("XM24/Occupy_Mordor", function (listone) { var dioporco = Mustache.render(template, listone); @@ -22,7 +28,7 @@ $(document).ready(function () { }, true); - }); + });*/ arkiwi.search('Ampioraggio', function (result) { console.log('Ricerca...'); @@ -30,8 +36,15 @@ $(document).ready(function () { }); - arkiwi.path('XM24/Occupy_Mordor', function (result) { + $.get("templates/list_item_id.txt", function (template) { + + arkiwi.search(iframe_id, function (result) { console.log('Lettura cartella...'); console.log(result); - }, true); + var pappone = Mustache.render(template, result); + console.log(pappone); + $(".row").append(pappone); + }); + }); + }); diff --git a/app/styles/main.css b/app/styles/main.css index a64ca3c..e93aca8 100644 --- a/app/styles/main.css +++ b/app/styles/main.css @@ -19,12 +19,29 @@ http://paletton.com/#uid=70f0u0ksXsOhL-cmHuduim--whE width:100%; min-width:100%; height:auto; +resize: both; +overflow: auto; } audio { background-color: #E65116 !important; border-radius: 6px; height: 35px; - opacity: 1; - z-index: 99; + width:100%; + +} +.tools a img { + width: 30px; +} +/*correzioni alle merde di bootstrapt*/ +/*media query aggiuntive*/ +@media (max-width: 660px) { + .col-xs-6 { + width: 49.9%; +} +} +@media (max-width: 460px) { + .col-xs-6 { + width: 99%; +} } \ No newline at end of file diff --git a/app/templates/list.txt b/app/templates/list.txt deleted file mode 100644 index 118f207..0000000 --- a/app/templates/list.txt +++ /dev/null @@ -1,22 +0,0 @@ -{{#items}} -
-
-

{{item.title}}

-

{{#item.creator}}

by: {{item.creator}}{{/item.creator}} - ... -{{#item.player}} - -{{/item.player}} -
-

{{item.description}}

-

- -[Download] - -Button -Button

-
-
-
- -{{/items}} diff --git a/app/templates/list.txt~ b/app/templates/list.txt~ index 167996a..118f207 100644 --- a/app/templates/list.txt~ +++ b/app/templates/list.txt~ @@ -1,23 +1,22 @@ {{#items}} -

{{item.title}}

{{#item.creator}}

by: {{item.creator}}{{/item.creator}} ... {{#item.player}} -

+ {{/item.player}}

{{item.description}}

-

Button Button

+

+ +[Download] + +Button +Button

- - - - - {{/items}} diff --git a/app/templates/list_item_id.txt b/app/templates/list_item_id.txt index 44d7c69..0618b07 100644 --- a/app/templates/list_item_id.txt +++ b/app/templates/list_item_id.txt @@ -1,16 +1,22 @@ {{#items}} -
+
-

{{#item.creator}}

by: {{item.creator}}{{/item.creator}} +

{{#item.title}}{{item.title}}

{{/item.title}} {{#item.player}} - + +

{{#item.creator}}

Creato da: {{item.creator}}{{/item.creator}} {{/item.player}}

{{item.description}}

-

+

[Download] +
diff --git a/app/wdg_list_item_id.html b/app/wdg_list_item_id.html index 36bf6db..d63adb7 100644 --- a/app/wdg_list_item_id.html +++ b/app/wdg_list_item_id.html @@ -57,4 +57,5 @@
+ From cdd999114ca5ac003061196f934100e532945985 Mon Sep 17 00:00:00 2001 From: cri Date: Sun, 13 Sep 2015 01:03:33 +0200 Subject: [PATCH 7/8] viz da search --- Doc | 2 +- app/index.html | 2 +- app/index.html~ | 2 +- app/scripts/main_list_item_id.js | 8 ++++---- app/templates/list_item_id.txt | 6 ++++-- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Doc b/Doc index 2b2c999..0478be3 100644 --- a/Doc +++ b/Doc @@ -30,5 +30,5 @@ widget/pagine differenti todo: -in ricerche: escludi cartelle, se medatype:null +in ricerche: escludi cartelle, se medatype:null: anche folderjail se serve diff --git a/app/index.html b/app/index.html index e45b7e0..df905d1 100644 --- a/app/index.html +++ b/app/index.html @@ -62,7 +62,7 @@

Iframe list items con id: -

iframe class="embed" data-arkiwi-id="hack" height="400px" width="99%" frameBorder='1' seamless='seamless' src="./wdg_list_item_id.html"
+
iframe class="embed" data-arkiwi-id="title:hack" height="400px" width="99%" frameBorder='1' seamless='seamless' src="./wdg_list_item_id.html"

diff --git a/app/index.html~ b/app/index.html~ index 9dbebd8..e45b7e0 100644 --- a/app/index.html~ +++ b/app/index.html~ @@ -64,7 +64,7 @@

Iframe list items con id: 

iframe class="embed" data-arkiwi-id="hack" height="400px" width="99%" frameBorder='1' seamless='seamless' src="./wdg_list_item_id.html"

- +
diff --git a/app/scripts/main_list_item_id.js b/app/scripts/main_list_item_id.js index 3705244..bf44254 100644 --- a/app/scripts/main_list_item_id.js +++ b/app/scripts/main_list_item_id.js @@ -15,7 +15,7 @@ $(document).ready(function () { var iframe_id = $(window.frameElement).attr("data-arkiwi-id"); - console.log(iframe_id); + //console.log(iframe_id); @@ -31,8 +31,8 @@ $(document).ready(function () { });*/ arkiwi.search('Ampioraggio', function (result) { - console.log('Ricerca...'); - console.log(result); + // console.log('Ricerca...'); + // console.log(result); }); @@ -42,7 +42,7 @@ $(document).ready(function () { console.log('Lettura cartella...'); console.log(result); var pappone = Mustache.render(template, result); - console.log(pappone); + //console.log(pappone); $(".row").append(pappone); }); }); diff --git a/app/templates/list_item_id.txt b/app/templates/list_item_id.txt index 0618b07..4737548 100644 --- a/app/templates/list_item_id.txt +++ b/app/templates/list_item_id.txt @@ -1,15 +1,17 @@ {{#items}}
-

{{#item.title}}{{item.title}}

{{/item.title}} +

{{#item.title}}{{item.title}}

{{/item.title}} {{#item.player}} -

{{#item.creator}}

Creato da: {{item.creator}}{{/item.creator}} {{/item.player}} + +

{{#item.creator}}

Creato da: {{item.creator}}{{/item.creator}} +

{{item.description}}

From b93523d9a5c6e49fa89c730ac1292ada6d10e971 Mon Sep 17 00:00:00 2001 From: cri Date: Sun, 13 Sep 2015 01:07:30 +0200 Subject: [PATCH 8/8] add data-type --- app/scripts/main_list_item_id.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/scripts/main_list_item_id.js b/app/scripts/main_list_item_id.js index bf44254..32b7e2b 100644 --- a/app/scripts/main_list_item_id.js +++ b/app/scripts/main_list_item_id.js @@ -16,8 +16,9 @@ $(document).ready(function () { var iframe_id = $(window.frameElement).attr("data-arkiwi-id"); //console.log(iframe_id); - - + var iframe_type = "audio" + var iframe_type = $(window.frameElement).attr("data-arkiwi-type"); + console.log(iframe_type); var arkiwi = new ARKIWI.Arkiwi('http://www.arkiwi.org', 'http://upload.arkiwi.org'); /* $.get("templates/list_item_id.txt", function (template) {