Home Explore Help
Register Sign In
kiki
/
arkiwi_boilerplate
0
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/arkiwi.js
	app/scripts/main.js
cek 8 years ago
parent
0b813f899f f6e082a268
commit
c79b67144a
4 changed files with 113 additions and 96 deletions
Split View Show Diff Stats
  1. 64 63
      app/index.html~
  2. 7 14
      app/scripts/main.js
  3. 30 14
      app/styles/main.css
  4. 12 5
      app/templates/list.txt

+ 64 - 63
app/index.html~
View File 

@@ -1,63 +1,64 @@
 
-<!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="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]-->

-

-    <div class="container">

-        <header>

-            <h1>App Generated <small>with the html5 app generator</small></h1>

-            <p>Now go develop</p>

-        </header>

-    </div>

-    <!-- 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>

-    <!-- endbower -->

-    <!-- endbuild -->

-

-    <script src="scripts/arkiwi.js"></script>

-    <script src="scripts/main.js"></script>

-</body>

-<div class="container-fluid" id="list" ><div class="row"></div></div>

-</html>

+<!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="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]-->
 
+
 
+    <div class="container">
 
+        <header>
 
+            <h1>App Generated <small>with the html5 app generator</small></h1>
 
+            <p>Now go develop</p>
 
+        </header>
 
+    </div>
 
+    <!-- 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.js"></script>
 
+</body>
 
+<div class="container-fluid" id="list" ><div class="row"></div></div>
 
+</html>

+ 7 - 14
app/scripts/main.js
View File 

@@ -16,28 +16,21 @@ $(document).ready(function () {
 
     var arkiwi = new ARKIWI.Arkiwi('http://www.arkiwi.org', 'http://upload.arkiwi.org');
 
     $.get("templates/list.txt", function (template) {
 
 
-    arkiwi.path("XM24", function (listone) {
 
-    var dioporco = Mustache.render(template, listone);
 
-    $(".row").append(dioporco);
 
-    },true);
 
-
 
-
 
-
 
-});
 
-
 
-
 
-
 
-
 
+        arkiwi.path("XM24/Occupy_Mordor", function (listone) {
 
+            var dioporco = Mustache.render(template, listone);
 
+            $(".row").append(dioporco);
 
+        }, true);
 
 
 
+    });
 
 
-arkiwi.search('Ampioraggio', function (result) {
 
+    arkiwi.search('Ampioraggio', function (result) {
 
         console.log('Ricerca...');
 
         console.log(result);
 
 
     });
 
 
-    arkiwi.path('XM24', function (result) {
 
+    arkiwi.path('XM24/Occupy_Mordor', function (result) {
 
         console.log('Lettura cartella...');
 
         console.log(result);
 
     }, true);

+ 30 - 14
app/styles/main.css
View File 

@@ -1,14 +1,30 @@
 
-/*------------------------------------------------------------------------------------------------------------------------

- @package: arkiwiJsBoilerplate

-

- @author: cek

- @www: arkiwi.oeg

-

- @copyright: COPYRIGHT 18 cek

- @license: MIT

-

- =============================================================================

- Filename: main.css

- =============================================================================

- This file is responsible for all styles on the arkiwiJsBoilerplate app.

- --------------------------------------------------------------------------------------------------------------------- */
 
+/*------------------------------------------------------------------------------------------------------------------------
 
+ @package: arkiwiJsBoilerplate
 
+
 
+ @author: cris
 
+ @www: arkiwi.oeg
 
+
 
+ @copyright: COPYRIGHT 18 cek
 
+ @license: MIT
 
+
 
+ =============================================================================
 
+ Filename: main.css
 
+ =============================================================================
 
+ This file is responsible for all styles on the arkiwiJsBoilerplate app.
 
+palette:
 
+http://paletton.com/#uid=70f0u0ksXsOhL-cmHuduim--whE
 
+ --------------------------------------------------------------------------------------------------------------------- */
 
+
 
+.embed-iframe{
 
+width:100%;
 
+min-width:100%;
 
+height:auto;
 
+}
 
+
 
+audio {
 
+    background-color: #E65116 !important;
 
+    border-radius: 6px;
 
+    height: 35px;
 
+    opacity: 1;
 
+    z-index: 99;
 
+}

+ 12 - 5
app/templates/list.txt
View File 

@@ -1,18 +1,25 @@
 
 {{#items}}
 
-
 
-  <div class="col-sm-6 col-md-4">
 
+ciao
 
+  <!--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>
 
+  </div-->
 
 
 {{/items}}
 
+
 
+<!--bootstrapt solution##<div class="embed-responsive embed-responsive-4by3"><iframe class="embed-responsive-item " frameBorder='0' seamless='seamless'  src='{{url}}'></iframe></div>##width='{{width}}' height='{{height}}'-->