Ajax loading + Tweaks of CSS

This commit is contained in:
Cqoicebordel 2015-02-17 01:07:14 +01:00
parent d740e7384a
commit e181041f11
10 changed files with 147 additions and 55 deletions

View file

@ -14,6 +14,9 @@
{% block meta %}{% endblock %}
{% block head %}
{% endblock %}
<script type="text/javascript">
var favicons = [[]];
</script>
</head>
<body>
<div id="container">
@ -23,6 +26,9 @@
searx = {};
</script>
<script src="{{ url_for('static', filename='js/searx.js') }}" ></script>
<script type="text/javascript">
load_images(1);
</script>
</div>
</body>
</html>

View file

@ -2,12 +2,5 @@
<canvas id="canvas-{{ pageno }}-{{ index }}" class="icon" width="16" height="16"></canvas>
</a>
<script type="text/javascript">
var img{{ pageno }}_{{ index }} = new Image();
img{{ pageno }}_{{ index }}.src = 'http://{{ result.url | extract_domain }}/favicon.ico';
img{{ pageno }}_{{ index }}.onload = function () {
var can{{ pageno }}_{{ index }} = document.getElementById('canvas-{{ pageno }}-{{ index }}');
var ctx = can{{ pageno }}_{{ index }}.getContext("2d");
ctx.drawImage(img{{ pageno }}_{{ index }}, 0, 0, 16, 16);
};
favicons[{{ pageno }}][{{ index }}] = 'http://{{ result.url | extract_domain }}/favicon.ico';
</script>

View file

@ -1,44 +1,32 @@
{% extends "pix-art/base.html" %}
{% block title %}{{ q }} - {% endblock %}
{% block meta %}{% endblock %}
{% block content %}
<div class="preferences_container right"><a href="{{ url_for('preferences') }}" id="preferences"><span>preferences</span></a></div>
<div class="small search center">
{% include 'pix-art/search.html' %}
</div>
<div id="results">
{% if pageno > 1 %}
{% for result in results %}
{% set index = loop.index %}
{% include 'pix-art/result_templates/default.html' %}
{% endfor %}
{% if paging %}
{% else %}
{% extends "pix-art/base.html" %}
{% block title %}{{ q }} - {% endblock %}
{% block meta %}{% endblock %}
{% block content %}
<div id="logo"><a href="./"><img src="{{ url_for('static', filename='img/searx-pixel-small.png') }}" alt="Searx Logo"/></a></div>
<div class="preferences_container right"><a href="{{ url_for('preferences') }}" id="preferences"><span>preferences</span></a></div>
<div class="small search center">
{% include 'pix-art/search.html' %}
</div>
<script type="text/javascript">
favicons[{{ pageno }}] = [];
</script>
<div id="results">
<span id="results_list">
{% for result in results %}
{% set index = loop.index %}
{% include 'pix-art/result_templates/default.html' %}
{% endfor %}
</span>
<div id="pagination">
{% if pageno > 1 %}
<form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
<div class="{% if rtl %}right{% else %}left{% endif %}">
<input type="hidden" name="q" value="{{ q }}" />
{% for category in selected_categories %}
<input type="hidden" name="category_{{ category }}" value="1"/>
{% endfor %}
<input type="hidden" name="pageno" value="{{ pageno-1 }}" />
<input type="submit" value="<< {{ _('previous page') }}" />
</div>
</form>
{% endif %}
<form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
<div class="{% if rtl %}left{% else %}right{% endif %}">
{% for category in selected_categories %}
<input type="hidden" name="category_{{ category }}" value="1"/>
{% endfor %}
<input type="hidden" name="q" value="{{ q }}" />
<input type="hidden" name="pageno" value="{{ pageno+1 }}" />
<input type="submit" value="{{ _('next page') }} >>" />
</div>
</form>
<br />
<input type="button" onclick="load_more('{{ q }}', {{ pageno+1 }})" id="load_more" value="{{ _('Load more...') }}" />
</div>
{% endif %}
</div>
{% endblock %}
{% endif %}

View file

@ -1,7 +1,7 @@
<form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" id="search_form">
<div id="search_wrapper">
<input type="text" placeholder="{{ _('Search for...') }}" id="q" class="q" name="q" tabindex="1" size="100" {% if q %}value="{{ q }}"{% endif %}/>
<input type="submit" value="search" id="search_submit" />
<input type="submit" value="" id="search_submit" />
{% for category in categories %}
<input type="hidden" name="category_{{ category }}" value="1"/>
{% endfor %}