diff --git a/src/main/java/kinosearch/core/Kino.java b/src/main/java/kinosearch/core/Kino.java index 6fc229f..0529749 100644 --- a/src/main/java/kinosearch/core/Kino.java +++ b/src/main/java/kinosearch/core/Kino.java @@ -3,6 +3,7 @@ package kinosearch.core; public class Kino { private String name; private String url; + private boolean player = false; public Kino(String name, String url) { this.name = name; @@ -20,4 +21,12 @@ public class Kino { public String getUrl() { return url; } + + public boolean hasPlayer() { + return player; + } + + public void setPlayer(boolean value) { + this.player = value; + } } diff --git a/src/main/java/kinosearch/core/warez/Onlinelife.java b/src/main/java/kinosearch/core/warez/Onlinelife.java index d8ddf5b..7075d2b 100644 --- a/src/main/java/kinosearch/core/warez/Onlinelife.java +++ b/src/main/java/kinosearch/core/warez/Onlinelife.java @@ -62,7 +62,9 @@ public class Onlinelife implements KinoWarez { } name = name.replaceAll("\\[.+", "").trim(); - outList.add(new Kino(name, url)); + Kino kino = new Kino(name, url); + kino.setPlayer(true); + outList.add(kino); } return outList; diff --git a/webapp/WEB-INF/index.html b/webapp/WEB-INF/index.html index 6dce7a4..ad6edd1 100644 --- a/webapp/WEB-INF/index.html +++ b/webapp/WEB-INF/index.html @@ -1,26 +1,72 @@ <#include "/header.inc.html"> - <#if resultsearch??> -
Ничего не найдено =(
- #if> +Ничего не найдено =(
+ #if> <#else> <#include "/news.inc.html"> #if> diff --git a/webapp/css/style.css b/webapp/css/style.css index bcc892d..7ebbf37 100644 --- a/webapp/css/style.css +++ b/webapp/css/style.css @@ -33,21 +33,8 @@ input.check-middle { vertical-align: sub; } -.resultlist { - padding-left: 0; -} - -.resultlist li { - list-style: none; -} - -.resultlist a { +a.panel-heading.spoiler { display: block; - padding: 1em; - background-color: #f1f1f1; - margin-bottom: 0.5em; - border-radius: 0.5em; - border: 1px solid #ccc; } .news time {