Compare commits

...

21 Commits

Author SHA1 Message Date
Kasper Rynning-Tønnesen
40ca95514a Removing attempt at manually inserting the automatic 2018-12-03 15:14:10 +01:00
Kasper Rynning-Tønnesen
7071895153 Temporarily removing tap-target 2018-12-03 15:12:43 +01:00
Kasper Rynning-Tønnesen
954ac85d4a Testing with manual auto 2018-12-03 15:06:18 +01:00
Kasper Rynning-Tønnesen
dcc85bdfc5 Bumped footer 2018-12-03 15:04:58 +01:00
Kasper Rynning-Tønnesen
ba1cf940dd Removed copy-video id textarea from remote 2018-12-03 14:58:54 +01:00
Kasper Rynning-Tønnesen
41e459e82b Removed elements from remote.zoff.me that isnt needed 2018-12-03 14:57:16 +01:00
Kasper Rynning-Tønnesen
7dfbdc12a6 Moving containers around for remote.zoff.me 2018-12-03 14:49:32 +01:00
Kasper Rynning-Tønnesen
190b14f265 Removed article try 2018-12-03 14:38:57 +01:00
Kasper Rynning-Tønnesen
af1def1923 Trying with another ad in settings 2018-12-03 14:30:40 +01:00
Kasper Rynning-Tønnesen
98bf9490c6 Removing 2018-12-03 14:29:18 +01:00
Kasper Rynning-Tønnesen
00aeeaff38 Trying to move some ads around 2018-12-03 14:26:30 +01:00
Kasper Rynning-Tønnesen
8318c52330 Async on the correct thing 2018-12-02 23:40:16 +01:00
Kasper Rynning-Tønnesen
20bdc87200 Added async to the ad-code 2018-12-02 23:38:41 +01:00
Kasper Rynning-Tønnesen
f7e3bc7c86 Merge branch 'fix/client' into feature/adversal 2018-12-02 15:25:44 +01:00
Kasper Rynning-Tønnesen
8e94ef605d Disabled ads in embedded 2018-12-02 14:02:50 +01:00
Kasper Rynning-Tønnesen
b9d7d3ade5 Added ads.txt 2018-12-02 13:53:49 +01:00
Kasper Rynning-Tønnesen
b17ff55643 COlor of ad 2018-12-02 13:46:45 +01:00
Kasper Rynning-Tønnesen
64f194774f Some better styling for the ad 2018-12-02 13:44:49 +01:00
Kasper Rynning-Tønnesen
73aad3d8b9 Updating some color 2018-12-02 13:39:37 +01:00
Kasper Rynning-Tønnesen
0743e7b7ae Testing infolinks 2018-12-02 13:36:44 +01:00
Kasper Rynning-Tønnesen
eba65006e4 infolinks thing 2018-12-02 13:31:36 +01:00
8 changed files with 132 additions and 56 deletions

View File

@@ -0,0 +1,58 @@
Infolinks.com, 3147936 , DIRECT
google.com, pub-4299156005397946, RESELLER, f08c47fec0942fa0
appnexus.com, 3251, RESELLER
appnexus.com, 1908, RESELLER, f5ab79cb980f11d1
openx.com, 118151, RESELLER, 6a698e2ec38604c6
openx.com, 540118184, DIRECT, 6a698e2ec38604c6
Pubmatic.com, 60809,RESELLER,5d62403b186f2ace
Adtech.com, 11409, RESELLER
google.com, pub-6373315980741255, RESELLER, f08c47fec0942fa0
google.com, pub-9685734445476814, RESELLER, f08c47fec0942fa0
aol.com, 6202, RESELLER
aol.com, 17744, RESELLER
lkqd.net, 295, RESELLER, 59c49fa9598a0117
lkqd.com, 295, RESELLER, 59c49fa9598a0117
Freewheel.tv, 482337, RESELLER
Freewheel.tv, 480609, RESELLER
revcontent.com, 29124, RESELLER
appnexus.com, 7666, RESELLER, f5ab79cb980f11d1
rubiconproject.com, 156042, RESELLER, 0bfd66d529a55807
advertising.com, 8603, RESELLER
advertising.com, 3531, RESELLER
appnexus.com, 3364, RESELLER
Indexexchange.com, 183756, RESELLER
openx.com, 539154393, RESELLER
rubiconproject.com, 16698, RESELLER, 0bfd66d529a55807
deepintent.com, 100004190, RESELLER, 4a5487c769369a8c
pubmatic.com, 156872, RESELLER, 5d62403b186f2ace
taboola.com, 1139936,RESELLER,c228e6794e811952
taboola.com, 1135488,RESELLER,c228e6794e811952
vi.ai, 913453223927387, RESELLER
spotxchange.com, 74964, RESELLER, 7842df1d2fe2db34
spotx.tv, 74964, RESELLER, 7842df1d2fe2db34
smartadserver.com, 2776,RESELLER
pubmatic.com, 156830, RESELLER
rubiconproject.com, 15476, RESELLER, 0bfd66d529a55807
contextweb.com, 559988, RESELLER, 89ff185a4c4e857c
rhythmone.com, 2221906906,DIRECT,a670c89d4a324e47
districtm.io, 101519, RESELLER
coxmt.com, 2000067907202, RESELLER
openx.com, 537143344, RESELLER
indexexchange.com, 175407, RESELLER
pubmatic.com,156078, RESELLER, 5d62403b186f2ace
33across.com, 0010b00002CpYhEAAV, RESELLER, bbea06d9c4d2853c
rubiconproject.com, 16414, RESELLER, 0bfd66d529a55807
pubmatic.com, 156423, RESELLER, 5d62403b186f2ace
rhythmone.com, 2439829435, RESELLER, a670c89d4a324e47
indexexchange.com, 185506, RESELLER
appnexus.com, 1356, RESELLER, f5ab79cb980f11d1
emxdgt.com, 326,RESELLER, 1e1d41537f7cad7f
sonobi.com, f0e1159c80, RESELLER
Smartadserver.com,3238,RESELLER
contextweb.com,560288,RESELLER,89ff185a4c4e857c
pubmatic.com,156439,RESELLER
pubmatic.com, 154037,RESELLER
rubiconproject.com,16114,RESELLER, 0bfd66d529a55807
openx.com,537149888,RESELLER,6a698e2ec38604c6
sovrn.com, 257611,RESELLER, fafdf38b16bf6b2b
appnexus.com,3703,RESELLER,f5ab79cb980f11d1

View File

@@ -4063,3 +4063,15 @@ input:not([type]):focus:not([readonly])+label, input[type=text]:not(.browser-def
-ms-user-select: all !important; /* No support yet */
user-select: all !important; /* Likely future */
}
footer > .IL_BASE ~ .IL_BASE {
display: inherit !important;
}
footer > .IL_BASE {
display: flex !important;
}
.IL_BASE .IL_BASE {
background-color: white;
}

View File

@@ -573,10 +573,10 @@ var Channel = {
if(!Helper.mobilecheck()) {
Helper.tooltip("#chan", "destroy");
}
var tap_1 = document.querySelectorAll(".tap-target")
/*var tap_1 = document.querySelectorAll(".tap-target")
if(tap_1.length > 0 && M.TapTarget.getInstance(tap_1[0])) {
M.TapTarget.getInstance(tap_1[0]).close();
}
}*/
}
clearTimeout(tap_target_timeout);
//before_toast();

View File

@@ -406,10 +406,10 @@ initializeCastApi = function() {
} catch(e){
_chSeen = false;
}
if((!_chSeen || _chSeen != "seen") && !client) {
/*if((!_chSeen || _chSeen != "seen") && !client) {
Helper.css(".castButton", "display", "block");
showDiscovery = true;
var elem = document.querySelector('.tap-target');
/*var elem = document.querySelector('.tap-target');
var instance = M.TapTarget.init(elem);
instance.open();
tap_target_timeout = setTimeout(function() {
@@ -419,7 +419,7 @@ initializeCastApi = function() {
localStorage.setItem("_chSeen", "seen");
} catch(e){}
Helper.removeClass('.castButton', 'castButton-white-active');
}
}*/
} else if(event.castState == "NO_DEVICES_AVAILABLE"){
cast_ready_connect = false;
Helper.removeClass(".volume-container", "volume-container-cast");

View File

@@ -47,47 +47,33 @@
}
}
</script>
{{#if adds}}
<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
<script>
(adsbygoogle = window.adsbygoogle || []).push({
google_ad_client: "{{{ adsense }}}",
enable_page_level_ads: true
});
</script>
{{/if}}
{{/unless}}
</head>
<body class="noselect">
{{{body}}}
{{#unless embed}}
{{#unless client}}
<div class="tap-target" data-target="castButton">
<div class="tap-target-content">
<h5>Chromecast</h5>
<p>This site supports chromecasting!</p>
</div>
</div>
{{/unless}}
{{> footer}}
{{> modal/cookie}}
{{> contact}}
{{> donate}}
{{> footer}}
<textarea class="copy_video_id" style="display:none;"></textarea>
<ul class="context-menu-list context-menu-root hide">
<li class="context-menu-item copy-context-menu">
<span>Copy link</span>
</li>
<li class="context-menu-item find-context-menu">
<span>Find Similar</span>
</li>
<li class="context-menu-item context-menu-separator context-menu-not-selectable">
</li>
<li class="context-menu-item delete-context-menu context-menu-disabled">
<span>Delete</span>
</li>
</ul>
<div id="context-menu-overlay" class="hide"></div>
{{#unless remote}}
<textarea class="copy_video_id" style="display:none;"></textarea>
<ul class="context-menu-list context-menu-root hide">
<li class="context-menu-item copy-context-menu">
<span>Copy link</span>
</li>
<li class="context-menu-item find-context-menu">
<span>Find Similar</span>
</li>
<li class="context-menu-item context-menu-separator context-menu-not-selectable">
</li>
<li class="context-menu-item delete-context-menu context-menu-disabled">
<span>Delete</span>
</li>
</ul>
<div id="context-menu-overlay" class="hide"></div>
{{/unless}}
{{/unless}}
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.1.0/socket.io.slim.js"></script>
@@ -95,5 +81,8 @@
{{#unless embed}}
<script async type="text/javascript" src="https://www.gstatic.com/cv/js/sender/v1/cast_sender.js?loadCastFramework=1"></script>
{{/unless}}
{{#if adds}}
<script type="text/javascript"> var infolinks_pid = {{adsense}}; var infolinks_wsid = 0; </script> <script type="text/javascript" src="//resources.infolinks.com/js/infolinks_main.js" async></script>
{{/if}}
</body>
</html>

View File

@@ -1,18 +1,21 @@
{{> remote/header}}
<main class="center-align container remote-container">
<div class="section">
<h3 id="remote-text">Remote Controller</h3>
</div>
<div class="section">
{{> remote/input}}
{{> remote/buttons}}
{{> remote/volume}}
</div>
<div id="main-container" class="noselect cursor-default">
{{> remote/header}}
<main class="center-align container remote-container">
<div class="section">
<h3 id="remote-text">Remote Controller</h3>
</div>
<div class="section">
{{> remote/input}}
{{> remote/buttons}}
{{> remote/volume}}
</div>
<div class="section about-remote">
<b>Here you can control another Zoff player from any device.</b>
<br>
To find the ID of your player, click the Conf <i class="material-icons">menu</i> icon on the top right of the player page, then "Remote Control".
<br>You can either scan the QR code or type the ID manually.
</div>
</main>
<div class="section about-remote">
<b>Here you can control another Zoff player from any device.</b>
<br>
To find the ID of your player, click the Conf <i class="material-icons">menu</i> icon on the top right of the player page, then "Remote Control".
<br>You can either scan the QR code or type the ID manually.
<br>
</div>
</main>
</div>

View File

@@ -9,6 +9,10 @@ router.route('/favicon.ico').get(function(req, res, next) {
res.sendFile(path.join(pathThumbnails, '/public/assets/images/favicon.ico'));
});
router.route('/ads.txt').get(function(req, res, next) {
res.sendFile(path.join(pathThumbnails, '/public/assets/ads.txt'));
});
router.route('/browserconfig.xml').get(function(req, res, next) {
res.sendFile(path.join(pathThumbnails, '/public/assets/images/browserconfig.xml'));
});

View File

@@ -6,7 +6,7 @@ var path = require('path');
var analytics = "xx";
var google = {};
var adsense = "xx";
var adds = false;
var adds = true;
var mongojs = require('mongojs');
var token_db = mongojs("tokens");
var Functions = require(pathThumbnails + '/handlers/functions.js');
@@ -67,11 +67,14 @@ router.route('/api/embed').get(function(req, res, next) {
var data = {
year: year,
type: "video",
adsense: "",
adds: false,
javascript_file: "embed.min.js",
captcha: res.recaptcha,
analytics: analytics,
stylesheet: "embed.css",
embed: true,
remote: false,
og_image: "https://zoff.me/assets/images/small-square.jpg",
}
res.render('layouts/client/embed', data);
@@ -92,6 +95,7 @@ router.route('/api/apply').get(function(req, res, next) {
type: "website",
activated: false,
id: "",
remote: false,
correct: false,
stylesheet: "style.css",
embed: false,
@@ -115,6 +119,7 @@ router.route('/api/apply/:id').get(function(req, res) {
adds: adds,
activated: true,
type: "website",
remote: false,
token: result[0].token,
correct: true,
stylesheet: "style.css",
@@ -133,6 +138,7 @@ router.route('/api/apply/:id').get(function(req, res) {
adsense: adsense,
adds: adds,
activated: false,
remote: false,
token:"",
type: "website",
correct: false,
@@ -164,6 +170,7 @@ function root(req, res, next) {
analytics: analytics,
type: "website",
stylesheet: "style.css",
remote: true,
embed: false,
client: false,
og_image: "https://zoff.me/assets/images/small-square.jpg",
@@ -182,6 +189,7 @@ function root(req, res, next) {
stylesheet: "style.css",
type: "website",
embed: false,
remote: false,
client: false,
og_image: "https://zoff.me/assets/images/small-square.jpg",
channels: [],
@@ -231,6 +239,7 @@ function channel(req, res, next) {
type: "website",
stylesheet: "style.css",
embed: false,
remote: false,
client: false,
og_image: "https://zoff.me/assets/images/small-square.jpg",
}
@@ -265,6 +274,7 @@ function channel(req, res, next) {
type: "video",
stylesheet: "style.css",
embed: false,
remote: false,
client:false,
og_image: "https://zoff.me/assets/images/small-square.jpg"
}