From 566862730de5a5ed65d09675138deea995c491fc Mon Sep 17 00:00:00 2001 From: noxy Date: Thu, 20 Oct 2016 22:21:03 +0000 Subject: [PATCH 01/21] Update item.tpl.html --- s/item.tpl.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/s/item.tpl.html b/s/item.tpl.html index a4c7413..fb78cc9 100644 --- a/s/item.tpl.html +++ b/s/item.tpl.html @@ -12,13 +12,14 @@
{% if item == "video" %} - {% elseif item == "audio" %} + + + {% elseif item == "audio" %} {% if thumb != null %}
{% endif %} - {% elseif item == "image" %} {% else %} From 838d679cf1dba4c56fe16dd63871965a83a575c6 Mon Sep 17 00:00:00 2001 From: noxy Date: Thu, 20 Oct 2016 22:22:32 +0000 Subject: [PATCH 02/21] Update item.tpl.html --- s/item.tpl.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/s/item.tpl.html b/s/item.tpl.html index fb78cc9..39f6d72 100644 --- a/s/item.tpl.html +++ b/s/item.tpl.html @@ -13,13 +13,15 @@ {% if item == "video" %} - - {% elseif item == "audio" %} {% if thumb != null %}
{% endif %} + + {% elseif item == "audio" %} + + {% elseif item == "image" %} {% else %} From 519fa7656bb7c300dc8f9345c20f23f7b4f8b5e9 Mon Sep 17 00:00:00 2001 From: noxy Date: Thu, 20 Oct 2016 22:24:45 +0000 Subject: [PATCH 03/21] Update item.tpl.html --- s/item.tpl.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/s/item.tpl.html b/s/item.tpl.html index 39f6d72..db90702 100644 --- a/s/item.tpl.html +++ b/s/item.tpl.html @@ -13,14 +13,14 @@ {% if item == "video" %} + {% elseif item == "audio" %} + {% if thumb != null %}
{% endif %} - {% elseif item == "audio" %} - {% elseif item == "image" %} From 4d25a3f78938dfc51d6e299623f0edf0c9657c18 Mon Sep 17 00:00:00 2001 From: noxy Date: Thu, 20 Oct 2016 22:25:33 +0000 Subject: [PATCH 04/21] Update item.tpl.html --- s/item.tpl.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/s/item.tpl.html b/s/item.tpl.html index db90702..2bf4402 100644 --- a/s/item.tpl.html +++ b/s/item.tpl.html @@ -13,14 +13,14 @@ {% if item == "video" %} - {% elseif item == "audio" %} - {% if thumb != null %} -
+ -
+ {% endif %} + {% elseif item == "audio" %} + {% elseif item == "image" %} From 3b9e90fb979a8d42b84c8f604d9498d2ce8a6dd0 Mon Sep 17 00:00:00 2001 From: noxy Date: Thu, 20 Oct 2016 22:28:09 +0000 Subject: [PATCH 05/21] Update item.tpl.html --- s/item.tpl.html | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/s/item.tpl.html b/s/item.tpl.html index 2bf4402..c583f66 100644 --- a/s/item.tpl.html +++ b/s/item.tpl.html @@ -14,14 +14,14 @@ {% if thumb != null %} - +
- +
{% endif %} {% elseif item == "audio" %} - + {% elseif item == "image" %} {% else %} @@ -65,7 +65,10 @@ }); } var video = document.getElementById('player'); - video.volume = 0.5; + video.volume = 0.3; + + var audio = document.getElementById('audioplayer'); + audio.volume = 0.3; From 55593e5c572ad5f4bf8057ce1128f37af551ccad Mon Sep 17 00:00:00 2001 From: noxy Date: Thu, 20 Oct 2016 22:30:17 +0000 Subject: [PATCH 06/21] Update item.tpl.html --- s/item.tpl.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/s/item.tpl.html b/s/item.tpl.html index c583f66..bfa7412 100644 --- a/s/item.tpl.html +++ b/s/item.tpl.html @@ -67,8 +67,10 @@ var video = document.getElementById('player'); video.volume = 0.3; + window.onload = function() { var audio = document.getElementById('audioplayer'); audio.volume = 0.3; + } From 3e260d6178cdc70e588b49b155c5721535a00bf2 Mon Sep 17 00:00:00 2001 From: noxy Date: Thu, 20 Oct 2016 22:32:30 +0000 Subject: [PATCH 07/21] Update item.tpl.html --- s/item.tpl.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/s/item.tpl.html b/s/item.tpl.html index bfa7412..7c2ca9b 100644 --- a/s/item.tpl.html +++ b/s/item.tpl.html @@ -21,7 +21,7 @@ {% elseif item == "audio" %} - + {% elseif item == "image" %} {% else %} @@ -68,7 +68,7 @@ video.volume = 0.3; window.onload = function() { - var audio = document.getElementById('audioplayer'); + var audio = document.getElementById('audio'); audio.volume = 0.3; } From 384558027a7666212de5e9a63f74fae02021ba86 Mon Sep 17 00:00:00 2001 From: noxy Date: Thu, 20 Oct 2016 22:37:50 +0000 Subject: [PATCH 08/21] Update item.tpl.html --- s/item.tpl.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/s/item.tpl.html b/s/item.tpl.html index 7c2ca9b..9e3a7cc 100644 --- a/s/item.tpl.html +++ b/s/item.tpl.html @@ -21,7 +21,7 @@ {% elseif item == "audio" %} - + {% elseif item == "image" %} {% else %} @@ -67,9 +67,8 @@ var video = document.getElementById('player'); video.volume = 0.3; - window.onload = function() { - var audio = document.getElementById('audio'); - audio.volume = 0.3; + setVolume = function(id,vol) { + sounds[audio].volume = 0.3; // vol between 0 and 1 } From 055ada07d2674ad05a94a1c647bce8c9a557db7b Mon Sep 17 00:00:00 2001 From: noxy Date: Thu, 20 Oct 2016 22:40:55 +0000 Subject: [PATCH 09/21] Update item.tpl.html --- s/item.tpl.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/s/item.tpl.html b/s/item.tpl.html index 9e3a7cc..893d087 100644 --- a/s/item.tpl.html +++ b/s/item.tpl.html @@ -21,7 +21,7 @@ {% elseif item == "audio" %} - + {% elseif item == "image" %} {% else %} @@ -67,9 +67,8 @@ var video = document.getElementById('player'); video.volume = 0.3; - setVolume = function(id,vol) { - sounds[audio].volume = 0.3; // vol between 0 and 1 - } + var x = document.getElementById("audio"); + x.volume = 0.2; From 1181c516646f4533c105a013ca6bfe59fe4688b6 Mon Sep 17 00:00:00 2001 From: noxy Date: Thu, 20 Oct 2016 22:42:50 +0000 Subject: [PATCH 10/21] Update item.tpl.html --- s/item.tpl.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/s/item.tpl.html b/s/item.tpl.html index 893d087..791c235 100644 --- a/s/item.tpl.html +++ b/s/item.tpl.html @@ -21,7 +21,7 @@ {% elseif item == "audio" %} - + {% elseif item == "image" %} {% else %} @@ -67,8 +67,8 @@ var video = document.getElementById('player'); video.volume = 0.3; - var x = document.getElementById("audio"); - x.volume = 0.2; +var x = document.getElementById("myAudio"); + x.volume = 0.2; From 0ab82c897b5e35f92538eaa36bd8ed428d7ba9bc Mon Sep 17 00:00:00 2001 From: noxy Date: Thu, 20 Oct 2016 22:45:46 +0000 Subject: [PATCH 11/21] Update item.tpl.html --- s/item.tpl.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s/item.tpl.html b/s/item.tpl.html index 791c235..1db1ab1 100644 --- a/s/item.tpl.html +++ b/s/item.tpl.html @@ -67,7 +67,7 @@ var video = document.getElementById('player'); video.volume = 0.3; -var x = document.getElementById("myAudio"); +var x = document.getElementById('myAudio'); x.volume = 0.2; From 4bf8eab7ad4ea64956bf5007a9917abb12620ae0 Mon Sep 17 00:00:00 2001 From: noxy Date: Thu, 20 Oct 2016 22:49:38 +0000 Subject: [PATCH 12/21] Update item.tpl.html --- s/item.tpl.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/s/item.tpl.html b/s/item.tpl.html index 1db1ab1..3d6c1cc 100644 --- a/s/item.tpl.html +++ b/s/item.tpl.html @@ -21,7 +21,7 @@ {% elseif item == "audio" %} - + {% elseif item == "image" %} {% else %} @@ -67,7 +67,7 @@ var video = document.getElementById('player'); video.volume = 0.3; -var x = document.getElementById('myAudio'); +var x = document.getElementById("player"); x.volume = 0.2; From 2e9ae965af3d7f7675d17f4fc45162acd4b2fd8e Mon Sep 17 00:00:00 2001 From: noxy Date: Thu, 20 Oct 2016 22:58:08 +0000 Subject: [PATCH 13/21] Update item.tpl.html --- s/item.tpl.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s/item.tpl.html b/s/item.tpl.html index 3d6c1cc..d0324ea 100644 --- a/s/item.tpl.html +++ b/s/item.tpl.html @@ -68,7 +68,7 @@ video.volume = 0.3; var x = document.getElementById("player"); - x.volume = 0.2; + x.volume = 0.3; From c1f5b5e72b4cbba3fa2a55d994854d3361bf966f Mon Sep 17 00:00:00 2001 From: noxy Date: Thu, 20 Oct 2016 23:11:10 +0000 Subject: [PATCH 14/21] Update item.tpl.html --- s/item.tpl.html | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/s/item.tpl.html b/s/item.tpl.html index d0324ea..ec619e7 100644 --- a/s/item.tpl.html +++ b/s/item.tpl.html @@ -9,19 +9,16 @@
{% if next != null %} | {% endif %} random {% if prev != null %} | {% endif %}

-
- {% if item == "video" %} - - {% if thumb != null %} -
+
{% endif %} - +
+ {% if item == "video" %} + {% elseif item == "audio" %} - - + {% elseif item == "image" %} {% else %} From c7067b822bd4171531cb6e46ef82c60a2ed12bd7 Mon Sep 17 00:00:00 2001 From: noxy Date: Thu, 20 Oct 2016 23:11:41 +0000 Subject: [PATCH 15/21] Update item.tpl.html --- s/item.tpl.html | 1 + 1 file changed, 1 insertion(+) diff --git a/s/item.tpl.html b/s/item.tpl.html index ec619e7..5e0ca0f 100644 --- a/s/item.tpl.html +++ b/s/item.tpl.html @@ -10,6 +10,7 @@
{% if next != null %} | {% endif %} random {% if prev != null %} | {% endif %}

{% if thumb != null %} +
From 4a21c75c352c7995d55f9ac121e9e35939961b61 Mon Sep 17 00:00:00 2001 From: noxy Date: Thu, 20 Oct 2016 23:14:03 +0000 Subject: [PATCH 16/21] Update item.tpl.html --- s/item.tpl.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/s/item.tpl.html b/s/item.tpl.html index 5e0ca0f..22d5842 100644 --- a/s/item.tpl.html +++ b/s/item.tpl.html @@ -9,17 +9,17 @@
{% if next != null %} | {% endif %} random {% if prev != null %} | {% endif %}

+
+ {% if item == "video" %} + + {% elseif item == "audio" %} + {% if thumb != null %}
{% endif %} -
- {% if item == "video" %} - - {% elseif item == "audio" %} - {% elseif item == "image" %} {% else %} From e1de555b2ec3a0f01344cee8fbc92895302e140c Mon Sep 17 00:00:00 2001 From: noxy Date: Thu, 20 Oct 2016 23:15:30 +0000 Subject: [PATCH 17/21] Update item.tpl.html --- s/item.tpl.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/s/item.tpl.html b/s/item.tpl.html index 22d5842..ad11d44 100644 --- a/s/item.tpl.html +++ b/s/item.tpl.html @@ -13,13 +13,12 @@ {% if item == "video" %} {% elseif item == "audio" %} - {% if thumb != null %} -
{% endif %} + {% elseif item == "image" %} {% else %} From 905812bcadfad986b9f53902ed264f351b023a14 Mon Sep 17 00:00:00 2001 From: noxy Date: Thu, 20 Oct 2016 23:16:07 +0000 Subject: [PATCH 18/21] Update item.tpl.html --- s/item.tpl.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s/item.tpl.html b/s/item.tpl.html index ad11d44..d502c4f 100644 --- a/s/item.tpl.html +++ b/s/item.tpl.html @@ -18,7 +18,7 @@
{% endif %} - +
{% elseif item == "image" %} {% else %} From 54863e09ce8d1fca9a971c46873312756324ee4c Mon Sep 17 00:00:00 2001 From: noxy Date: Thu, 20 Oct 2016 23:16:56 +0000 Subject: [PATCH 19/21] Update item.tpl.html --- s/item.tpl.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s/item.tpl.html b/s/item.tpl.html index d502c4f..eddd284 100644 --- a/s/item.tpl.html +++ b/s/item.tpl.html @@ -13,12 +13,12 @@ {% if item == "video" %} {% elseif item == "audio" %} +
{% if thumb != null %}
{% endif %} -
{% elseif item == "image" %} {% else %} From bcaa286734b821136fac3056dccb3e76a60d4ea0 Mon Sep 17 00:00:00 2001 From: noxy Date: Thu, 20 Oct 2016 23:25:22 +0000 Subject: [PATCH 20/21] Update item.tpl.html --- s/item.tpl.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/s/item.tpl.html b/s/item.tpl.html index eddd284..ea9c161 100644 --- a/s/item.tpl.html +++ b/s/item.tpl.html @@ -15,9 +15,9 @@ {% elseif item == "audio" %}
{% if thumb != null %} -
+ -
+ {% endif %} {% elseif item == "image" %} From 3b8ba3a9c64f370f9772664ac17d78d564265932 Mon Sep 17 00:00:00 2001 From: noxy Date: Thu, 20 Oct 2016 23:26:18 +0000 Subject: [PATCH 21/21] Update item.tpl.html --- s/item.tpl.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s/item.tpl.html b/s/item.tpl.html index ea9c161..e4a0a7e 100644 --- a/s/item.tpl.html +++ b/s/item.tpl.html @@ -13,12 +13,12 @@ {% if item == "video" %} {% elseif item == "audio" %} -
{% if thumb != null %} {% endif %} +
{% elseif item == "image" %} {% else %}