0

Внешний вид выдачи

This commit is contained in:
2016-03-26 18:30:30 +03:00
parent db4878e614
commit c827bf7ab8
4 changed files with 79 additions and 35 deletions

View File

@@ -3,6 +3,7 @@ package kinosearch.core;
public class Kino { public class Kino {
private String name; private String name;
private String url; private String url;
private boolean player = false;
public Kino(String name, String url) { public Kino(String name, String url) {
this.name = name; this.name = name;
@@ -20,4 +21,12 @@ public class Kino {
public String getUrl() { public String getUrl() {
return url; return url;
} }
public boolean hasPlayer() {
return player;
}
public void setPlayer(boolean value) {
this.player = value;
}
} }

View File

@@ -62,7 +62,9 @@ public class Onlinelife implements KinoWarez {
} }
name = name.replaceAll("\\[.+", "").trim(); name = name.replaceAll("\\[.+", "").trim();
outList.add(new Kino(name, url)); Kino kino = new Kino(name, url);
kino.setPlayer(true);
outList.add(kino);
} }
return outList; return outList;

View File

@@ -1,23 +1,69 @@
<#include "/header.inc.html"> <#include "/header.inc.html">
<#if resultsearch??> <#if resultsearch??>
<script type="text/javascript">
$(function(){
$('a.spoiler').bind('click',function(){
$(this).next().collapse('toggle');
return false;
});
});
</script>
<hr> <hr>
<#if resultsearch?has_content> <#if resultsearch?has_content>
<ul class="resultlist">
<#list resultsearch as kino> <#list resultsearch as kino>
<li>
<#if kino.getClass().getSimpleName() == "KinoGroup"> <#if kino.getClass().getSimpleName() == "KinoGroup">
<b>${kino.name}</b> <div class="panel panel-default">
<ul> <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> <#list kino.kinolist as kino_groupped>
<li><a href="${kino_groupped.url}" target="_blank">${kino_groupped.name}</a></li> <div class="panel panel-default">
</#list> <div class="panel-heading"><b>${kino_groupped.name}</b></div>
</ul> <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> <#else>
<a href="${kino.url}" target="_blank">${kino.name}</a> <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>
</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> </#if>
</li>
</#list> </#list>
</ul>
<#else> <#else>
<p>Ничего не найдено =(</p> <p>Ничего не найдено =(</p>
</#if> </#if>

View File

@@ -33,21 +33,8 @@ input.check-middle {
vertical-align: sub; vertical-align: sub;
} }
.resultlist { a.panel-heading.spoiler {
padding-left: 0;
}
.resultlist li {
list-style: none;
}
.resultlist a {
display: block; display: block;
padding: 1em;
background-color: #f1f1f1;
margin-bottom: 0.5em;
border-radius: 0.5em;
border: 1px solid #ccc;
} }
.news time { .news time {