Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-04-28 02:24:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:torchbox/wagtail

Browse source
This commit is contained in:
Matt Westcott 2014-10-07 11:51:51 +01:00
commit 03b1e289b9
7 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
wagtail/wagtailadmin/static/wagtailadmin/scss/components/main-nav.scss
View file

@ -35,13 +35,8 @@ $submenu-color:darken($color-grey-1, 5%);
list-style-type:none;
}
ul{
border-top:1px solid rgba(100,100,100,0.2);
}
li{
@include transition(border-color 0.2s ease);
border-bottom:1px solid rgba(100,100,100,0.2);
position:relative;
/* TODO: find better way to procedurally detect the appropriate menu to highlight */
@ -147,6 +142,7 @@ $submenu-color:darken($color-grey-1, 5%);
.nav-search{
position:relative;
padding:0;
margin:0 1em;
label{
@include visuallyhidden();
@ -157,10 +153,15 @@ $submenu-color:darken($color-grey-1, 5%);
@include border-radius(0);
}
input{
cursor:pointer;
border:1px solid darken($color-grey-2, 10%);
background-color:darken($color-grey-2, 15%);
color:#AAA;
padding: 0.9em 2.5em 0.9em 2em;
padding: 0.8em 2.5em 0.8em 1em;
&:hover{
background-color:darken($color-grey-2, 10%);
}
&:active, &:focus{
background-color:darken($color-grey-2, 5%);
color:white;
@ -259,7 +260,7 @@ body.explorer-open {
.nav-main{
position:absolute;
top: 164px; /* WARNING - magic number - the height of the logo plus search box */
top: 175px; /* WARNING - magic number - the height of the logo plus search box */
margin-bottom: 116px; /* WARNING - magic number - the height of the .footer */
.footer{
@ -351,7 +352,7 @@ body.explorer-open {
position: absolute;
top:0;
left:99%;
margin-top:164px; /* same as .nav-main minus 1 pixel for border */
margin-top:175px; /* same as .nav-main minus 1 pixel for border */
}
.dl-menu {

7
wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/add.html
View file

@ -8,9 +8,10 @@
<div class="nice-padding">
<div class="help-block help-info">
{% blocktrans %}
<p>Editors picks are a means of recommending specific pages that might not organically come high up in search results. E.g recommending your primary donation page to a user searching with a less common term like "<em>giving</em>".</p>
{% endblocktrans %}
{% blocktrans %}
<p>Promoted search results are a means of recommending specific pages that might not organically come high up in search results. E.g recommending your primary donation page to a user searching with the less common term "<em>giving</em>".</p>
{% endblocktrans %}
{% blocktrans %}
<p>The "Search term(s)/phrase" field below must contain the full and exact search for which you wish to provide recommended results, <em>including</em> any misspellings/user error. To help, you can choose from search terms that have been popular with users of your site.</p>
{% endblocktrans %}
</div>

2
wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/confirm_delete.html
View file

@ -6,7 +6,7 @@
{% include "wagtailadmin/shared/header.html" with title=delete_str subtitle=query.query_string %}
<div class="nice-padding">
<p>{% trans "Are you sure you want to delete all editors picks for this search term?" %}</p>
<p>{% trans "Are you sure you want to delete all promoted results for this search term?" %}</p>
<form action="{% url 'wagtailsearch_editorspicks_delete' query.id %}" method="POST">
{% csrf_token %}
<input type="submit" value="{% trans 'Yes, delete' %}" class="serious" />

2
wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/includes/editorspicks_form.html
View file

@ -7,7 +7,7 @@
</ul>
<fieldset>
<legend>{% trans "Editors pick" %}</legend>
<legend>{% trans "Promoted search result" %}</legend>
<ul class="fields">
<li class="model_choice_field">
{% trans "Choose another page" as choose_another_text_str %}

4
wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/index.html
View file

@ -14,8 +14,8 @@
{% endblock %}
{% block content %}
{% trans "Editor's search picks" as sp_title_str %}
{% trans "Add new editor's pick" as sp_text_str %}
{% trans "Promoted search results" as sp_title_str %}
{% trans "Add new promoted result" as sp_text_str %}
{% include "wagtailadmin/shared/header.html" with title=sp_title_str add_link="wagtailsearch_editorspicks_add" icon="pick" add_text=sp_text_str search_url="wagtailsearch_editorspicks_index" %}
<div class="nice-padding">

2
wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/list.html
View file

@ -6,7 +6,7 @@
<thead>
<tr>
<th class="title">{% trans "Search term(s)" %}</th>
<th>{% trans "Editors picks" %}</th>
<th>{% trans "Promoted results" %}</th>
<th>{% trans "Views (past week)" %}</th>
</tr>
</thead>

4
wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/results.html
View file

@ -15,9 +15,9 @@
{% include "wagtailadmin/shared/pagination_nav.html" with items=queries is_searching=is_searching linkurl="wagtailsearch_editorspicks_index" %}
{% else %}
{% if is_searching %}
<p>{% blocktrans %}Sorry, no editor's picks match "<em>{{ query_string }}</em>"{% endblocktrans %}</p>
<p>{% blocktrans %}Sorry, no promoted results match "<em>{{ query_string }}</em>"{% endblocktrans %}</p>
{% else %}
{% url 'wagtailsearch_editorspicks_add' as wagtailsearch_editorspicks_add_url %}
<p>{% blocktrans %}No editor's picks have been created. Why not <a href="{{ wagtailsearch_editorspicks_add_url }}">add one</a>?{% endblocktrans %}</p>
<p>{% blocktrans %}No promoted results have been created. Why not <a href="{{ wagtailsearch_editorspicks_add_url }}">add one</a>?{% endblocktrans %}</p>
{% endif %}
{% endif %}