Browse Source

Merge remote-tracking branch 'origin/master'

cek 8 years ago
parent
commit
4e662731d5

+ 13 - 0
Doc

@@ -19,3 +19,16 @@ 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)
+
+
+todo:
+in ricerche: escludi cartelle, se medatype:null: anche folderjail se serve
+

+ 16 - 3
app/index.html

@@ -36,7 +36,7 @@
     <div class="container">
         <header>
             <h1>App Generated <small>with the html5 app generator</small></h1>
-            <p>Now go develop</p>
+            <p>Example of the widget embed</p>
         </header>
     </div>
     <!-- build:js scripts/vendor.js -->
@@ -49,7 +49,20 @@
     <!-- endbuild -->
 
     <script src="scripts/arkiwi.js"></script>
-    <script src="scripts/main.js"></script>
-</body>
+    
+</body><div class="container">
+<p>Iframe list items con id:
+<pre>iframe class="embed" data-arkiwi-id="title:hack" height="400px" width="99%" frameBorder='1' seamless='seamless' src="./wdg_list_item_id.html"</pre>
+</p>
+<iframe class="embed" name="arkiwi" data-arkiwi-id="title:hack" height="400px" width="99%" frameBorder='1' seamless='seamless' src="./wdg_list_item_id.html"></iframe>
 <div class="container-fluid" id="list" ><div class="row"></div></div>
+
+
+<p>Iframe  list items viz Arkiwi home page:
+<pre>iframe class="embed" height="400px" width="400px" frameBorder='1' seamless='seamless' src="./wdg_list_item_home.html"</pre>
+</p>
+<iframe class="embed" data-id="title:hack" height="400px" width="99%" frameBorder='1' seamless='seamless' src="./wdg_list_item_home.html"></iframe>
+<div class="container-fluid" id="list" ><div class="row"></div></div>
+
+</div> <!--container-->
 </html>

+ 17 - 3
app/index.html~

@@ -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 -->
 
@@ -45,7 +46,7 @@
     <div class="container">
         <header>
             <h1>App Generated <small>with the html5 app generator</small></h1>
-            <p>Now go develop</p>
+            <p>Example of the widget embed</p>
         </header>
     </div>
     <!-- build:js scripts/vendor.js -->
@@ -58,7 +59,20 @@
     <!-- endbuild -->
 
     <script src="scripts/arkiwi.js"></script>
-    <script src="scripts/main.js"></script>
-</body>
+    
+</body><div class="container">
+<p>Iframe list items con id:
+<pre>iframe class="embed" data-arkiwi-id="hack" height="400px" width="99%" frameBorder='1' seamless='seamless' src="./wdg_list_item_id.html"</pre>
+</p>
+<iframe class="embed" name="arkiwi" data-arkiwi-id="title:hack" height="400px" width="99%" frameBorder='1' seamless='seamless' src="./wdg_list_item_id.html"></iframe>
 <div class="container-fluid" id="list" ><div class="row"></div></div>
+
+
+<p>Iframe  list items viz Arkiwi home page:
+<pre>iframe class="embed" height="400px" width="400px" frameBorder='1' seamless='seamless' src="./wdg_list_item_home.html"</pre>
+</p>
+<iframe class="embed" data-id="title:hack" height="400px" width="99%" frameBorder='1' seamless='seamless' src="./wdg_list_item_home.html"></iframe>
+<div class="container-fluid" id="list" ><div class="row"></div></div>
+
+</div> <!--container-->
 </html>

+ 1 - 1
app/scripts/main.js → app/scripts/main_list_item_home.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_home.txt", function (template) {
 
         arkiwi.path("XM24/Occupy_Mordor", function (listone) {
             var dioporco = Mustache.render(template, listone);

+ 51 - 0
app/scripts/main_list_item_id.js

@@ -0,0 +1,51 @@
+/*------------------------------------------------------------------------------------------------------------------------
+ @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 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) {
+
+        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);
+
+    });
+
+	   $.get("templates/list_item_id.txt", function (template) {
+		   
+    arkiwi.search(iframe_id, function (result) {
+        console.log('Lettura cartella...');
+        console.log(result);
+		var pappone =   Mustache.render(template, result);
+		//console.log(pappone);
+            $(".row").append(pappone);
+    });
+	   });
+		   
+});

+ 19 - 2
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%;
+}
 }

+ 7 - 8
app/templates/list.txt~

@@ -1,23 +1,22 @@
 {{#items}}
-
   <div class="col-sm-6 col-md-4">
     <div class="thumbnail">
 <h3><a href='/hack/path64/{{item.URI}}/'>{{item.title}}</a></h3>
 <h4>{{#item.creator}}</h4><small>by: <i>{{item.creator}}</i></small>{{/item.creator}}
       <img src="..." alt="...">
 {{#item.player}}
-<p><iframe style="display:none;" frameBorder='0' seamless='seamless' width='{{width}}' height='{{height}}' src='{{url}}'></iframe></p>
+<iframe class="embed-iframe" frameBorder='0' seamless='seamless'  src='{{url}}'></iframe>
 {{/item.player}}
       <div class="caption">
         <p><i>{{item.description}}</i></p>
-        <p><a href="#" class="btn btn-primary" role="button">Button</a> <a href="#" class="btn btn-default" role="button">Button</a></p>
+        <p>
+<a href='/hack/path64/{{item.URI}}/' role="button" class="btn btn-primary">
+<img title="Download" alt="[Download]" src="http://arkiwi.org/arav_icons/download_icon.png">
+</a>
+<a href="#"  >Button</a>
+<a href="#" class="btn btn-default" role="button">Button</a></p>
       </div>
     </div>
   </div>
 
-
-
-
-
-
 {{/items}}

+ 1 - 3
app/templates/list.txt → app/templates/list_item_home.txt

@@ -10,11 +10,9 @@
       <div class="caption">
         <p><i>{{item.description}}</i></p>
         <p>
-<a href='/hack/path64/{{item.URI}}/' role="button" class="btn btn-primary">
+<a href='/hack/path64/{{item.URI}}/' >
 <img title="Download" alt="[Download]" src="http://arkiwi.org/arav_icons/download_icon.png">
 </a>
-<a href="#"  >Button</a>
-<a href="#" class="btn btn-default" role="button">Button</a></p>
       </div>
     </div>
   </div>

+ 26 - 0
app/templates/list_item_id.txt

@@ -0,0 +1,26 @@
+{{#items}}
+  <div class="col-xs-6 col-sm-3">
+    <div class="thumbnail">
+<h4>{{#item.title}}<small><b>{{item.title}}</b></small></h4>{{/item.title}}
+{{#item.player}}
+ <audio controls>
+  <source src="http://storage.arkiwi.org/{{item.identifier}}" type="audio/ogg">
+  <source src="#" type="audio/mpeg">
+Your browser does not support the audio element.
+</audio> 
+{{/item.player}}
+
+<h4>{{#item.creator}}</h4><small>Creato da: <i>{{item.creator}}</i></small>{{/item.creator}}
+
+      <div class="caption">
+        <p><i>{{item.description}}</i></p>
+        <div class="tools">
+<a target="_blank" href='http://storage.arkiwi.org/{{item.identifier}}' download>
+<img title="Download" alt="[Download]" src="http://arkiwi.org/arav_icons/download_icon.png">
+</a>
+</div>
+      </div>
+    </div>
+  </div>
+
+{{/items}}

+ 60 - 0
app/wdg_list_item_home.html

@@ -0,0 +1,60 @@
+<!doctype html>
+<!--[if lt IE 7]>
+<html class = "no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
+<!--[if IE 7]>
+<html class = "no-js lt-ie9 lt-ie8"> <![endif]-->
+<!--[if IE 8]>
+<html class = "no-js lt-ie9"> <![endif]-->
+<!--[if gt IE 8]><!-->
+<html class="no-js">
+<!--<![endif]-->
+
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <title>arkiwiJsBoilerplate</title>
+    <meta name="description" content="Arkiwi JS Boilerplate">
+    <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
+    <!-- build:css styles/vendor.css -->
+    <!-- bower:css -->
+    <!-- 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 -->
+
+
+<!-- Latest compiled and minified CSS -->
+<!--<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">-->
+
+<!-- Optional theme -->
+<!--<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css">-->
+
+<!-- Latest compiled and minified JavaScript -->
+<!--<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>-->
+</head>
+
+<body>
+    <!--[if lt IE 10]>
+        <p class = "browsehappy">You are using an <strong>outdated</strong> browser. Please
+            <a href = "http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
+        <![endif]-->
+
+ 
+    <!-- build:js scripts/vendor.js -->
+    <!-- bower:js -->
+    <script src="bower_components/jquery/dist/jquery.js"></script>
+    <script src="bower_components/mustache/mustache.js"></script>
+    <script src="bower_components/bower-parseuri/parseuri.js"></script>
+    <script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
+    <!-- endbower -->
+    <!-- endbuild -->
+
+    <script src="scripts/arkiwi.js"></script>
+    <script src="scripts/main_list_item_home.js"></script>
+</body>
+<div class="container-fluid" id="list" ><div class="row"></div></div>
+</html>

+ 61 - 0
app/wdg_list_item_id.html

@@ -0,0 +1,61 @@
+<!doctype html>
+<!--[if lt IE 7]>
+<html class = "no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
+<!--[if IE 7]>
+<html class = "no-js lt-ie9 lt-ie8"> <![endif]-->
+<!--[if IE 8]>
+<html class = "no-js lt-ie9"> <![endif]-->
+<!--[if gt IE 8]><!-->
+<html class="no-js">
+<!--<![endif]-->
+
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <title>arkiwiJsBoilerplate</title>
+    <meta name="description" content="Arkiwi JS Boilerplate">
+    <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
+    <!-- build:css styles/vendor.css -->
+    <!-- bower:css -->
+    <!-- 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 -->
+
+
+<!-- Latest compiled and minified CSS -->
+<!--<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">-->
+
+<!-- Optional theme -->
+<!--<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css">-->
+
+<!-- Latest compiled and minified JavaScript -->
+<!--<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>-->
+</head>
+
+<body>
+    <!--[if lt IE 10]>
+        <p class = "browsehappy">You are using an <strong>outdated</strong> browser. Please
+            <a href = "http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
+        <![endif]-->
+
+ 
+    <!-- build:js scripts/vendor.js -->
+    <!-- bower:js -->
+    <script src="bower_components/jquery/dist/jquery.js"></script>
+    <script src="bower_components/mustache/mustache.js"></script>
+    <script src="bower_components/bower-parseuri/parseuri.js"></script>
+    <script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
+    <!-- endbower -->
+    <!-- endbuild -->
+
+    <script src="scripts/arkiwi.js"></script>
+    <script src="scripts/main_list_item_id.js"></script>
+</body>
+<div class="container-fluid" id="list" ><div class="row"></div></div>
+
+</html>