Lots of courgette modification

This commit is contained in:
Cqoicebordel 2015-01-16 00:56:54 +01:00
parent 14447a0761
commit 2fc1de54da
15 changed files with 192 additions and 176 deletions

View File

@ -1,6 +1,6 @@
{% extends 'default/base.html' %} {% extends 'courgette/base.html' %}
{% block content %} {% block content %}
{% include 'default/github_ribbon.html' %} {% include 'courgette/github_ribbon.html' %}
<div class="row"> <div class="row">
<h1>About <a href="{{ url_for('index') }}">searx</a></h1> <h1>About <a href="{{ url_for('index') }}">searx</a></h1>

View File

@ -11,6 +11,7 @@
<link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}?v=2" /> <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}?v=2" />
{% block styles %} {% block styles %}
{% endblock %} {% endblock %}
{% block meta %}{% endblock %}
{% block head %} {% block head %}
<link title="searx" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/> <link title="searx" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/>
{% endblock %} {% endblock %}

View File

@ -1,7 +1,9 @@
<div id="categories"> <div id="categories">
<div id="categories_container">
{% for category in categories %} {% for category in categories %}
<div class="checkbox_container"> <div class="checkbox_container">
<input type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} /><label for="checkbox_{{ category|replace(' ', '_') }}">{{ _(category) }}</label> <input type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} /><label for="checkbox_{{ category|replace(' ', '_') }}">{{ _(category) }}</label>
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
</div>

View File

@ -1,9 +1,9 @@
{% extends "default/base.html" %} {% extends "courgette/base.html" %}
{% block content %} {% block content %}
{% include 'default/github_ribbon.html' %} {% include 'courgette/github_ribbon.html' %}
<div class="center"> <div class="center">
<div class="title"><h1>searx</h1></div> <div class="title"><h1>searx</h1></div>
{% include 'default/search.html' %} {% include 'courgette/search.html' %}
<p class="top_margin"> <p class="top_margin">
<a href="{{ url_for('about') }}" class="hmarg">{{ _('about') }}</a> <a href="{{ url_for('about') }}" class="hmarg">{{ _('about') }}</a>
<a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a> <a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a>

View File

@ -1,4 +1,4 @@
{% extends "default/base.html" %} {% extends "courgette/base.html" %}
{% block head %} {% endblock %} {% block head %} {% endblock %}
{% block content %} {% block content %}
<div class="row"> <div class="row">
@ -7,9 +7,7 @@
<form method="post" action="{{ url_for('preferences') }}" id="search_form"> <form method="post" action="{{ url_for('preferences') }}" id="search_form">
<fieldset> <fieldset>
<legend>{{ _('Default categories') }}</legend> <legend>{{ _('Default categories') }}</legend>
<p> {% include 'courgette/categories.html' %}
{% include 'default/categories.html' %}
</p>
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend>{{ _('Search language') }}</legend> <legend>{{ _('Search language') }}</legend>
@ -79,9 +77,9 @@
<td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</td> <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</td>
<td>{{ _(categ) }}</td> <td>{{ _(categ) }}</td>
<td class="engine_checkbox"> <td class="engine_checkbox">
<input type="checkbox" id="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}"{% if search_engine.name in blocked_engines %} checked="checked"{% endif %} /> <input type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}"{% if search_engine.name in blocked_engines %} checked="checked"{% endif %} />
<label class="allow" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label> <label class="allow" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
<label class="deny" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label> <label class="deny" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
</td> </td>
</tr> </tr>
{% endif %} {% endif %}

View File

@ -1,9 +1,9 @@
<div class="result {{ result.class }}"> <div class="result {{ result.class }}">
<h3 class="result_title">{% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3> <h3 class="result_title">{% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
<p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">cached</a></p> {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}
{% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
<p class="content">{% if result.img_src %}<img src="{{ result.img_src }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p> <p class="content">{% if result.img_src %}<img src="{{ result.img_src }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
{% if result.repository %}<p class="result-content"><a href="{{ result.repository|safe }}">{{ result.repository }}</a></p>{% endif %} {% if result.repository %}<p class="content"><a href="{{ result.repository|safe }}">{{ result.repository }}</a></p>{% endif %}
{{ result.codelines|code_highlighter(result.code_language)|safe }} {{ result.codelines|code_highlighter(result.code_language)|safe }}
<p class="url">{{ result.pretty_url }}</p>
</div> </div>

View File

@ -6,7 +6,7 @@
<div> <div>
<h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3> <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
{% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %} {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}
<p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p> <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
<p class="url">{{ result.pretty_url }}</p> <p class="url">{{ result.pretty_url }}</p>
</div> </div>

View File

@ -1,6 +1,6 @@
<div class="image_result"> <div class="image_result">
<p> <p>
<a href="{{ result.img_src }}"><img src="{{ result.img_src }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a> <a href="{{ result.img_src }}"><img src="{{ result.img_src }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
<span class="url"><a href="{{ result.url }}" class="small_font">original context</a></span> <span class="url"><a href="{{ result.url }}" class="small_font">{{ _('original context') }}</a></span>
</p> </p>
</div> </div>

View File

@ -6,7 +6,7 @@
<div> <div>
<h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3> <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
{% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %} {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}
<p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p> <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
<p class="url">{{ result.pretty_url }}</p> <p class="url">{{ result.pretty_url }}</p>
</div> </div>

View File

@ -1,7 +1,13 @@
<div class="result torrent_result"> <div class="result torrent_result">
{% if "icon_"~result.engine~".ico" in favicons %}
<img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
{% endif %}
<h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3> <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
{% if result.content %}<p class="content">{{ result.content|safe }}</p>{% endif %} {% if result.content %}<span class="content">{{ result.content|safe }}</span><br />{% endif %}
<p class="stats">Seed: {{ result.seed }}, Leech: {{ result.leech }}</p> <span class="stats">{{ _('Seeder') }} : {{ result.seed }}, {{ _('Leecher') }} : {{ result.leech }}</span><br />
<p><a href="{{ result.magnetlink }}" class="magnetlink">magnet link</a></p> <span>
{% if result.magnetlink %}<a href="{{ result.magnetlink }}" class="magnetlink">{{ _('magnet link') }}</a>{% endif %}
{% if result.torrentfile %}<a href="{{ result.torrentfile }}" class="torrentfile">{{ _('torrent file') }}</a>{% endif %}
</span>
<p class="url">{{ result.pretty_url }}</p> <p class="url">{{ result.pretty_url }}</p>
</div> </div>

View File

@ -4,7 +4,7 @@
{% endif %} {% endif %}
<h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3> <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
{% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %} {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span><br />{% endif %}
<a href="{{ result.url }}"><img width="400" src="{{ result.thumbnail }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a> <a href="{{ result.url }}"><img width="400" src="{{ result.thumbnail }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
<p class="url">{{ result.url }}</p> <p class="url">{{ result.pretty_url }}</p>
</div> </div>

View File

@ -1,9 +1,10 @@
{% extends "default/base.html" %} {% extends "courgette/base.html" %}
{% block title %}{{ q }} - {% endblock %} {% block title %}{{ q }} - {% endblock %}
{% block meta %}<link rel="alternate" type="application/rss+xml" title="Searx search: {{ q }}" href="{{ url_for('index') }}?q={{ q|urlencode }}&amp;format=rss&amp;{% for category in selected_categories %}category_{{ category }}=1&amp;{% endfor %}pageno={{ pageno }}">{% endblock %}
{% block content %} {% block content %}
<div class="right"><a href="{{ url_for('preferences') }}" id="preferences"><span>preferences</span></a></div> <div class="right"><a href="{{ url_for('preferences') }}" id="preferences"><span>{{ _('preferences') }}</span></a></div>
<div class="small search center"> <div class="small search center">
{% include 'default/search.html' %} {% include 'courgette/search.html' %}
</div> </div>
<div id="results"> <div id="results">
<div id="sidebar"> <div id="sidebar">
@ -30,6 +31,14 @@
</div> </div>
</div> </div>
{% if answers %}
<div id="answers" class=""><span>{{ _('Answers') }}</span>
{% for answer in answers %}
<span>{{ answer }}</span>
{% endfor %}
</div>
{% endif %}
{% if suggestions %} {% if suggestions %}
<div id="suggestions"><span>{{ _('Suggestions') }}</span> <div id="suggestions"><span>{{ _('Suggestions') }}</span>
{% for suggestion in suggestions %} {% for suggestion in suggestions %}

View File

@ -3,5 +3,5 @@
<input type="text" placeholder="{{ _('Search for...') }}" id="q" class="q" name="q" tabindex="1" autocomplete="off" {% if q %}value="{{ q }}"{% endif %}/> <input type="text" placeholder="{{ _('Search for...') }}" id="q" class="q" name="q" tabindex="1" autocomplete="off" {% if q %}value="{{ q }}"{% endif %}/>
<input type="submit" value="search" id="search_submit" /> <input type="submit" value="search" id="search_submit" />
</div> </div>
{% include 'default/categories.html' %} {% include 'courgette/categories.html' %}
</form> </form>

View File

@ -1,4 +1,4 @@
{% extends "default/base.html" %} {% extends "courgette/base.html" %}
{% block head %} {% endblock %} {% block head %} {% endblock %}
{% block content %} {% block content %}
<h2>{{ _('Engine stats') }}</h2> <h2>{{ _('Engine stats') }}</h2>
@ -6,8 +6,8 @@
{% for stat_name,stat_category in stats %} {% for stat_name,stat_category in stats %}
<div class="left"> <div class="left">
<table> <table>
<tr colspan="3"> <tr>
<th>{{ stat_name }}</th> <th colspan="3">{{ stat_name }}</th>
</tr> </tr>
{% for engine in stat_category %} {% for engine in stat_category %}
<tr> <tr>