Skip to content

Commit

Permalink
v3.0 of query page
Browse files Browse the repository at this point in the history
  • Loading branch information
@MrShepherd
MrShepherd committed Nov 6, 2016
1 parent 786bc5e commit b04c6b4
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 82 deletions.
8 changes: 6 additions & 2 deletions app/main/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,12 @@ def query():
return render_template('query.html', query_data=query_data)
if request.method == 'POST':
args = request.form
query_data = queries.get_query_data(**args)['data']
return render_template('tablerow.html', data=query_data, ladder_type='query')
if 'list' in args.get('region'):
query_data = queries.get_query_data(**args)['data']
return render_template('tablerow.html', data=query_data, ladder_type='query')
if 'img' in args.get('region'):
query_data = queries.get_query_data(**args)['data']
return render_template('playerlistimg.html', data=query_data)


@main.route('/help', methods=['GET'])
Expand Down
18 changes: 10 additions & 8 deletions app/static/css/lolhf.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,13 @@ hr.divider {
/*left_filter*/
.left_filter {
float: left;
padding-top: 30px;
padding-left: 50px;
padding-top: 20px;
padding-left: 150px;
}

.panel {
width: 180px;
margin-top: 25px;
}

.panel-heading {
Expand Down Expand Up @@ -126,10 +127,11 @@ hr.divider {
/*player_list*/
.player_list {
clear: right;
width: 70%;
margin-left: 200px;
padding-left: 80px;
padding-left: 180px;
padding-right: 80px;
padding-top: 30px;
padding-top: 50px;
}

.player_list ul {
Expand All @@ -144,13 +146,13 @@ hr.divider {
}

.player_list a.thumbnail {
margin-bottom: 10px;
width: 200px;
margin-bottom: 5px;
width: 110px;
}

.player_list .thumbnail {
margin-bottom: 15px;
width: 220px;
width: 130px;
padding-left: 5px;
padding-right: 5px;
margin-left: 5px;
Expand All @@ -160,7 +162,7 @@ hr.divider {
.player_list .caption {
padding: 0;
text-align: center;
font-size: 18px;
font-size: 14px;
}

.player_list .col-md-3 {
Expand Down
18 changes: 15 additions & 3 deletions app/static/js/lolhf.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,30 @@ $(function () {
$(this).parent().siblings().children().removeClass("active");
$(this).addClass("active");
var url = '/query';
var args = {};
var args1 = {};
var args2 = {};
$(".left_filter .active").each(function () {
args[$(this).parent().parent().attr("class")] = $(this).text();
args1[$(this).parent().parent().attr("class")] = $(this).text();
args2[$(this).parent().parent().attr("class")] = $(this).text();
});
$.post(url, args, function (data) {
args1['region'] = 'list';
args2['region'] = 'img';
$.post(url, args1, function (data) {
if (data) {
$(".ladder-row").empty().append(data);
} else {
alert('指定条件没有查询到数据');
return false;
}
});
$.post(url, args2, function (data) {
if (data) {
$(".player_list").empty().append(data);
} else {
alert('指定条件没有查询到数据');
return false;
}
});
});
});

Expand Down
12 changes: 12 additions & 0 deletions app/templates/playerlistimg.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{% for item in data %}
<div class="col-sm-6 col-md-2">
<div class="thumbnail">
<a href="#" class="thumbnail">
<img src="{{ url_for('static',filename='img/player/'~item.player_name~'.png') }}" alt="..." width="180" height="180">
</a>
<div class="caption">
<a href="#">{{ item.player_name }}</a>
</div>
</div>
</div>
{% endfor %}
82 changes: 13 additions & 69 deletions app/templates/query.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,76 +65,20 @@
</div>
</div>
<div class="player_list">
<div class="col-sm-6 col-md-3">
<div class="thumbnail">
<a href="#" class="thumbnail">
<img src="{{ url_for('static',filename='img/tmp/tmp_img.jpg') }}" alt="..." width="180" height="180">
</a>
<div class="caption">
<a href="#">LOOPER</a>
{% for item in query_data %}
{% if item.player_name!='路人' %}
<div class="col-sm-6 col-md-2">
<div class="thumbnail">
<a href="#" class="thumbnail">
<img src="{{ url_for('static',filename='img/player/'~item.player_name~'.png') }}" alt="..." width="100" height="100">
</a>
<div class="caption">
<a href="#">{{ item.player_name }}</a>
</div>
</div>
</div>
</div>
</div>
<div class="col-sm-6 col-md-3">
<div class="thumbnail">
<a href="#" class="thumbnail">
<img src="{{ url_for('static',filename='img/tmp/tmp_img.jpg') }}" alt="..." width="180" height="180">
</a>
<div class="caption">
<a href="#">UZI</a>
</div>
</div>
</div>
<div class="col-sm-6 col-md-3">
<div class="thumbnail">
<a href="#" class="thumbnail">
<img src="{{ url_for('static',filename='img/tmp/tmp_img.jpg') }}" alt="..." width="180" height="180">
</a>
<div class="caption">
<a href="#">UZI</a>
</div>
</div>
</div>
<div class="col-sm-6 col-md-3">
<div class="thumbnail">
<a href="#" class="thumbnail">
<img src="{{ url_for('static',filename='img/tmp/tmp_img.jpg') }}" alt="..." width="180" height="180">
</a>
<div class="caption">
<a href="#">UZI</a>
</div>
</div>
</div>
<div class="col-sm-6 col-md-3">
<div class="thumbnail">
<a href="#" class="thumbnail">
<img src="{{ url_for('static',filename='img/tmp/tmp_img.jpg') }}" alt="..." width="180" height="180">
</a>
<div class="caption">
<a href="#">UZI</a>
</div>
</div>
</div>
<div class="col-sm-6 col-md-3">
<div class="thumbnail">
<a href="#" class="thumbnail">
<img src="{{ url_for('static',filename='img/tmp/tmp_img.jpg') }}" alt="..." width="180" height="180">
</a>
<div class="caption">
<a href="#">UZI</a>
</div>
</div>
</div>
<div class="col-sm-6 col-md-3">
<div class="thumbnail">
<a href="#" class="thumbnail">
<img src="{{ url_for('static',filename='img/tmp/tmp_img.jpg') }}" alt="..." width="180" height="180">
</a>
<div class="caption">
<a href="#">UZI</a>
</div>
</div>
</div>
{% endif %}
{% endfor %}
</div>
<div class="table-responsive table-ladder table_style">
<table class="table table-stripped table-hover">
Expand Down

0 comments on commit b04c6b4

Please sign in to comment.