From c827bf7ab82f67c5fce69af26d9f98a8a5042067 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Sat, 26 Mar 2016 18:30:30 +0300
Subject: [PATCH] =?UTF-8?q?=D0=92=D0=BD=D0=B5=D1=88=D0=BD=D0=B8=D0=B9=20?=
 =?UTF-8?q?=D0=B2=D0=B8=D0=B4=20=D0=B2=D1=8B=D0=B4=D0=B0=D1=87=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/kinosearch/core/Kino.java       |  9 ++
 .../kinosearch/core/warez/Onlinelife.java     |  4 +-
 webapp/WEB-INF/index.html                     | 86 ++++++++++++++-----
 webapp/css/style.css                          | 15 +---
 4 files changed, 79 insertions(+), 35 deletions(-)

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??>
-            <hr>
-            <#if resultsearch?has_content>
-                <ul class="resultlist">
-                <#list resultsearch as kino>
-                    <li>
-                        <#if kino.getClass().getSimpleName() == "KinoGroup">
-                            <b>${kino.name}</b>
-                            <ul>
+    <#if resultsearch??>
+        <script type="text/javascript">
+            $(function(){
+                $('a.spoiler').bind('click',function(){
+                    $(this).next().collapse('toggle');
+                    return false;
+                });
+            });
+        </script>
+        <hr>
+        <#if resultsearch?has_content>
+            <#list resultsearch as kino>
+                <#if kino.getClass().getSimpleName() == "KinoGroup">
+                    <div class="panel panel-default">
+                        <a href="#" class="panel-heading spoiler">
+                            <span class="glyphicon glyphicon-chevron-down">&nbsp;</span><b>${kino.name}</b>
+                        </a>
+                        <div class="panel-collapse collapse out">
+                            <div class="panel-body">
                                 <#list kino.kinolist as kino_groupped>
-                                    <li><a href="${kino_groupped.url}" target="_blank">${kino_groupped.name}</a></li>
+                                    <div class="panel panel-default">
+                                        <div class="panel-heading"><b>${kino_groupped.name}</b></div>
+                                        <div class="panel-body">
+                                            <div class="row">
+                                                <#if kino_groupped.hasPlayer()>
+                                                    <div class="col-sm-6">
+                                                        <a class="btn btn-primary btn-block" href="${kino_groupped.url}" target="_blank">на сайте</a>
+                                                    </div>
+                                                    <div class="col-sm-6">
+                                                        <a class="btn btn-danger btn-block" href="#" target="_blank">в плеере</a>
+                                                    </div>
+                                                <#else>
+                                                    <div class="col-sm-12">
+                                                        <a class="btn btn-primary btn-block" href="${kino_groupped.url}" target="_blank">на сайте</a>
+                                                    </div>
+                                                </#if>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </#list>
-                            </ul>
-                        <#else>
-                            <a href="${kino.url}" target="_blank">${kino.name}</a>
-                        </#if>
-                    </li>
-                </#list>
-                </ul>
-            <#else>
-                <p>Ничего не найдено =(</p>
-            </#if>
+                            </div>
+                        </div>
+                    </div>
+                <#else>
+                    <div class="panel panel-default">
+                        <div class="panel-heading"><b>${kino.name}</b></div>
+                        <div class="panel-body">
+                            <div class="row">
+                                <#if kino.hasPlayer()>
+                                    <div class="col-sm-6">
+                                        <a class="btn btn-primary btn-block" href="${kino.url}" target="_blank">на сайте</a>
+                                    </div>
+                                    <div class="col-sm-6">
+                                        <a class="btn btn-danger btn-block" href="#" target="_blank">в плеере</a>
+                                    </div>
+                                <#else>
+                                    <div class="col-sm-12">
+                                        <a class="btn btn-primary btn-block" href="${kino.url}" target="_blank">на сайте</a>
+                                    </div>
+                                </#if>
+                            </div>
+                        </div>
+                    </div>
+                </#if>
+            </#list>
+        <#else>
+            <p>Ничего не найдено =(</p>
+        </#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 {