From d858c2986c2795823dd1931caa09333fe993faf9 Mon Sep 17 00:00:00 2001 From: Surinam Date: Mon, 9 Jan 2017 22:45:07 +0200 Subject: [PATCH] Add adv blocks, fix validator --- views/categories.ejs | 17 +++++++-- views/category.ejs | 21 ++++++++--- views/download.ejs | 71 ++++++++++++++++++++++++------------ views/episode.ejs | 71 ++++++++++++++++++++++++------------ views/includes/footer.ejs | 8 ++--- views/includes/short.ejs | 5 ++- views/index.ejs | 24 +++++++++---- views/movie.ejs | 68 ++++++++++++++++++++++++----------- views/online.ejs | 71 ++++++++++++++++++++++++------------ views/picture.ejs | 75 ++++++++++++++++++++++++++------------- views/trailer.ejs | 75 ++++++++++++++++++++++++++------------- 11 files changed, 349 insertions(+), 157 deletions(-) diff --git a/views/categories.ejs b/views/categories.ejs index 37a47b7..36ede4d 100644 --- a/views/categories.ejs +++ b/views/categories.ejs @@ -22,7 +22,7 @@ <% if (typeof slider == 'object' && slider.movies.length) { %> -
+
-
+ <% } %> + <% if (typeof page.adv == 'object' && page.adv.top) { %> +
+ <%- page.adv.top %> +
+ <% } %> +

<%- page.title %>

@@ -81,6 +87,13 @@
+ + <% if (typeof page.adv == 'object' && page.adv.bottom) { %> +
+ <%- page.adv.bottom %> +
+ <% } %> + diff --git a/views/category.ejs b/views/category.ejs index 9b1825c..2f86eb3 100644 --- a/views/category.ejs +++ b/views/category.ejs @@ -22,7 +22,7 @@ <% if (typeof slider == 'object' && slider.movies.length) { %> -
+
-
+ <% } %> + <% if (typeof page.adv == 'object' && page.adv.top) { %> +
+ <%- page.adv.top %> +
+ <% } %> +

<%- page.title %>

@@ -92,11 +98,11 @@ <% movies.forEach(function (movie) { %> -
+
<% include includes/short.ejs %> -
+
<% }); %> @@ -124,6 +130,13 @@ + + <% if (typeof page.adv == 'object' && page.adv.top) { %> +
+ <%- page.adv.top %> +
+ <% } %> + diff --git a/views/download.ejs b/views/download.ejs index 84efd1c..5ea62d5 100644 --- a/views/download.ejs +++ b/views/download.ejs @@ -22,7 +22,7 @@ <% if (typeof slider == 'object' && slider.movies.length) { %> -
+
-
+ <% } %> + <% if (typeof page.adv == 'object' && page.adv.top) { %> +
+ <%- page.adv.top %> +
+ <% } %> +
@@ -71,13 +77,13 @@ Скачать
-
-
+
+
<%- movie.title %> скачать
-
-
+
+
@@ -89,30 +95,30 @@
+
@@ -205,7 +223,7 @@ <% if (movies[type].length) { movies[type].forEach(function (category) { %> -
+
<%- category.name %> @@ -213,15 +231,15 @@ <% if (category.movies.length) { category.movies.forEach(function (movie) { %> -
+
<% include includes/short.ejs %> -
+
<% }); } %> -
+
<% }); } %> @@ -232,6 +250,13 @@
+ + <% if (typeof page.adv == 'object' && page.adv.bottom) { %> +
+ <%- page.adv.bottom %> +
+ <% } %> + diff --git a/views/episode.ejs b/views/episode.ejs index 9ee0d49..3669b7e 100644 --- a/views/episode.ejs +++ b/views/episode.ejs @@ -22,7 +22,7 @@ <% if (typeof slider == 'object' && slider.movies.length) { %> -
+
-
+ <% } %> + <% if (typeof page.adv == 'object' && page.adv.top) { %> +
+ <%- page.adv.top %> +
+ <% } %> +
@@ -71,8 +77,8 @@ <%- page.title %>
-
-
+
+
<%- movie.title %> серия онлайн
-
-
+
+
@@ -94,30 +100,30 @@
+
@@ -210,7 +228,7 @@ <% if (movies[type].length) { movies[type].forEach(function (category) { %> -
+
<%- category.name %> @@ -218,15 +236,15 @@ <% if (category.movies.length) { category.movies.forEach(function (movie) { %> -
+
<% include includes/short.ejs %> -
+
<% }); } %> -
+
<% }); } %> @@ -237,6 +255,13 @@
+ + <% if (typeof page.adv == 'object' && page.adv.bottom) { %> +
+ <%- page.adv.bottom %> +
+ <% } %> + diff --git a/views/includes/footer.ejs b/views/includes/footer.ejs index 090cd03..678eed4 100644 --- a/views/includes/footer.ejs +++ b/views/includes/footer.ejs @@ -65,7 +65,7 @@ <% if (page.social) { %> -
+
Присоединяйся и смотри первым! @@ -83,7 +83,7 @@ <% } %> -
+ <% } %> @@ -92,14 +92,14 @@
-
+
Лучшие фильмы онлайн бесплатно
Email: <%- page.email %>
-
+
diff --git a/views/movie.ejs b/views/movie.ejs index 8c31f2e..52c56ee 100644 --- a/views/movie.ejs +++ b/views/movie.ejs @@ -22,7 +22,7 @@ <% if (typeof slider == 'object' && slider.movies.length) { %> -
+
-
+ <% } %> + <% if (typeof page.adv == 'object' && page.adv.top) { %> +
+ <%- page.adv.top %> +
+ <% } %> +
@@ -63,8 +69,8 @@ <%- movie.title %>
-
-
+
+
<%- movie.title %> смотреть онлайн @@ -76,8 +82,8 @@
-
-
+
+
@@ -89,30 +95,30 @@
@@ -199,7 +218,7 @@ <% if (movies[type].length) { movies[type].forEach(function (category) { %> -
+
<%- category.name %> @@ -207,15 +226,15 @@ <% if (category.movies.length) { category.movies.forEach(function (movie) { %> -
+
<% include includes/short.ejs %> -
+
<% }); } %> -
+
<% }); } %> @@ -226,6 +245,13 @@
+ + <% if (typeof page.adv == 'object' && page.adv.bottom) { %> +
+ <%- page.adv.bottom %> +
+ <% } %> +
diff --git a/views/online.ejs b/views/online.ejs index 8b991a9..a1275a2 100644 --- a/views/online.ejs +++ b/views/online.ejs @@ -22,7 +22,7 @@ <% if (typeof slider == 'object' && slider.movies.length) { %> -
+
-
+ <% } %> + <% if (typeof page.adv == 'object' && page.adv.top) { %> +
+ <%- page.adv.top %> +
+ <% } %> +
@@ -71,8 +77,8 @@ Смотреть онлайн
-
-
+
+
<%- movie.title %> смотреть онлайн
-
-
+
+
@@ -94,30 +100,30 @@
+
@@ -210,7 +228,7 @@ <% if (movies[type].length) { movies[type].forEach(function (category) { %> -
+
<%- category.name %> @@ -218,15 +236,15 @@ <% if (category.movies.length) { category.movies.forEach(function (movie) { %> -
+
<% include includes/short.ejs %> -
+
<% }); } %> -
+
<% }); } %> @@ -237,6 +255,13 @@
+ + <% if (typeof page.adv == 'object' && page.adv.bottom) { %> +
+ <%- page.adv.bottom %> +
+ <% } %> + diff --git a/views/picture.ejs b/views/picture.ejs index c30133f..ca0d4ba 100644 --- a/views/picture.ejs +++ b/views/picture.ejs @@ -11,7 +11,7 @@ <% include includes/header.ejs %> -
+
@@ -22,7 +22,7 @@ <% if (typeof slider == 'object' && slider.movies.length) { %> -
+
-
+
<% } %> + <% if (typeof page.adv == 'object' && page.adv.top) { %> +
+ <%- page.adv.top %> +
+ <% } %> +
@@ -71,13 +77,13 @@ Кадры
-
-
+
+
<%- movie.title %> кадры
-
-
+
+
@@ -89,30 +95,30 @@
+
-
+ <% if (typeof page.adv == 'object' && page.adv.over) { %> +
+ <%- page.adv.over %> +
+ <% } %> + +
<%- page.player %> -
+ + + <% if (typeof page.adv == 'object' && page.adv.under) { %> +
+ <%- page.adv.under %> +
+ <% } %>
-
+
<% if (page.comments) { %> <%- page.comments %> <% } %>
-
- + +
@@ -205,7 +223,7 @@ <% if (movies[type].length) { movies[type].forEach(function (category) { %> -
+
<%- category.name %> @@ -213,15 +231,15 @@ <% if (category.movies.length) { category.movies.forEach(function (movie) { %> -
+
<% include includes/short.ejs %> -
+
<% }); } %> -
+ <% }); } %> @@ -232,11 +250,18 @@ + + <% if (typeof page.adv == 'object' && page.adv.bottom) { %> +
+ <%- page.adv.bottom %> +
+ <% } %> + - +