kopia lustrzana https://github.com/wagtail/wagtail
merging from ui update branch
Dave Cranwell
rodzic
12c795f4b3
commit
8628cad394
|
|
@ -249,20 +249,22 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
|
|||
}
|
||||
}
|
||||
|
||||
/* multiple-item forms where groups of fields can be added */
|
||||
.multiple {
|
||||
|
||||
.multiple{
|
||||
.transition(max-height 10s ease);
|
||||
padding:0;
|
||||
max-height:10000px;
|
||||
max-width:1024px - 50px;
|
||||
overflow:hidden;
|
||||
|
||||
> li{
|
||||
position:relative;
|
||||
border-bottom: 1px solid @color-input-border;
|
||||
|
||||
&:first-child fieldset{
|
||||
padding-top:0;
|
||||
}
|
||||
background-color:white;
|
||||
padding:1em 1.5em;
|
||||
margin-bottom:1em;
|
||||
border:1px solid lighten(@color-grey-4, 3%); /* really trying to avoid creating more greys, but this one is better than grey 4 or 5 */
|
||||
.border-radius(2px);
|
||||
}
|
||||
|
||||
/* styles applied to an element as it is being reordered */
|
||||
&.moving{
|
||||
position:relative;
|
||||
}
|
||||
|
|
@ -271,26 +273,35 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
|
|||
width:100%;
|
||||
}
|
||||
|
||||
fieldset{
|
||||
padding-top:0;
|
||||
padding-bottom:0;
|
||||
}
|
||||
|
||||
/* Object controls */
|
||||
.controls{
|
||||
position:absolute;
|
||||
right:0;
|
||||
top:2em;
|
||||
text-transform:uppercase;
|
||||
right:1em;
|
||||
top:1em;
|
||||
color:@color-grey-2;
|
||||
-webkit-border-radius: 3px;
|
||||
border-radius: 3px;
|
||||
overflow:hidden;
|
||||
line-height:0em;
|
||||
.border-radius(2px);
|
||||
|
||||
li{
|
||||
background-color: @color-grey-4;
|
||||
display:inline-block;
|
||||
background-color: @color-grey-3;
|
||||
float:left;
|
||||
cursor:pointer;
|
||||
margin-right:1px;
|
||||
|
||||
&:last-child{
|
||||
margin-right:0;
|
||||
}
|
||||
}
|
||||
|
||||
.icon{
|
||||
padding:0.3em;
|
||||
}
|
||||
|
||||
.icon:before{
|
||||
vertical-align:middle;
|
||||
line-height:2em;
|
||||
|
|
@ -302,23 +313,25 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
|
|||
color:white;
|
||||
}
|
||||
}
|
||||
.icon-bin:hover{
|
||||
background-color:@color-red;
|
||||
}
|
||||
.disabled{
|
||||
display:none;
|
||||
}
|
||||
}
|
||||
> li:first-child .controls{
|
||||
top:0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/* wrapper around add button for mutliple objects */
|
||||
p.add{
|
||||
.add{
|
||||
font-weight:700;
|
||||
cursor:pointer;
|
||||
margin-top:0;
|
||||
margin-bottom:0;
|
||||
padding-top:2.5em;
|
||||
padding-top:1em;
|
||||
padding-bottom:2em;
|
||||
clear:both;
|
||||
}
|
||||
|
||||
/* Other text */
|
||||
|
|
|
|||
|
|
@ -87,6 +87,10 @@
|
|||
.modal-body {
|
||||
position: relative;
|
||||
padding-bottom:2em;
|
||||
|
||||
header{
|
||||
padding-right:100px;
|
||||
}
|
||||
}
|
||||
|
||||
@media screen and (min-width: @breakpoint-mobile) {
|
||||
|
|
|
|||
|
|
@ -646,9 +646,9 @@ footer, .logo{
|
|||
left:0;
|
||||
height:100%;
|
||||
width:@menu-width;
|
||||
margin-left:-@menu-width;
|
||||
|
||||
.inner{ /* inner only serves a purpose to position content */
|
||||
margin-left: -@menu-width;
|
||||
|
||||
.inner{
|
||||
height:100%;
|
||||
position:fixed;
|
||||
width:@menu-width;
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@
|
|||
h2, .object-help{
|
||||
display:none; /* The field label is used instead */
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Special full-width, one-off fields i.e a single text or textarea input */
|
||||
&.full{
|
||||
|
|
@ -158,45 +158,24 @@
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
&.title input,
|
||||
&.title textarea{
|
||||
font-size:2em;
|
||||
padding-top:2em;
|
||||
}
|
||||
|
||||
&.title input{
|
||||
padding-top:1.5em;
|
||||
padding-bottom:1.5em;
|
||||
}
|
||||
|
||||
|
||||
.multiple{
|
||||
.transition(max-height 10s ease);
|
||||
padding:4.5em 0 0 0;
|
||||
max-height:10000px;
|
||||
max-width:1024px - 50px;
|
||||
overflow:hidden;
|
||||
|
||||
> li{
|
||||
position:relative;
|
||||
background-color:white;
|
||||
padding:1em 2em;
|
||||
margin-bottom:1em;
|
||||
border:1px solid @color-grey-5;
|
||||
}
|
||||
|
||||
fieldset{
|
||||
padding-top:0;
|
||||
padding-bottom:0;
|
||||
}
|
||||
|
||||
&.moving{
|
||||
position:relative;
|
||||
}
|
||||
li.moving{
|
||||
position:absolute;
|
||||
width:100%;
|
||||
}
|
||||
}
|
||||
|
||||
.fields{
|
||||
|
|
@ -209,9 +188,8 @@
|
|||
}
|
||||
|
||||
.add{
|
||||
cursor:pointer;
|
||||
padding-top:1em;
|
||||
margin-bottom:3em;
|
||||
clear:both;
|
||||
}
|
||||
|
||||
&.empty{
|
||||
|
|
@ -266,51 +244,6 @@
|
|||
padding-bottom:0.5em;
|
||||
}
|
||||
|
||||
|
||||
/* Object controls */
|
||||
.controls{
|
||||
position:absolute;
|
||||
right:1em;
|
||||
top:1em;
|
||||
color:@color-grey-2;
|
||||
overflow:hidden;
|
||||
.border-radius(2px);
|
||||
|
||||
li{
|
||||
background-color: @color-grey-3;
|
||||
float:left;
|
||||
cursor:pointer;
|
||||
margin-right:1px;
|
||||
|
||||
&:last-child{
|
||||
margin-right:0;
|
||||
}
|
||||
}
|
||||
|
||||
.icon{
|
||||
padding:0.3em;
|
||||
}
|
||||
|
||||
.icon:before{
|
||||
vertical-align:middle;
|
||||
line-height:2em;
|
||||
}
|
||||
.icon:hover{
|
||||
background-color:@color-teal;
|
||||
|
||||
&:before{
|
||||
color:white;
|
||||
}
|
||||
}
|
||||
.icon-bin:hover{
|
||||
background-color:@color-red;
|
||||
}
|
||||
.disabled{
|
||||
display:none;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@media screen and (min-width: @breakpoint-mobile){
|
||||
.object{
|
||||
fieldset{
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
<<<<<<< HEAD:django-wagtail/wagtail/wagtailadmin/templates/wagtailadmin/chooser/browse.html
|
||||
<header class="nice-padding">
|
||||
<h1>Choose a page</h1>
|
||||
</header>
|
||||
{% include "wagtailadmin/shared/header.html" with title="Choose a page" %}
|
||||
{% include 'wagtailadmin/chooser/_search_form.html' %}
|
||||
{% include "wagtailadmin/shared/header.html" with title="Choose a page" search_url="wagtailadmin_choose_page" %}
|
||||
|
||||
<div class="nice-padding">
|
||||
{% include 'wagtailadmin/chooser/_link_types.html' with current='internal' %}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<header class="nice-padding {% if merged %}merged{% endif %} {% if tabbed %}tab-merged{% endif %} {% if search_form %}hasform{% endif %}">
|
||||
<div class="row row-flush">
|
||||
<div class="left col{% if search_form %}6{% else %}9{% endif %}">
|
||||
<div class="left col{% if search_form and add_link %}6{% else %}9{% endif %}">
|
||||
<h1>{{ title }} <span>{{ subtitle }}</span></h1>
|
||||
</div>
|
||||
{% if search_form %}
|
||||
|
|
@ -15,10 +15,10 @@
|
|||
</form>
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="right col3">
|
||||
{% if add_link %}
|
||||
<a href="{% url add_link %}" class="button bicolor icon icon-plus">{{ add_text }}</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% if add_link %}
|
||||
<div class="right col3">
|
||||
<a href="{% url add_link %}" class="button bicolor icon icon-plus">{{ add_text }}</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</header>
|
||||
|
|
@ -63,7 +63,7 @@ def browse(request, parent_page_id=None):
|
|||
if is_searching:
|
||||
return render(request, 'wagtailadmin/chooser/_search_results.html', {
|
||||
'querystring': get_querystring(request),
|
||||
'search_form': search_form,
|
||||
'searchform': search_form,
|
||||
'pages': pages,
|
||||
'is_searching': is_searching
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
{% extends "wagtailadmin/base.html" %}
|
||||
{% block titletag %}Add editors pick{% endblock %}
|
||||
{% block content %}
|
||||
<header>
|
||||
<h1>Add editors pick</h1>
|
||||
</header>
|
||||
{% include "verdantadmin/shared/header.html" with title="Add editor's pick" %}
|
||||
|
||||
<div class="nice-padding">
|
||||
<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>
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@
|
|||
|
||||
{% block titletag %}Delete {{ query.query_string }}{% endblock %}
|
||||
{% block content %}
|
||||
<header>
|
||||
<h1>Delete <span>{{ query.query_string }}</span></h1>
|
||||
</header>
|
||||
|
||||
{% include "verdantadmin/shared/header.html" with title="Delete" subtitle=query.query_string %}
|
||||
|
||||
<div class="nice-padding">
|
||||
<p>Are you sure you want to delete all editors picks for this search term?</p>
|
||||
<form action="{% url 'wagtailsearch_editorspicks_delete' query.id %}" method="POST">
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
{% extends "wagtailadmin/base.html" %}
|
||||
{% block titletag %}Editing {{ query.query_string }}{% endblock %}
|
||||
{% block content %}
|
||||
<header>
|
||||
<h1>Editing <span>{{ query.query_string }}</span></h1>
|
||||
</header>
|
||||
|
||||
{% include "verdantadmin/shared/header.html" with title="Editing" subtitle=query.query_string %}
|
||||
|
||||
<form action="{% url 'wagtailsearch_editorspicks_edit' query.id %}" method="POST" class="nice-padding">
|
||||
{% csrf_token %}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<li id="inline_child_{{ form.prefix }}"{% if form.DELETE.value %} style="display: none;"{% endif %}>
|
||||
<ul class="controls">
|
||||
<li class="icon text-replace teal icon-arrow-up-big inline-child-move-up" id="{{ form.prefix }}-move-up">Move up</li>
|
||||
<li class="icon text-replace teal icon-arrow-down-big inline-child-move-down" id="{{ form.prefix }}-move-down">Move down</li>
|
||||
<li class="icon text-replace teal icon-cross" id="{{ form.DELETE.id_for_label }}-button">Delete</li>
|
||||
<li class="icon text-replace icon-order-up inline-child-move-up" id="{{ form.prefix }}-move-up">Move up</li>
|
||||
<li class="icon text-replace icon-order-down inline-child-move-down" id="{{ form.prefix }}-move-down">Move down</li>
|
||||
<li class="icon text-replace icon-bin" id="{{ form.DELETE.id_for_label }}-button">Delete</li>
|
||||
</ul>
|
||||
|
||||
<fieldset>
|
||||
|
|
|
|||
|
|
@ -10,5 +10,5 @@
|
|||
</script>
|
||||
|
||||
<p class="add">
|
||||
<a class="icon icon-plus-inverse" id="id_{{ formset.prefix }}-ADD" value="Add">Add page</a>
|
||||
<a class="button bicolor icon icon-plus" id="id_{{ formset.prefix }}-ADD" value="Add">Add page</a>
|
||||
</p>
|
||||
|
|
@ -3,18 +3,8 @@
|
|||
{% block bodyclass %}page-explorer{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<header>
|
||||
<div class="row row-flush">
|
||||
<div class="left col9">
|
||||
<h1>Editor's Search Picks</h1>
|
||||
</div>
|
||||
<div class="right col3">
|
||||
<a href="{% url 'wagtailsearch_editorspicks_add' %}" class="button icon icon-plus-inverse">Add new editors pick</a>
|
||||
</div>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
|
||||
{% include "wagtailadmin/shared/header.html" with title="Editor's search picks" add_link="wagtailsearch_editorspicks_add" add_text="Add new editor's pick" %}
|
||||
|
||||
<table class="listing full-width">
|
||||
<col />
|
||||
<col width="40%"/>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
<header>
|
||||
<h1>Popular search terms</h1>
|
||||
</header>
|
||||
{% include "verdantadmin/shared/header.html" with title="Popular search terms" %}
|
||||
|
||||
<form class="query-search search-bar full-width" action="{% url 'wagtailsearch_queries_chooserresults' %}" method="GET" autocomplete="off">
|
||||
<ul class="fields">
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue