Browse Source

Merge remote-tracking branch 'origin/master'

cek 8 years ago
parent
commit
7790bd9b0b

+ 1 - 1
app/scripts/main_list_item_home.js

@@ -13,7 +13,7 @@
  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');
+    var arkiwi = new ARKIWI.Aggregator('http://www.arkiwi.org');
     $.get("templates/list_item_home.txt", function (template) {
 
         arkiwi.path("XM24/Occupy_Mordor", function (listone) {

+ 1 - 1
app/scripts/main_list_item_id.js

@@ -20,7 +20,7 @@ $(document).ready(function () {
 	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');
+    var arkiwi = new ARKIWI.Aggregator('http://www.arkiwi.org');
    /* $.get("templates/list_item_id.txt", function (template) {
 
         arkiwi.path("XM24/Occupy_Mordor", function (listone) {

+ 8 - 0
app/styles/main.css

@@ -14,6 +14,14 @@
 palette:
 http://paletton.com/#uid=70f0u0ksXsOhL-cmHuduim--whE
  --------------------------------------------------------------------------------------------------------------------- */
+.hide{display:none;}
+
+.thmbs{cursor:pointer;}
+
+.thumbnail {
+    max-height: 250px;
+    overflow: auto;
+}
 
 .embed-iframe{
 width:100%;

+ 3 - 1
app/templates/list_item_id.txt

@@ -10,7 +10,9 @@ Your browser does not support the audio element.
 </audio> 
 {{/item.audio}}
 {{#item.video}}
- <video controls>
+<img class="thmbs" src="{{item.thumbnail}}"  onclick="$(this).siblings().fadeIn( 'slow' );$(this).addClass('hide')">
+ 
+<video controls style="display:none">
   <source src="http://storage.arkiwi.org/{{item.identifier}}" type="video/ogg">
   <source src="#" type="video/mpeg">
 Your browser does not support the audio element.